diff options
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/base16-builder/node-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/misc/drivers/hplip/3.16.11.nix | 12 | ||||
-rw-r--r-- | pkgs/misc/drivers/hplip/3.18.5.nix | 12 | ||||
-rw-r--r-- | pkgs/misc/drivers/hplip/default.nix | 10 | ||||
-rw-r--r-- | pkgs/misc/vim-plugins/vim-utils.nix | 4 | ||||
-rw-r--r-- | pkgs/misc/vscode-extensions/python/default.nix | 6 |
6 files changed, 23 insertions, 23 deletions
diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index e7b4f81f7e04..735ea6232471 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-10_x}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index ebea49d9540a..779325c99b0b 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -28,14 +28,14 @@ let }; hplipPlatforms = { - "i686-linux" = "x86_32"; - "x86_64-linux" = "x86_64"; - "armv6l-linux" = "arm32"; - "armv7l-linux" = "arm32"; - "aarch64-linux" = "arm64"; + i686-linux = "x86_32"; + x86_64-linux = "x86_64"; + armv6l-linux = "arm32"; + armv7l-linux = "arm32"; + aarch64-linux = "arm64"; }; - hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}" + hplipArch = hplipPlatforms.${stdenv.hostPlatform.system} or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}"); pluginArches = [ "x86_32" "x86_64" "arm32" "arm64" ]; diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix index 68220392fd00..d95eb85168e2 100644 --- a/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -30,14 +30,14 @@ let }; hplipPlatforms = { - "i686-linux" = "x86_32"; - "x86_64-linux" = "x86_64"; - "armv6l-linux" = "arm32"; - "armv7l-linux" = "arm32"; - "aarch64-linux" = "arm64"; + i686-linux = "x86_32"; + x86_64-linux = "x86_64"; + armv6l-linux = "arm32"; + armv7l-linux = "arm32"; + aarch64-linux = "arm64"; }; - hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}" + hplipArch = hplipPlatforms.${stdenv.hostPlatform.system} or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}"); pluginArches = [ "x86_32" "x86_64" "arm32" "arm64" ]; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 851aa9f3f882..978fd9b9e039 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -30,13 +30,13 @@ let }; hplipPlatforms = { - "i686-linux" = "x86_32"; - "x86_64-linux" = "x86_64"; - "armv6l-linux" = "arm32"; - "armv7l-linux" = "arm32"; + i686-linux = "x86_32"; + x86_64-linux = "x86_64"; + armv6l-linux = "arm32"; + armv7l-linux = "arm32"; }; - hplipArch = hplipPlatforms."${stdenv.hostPlatform.system}" + hplipArch = hplipPlatforms.${stdenv.hostPlatform.system} or (throw "HPLIP not supported on ${stdenv.hostPlatform.system}"); pluginArches = [ "x86_32" "x86_64" "arm32" ]; diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 44bc7ec3ced1..fad9503559b1 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -264,7 +264,7 @@ let ${lib.concatMapStrings (plugin: '' let g:nix_plugin_locations['${plugin.pname}'] = "${plugin.rtp}" '') plugins} - let g:nix_plugin_locations['vim-addon-manager'] = "${knownPlugins."vim-addon-manager".rtp}" + let g:nix_plugin_locations['vim-addon-manager'] = "${knownPlugins.vim-addon-manager.rtp}" let g:vim_addon_manager = {} @@ -513,7 +513,7 @@ rec { name = "vim_with_custom_plugin"; vimrcConfig.vam.knownPlugins = vimPlugins // ({ - "vim-trailing-whitespace" = buildVimPluginFrom2Nix { + vim-trailing-whitespace = buildVimPluginFrom2Nix { name = "vim-trailing-whitespace"; src = fetchFromGitHub { owner = "bronson"; diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 423f39f9bbcc..f4ebea8e4383 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -23,9 +23,9 @@ let else throw "Only x86_64 Linux and Darwin are supported."; languageServerSha256 = { - "linux-x64" = "0j9251f8dfccmg0x9gzg1cai4k5zd0alcfpb0443gs4jqakl0lr2"; - "osx-x64" = "070qwwl08fa24rsnln4i5x9mfriqaw920l6v2j8d1r0zylxnyjsa"; - }."${arch}"; + linux-x64 = "0j9251f8dfccmg0x9gzg1cai4k5zd0alcfpb0443gs4jqakl0lr2"; + osx-x64 = "070qwwl08fa24rsnln4i5x9mfriqaw920l6v2j8d1r0zylxnyjsa"; + }.${arch}; # version is languageServerVersion in the package.json languageServer = extractNuGet rec { |