diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-03 20:07:35 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-03 20:07:35 +0100 |
commit | 2da31b80bb53000476b0a5ddcf7d76a44a15bfe4 (patch) | |
tree | 9ac0bebed906a14b77141b3450e81681602b95e7 /pkgs/misc | |
parent | 092e3b50a8ff501a6ad1caf20165d2284d1ad5cb (diff) | |
parent | 4b5b8850d81e11cb81855dbe58f4ce789d9e3893 (diff) | |
download | nixlib-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.tar nixlib-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.tar.gz nixlib-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.tar.bz2 nixlib-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.tar.lz nixlib-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.tar.xz nixlib-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.tar.zst nixlib-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/drivers/sc-controller/default.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/vim-plugins/overrides.nix | 6 | ||||
-rw-r--r-- | pkgs/misc/vim-plugins/vim-utils.nix | 35 |
3 files changed, 22 insertions, 23 deletions
diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index c0f471c8e201..764e60ac13ba 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "sc-controller"; - version = "0.4.6"; + version = "0.4.6.1"; src = fetchFromGitHub { owner = "kozec"; repo = pname; rev = "v${version}"; - sha256 = "0527igjgc5jf60ldsrc4xv3k8gw2480pmqyp6nv5xcrm5j0ah4q5"; + sha256 = "1kcqsnrlwl4s94j6ahgkz3w4sy9hsr95y624zab6g10w0fl5sqrc"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 307681111ac2..febdd94e1198 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -1,7 +1,7 @@ { lib, stdenv , python, cmake, vim, ruby , which, fetchgit, llvmPackages, rustPlatform -, xkb_switch, fzf, skim +, xkb-switch, fzf, skim , python3, boost, icu, ncurses , ycmd, rake , substituteAll @@ -308,9 +308,9 @@ self: super: { vim-xkbswitch = super.vim-xkbswitch.overrideAttrs(old: { patchPhase = '' substituteInPlace plugin/xkbswitch.vim \ - --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so + --replace /usr/local/lib/libxkbswitch.so ${xkb-switch}/lib/libxkbswitch.so ''; - buildInputs = [ xkb_switch ]; + buildInputs = [ xkb-switch ]; }); vim-yapf = super.vim-yapf.overrideAttrs(old: { diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 6e867dfc9661..cf5eeaec3e33 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -152,15 +152,21 @@ vim_with_plugins can be installed like any other application within Nix. let inherit (stdenv) lib; - # make sure a plugin is a derivation. If plugin already is a derivation, this - # is a no-op. If it is a string, it is looked up in knownPlugins. + # make sure a plugin is a derivation and its dependencies are derivations. If + # plugin already is a derivation, this is a no-op. If it is a string, it is + # looked up in knownPlugins. pluginToDrv = knownPlugins: plugin: - if builtins.isString plugin then - # make sure `pname` is set to that we are able to convert the derivation - # back to a string. - ( knownPlugins.${plugin} // { pname = plugin; }) - else - plugin; + let + drv = + if builtins.isString plugin then + # make sure `pname` is set to that we are able to convert the derivation + # back to a string. + ( knownPlugins.${plugin} // { pname = plugin; }) + else + plugin; + in + # make sure all the dependencies of the plugin are also derivations + drv // { dependencies = map (pluginToDrv knownPlugins) (drv.dependencies or []); }; # transitive closure of plugin dependencies (plugin needs to be a derivation) transitiveClosure = plugin: @@ -170,14 +176,6 @@ let findDependenciesRecursively = plugins: lib.concatMap transitiveClosure plugins; - attrnamesToPlugins = { knownPlugins, names }: - map (name: if builtins.isString name then knownPlugins.${name} else name) knownPlugins; - - pluginToAttrname = plugin: - plugin.pname; - - pluginsToAttrnames = plugins: map pluginToAttrname plugins; - vamDictToNames = x: if builtins.isString x then [x] else (lib.optional (x ? name) x.name) @@ -429,7 +427,7 @@ rec { if vam != null && vam ? knownPlugins then vam.knownPlugins else if pathogen != null && pathogen ? knownPlugins then pathogen.knownPlugins else vimPlugins; - pathogenPlugins = findDependenciesRecursively ((map pluginToDrv knownPlugins) pathogen.pluginNames); + pathogenPlugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) pathogen.pluginNames); vamPlugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) (lib.concatMap vamDictToNames vam.pluginDictionaries)); nonNativePlugins = (lib.optionals (pathogen != null) pathogenPlugins) ++ (lib.optionals (vam != null) vamPlugins) @@ -482,7 +480,8 @@ rec { rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6"; sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9"; }; - dependencies = []; + # make sure string dependencies are handled + dependencies = [ "vim-nix" ]; }; }); vimrcConfig.vam.pluginDictionaries = [ { names = [ "vim-trailing-whitespace" ]; } ]; |