diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/editors/neovim/tests/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/editors/spacevim/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/editors/vim/macvim-configurable.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/editors/vim/plugins/vim-utils.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/editors/vim/vimacs.nix | 4 | ||||
-rw-r--r-- | pkgs/test/vim/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
9 files changed, 18 insertions, 18 deletions
diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 3fed7fda38aca..29749c35db1fa 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -1,5 +1,5 @@ # run tests by building `neovim.tests` -{ vimUtils, vim_configurable, writeText, neovim, vimPlugins +{ vimUtils, writeText, neovim, vimPlugins , lib, fetchFromGitHub, neovimUtils, wrapNeovimUnstable , neovim-unwrapped , fetchFromGitLab diff --git a/pkgs/applications/editors/spacevim/default.nix b/pkgs/applications/editors/spacevim/default.nix index ef3a6538c7c4a..8252f8ce1c145 100644 --- a/pkgs/applications/editors/spacevim/default.nix +++ b/pkgs/applications/editors/spacevim/default.nix @@ -2,7 +2,7 @@ , git , fzf , makeWrapper -, vim_configurable +, vim-full , vimPlugins , fetchFromGitHub , lib @@ -14,7 +14,7 @@ let format = formats.toml { }; - vim-customized = vim_configurable.customize { + vim-customized = vim-full.customize { name = "vim"; # Not clear at the moment how to import plugins such that # SpaceVim finds them and does not auto download them to diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 11ddddaefc24c..ad64772de5548 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -63,7 +63,7 @@ let in stdenv.mkDerivation rec { - pname = "vim_configurable"; + pname = "vim-full"; inherit (common) version postPatch hardeningDisable enableParallelBuilding meta; diff --git a/pkgs/applications/editors/vim/macvim-configurable.nix b/pkgs/applications/editors/vim/macvim-configurable.nix index 7ed3dee9b6b9e..5c436307897f4 100644 --- a/pkgs/applications/editors/vim/macvim-configurable.nix +++ b/pkgs/applications/editors/vim/macvim-configurable.nix @@ -6,9 +6,9 @@ let makeCustomizable = macvim: macvim // { # configure expects the same args as vimUtils.vimrcFile. # This is the same as the value given to neovim.override { configure = … } - # or the value of vim_configurable.customize { vimrcConfig = … } + # or the value of vim-full.customize { vimrcConfig = … } # - # Note: Like neovim and vim_configurable, configuring macvim disables the + # Note: Like neovim and vim-full, configuring macvim disables the # sourcing of the user's vimrc. Use `customRC = "source $HOME/.vim/vimrc"` # if you want to preserve that behavior. configure = let diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index f0e4e8e982e8f..6607ff2b8c433 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -14,7 +14,7 @@ USAGE EXAMPLE Install Vim like this eg using nixos option environment.systemPackages which will provide vim-with-plugins in PATH: - vim_configurable.customize { + vim-full.customize { name = "vim-with-plugins"; # optional # add custom .vimrc lines like this: @@ -105,7 +105,7 @@ fitting the vimrcConfig.vam.pluginDictionaries option. Thus the most simple usage would be: vim_with_plugins = - let vim = vim_configurable; + let vim = vim-full; inherit (vimUtil.override {inherit vim}) rtpPath addRtp buildVimPlugin vimHelpTags; vimPlugins = [ # the derivation list from the buffer created by nix#ExportPluginsForNix diff --git a/pkgs/applications/editors/vim/vimacs.nix b/pkgs/applications/editors/vim/vimacs.nix index f8a087cbe6ee0..e65439df5236e 100644 --- a/pkgs/applications/editors/vim/vimacs.nix +++ b/pkgs/applications/editors/vim/vimacs.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, config, vim_configurable, macvim, vimPlugins +{ lib, stdenv, config, vim-full, macvim, vimPlugins , useMacvim ? stdenv.isDarwin && (config.vimacs.macvim or true) , vimacsExtraArgs ? "" }: stdenv.mkDerivation rec { pname = "vimacs"; version = lib.getVersion vimPackage; - vimPackage = if useMacvim then macvim else vim_configurable; + vimPackage = if useMacvim then macvim else vim-full; buildInputs = [ vimPackage vimPlugins.vimacs ]; diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index 488a2fe99c563..4d8e59a306a80 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -1,4 +1,4 @@ -{ vimUtils, vim_configurable, writeText, vimPlugins +{ vimUtils, vim-full, writeText, vimPlugins , lib, fetchFromGitHub , pkgs }: @@ -14,12 +14,12 @@ in ### vim tests ################## - test_vim_with_vim_nix_using_plug = vim_configurable.customize { + test_vim_with_vim_nix_using_plug = vim-full.customize { name = "vim-with-vim-addon-nix-using-plug"; vimrcConfig.plug.plugins = with vimPlugins; [ vim-nix ]; }; - test_vim_with_vim_nix = vim_configurable.customize { + test_vim_with_vim_nix = vim-full.customize { name = "vim-with-vim-addon-nix"; vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a2a6d988296d7..3508f189fbeda 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1559,6 +1559,8 @@ mapAliases ({ vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168 venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # Added 2021-02-05 vgo2nix = throw "vgo2nix has been removed, because it was deprecated. Consider using gomod2nix instead"; # added 2022-08-24 + vimHugeX = vim-full; # Added 2022-12-04 + vim_configurable = vim-full; # Added 2022-12-04 vimbWrapper = throw "'vimbWrapper' has been renamed to/replaced by 'vimb'"; # Converted to throw 2022-02-22 virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # Added 2021-07-21 virtuoso = throw "virtuoso has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccc45a0bba460..439d7e9e9c7a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27532,7 +27532,7 @@ with pkgs; assign-lb-ip = callPackage ../applications/networking/cluster/assign-lb-ip { }; astroid = callPackage ../applications/networking/mailreaders/astroid { - vim = vim_configurable.override { features = "normal"; }; + vim = vim-full.override { features = "normal"; }; }; aucatctl = callPackage ../applications/audio/aucatctl { }; @@ -32738,14 +32738,12 @@ with pkgs; macvim = callPackage ../applications/editors/vim/macvim-configurable.nix { stdenv = clangStdenv; }; - vimHugeX = vim_configurable; - - vim_configurable = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix { + vim-full = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; inherit (darwin) libobjc; }); - vim-darwin = (vim_configurable.override { + vim-darwin = (vim-full.override { config = { vim = { gui = "none"; |