diff --git a/flake.lock b/flake.lock index 92ffdc5..a810dd6 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1685655444, - "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=", + "lastModified": 1697059129, + "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd", + "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", "type": "github" }, "original": { diff --git a/pkgs/vim/default.nix b/pkgs/vim/default.nix index ef86d5f..d2c24db 100755 --- a/pkgs/vim/default.nix +++ b/pkgs/vim/default.nix @@ -11,8 +11,8 @@ with pkgs; let - plugins = let inherit (vimUtils) buildVimPluginFrom2Nix; in { - "systemd-syntax" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + plugins = let inherit (vimUtils) buildVimPlugin; in { + "systemd-syntax" = buildVimPlugin { # created by nix#NixDerivation pname = "systemd-syntax"; version = "git"; src = fetchFromGitHub { @@ -23,7 +23,7 @@ let }; dependencies = []; }; - "opencl-syntax" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + "opencl-syntax" = buildVimPlugin { # created by nix#NixDerivation pname = "opencl-syntax"; version = "git"; src = fetchFromGitHub { @@ -34,7 +34,7 @@ let }; dependencies = []; }; - vim-timedot = buildVimPluginFrom2Nix { + vim-timedot = buildVimPlugin { pname = "vim-timedot"; version = "git"; src = fetchFromGitHub { @@ -44,7 +44,7 @@ let sha256 = "0vgga3fmppb71apd31bwji98d62vs1p77c1hssshmh2fc7yck6s8"; }; }; - vim-selinux = buildVimPluginFrom2Nix { + vim-selinux = buildVimPlugin { pname = "vim-selinux"; version = "git"; src = fetchFromGitHub { @@ -54,13 +54,13 @@ let sha256 = "kOKOpxLSMCEQ1mmoJrL72/1fAH9xPV21rReAXrr5f5g="; }; }; - vim-lilypond = buildVimPluginFrom2Nix { # created by nix#NixDerivation + vim-lilypond = buildVimPlugin { # created by nix#NixDerivation pname = "vim-lilypond"; version = "git"; src = "${pkgs.lilypond.outPath}/share/lilypond/${pkgs.lilypond.version}/vim"; dependencies = []; }; - vim-css-color = buildVimPluginFrom2Nix { + vim-css-color = buildVimPlugin { pname = "vim-css-color"; version = "git"; src = fetchFromGitHub { @@ -70,7 +70,7 @@ let sha256 = "08k1jh9n0kz9xwmy0ig03w9lx0r2m2rhmfwb0idy81madllcidjc"; }; }; - vim-lsp-mats = buildVimPluginFrom2Nix { + vim-lsp-mats = buildVimPlugin { pname = "vim-lsp"; version = "git"; src = fetchFromGitHub {