From 3357c037e664de59f6a59bfe3cee074c4f25aea6 Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Fri, 5 Jan 2024 16:12:25 -0500 Subject: [PATCH] Stop using deprecated builder --- nix/base-system/flake.nix | 4 ++-- nix/base-system/harpoon-nvim.nix | 4 ++-- nix/darwin/flake.lock | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix index 25146b0..bc2c4cf 100644 --- a/nix/base-system/flake.nix +++ b/nix/base-system/flake.nix @@ -53,10 +53,10 @@ inherit (pkgs) fetchFromGitHub; }; harpoon-nvim = pkgs.callPackage ./harpoon-nvim.nix { - inherit (pkgs.vimUtils) buildVimPluginFrom2Nix; + inherit (pkgs.vimUtils) buildVimPlugin; harpoonSrc = harpoon-src; }; - nvim-treesitter-context = pkgs.vimUtils.buildVimPluginFrom2Nix { + nvim-treesitter-context = pkgs.vimUtils.buildVimPlugin { name = "nvim-treesitter-context"; src = treesitter-context; }; diff --git a/nix/base-system/harpoon-nvim.nix b/nix/base-system/harpoon-nvim.nix index b69b653..fbae076 100644 --- a/nix/base-system/harpoon-nvim.nix +++ b/nix/base-system/harpoon-nvim.nix @@ -1,5 +1,5 @@ -{buildVimPluginFrom2Nix, harpoonSrc, ...}: -buildVimPluginFrom2Nix { +{buildVimPlugin, harpoonSrc, ...}: +buildVimPlugin { name = "harpoon"; src = harpoonSrc; } diff --git a/nix/darwin/flake.lock b/nix/darwin/flake.lock index c15e241..20adaac 100644 --- a/nix/darwin/flake.lock +++ b/nix/darwin/flake.lock @@ -36,12 +36,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-h8APs3KV8oU8sWYFEpSpqFjqJ/QY2a2L90BDfad5VUo=", - "path": "/nix/store/0jd7ginq0vz1gglni90j5bzj4bk4ly7q-source/nix/base-system", + "narHash": "sha256-V/t8UhlpbGYByMB1kBdPn2kHLgUlWdOKX4e3XFgDIi4=", + "path": "/nix/store/mmp67clvw8ypsi8vfc17i4mvzr19hnxd-source/nix/base-system", "type": "path" }, "original": { - "path": "/nix/store/0jd7ginq0vz1gglni90j5bzj4bk4ly7q-source/nix/base-system", + "path": "/nix/store/mmp67clvw8ypsi8vfc17i4mvzr19hnxd-source/nix/base-system", "type": "path" } },