diff options
| author | Naïm Favier <n@monade.li> | 2022-12-09 10:34:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-09 10:34:17 +0100 |
| commit | 0bc9e25e681a9670be7d8bbe46768a268e04acff (patch) | |
| tree | 3b0a1e86dc61134843f23360ec12a45308509423 /pkgs/top-level | |
| parent | 357832f20807163f2849af503029507b160557a5 (diff) | |
| parent | 4e5ebcc3ed1de9c5c2001c7d5829f4566e0bde3f (diff) | |
Merge pull request #204438 from ncfavier/vim-full
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
2 files changed, 5 insertions, 5 deletions
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"; |