From 0eb92176bf486dab758ce55c494623f24937e45b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 19 Mar 2022 22:56:44 +0100 Subject: [PATCH] vim_configurable: don't accept arbitrary arguments This hides potential errors. --- pkgs/applications/editors/vim/configurable.nix | 1 - pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 9f17bfa767e7..b436c5db5b2d 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -25,7 +25,6 @@ , ximSupport ? config.vim.xim or true # less than 15KB, needed for deadkeys , darwinSupport ? config.vim.darwin or false # Enable Darwin support , ftNixSupport ? config.vim.ftNix or true # Add .nix filetype detection and minimal syntax highlighting support -, ... }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8e159718ce4..62a8598c8ea9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24717,7 +24717,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"; gui = "auto"; }; + vim = vim_configurable.override { features = "normal"; }; }; aucatctl = callPackage ../applications/audio/aucatctl { }; @@ -29721,8 +29721,6 @@ with pkgs; vim_configurable = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; inherit (darwin) libobjc; - gtk2 = if stdenv.isDarwin then gtk2-x11 else gtk2; - gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; }); vim-darwin = (vim_configurable.override {