diff options
Diffstat (limited to 'pkgs')
135 files changed, 505 insertions, 505 deletions
diff --git a/pkgs/applications/editors/emacs-modes/libgenerated.nix b/pkgs/applications/editors/emacs-modes/libgenerated.nix index 73d66dc2b3c49..0529fce2b16d6 100644 --- a/pkgs/applications/editors/emacs-modes/libgenerated.nix +++ b/pkgs/applications/editors/emacs-modes/libgenerated.nix @@ -53,7 +53,7 @@ in { , sha256 ? null , ... }@args: let - sourceArgs = args."${variant}"; + sourceArgs = args.${variant}; version = sourceArgs.version or null; deps = sourceArgs.deps or null; error = sourceArgs.error or args.error or null; @@ -78,7 +78,7 @@ in { inherit sha256; }; packageRequires = lib.optional (! isNull deps) - (map (dep: pkgargs."${dep}" or self."${dep}" or null) + (map (dep: pkgargs.${dep} or self.${dep} or null) deps); meta = (sourceArgs.meta or {}) // { inherit broken; diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index f57c1b71b13dc..a790c6a34555a 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -500,6 +500,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac }; }; - in super // overrides."${variant}"); + in super // overrides.${variant}); in generateMelpa { } diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 629bd9d019d27..0d647ea5aaadc 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -4,13 +4,13 @@ let version = "3.0.15"; plat = { - "i386-linux" = "i386"; - "x86_64-linux" = "x86_64"; + i386-linux = "i386"; + x86_64-linux = "x86_64"; }.${stdenv.hostPlatform.system}; sha256 = { - "i386-linux" = "0v2nsis6vb1lnhmjd28vrfxqwwpycv02j0nvjlfzcgj4b3400j7a"; - "x86_64-linux" = "130n586cw0836zsbwqcz3pp3h0d4ny74ngqs4k4cvfb92556r7xh"; + i386-linux = "0v2nsis6vb1lnhmjd28vrfxqwwpycv02j0nvjlfzcgj4b3400j7a"; + x86_64-linux = "130n586cw0836zsbwqcz3pp3h0d4ny74ngqs4k4cvfb92556r7xh"; }.${stdenv.hostPlatform.system}; in diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 1d65be3e73dd7..d21d0ad5ee00a 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { inherit (common) version postPatch hardeningDisable enableParallelBuilding meta; src = builtins.getAttr source { - "default" = common.src; # latest release + default = common.src; # latest release }; patches = [ ./cflags-prune.diff ] ++ stdenv.lib.optional ftNixSupport ./ft-nix-support.patch; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 7e4035ac336aa..5c0a21237a088 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -4,15 +4,15 @@ let inherit (stdenv.hostPlatform) system; plat = { - "x86_64-linux" = "linux-x64"; - "x86_64-darwin" = "darwin"; + x86_64-linux = "linux-x64"; + x86_64-darwin = "darwin"; }.${system}; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "x86_64-linux" = "17g7mra9a52qlrrj77cw16vqvc7fsvbhc03wrl4iq1afzxsyqi22"; - "x86_64-darwin" = "1is04anvhl2b354h5w7i5qi7ixhzna277f7xdy4qj9gjby6zydc6"; + x86_64-linux = "17g7mra9a52qlrrj77cw16vqvc7fsvbhc03wrl4iq1afzxsyqi22"; + x86_64-darwin = "1is04anvhl2b354h5w7i5qi7ixhzna277f7xdy4qj9gjby6zydc6"; }.${system}; in callPackage ./generic.nix rec { diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index fbcc6d0c7374f..b301cdaafe90d 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -4,15 +4,15 @@ let inherit (stdenv.hostPlatform) system; plat = { - "x86_64-linux" = "linux-x64"; - "x86_64-darwin" = "darwin"; + x86_64-linux = "linux-x64"; + x86_64-darwin = "darwin"; }.${system}; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "x86_64-linux" = "1ay4zvkbln2wf2j1d71mn13b6p2fqvzgz45mzrgaqwsszhbg4xzp"; - "x86_64-darwin" = "17r9krb1qd92ybx078hkw9zlyym6kbnmbl91vjdilsq77bkf9jmw"; + x86_64-linux = "1ay4zvkbln2wf2j1d71mn13b6p2fqvzgz45mzrgaqwsszhbg4xzp"; + x86_64-darwin = "17r9krb1qd92ybx078hkw9zlyym6kbnmbl91vjdilsq77bkf9jmw"; }.${system}; in callPackage ./generic.nix rec { diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index f046b07ad348c..9b146aa503647 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -38,7 +38,7 @@ let let inherit (args) name; sname = args.sname or name; - inherit (srcs."${sname}") src version; + inherit (srcs.${sname}) src version; mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; in diff --git a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix b/pkgs/applications/misc/taskjuggler/3.x/gemset.nix index e65ab3451a62d..deeeac106943a 100644 --- a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix +++ b/pkgs/applications/misc/taskjuggler/3.x/gemset.nix @@ -1,5 +1,5 @@ { - "mail" = { + mail = { version = "2.6.3"; source = { type = "gem"; @@ -9,14 +9,14 @@ "mime-types" ]; }; - "mime-types" = { + mime-types = { version = "2.6.1"; source = { type = "gem"; sha256 = "1vnrvf245ijfyxzjbj9dr6i1hkjbyrh4yj88865wv9bs75axc5jv"; }; }; - "taskjuggler" = { + taskjuggler = { version = "3.5.0"; source = { type = "gem"; @@ -27,7 +27,7 @@ "term-ansicolor" ]; }; - "term-ansicolor" = { + term-ansicolor = { version = "1.3.2"; source = { type = "gem"; @@ -37,7 +37,7 @@ "tins" ]; }; - "tins" = { + tins = { version = "1.6.0"; source = { type = "gem"; diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 2f79f6900cd99..b1067414b66c4 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -58,8 +58,8 @@ let inherit (generated) version sources; mozillaPlatforms = { - "i686-linux" = "linux-i686"; - "x86_64-linux" = "linux-x86_64"; + i686-linux = "linux-i686"; + x86_64-linux = "linux-x86_64"; }; arch = mozillaPlatforms.${stdenv.hostPlatform.system}; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index fc3cc2e89a91b..c0cb85eb17770 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -94,7 +94,7 @@ let lang = "en-US"; srcs = { - "x86_64-linux" = fetchurl { + x86_64-linux = fetchurl { urls = [ "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" @@ -102,7 +102,7 @@ let sha256 = "0nnzynk3nlnd847c8jjghs9anmr5a2hv7nk1qxigigxqa5vqy96z"; }; - "i686-linux" = fetchurl { + i686-linux = fetchurl { urls = [ "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { pname = "tor-browser-bundle-bin"; inherit version; - src = srcs."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); preferLocalBuild = true; allowSubstitutes = false; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index d820d40f7a34a..9a05a92cfb314 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -10,8 +10,8 @@ let version = "73.4.118"; arch = { - "x86_64-linux" = "x86_64"; - "i686-linux" = "x86"; + x86_64-linux = "x86_64"; + i686-linux = "x86"; }.${stdenv.hostPlatform.system}; installer = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz"; diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 10b7eb7d439f4..77f86e10a4930 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -18,13 +18,13 @@ let pname = "wire-desktop"; version = { - "x86_64-linux" = "3.9.2895"; - "x86_64-darwin" = "3.9.2943"; + x86_64-linux = "3.9.2895"; + x86_64-darwin = "3.9.2943"; }.${system} or throwSystem; sha256 = { - "x86_64-linux" = "0wrn95m64j4b7ym44h9zawq13kg4m12aixlyyzp56bfyczmjq4a5"; - "x86_64-darwin" = "1y1bzsjmjrj518q29xfx6gg1nhdbaz7y5hzaqrp241az6plp090k"; + x86_64-linux = "0wrn95m64j4b7ym44h9zawq13kg4m12aixlyyzp56bfyczmjq4a5"; + x86_64-darwin = "1y1bzsjmjrj518q29xfx6gg1nhdbaz7y5hzaqrp241az6plp090k"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index bcfe8f01e4a4c..704c439bb27d7 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -17,7 +17,7 @@ let mainbin = "SoulseekQt-" + (version) +"-"+ (if stdenv.is64bit then "64bit" else "32bit"); srcs = { - "x86_64-linux" = fetchurl { + x86_64-linux = fetchurl { url = "https://www.dropbox.com/s/0vi87eef3ooh7iy/${mainbin}.tgz"; sha256 = "0d1cayxr1a4j19bc5a3qp9pg22ggzmd55b6f5av3lc6lvwqqg4w6"; }; @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { pname = "soulseekqt"; inherit version; - src = srcs."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + src = srcs.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); dontBuild = true; diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 5255b492ec662..cc2bf534fd940 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -4,14 +4,14 @@ let sha256 = { - "x86_64-linux" = "08kdxsg9npb1nmlr2jyq7p238735kqkp7c5xckxn6rc4cp12n2y2"; - "i686-linux" = "11r5d4234zbkkgyrd7q9x3w7s7lailnq7z4x8cnhpr8vipzrg7h2"; - }."${stdenv.hostPlatform.system}" or (throw "system ${stdenv.hostPlatform.system} not supported"); + x86_64-linux = "08kdxsg9npb1nmlr2jyq7p238735kqkp7c5xckxn6rc4cp12n2y2"; + i686-linux = "11r5d4234zbkkgyrd7q9x3w7s7lailnq7z4x8cnhpr8vipzrg7h2"; + }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); arch = { - "x86_64-linux" = "amd64"; - "i686-linux" = "i686"; - }."${stdenv.hostPlatform.system}" or (throw "system ${stdenv.hostPlatform.system} not supported"); + x86_64-linux = "amd64"; + i686-linux = "i686"; + }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); description = "Desktop sharing application, providing remote support and online meetings"; diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index ecce7172defa7..e9d0727d31cf1 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -2,8 +2,8 @@ let arch = { - "x86_64-linux" = "x64"; - "i686-linux" = "i386"; + x86_64-linux = "x64"; + i686-linux = "i386"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; @@ -14,8 +14,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "114k7dsxn7lzv6mjq9alsqxypvkah4lmjn5w6brbvgd6m6pdwslz"; - "i686-linux" = "1dh0hxbd33bs51xib3qwxw58h9j30v0dc10b4x4rwkbgsj11nc83"; + x86_64-linux = "114k7dsxn7lzv6mjq9alsqxypvkah4lmjn5w6brbvgd6m6pdwslz"; + i686-linux = "1dh0hxbd33bs51xib3qwxw58h9j30v0dc10b4x4rwkbgsj11nc83"; }.${stdenv.hostPlatform.system}; }; diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix index 6b23858aee48e..de2e99ea07d49 100644 --- a/pkgs/applications/radio/gnuradio/ais.nix +++ b/pkgs/applications/radio/gnuradio/ais.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { owner = "bistromath"; repo = "gr-ais"; # Upstream PR: https://github.com/bistromath/gr-ais/commit/8502d0252a2a1a9b8d1a71795eaeb5d820684054 - "rev" = "8502d0252a2a1a9b8d1a71795eaeb5d820684054"; - "sha256" = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh"; + rev = "8502d0252a2a1a9b8d1a71795eaeb5d820684054"; + sha256 = "1b9j0kc74cw12a7jv4lii77dgzqzg2s8ndzp4xmisxksgva1qfvh"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index dfe1277d5ac98..a04ec0bb16ce0 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -29,7 +29,7 @@ let "8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh"; "8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2"; "8.10+beta2" = "0jk7pwydhd17ab7ii69zvi4sgrr630q2lsxhckaj3sz55cpjlhal"; - }."${version}"; + }.${version}; coq-version = stdenv.lib.versions.majorMinor version; versionAtLeast = stdenv.lib.versionAtLeast coq-version; ideFlags = stdenv.lib.optionalString (buildIde && !versionAtLeast "8.10") diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index c86354234e3fc..bd116b02e29e6 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { # Prevent nauty from sniffing some cpu features. While those are very # widely available, it can lead to nasty bugs when they are not available: # https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA - "default" = [ "--disable-clz" "--disable-popcnt" ]; - "westmere" = [ "--disable-clz" ]; - "sandybridge" = [ "--disable-clz" ]; - "ivybridge" = [ "--disable-clz" ]; + default = [ "--disable-clz" "--disable-popcnt" ]; + westmere = [ "--disable-clz" ]; + sandybridge = [ "--disable-clz" ]; + ivybridge = [ "--disable-clz" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"} or []; buildInputs = []; installPhase = '' diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 1cb5107806914..7bb905fecd86a 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -172,7 +172,7 @@ let self = rec { }; mkController = controller: { - "${controller}" = mkKodiPlugin rec { + ${controller} = mkKodiPlugin rec { plugin = pname + "-" + controller; namespace = "game.controller." + controller; sourceDir = "addons/" + namespace; diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index f3055fc79c35a..042b01e86780f 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -47,7 +47,7 @@ callPackage (import ./generic.nix (rec { # Sources needed to build tools and firmwares. xenfiles = optionalAttrs withInternalQemu { - "qemu-xen" = { + qemu-xen = { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen.git; # rev = "refs/tags/qemu-xen-${version}"; @@ -67,7 +67,7 @@ callPackage (import ./generic.nix (rec { meta.description = "Xen's fork of upstream Qemu"; }; } // optionalAttrs withInternalTraditionalQemu { - "qemu-xen-traditional" = { + qemu-xen-traditional = { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; # rev = "refs/tags/xen-${version}"; @@ -114,7 +114,7 @@ callPackage (import ./generic.nix (rec { meta.description = "Xen's fork of iPXE"; }; } // optionalAttrs withLibHVM { - "xen-libhvm-dir-remote" = { + xen-libhvm-dir-remote = { src = fetchgit { name = "xen-libhvm"; url = https://github.com/michalpalka/xen-libhvm; diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index 64704f73e7b1f..af4721516eca5 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -50,7 +50,7 @@ callPackage (import ./generic.nix (rec { # Sources needed to build tools and firmwares. xenfiles = optionalAttrs withInternalQemu { - "qemu-xen" = { + qemu-xen = { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen.git; rev = "refs/tags/qemu-xen-${version}"; @@ -86,7 +86,7 @@ callPackage (import ./generic.nix (rec { meta.description = "Xen's fork of upstream Qemu"; }; } // optionalAttrs withInternalTraditionalQemu { - "qemu-xen-traditional" = { + qemu-xen-traditional = { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; rev = "refs/tags/xen-${version}"; @@ -152,7 +152,7 @@ callPackage (import ./generic.nix (rec { meta.description = "Xen's fork of iPXE"; }; } // optionalAttrs withLibHVM { - "xen-libhvm-dir-remote" = { + xen-libhvm-dir-remote = { src = fetchgit { name = "xen-libhvm"; url = https://github.com/ts468/xen-libhvm; diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 2a59cd1f06153..67bb5e996cccf 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -59,7 +59,7 @@ callPackage (import ./generic.nix (rec { # Sources needed to build tools and firmwares. xenfiles = optionalAttrs withInternalQemu { - "qemu-xen" = { + qemu-xen = { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen.git; rev = "refs/tags/qemu-xen-${version}"; @@ -72,7 +72,7 @@ callPackage (import ./generic.nix (rec { meta.description = "Xen's fork of upstream Qemu"; }; } // optionalAttrs withInternalTraditionalQemu { - "qemu-xen-traditional" = { + qemu-xen-traditional = { src = fetchgit { url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; rev = "refs/tags/xen-${version}"; @@ -117,7 +117,7 @@ callPackage (import ./generic.nix (rec { meta.description = "Xen's fork of iPXE"; }; } // optionalAttrs withLibHVM { - "xen-libhvm-dir-remote" = { + xen-libhvm-dir-remote = { src = fetchgit { name = "xen-libhvm"; url = https://github.com/michalpalka/xen-libhvm; diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 3ed7f4325f243..3423a9b0bae50 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -10,7 +10,7 @@ let sha256 = "1ml6mjk2fsfv4sf65fdbji3q5x0qiq99g1k8w7a99gsl2i8h60gc"; }); versionSpec = { - "latest" = { + latest = { name = "1.0.0"; rev = "refs/tags/1.0.0"; sha256 = "16r0lwhxl8g71masmfbjr7s7m7fah4ii4smi1g8zpbpiqjz48ryb"; @@ -22,7 +22,7 @@ let sha256 = "0hmvbdk2yr5wrkiwn9dfzf65s4xc2qifj0sn6w2mghzp96cph79k"; patches = [ ./fix-module-path.patch ]; }; - "git" = { + git = { name = "git-20170203"; rev = "d20f24e58ab62afceae2afb6262ffef3cc318b97"; sha256 = "1gi29ds1x6dq7lz8lamnhcvcrr3cvvrg5yappfkggyhyvib1ii70"; diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix index 9ebb0b5ffcfb9..e29e8b855ba5e 100644 --- a/pkgs/applications/window-managers/way-cooler/default.nix +++ b/pkgs/applications/window-managers/way-cooler/default.nix @@ -16,9 +16,9 @@ let # https://nest.pijul.com/pmeunier/carnix/discussions/22 version = "0.8.1"; deps = (callPackage ./way-cooler.nix {}).deps; - way_cooler_ = f: cratesIO.crates.way_cooler."${version}" deps { - features = cratesIO.features_.way_cooler."${version}" deps { - "way_cooler"."${version}" = f; + way_cooler_ = f: cratesIO.crates.way_cooler.${version} deps { + features = cratesIO.features_.way_cooler.${version} deps { + way_cooler.${version} = f; }; }; way-cooler = ((way_cooler_ { builtin-lua = true; }).override { diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index e1ec09bc95a16..e02e77de45e47 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -180,10 +180,10 @@ stdenv.mkDerivation { else if targetPlatform.isx86_64 then "x86-64" else if targetPlatform.isx86_32 then "i386" else if targetPlatform.isMips then { - "mips" = "btsmipn32"; # n32 variant - "mipsel" = "ltsmipn32"; # n32 variant - "mips64" = "btsmip"; - "mips64el" = "ltsmip"; + mips = "btsmipn32"; # n32 variant + mipsel = "ltsmipn32"; # n32 variant + mips64 = "btsmip"; + mips64el = "ltsmip"; }.${targetPlatform.parsed.cpu.name} else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc" else if targetPlatform.isSparc then "sparc" diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix index bbd2bae46df55..57d2e4ad82d2d 100644 --- a/pkgs/build-support/fetchdocker/default.nix +++ b/pkgs/build-support/fetchdocker/default.nix @@ -37,8 +37,8 @@ let repositories = writeText "repositories" (builtins.toJSON { - "${repoTag1}" = { - "${tag}" = lib.last layers; + ${repoTag1} = { + ${tag} = lib.last layers; }; }); diff --git a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix index 068cc5a988437..abf5fedbf7910 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/brotli-crates.nix @@ -52,20 +52,20 @@ rec { features = mkFeatures (features.brotli_2_5_0 or {}); }; brotli_2_5_0_features = f: updateFeatures f (rec { - alloc_no_stdlib_1_3_0."no-stdlib" = - (f.alloc_no_stdlib_1_3_0."no-stdlib" or false) || - (brotli_2_5_0."no-stdlib" or false) || - (f.brotli_2_5_0."no-stdlib" or false); + alloc_no_stdlib_1_3_0.no-stdlib = + (f.alloc_no_stdlib_1_3_0.no-stdlib or false) || + (brotli_2_5_0.no-stdlib or false) || + (f.brotli_2_5_0.no-stdlib or false); alloc_no_stdlib_1_3_0.default = true; brotli_2_5_0.default = (f.brotli_2_5_0.default or true); - brotli_decompressor_1_3_1."disable-timer" = - (f.brotli_decompressor_1_3_1."disable-timer" or false) || - (brotli_2_5_0."disable-timer" or false) || - (f.brotli_2_5_0."disable-timer" or false); - brotli_decompressor_1_3_1."no-stdlib" = - (f.brotli_decompressor_1_3_1."no-stdlib" or false) || - (brotli_2_5_0."no-stdlib" or false) || - (f.brotli_2_5_0."no-stdlib" or false); + brotli_decompressor_1_3_1.disable-timer = + (f.brotli_decompressor_1_3_1.disable-timer or false) || + (brotli_2_5_0.disable-timer or false) || + (f.brotli_2_5_0.disable-timer or false); + brotli_decompressor_1_3_1.no-stdlib = + (f.brotli_decompressor_1_3_1.no-stdlib or false) || + (brotli_2_5_0.no-stdlib or false) || + (f.brotli_2_5_0.no-stdlib or false); brotli_decompressor_1_3_1.benchmark = (f.brotli_decompressor_1_3_1.benchmark or false) || (brotli_2_5_0.benchmark or false) || @@ -81,10 +81,10 @@ rec { features = mkFeatures (features.brotli_decompressor_1_3_1 or {}); }; brotli_decompressor_1_3_1_features = f: updateFeatures f (rec { - alloc_no_stdlib_1_3_0."no-stdlib" = - (f.alloc_no_stdlib_1_3_0."no-stdlib" or false) || - (brotli_decompressor_1_3_1."no-stdlib" or false) || - (f.brotli_decompressor_1_3_1."no-stdlib" or false); + alloc_no_stdlib_1_3_0.no-stdlib = + (f.alloc_no_stdlib_1_3_0.no-stdlib or false) || + (brotli_decompressor_1_3_1.no-stdlib or false) || + (f.brotli_decompressor_1_3_1.no-stdlib or false); alloc_no_stdlib_1_3_0.default = true; alloc_no_stdlib_1_3_0.unsafe = (f.alloc_no_stdlib_1_3_0.unsafe or false) || diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 09802d56d34c5..ce1bf8002767e 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -44,8 +44,8 @@ let hostConfig = stdenv.hostPlatform.config; rustHostConfig = { - "x86_64-pc-mingw32" = "x86_64-pc-windows-gnu"; - }."${hostConfig}" or hostConfig; + x86_64-pc-mingw32 = "x86_64-pc-windows-gnu"; + }.${hostConfig} or hostConfig; ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; diff --git a/pkgs/data/fonts/iosevka/package-lock.nix b/pkgs/data/fonts/iosevka/package-lock.nix index 4a7be92e7375a..546482cc0d262 100644 --- a/pkgs/data/fonts/iosevka/package-lock.nix +++ b/pkgs/data/fonts/iosevka/package-lock.nix @@ -14,58 +14,58 @@ let 0; chars = stringToCharacters (substring 0 (len - padding) str); table = { - "A" = [0 0 0]; - "B" = [0 0 1]; - "C" = [0 0 2]; - "D" = [0 0 3]; - "E" = [0 1 0]; - "F" = [0 1 1]; - "G" = [0 1 2]; - "H" = [0 1 3]; - "I" = [0 2 0]; - "J" = [0 2 1]; - "K" = [0 2 2]; - "L" = [0 2 3]; - "M" = [0 3 0]; - "N" = [0 3 1]; - "O" = [0 3 2]; - "P" = [0 3 3]; - "Q" = [1 0 0]; - "R" = [1 0 1]; - "S" = [1 0 2]; - "T" = [1 0 3]; - "U" = [1 1 0]; - "V" = [1 1 1]; - "W" = [1 1 2]; - "X" = [1 1 3]; - "Y" = [1 2 0]; - "Z" = [1 2 1]; - "a" = [1 2 2]; - "b" = [1 2 3]; - "c" = [1 3 0]; - "d" = [1 3 1]; - "e" = [1 3 2]; - "f" = [1 3 3]; - "g" = [2 0 0]; - "h" = [2 0 1]; - "i" = [2 0 2]; - "j" = [2 0 3]; - "k" = [2 1 0]; - "l" = [2 1 1]; - "m" = [2 1 2]; - "n" = [2 1 3]; - "o" = [2 2 0]; - "p" = [2 2 1]; - "q" = [2 2 2]; - "r" = [2 2 3]; - "s" = [2 3 0]; - "t" = [2 3 1]; - "u" = [2 3 2]; - "v" = [2 3 3]; - "w" = [3 0 0]; - "x" = [3 0 1]; - "y" = [3 0 2]; - "z" = [3 0 3]; + A = [0 0 0]; + B = [0 0 1]; + C = [0 0 2]; + D = [0 0 3]; + E = [0 1 0]; + F = [0 1 1]; + G = [0 1 2]; + H = [0 1 3]; + I = [0 2 0]; + J = [0 2 1]; + K = [0 2 2]; + L = [0 2 3]; + M = [0 3 0]; + N = [0 3 1]; + O = [0 3 2]; + P = [0 3 3]; + Q = [1 0 0]; + R = [1 0 1]; + S = [1 0 2]; + T = [1 0 3]; + U = [1 1 0]; + V = [1 1 1]; + W = [1 1 2]; + X = [1 1 3]; + Y = [1 2 0]; + Z = [1 2 1]; + a = [1 2 2]; + b = [1 2 3]; + c = [1 3 0]; + d = [1 3 1]; + e = [1 3 2]; + f = [1 3 3]; + g = [2 0 0]; + h = [2 0 1]; + i = [2 0 2]; + j = [2 0 3]; + k = [2 1 0]; + l = [2 1 1]; + m = [2 1 2]; + n = [2 1 3]; + o = [2 2 0]; + p = [2 2 1]; + q = [2 2 2]; + r = [2 2 3]; + s = [2 3 0]; + t = [2 3 1]; + u = [2 3 2]; + v = [2 3 3]; + w = [3 0 0]; + x = [3 0 1]; + y = [3 0 2]; + z = [3 0 3]; "0" = [3 1 0]; "1" = [3 1 1]; "2" = [3 1 2]; diff --git a/pkgs/desktops/pantheon/update.nix b/pkgs/desktops/pantheon/update.nix index 7e9aacc0c2b27..3bc432c5d3250 100644 --- a/pkgs/desktops/pantheon/update.nix +++ b/pkgs/desktops/pantheon/update.nix @@ -31,6 +31,6 @@ let throwFlag = throw "${versionPolicy} is not a valid versionPolicy - Options are either 'release' or 'master' (defaults to release)."; - versionFlag = { "release" = "-r"; "master" = "-m"; }.${versionPolicy} or throwFlag; + versionFlag = { release = "-r"; master = "-m"; }.${versionPolicy} or throwFlag; in [ updateScript versionFlag repoName attrPath ] diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 07c6805c689a9..e188e4e3fcdd4 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -72,7 +72,7 @@ let let inherit (args) name; sname = args.sname or name; - inherit (srcs."${sname}") src version; + inherit (srcs.${sname}) src version; outputs = args.outputs or [ "out" ]; hasBin = lib.elem "bin" outputs; diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index fcdd2eb518116..02aa6567c1a97 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -12,31 +12,31 @@ let # than we do. We don't just use theirs because ours are less ambiguous and # some builds need that clarity. ndkInfoFun = { config, ... }: { - "x86_64-apple-darwin" = { + x86_64-apple-darwin = { double = "darwin-x86_64"; }; - "x86_64-unknown-linux-gnu" = { + x86_64-unknown-linux-gnu = { double = "linux-x86_64"; }; - "i686-unknown-linux-android" = { + i686-unknown-linux-android = { triple = "i686-linux-android"; arch = "x86"; toolchain = "x86"; gccVer = "4.9"; }; - "x86_64-unknown-linux-android" = { + x86_64-unknown-linux-android = { triple = "x86_64-linux-android"; arch = "x86_64"; toolchain = "x86_64"; gccVer = "4.9"; }; - "armv7a-unknown-linux-androideabi" = { + armv7a-unknown-linux-androideabi = { arch = "arm"; triple = "arm-linux-androideabi"; toolchain = "arm-linux-androideabi"; gccVer = "4.9"; }; - "aarch64-unknown-linux-android" = { + aarch64-unknown-linux-android = { arch = "arm64"; triple = "aarch64-linux-android"; toolchain = "aarch64-linux-android"; diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index c0e6c4b50044a..664335c3dade3 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -5,7 +5,7 @@ let # Map from git revs to SHA256 hashes sha256s = { - "version_89" = "0rh1dq33ilq54szfgi1ajaiaj7rbylai02rhp9zm9vpwp0rw8mij"; + version_89 = "0rh1dq33ilq54szfgi1ajaiaj7rbylai02rhp9zm9vpwp0rw8mij"; "1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v"; }; in diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 6fac183125f55..ec166352267e4 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -29,7 +29,7 @@ let }; armv6l-linux = armv7l-linux; }; - cfg = options."${stdenv.hostPlatform.system}" or (throw "missing source url for platform ${stdenv.hostPlatform.system}"); + cfg = options.${stdenv.hostPlatform.system} or (throw "missing source url for platform ${stdenv.hostPlatform.system}"); in stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 90355896064c1..d698a6e39fea5 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -12,12 +12,12 @@ let archs = { - "x86_64-linux" = "linux-x86_64"; - "i686-linux" = "linux-i686"; - "x86_64-darwin" = "darwin-x86_64"; + x86_64-linux = "linux-x86_64"; + i686-linux = "linux-i686"; + x86_64-darwin = "darwin-x86_64"; }; - arch = archs."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + arch = archs.${stdenv.system} or (throw "system ${stdenv.system} not supported"); checkInputs = [ git gmp openssl readline libxml2 libyaml ]; @@ -28,7 +28,7 @@ let src = fetchurl { url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; - sha256 = sha256s."${stdenv.system}"; + sha256 = sha256s.${stdenv.system}; }; buildCommand = '' @@ -148,27 +148,27 @@ in rec { binaryCrystal_0_26 = genericBinary { version = "0.26.1"; sha256s = { - "x86_64-linux" = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45"; - "i686-linux" = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic"; - "x86_64-darwin" = "1mri8bfrcldl69gczxpihxpv1shn4bijx28m3qby8vnk0ii63n9s"; + x86_64-linux = "1xban102yiiwmlklxvn3xp3q546bp8hlxxpakayajkhhnpl6yv45"; + i686-linux = "1igspf1lrv7wpmz0pfrkbx8m1ykvnv4zhic53cav4nicppm2v0ic"; + x86_64-darwin = "1mri8bfrcldl69gczxpihxpv1shn4bijx28m3qby8vnk0ii63n9s"; }; }; binaryCrystal_0_27 = genericBinary { version = "0.27.2"; sha256s = { - "x86_64-linux" = "05l5x7kx2acgnv42fj3rr17z73ix06zvi05h7d7vf3kw0izxrasm"; - "i686-linux" = "1iwizkvn6pglc0azkyfhlmk9ap793krdgcnbihd1kvrvs4cz0mm9"; - "x86_64-darwin" = "14c69ac2dmfwmb5q56ps3xyxxb0mrbc91ahk9h07c8fiqfii3k9g"; + x86_64-linux = "05l5x7kx2acgnv42fj3rr17z73ix06zvi05h7d7vf3kw0izxrasm"; + i686-linux = "1iwizkvn6pglc0azkyfhlmk9ap793krdgcnbihd1kvrvs4cz0mm9"; + x86_64-darwin = "14c69ac2dmfwmb5q56ps3xyxxb0mrbc91ahk9h07c8fiqfii3k9g"; }; }; binaryCrystal_0_29 = genericBinary { version = "0.29.0"; sha256s = { - "x86_64-linux" = "1wrk29sfx35akg7hxwpdiikvl18wd40gq1kwirw7x522hnq7vlna"; - "i686-linux" = "1nx0piis2k3nn7kqiijqazzbvlaavhgvsln0l3dxmpfa4i4dz5h2"; - "x86_64-darwin" = "1fd0fbyf05abivnp3igjlrm2axf65n2wdmg4aq6nqj60ipc01rvd"; + x86_64-linux = "1wrk29sfx35akg7hxwpdiikvl18wd40gq1kwirw7x522hnq7vlna"; + i686-linux = "1nx0piis2k3nn7kqiijqazzbvlaavhgvsln0l3dxmpfa4i4dz5h2"; + x86_64-darwin = "1fd0fbyf05abivnp3igjlrm2axf65n2wdmg4aq6nqj60ipc01rvd"; }; }; diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 332ded31df6a5..6cae1fa073b34 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -13,7 +13,7 @@ let dmdConfFile = writeTextFile { name = "dmd.conf"; text = (lib.generators.toINI {} { - "Environment" = { + Environment = { DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}''; }; }); diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix index fa0a1482f97a9..7f20c74dbd4ab 100644 --- a/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node-composition.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 ./node-env.nix { diff --git a/pkgs/development/compilers/ghc/8.2.2-binary.nix b/pkgs/development/compilers/ghc/8.2.2-binary.nix index 9fe3a7d9dba30..d68bf7e24b5e0 100644 --- a/pkgs/development/compilers/ghc/8.2.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.2-binary.nix @@ -29,23 +29,23 @@ stdenv.mkDerivation rec { name = "ghc-${version}-binary"; src = fetchurl ({ - "i686-linux" = { + i686-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz"; sha256 = "08w2ik55dp3n95qikmrflc91lsiq01xp53ki3jlhnbj8fqnxfrwy"; }; - "x86_64-linux" = { + x86_64-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz"; sha256 = "0ahv26304pqi3dm7i78si4pxwvg5f5dc2jwsfgvcrhcx5g30bqj8"; }; - "armv7l-linux" = { + armv7l-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-armv7-deb8-linux.tar.xz"; sha256 = "1jmv8qmnh5bn324fivbwdcaj55kvw7cb2zq9pafmlmv3qwwx7s46"; }; - "aarch64-linux" = { + aarch64-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-deb8-linux.tar.xz"; sha256 = "1k2amylcp1ad67c75h1pqf7czf9m0zj1i7hdc45ghjklnfq9hrk7"; }; - "x86_64-darwin" = { + x86_64-darwin = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; sha256 = "09swx71gh5habzbx55shz2xykgr96xkcy09nzinnm4z0yxicy3zr"; }; diff --git a/pkgs/development/compilers/ghc/8.6.3-binary.nix b/pkgs/development/compilers/ghc/8.6.3-binary.nix index 7e845da5b6486..152bd5e4874c7 100644 --- a/pkgs/development/compilers/ghc/8.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.3-binary.nix @@ -29,15 +29,15 @@ stdenv.mkDerivation rec { name = "ghc-${version}-binary"; src = fetchurl ({ - "i686-linux" = { + i686-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz"; sha256 = "0bw8a7fxcbskf93rb4m542ff66vrmx5i5kj77qx37cbhijx70w5m"; }; - "x86_64-linux" = { + x86_64-linux = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz"; sha256 = "1m9gaga2pzi2cx5gvasg0rx1dlvr68gmi20l67652kag6xjsa719"; }; - "x86_64-darwin" = { + x86_64-darwin = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; sha256 = "1hbzk57v45176kxcx848p5jn5p1xbp2129ramkbzsk6plyhnkl3r"; }; diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index 56a386d8b97d0..1e370342ba3c6 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -17,13 +17,13 @@ let ''; goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; - "aarch64" = "arm64"; - "arm" = "arm"; - "armv5tel" = "arm"; - "armv6l" = "arm"; - "armv7l" = "arm"; + i686 = "386"; + x86_64 = "amd64"; + aarch64 = "arm64"; + arm = "arm"; + armv5tel = "arm"; + armv6l = "arm"; + armv7l = "arm"; }.${platform.parsed.cpu.name} or (throw "Unsupported system"); in diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix index 098870c98084f..4560c94a64fda 100644 --- a/pkgs/development/compilers/go/1.12.nix +++ b/pkgs/development/compilers/go/1.12.nix @@ -17,13 +17,13 @@ let ''; goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; - "aarch64" = "arm64"; - "arm" = "arm"; - "armv5tel" = "arm"; - "armv6l" = "arm"; - "armv7l" = "arm"; + i686 = "386"; + x86_64 = "amd64"; + aarch64 = "arm64"; + arm = "arm"; + armv5tel = "arm"; + armv6l = "arm"; + armv7l = "arm"; }.${platform.parsed.cpu.name} or (throw "Unsupported system"); in diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 97c243439e89c..1052f1f1ae1ef 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -4,7 +4,7 @@ , Security }: let - libc = if stdenv ? "cross" then libcCross else stdenv.cc.libc; + libc = if stdenv ? cross then libcCross else stdenv.cc.libc; in stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index c0414c6259fdd..c706f2facec79 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -129,10 +129,10 @@ stdenv.mkDerivation rec { makeFlags = let arch = head (splitString "-" stdenv.system); - march = { "x86_64" = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; "i686" = "pentium4"; }."${arch}" + march = { x86_64 = stdenv.hostPlatform.platform.gcc.arch or "x86-64"; i686 = "pentium4"; }.${arch} or (throw "unsupported architecture: ${arch}"); # Julia requires Pentium 4 (SSE2) or better - cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}" + cpuTarget = { x86_64 = "x86-64"; i686 = "pentium4"; }.${arch} or (throw "unsupported architecture: ${arch}"); in [ "ARCH=${arch}" diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index 2067184a5b00d..8eb35f1b5f7a6 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -8,7 +8,7 @@ let version = "2.0.0"; binaries = { - "x86_64-linux" = fetchurl { + x86_64-linux = fetchurl { url = "mirror://sourceforge/project/mozart-oz/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz"; sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { preferLocalBuild = true; - src = binaries."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + src = binaries.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index c93fc5a0926aa..e764e9c62cb8a 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -15,9 +15,9 @@ let * The JRE libraries are in directories that depend on the CPU. */ architecture = { - "i686-linux" = "i386"; - "x86_64-linux" = "amd64"; - "aarch64-linux" = "aarch64"; + i686-linux = "i386"; + x86_64-linux = "amd64"; + aarch64-linux = "aarch64"; }.${stdenv.system} or (throw "Unsupported platform"); update = "222"; diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 88d119bee8097..e1c94ffb59795 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -59,8 +59,8 @@ let outputHashMode = "recursive"; # Downloaded AWT jars differ by platform. outputHash = { - "i686-linux" = "0mjlyf6jvbis7nrm5d394sjv4hjw6k3753hr1nwdxk8skwc3ry08"; - "x86_64-linux" = "0d4msxswdav1xsfkpr0qd3xgqkcbxzf47v1zdy5jmg5w4bs6a78a"; + i686-linux = "0mjlyf6jvbis7nrm5d394sjv4hjw6k3753hr1nwdxk8skwc3ry08"; + x86_64-linux = "0d4msxswdav1xsfkpr0qd3xgqkcbxzf47v1zdy5jmg5w4bs6a78a"; }.${stdenv.system} or (throw "Unsupported platform"); }; diff --git a/pkgs/development/compilers/openjdk/openjfx/12.nix b/pkgs/development/compilers/openjdk/openjfx/12.nix index 0a1db50857837..22c608f36c1de 100644 --- a/pkgs/development/compilers/openjdk/openjfx/12.nix +++ b/pkgs/development/compilers/openjdk/openjfx/12.nix @@ -59,8 +59,8 @@ let outputHashMode = "recursive"; # Downloaded AWT jars differ by platform. outputHash = { - "x86_64-linux" = "1z5qar5l28ja4pkf5l5m48xbv3x1yrnilsv9lpf2j3vkdk9h1nci"; - "i686-linux" = "0rbygvjc7w197fi5nxldqdrm6mpiyd3n45042g3gd4s5qk08spjd"; + x86_64-linux = "1z5qar5l28ja4pkf5l5m48xbv3x1yrnilsv9lpf2j3vkdk9h1nci"; + i686-linux = "0rbygvjc7w197fi5nxldqdrm6mpiyd3n45042g3gd4s5qk08spjd"; }.${stdenv.system} or (throw "Unsupported platform"); }; diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 5cf48715dae20..43a72985ddec5 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -32,7 +32,7 @@ let src = fetchurl { url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz"; - sha256 = hashes."${platform}"; + sha256 = hashes.${platform}; }; in callPackage ./binary.nix diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 874b99f2bebf0..ed8c7ec6a69dd 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -26,7 +26,7 @@ let params = sha256 = "1c34v1k37rk7v0xk2czv5n79mbjxjrm6nh3llg2mpfmdsqi68wf3"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in let recent = stdenv.lib.versionAtLeast coq.coq-version "8.8"; in diff --git a/pkgs/development/coq-modules/Velisarios/default.nix b/pkgs/development/coq-modules/Velisarios/default.nix index cd7ddfefb84a4..e7371b6bbf579 100644 --- a/pkgs/development/coq-modules/Velisarios/default.nix +++ b/pkgs/development/coq-modules/Velisarios/default.nix @@ -20,7 +20,7 @@ let params = sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index a074b27ff6587..d69eddf75a2e9 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -22,7 +22,7 @@ let params = { sha256 = "1slw227idwjw9a21vj3s6kal22mrmvvlpg8r7xk590ml99bn6404"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index 3dfa95154d33d..e16a873ddc1d8 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -19,7 +19,7 @@ let "8.8" = v20190414; "8.9" = v20190414; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix index faf7db09ff9bb..91fdb8651cc6b 100644 --- a/pkgs/development/coq-modules/contribs/default.nix +++ b/pkgs/development/coq-modules/contribs/default.nix @@ -34,7 +34,7 @@ let mkContrib = repo: revs: param: rev = "86ac28259030649ef51460e4de2441c8a1017751"; sha256 = "09bbk2a7pn0j76mmapl583f8a20zqd3a1m9lkml8rpwml692bzi9"; }; - }."${coq.coq-version}"; + }.${coq.coq-version}; abp = mkContrib "abp" [ "8.5" "8.6" "8.7" ] { version = "v8.6.0"; @@ -219,7 +219,7 @@ let mkContrib = repo: revs: param: rev = "aa33052c1edfc5a65885942a67c2773b5d96f8cc"; sha256 = "0mjgfdr9bzsch0dlk4vq1frkaig14dqh46r54cv0l15flxapg0iw"; }; - }."${coq.coq-version}"; + }.${coq.coq-version}; continuations = mkContrib "continuations" [ ] { version = "v8.5.0-13-g6885310"; diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 04fc428b40921..c689cea1a8270 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -7,7 +7,7 @@ let params = { sha256 = "188avk9irwjsbs5ya4ka01mpk3vw4397kv2rmsncqrrrsa1pdddk"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index cade2bd352ebe..898272d402b6c 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -8,7 +8,7 @@ let params = "8.8" = { version = "0.9.8"; sha256 = "0z1ix855kdjl7zw5ca664h5njd1x8mmvf5wi37fck4dj9dgamwlz"; }; "8.9" = { version = "0.10.1"; sha256 = "0r1vspad8fb8bry3zliiz4hfj4w1iib1l2gm115a94m6zbiksd95"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix index 57f31e1847c1a..b8a34c49417bc 100644 --- a/pkgs/development/coq-modules/coq-haskell/default.nix +++ b/pkgs/development/coq-modules/coq-haskell/default.nix @@ -26,7 +26,7 @@ let params = sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix index 28c651f9b16af..83a505017fbc6 100644 --- a/pkgs/development/coq-modules/coqhammer/default.nix +++ b/pkgs/development/coq-modules/coqhammer/default.nix @@ -9,7 +9,7 @@ let sha256 = "0hmqwsry8ldg4g4hhwg4b84dgzibpdrg1wwsajhlyqfx3fb3n3b5"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index c67342f1a2f74..6228bd4be9d09 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -15,7 +15,7 @@ let params = "8.9" = v_8_8; "8.10" = v_8_8; }; - param = params."${coq.coq-version}" + param = params.${coq.coq-version} ; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index e403f7d4fb5ce..401cb299497b0 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -22,7 +22,7 @@ let params = { sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n"; }; }; -param = params."${coq.coq-version}"; +param = params.${coq.coq-version}; in stdenv.mkDerivation { diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 5446b540fac3d..38444fe2b0610 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -32,7 +32,7 @@ let sha256 = "1v5kx0xzxzsbs5r4w08rm1lrmjjggnd3ap0sd1my88ds17jzyasd"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix index 30917fcb78f23..80b167aaa98aa 100644 --- a/pkgs/development/coq-modules/ltac2/default.nix +++ b/pkgs/development/coq-modules/ltac2/default.nix @@ -17,7 +17,7 @@ let params = { sha256 = "0xby1kb26r9gcvk5511wqj05fqm9paynwfxlfqkmwkgnfmzk0x73"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index d573eca809a27..2b653cdaa2640 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -30,7 +30,7 @@ let # COMPUTED using the configuration above (edit with caution) # ############################################################## default-mathcomp-version = let v = head ( - filter (mc: mathcomp-coq-versions."${mc}" coq.coq-version) + filter (mc: mathcomp-coq-versions.${mc} coq.coq-version) mathcomp-version-preference ++ ["0.0.0"]); in if v == "0.0.0" then max-mathcomp-version else v; @@ -126,9 +126,9 @@ let }; }; in - {"${mathcomp-pkg}" = stdenv.mkDerivation (attrs // overrides attrs);}; + {${mathcomp-pkg} = stdenv.mkDerivation (attrs // overrides attrs);}; -getAttrOr = a: n: a."${n}" or (throw a.error); +getAttrOr = a: n: a.${n} or (throw a.error); mathcompCorePkgs_1_7 = mathcompGen "1.7.0"; mathcompCorePkgs_1_8 = mathcompGen "1.8.0"; diff --git a/pkgs/development/coq-modules/mathcomp/extra.nix b/pkgs/development/coq-modules/mathcomp/extra.nix index 0d9557623c36f..c342c25a41189 100644 --- a/pkgs/development/coq-modules/mathcomp/extra.nix +++ b/pkgs/development/coq-modules/mathcomp/extra.nix @@ -139,7 +139,7 @@ packageGen = { else compatibleCoqVersions; mc-core-deps = if builtins.isNull core-deps then [ssreflect] else core-deps; in - { "${package}" = let from = src; in + { ${package} = let from = src; in stdenv.mkDerivation rec { inherit version; @@ -149,7 +149,7 @@ packageGen = { owner = owner; repo = package; rev = version; - sha256 = version-sha256."${version}"; + sha256 = version-sha256.${version}; } else from; propagatedBuildInputs = [ coq ] ++ mc-core-deps ++ extra-deps; @@ -173,7 +173,7 @@ packageGen = { }; }; -current-versions = versions."${current-ssreflect.version}" or {}; +current-versions = versions.${current-ssreflect.version} or {}; select = x: mapAttrs (n: pkg: {package = n;} // pkg) (recursiveUpdate param x); @@ -181,14 +181,14 @@ for-version = v: suffix: (mapAttrs' (n: pkg: {name = "mathcomp_${suffix}-${n}"; value = (packageGen ({ ssreflect = coqPackages."mathcomp-ssreflect_${suffix}"; - } // pkg))."${n}";}) - (select versions."${v}")); + } // pkg)).${n};}) + (select versions.${v})); all = (for-version "1.7.0" "1_7") // (for-version "1.8.0" "1_8") // (for-version "1.9.0" "1_9") // (recurseIntoAttrs (mapDerivationAttrset dontDistribute ( - mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = (packageGen pkg)."${n}";}) + mapAttrs' (n: pkg: {name = "mathcomp-${n}"; value = (packageGen pkg).${n};}) (select current-versions)))); in { diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix index 472d3aeb2d08d..a8dd74dd5fb64 100644 --- a/pkgs/development/coq-modules/paramcoq/default.nix +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -15,7 +15,7 @@ let params = sha256 = "002xabhjlph394vydw3dx8ipv5ry2nq3py4440bk9a18ljx0w6ll"; }; }; - param = params."${coq.coq-version}"; + param = params.${coq.coq-version}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index d53337aca1ad0..8d93492209c62 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -17,8 +17,8 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "acl2-devel"; repo = "acl2-devel"; - rev = revs."${version}"; - sha256 = hashes."${version}"; + rev = revs.${version}; + sha256 = hashes.${version}; }; buildInputs = [ sbcl diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index a7009097a6028..62cc77c12537b 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -88,7 +88,7 @@ let (import ./patchsets.nix { inherit patchSet useRailsExpress ops; patchLevel = ver.patchLevel; - })."${ver.majMinTiny}"; + }).${ver.majMinTiny}; postUnpack = '' cp -r ${rubygems} $sourceRoot/rubygems diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 858bc20939165..649a90200e0d2 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { "--with-lapack-libs=-l${blas.linkName}" ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) - "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "haswell" = [ "--disable-fma4" ]; - "broadwell" = [ "--disable-fma4" ]; - "skylake" = [ "--disable-fma4" ]; - "skylake-avx512" = [ "--disable-fma4" ]; + default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + haswell = [ "--disable-fma4" ]; + broadwell = [ "--disable-fma4" ]; + skylake = [ "--disable-fma4" ]; + skylake-avx512 = [ "--disable-fma4" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; doCheck = true; diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index 909c504870f0e..21975766e74e6 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/development/libraries/g2o/default.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { "-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer" "-DG2O_BUILD_EXAMPLES=OFF" ] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ { - "default" = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ]; - "westmere" = [ "-DDISABLE_SSE4_A=ON" ]; - "sandybridge" = [ "-DDISABLE_SSE4_A=ON" ]; - "ivybridge" = [ "-DDISABLE_SSE4_A=ON" ]; - "haswell" = [ "-DDISABLE_SSE4_A=ON" ]; - "broadwell" = [ "-DDISABLE_SSE4_A=ON" ]; - "skylake" = [ "-DDISABLE_SSE4_A=ON" ]; - "skylake-avx512" = [ "-DDISABLE_SSE4_A=ON" ]; + default = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ]; + westmere = [ "-DDISABLE_SSE4_A=ON" ]; + sandybridge = [ "-DDISABLE_SSE4_A=ON" ]; + ivybridge = [ "-DDISABLE_SSE4_A=ON" ]; + haswell = [ "-DDISABLE_SSE4_A=ON" ]; + broadwell = [ "-DDISABLE_SSE4_A=ON" ]; + skylake = [ "-DDISABLE_SSE4_A=ON" ]; + skylake-avx512 = [ "-DDISABLE_SSE4_A=ON" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"}); postInstall = '' diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 79fb7a8d738f4..4c1e538dcd66c 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { "--disable-optimization" ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) - "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "haswell" = [ "--disable-fma4" ]; - "broadwell" = [ "--disable-fma4" ]; - "skylake" = [ "--disable-fma4" ]; - "skylake-avx512" = [ "--disable-fma4" ]; + default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + haswell = [ "--disable-fma4" ]; + broadwell = [ "--disable-fma4" ]; + skylake = [ "--disable-fma4" ]; + skylake-avx512 = [ "--disable-fma4" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; # On darwin, tests are linked to dylib in the nix store, so we need to make diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 591de48d31954..a93d77742915f 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -5,13 +5,13 @@ let platformMap = { - "x86_64-linux" = + x86_64-linux = { platform = "gtk-linux-x86_64"; sha256 = "1qq0pjll6030v4ml0hifcaaik7sx3fl7ghybfdw95vsvxafwp2ff"; }; - "i686-linux" = + i686-linux = { platform = "gtk-linux-x86"; sha256 = "03mhzraikcs4fsz7d3h5af9pw1bbcfd6dglsvbk2ciwimy9zj30q"; }; - "x86_64-darwin" = + x86_64-darwin = { platform = "cocoa-macosx-x86_64"; sha256 = "00k1mfbncvyh8klgmk0891w8jwnd5niqb16j1j8yacrm2smmlb05"; }; }; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index e8a7aa7322f3e..ef1171b17601c 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -64,7 +64,7 @@ let let inherit (args) name; - inherit (srcs."${name}") src version; + inherit (srcs.${name}) src version; outputs = args.outputs or [ "bin" "dev" "out" ]; hasSeparateDev = lib.elem "dev" outputs; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index f5cb197dfe5e8..8635b8c412f3a 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -37,14 +37,14 @@ stdenv.mkDerivation rec { "--disable-optimization" ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) - "default" = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "westmere" = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "sandybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "ivybridge" = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - "haswell" = [ "--disable-fma4" ]; - "broadwell" = [ "--disable-fma4" ]; - "skylake" = [ "--disable-fma4" ]; - "skylake-avx512" = [ "--disable-fma4" ]; + default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; + haswell = [ "--disable-fma4" ]; + broadwell = [ "--disable-fma4" ]; + skylake = [ "--disable-fma4" ]; + skylake-avx512 = [ "--disable-fma4" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"} ++ stdenv.lib.optionals withSage [ "--enable-sage" diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index bd4802b8775b4..84cfb47b55400 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -44,10 +44,10 @@ let # TODO(@Ericson2314): Improve with mass rebuild configurePlatforms = []; configureScript = { - "x86_64-darwin" = "./Configure darwin64-x86_64-cc"; - "x86_64-solaris" = "./Configure solaris64-x86_64-gcc"; - "armv6l-linux" = "./Configure linux-armv4 -march=armv6"; - "armv7l-linux" = "./Configure linux-armv4 -march=armv7-a"; + x86_64-darwin = "./Configure darwin64-x86_64-cc"; + x86_64-solaris = "./Configure solaris64-x86_64-gcc"; + armv6l-linux = "./Configure linux-armv4 -march=armv6"; + armv7l-linux = "./Configure linux-armv4 -march=armv7-a"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index 2e90d867b5a71..6c5d4b94d5310 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -17,22 +17,22 @@ let throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; arch = { - "x86_64-linux" = "linux.x64"; - "x86_64-darwin" = "macos.x64"; - }."${stdenv.hostPlatform.system}" or throwSystem; + x86_64-linux = "linux.x64"; + x86_64-darwin = "macos.x64"; + }.${stdenv.hostPlatform.system} or throwSystem; srcs = { - "x86_64-linux" = [ + x86_64-linux = [ (requireSource "basic" arch version "" "5015e3c9fba84e009f7519893f798a1622c37d1ae2c55104ff502c52a0fe5194") (requireSource "sdk" arch version "" "7f404c3573c062ce487a51ac4cfe650c878d7edf8e73b364ec852645ed1098cb") (requireSource "sqlplus" arch version "" "d49b2bd97376591ca07e7a836278933c3f251875c215044feac73ba9f451dfc2") ] ++ optional odbcSupport (requireSource "odbc" arch version "2" "365a4ae32c7062d9fbc3fb41add748e7881f774484a175a4b41a2c294ce9095d"); - "x86_64-darwin" = [ + x86_64-darwin = [ (requireSource "basic" arch version "2" "3ed3102e5a24f0da638694191edb34933309fb472eb1df21ad5c86eedac3ebb9") (requireSource "sdk" arch version "2" "e0befca9c4e71ebc9f444957ffa70f01aeeec5976ea27c40406471b04c34848b") (requireSource "sqlplus" arch version "2" "d147cbb5b2a954fdcb4b642df4f0bd1153fd56e0f56e7fa301601b4f7e2abe0e") ] ++ optional odbcSupport (requireSource "odbc" arch version "2" "1805c1ab6c8c5e8df7bdcc35d7f2b94c329ecf4dff9bde55d5f9b159ecd8b64e"); - }."${stdenv.hostPlatform.system}" or throwSystem; + }.${stdenv.hostPlatform.system} or throwSystem; extLib = stdenv.hostPlatform.extensions.sharedLibrary; in stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 8250e42a1b6cb..e2c71a77062eb 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -255,14 +255,14 @@ stdenv.mkDerivation { if (!stdenv.hostPlatform.isx86_64) then [ "-no-sse2" ] else lib.optionals (compareVersion "5.9.0" >= 0) { - "default" = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ]; - "westmere" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ]; - "sandybridge" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; - "ivybridge" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; - "haswell" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - "broadwell" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - "skylake" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - "skylake-avx512" = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + default = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ]; + westmere = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ]; + sandybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; + ivybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; + haswell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + broadwell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + skylake = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; + skylake-avx512 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"} ) ++ [ diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index 84a9d30918b15..5003205ef37dc 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -8,14 +8,14 @@ args: let inherit (args) name; - version = args.version or srcs."${name}".version; - src = args.src or srcs."${name}".src; + version = args.version or srcs.${name}.version; + src = args.src or srcs.${name}.src; in mkDerivation (args // { name = "${name}-${version}"; inherit src; - patches = args.patches or patches."${name}" or []; + patches = args.patches or patches.${name} or []; nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ]; propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); diff --git a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix b/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix index 892dfa2a60972..76f0c5eea7fa8 100644 --- a/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix +++ b/pkgs/development/libraries/science/math/tensorflow/binary-hashes.nix @@ -1,14 +1,14 @@ { version = "1.14.0"; -"cpu-linux-x86_64" = { +cpu-linux-x86_64 = { url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz"; sha256 = "04bi3ijq4sbb8c5vk964zlv0j9mrjnzzxd9q9knq3h273nc1a36k"; }; -"gpu-linux-x86_64" = { +gpu-linux-x86_64 = { url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-1.14.0.tar.gz"; sha256 = "1ffnpyj9jjgwxpjfiyjvq4dm3n6nwiksim5jld9zw7fdswh215x6"; }; -"cpu-darwin-x86_64" = { +cpu-darwin-x86_64 = { url = "https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-darwin-x86_64-1.14.0.tar.gz"; sha256 = "0zsd5ils1a17j6jzh0c7q1z56fw46gkzybbnms7h2rgg8al0rh92"; }; diff --git a/pkgs/development/libraries/v8/5_x.nix b/pkgs/development/libraries/v8/5_x.nix index cb53765e394b5..050abe9e81bfc 100644 --- a/pkgs/development/libraries/v8/5_x.nix +++ b/pkgs/development/libraries/v8/5_x.nix @@ -17,7 +17,7 @@ let sharedFlag = if static then "static_library" else "shared_library"; deps = { - "build" = fetchgit { + build = fetchgit { url = "${git_url}/chromium/src/build.git"; rev = "2c67d4d74b6b3673228fab191918500a582ef3b0"; sha256 = "0jc7hci5yh792pw0ahjfxrk5xzllnlrv9llmwlgcgn2x8x6bn34q"; @@ -32,7 +32,7 @@ let rev = "b5ecbb29a26532f72ef482569b223d5a51fd50bf"; sha256 = "0ld47wdnk8grcba221z67l3pnphv9zwifk4y44f5b946w3iwmpns"; }; - "buildtools" = fetchgit { + buildtools = fetchgit { url = "${git_url}/chromium/buildtools.git"; rev = "60f7f9a8b421ebf9a46041dfa2ff11c0fe59c582"; sha256 = "0i10bw7yhslklqwcx5krs3k05sicb73cpwd0mkaz96yxsvmkvjq0"; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 2d9c5d4b92a37..e367d8242dec2 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -14,7 +14,7 @@ let rev = "936ba8a963284a6b3737cf2f0474a7131073abee"; sha256 = "14nr22fqdpxma1kzjflj6a865vr3hfnnm2gs4vcixyq4kmfzfcy2"; }; - "build" = fetchgit { + build = fetchgit { url = "${git_url}/chromium/src/build.git"; rev = "325e95d6dae64f35b160b3dc7d73218cee5ec079"; sha256 = "0dddyxa76p2xpjhmxif05v63i5ar6h5v684fdl667sg84f5bhhxf"; diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix index bda3f07f0a4c5..f1155c41c1208 100644 --- a/pkgs/development/libraries/v8/plv8_6_x.nix +++ b/pkgs/development/libraries/v8/plv8_6_x.nix @@ -24,12 +24,12 @@ let rev = "0e9a47d74970bee1bbfc063c47215406f8918699"; sha256 = "07rbzrlscp8adh4z86yl5jxdnvgkc3xs950xldpk318wf9i3bh6c"; }; - "build" = fetchgit { + build = fetchgit { url = "${git_url}/chromium/src/build.git"; rev = "9338ce52d0b9bcef34c38285fbd5023b62739fac"; sha256 = "1s2sa8dy3waidsirjylc82ggb18l1108bczjc8z0v4ywyj4k0cvh"; }; - "buildtools" = fetchgit { + buildtools = fetchgit { url = "${git_url}/chromium/buildtools.git"; rev = "505de88083136eefd056e5ee4ca0f01fe9b33de8"; sha256 = "0vj216nhb803bggsl0hnyagj8njrm96pn8sim6xcnqb7nhz1vabw"; diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index e5802c12e816d..15bb18f5e243c 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -79,14 +79,14 @@ rec { platform-tools = import ./platform-tools.nix { inherit deployAndroidPackage os autoPatchelfHook pkgs; inherit (stdenv) lib; - package = packages.platform-tools."${platformToolsVersion}"; + package = packages.platform-tools.${platformToolsVersion}; }; build-tools = map (version: import ./build-tools.nix { inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686; inherit (stdenv) lib; - package = packages.build-tools."${version}"; + package = packages.build-tools.${version}; } ) buildToolsVersions; @@ -98,20 +98,20 @@ rec { emulator = import ./emulator.nix { inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgs_i686; inherit (stdenv) lib; - package = packages.emulator."${emulatorVersion}"."${os}"; + package = packages.emulator.${emulatorVersion}.${os}; }; platforms = map (version: deployAndroidPackage { inherit os; - package = packages.platforms."${version}"; + package = packages.platforms.${version}; } ) platformVersions; sources = map (version: deployAndroidPackage { inherit os; - package = packages.sources."${version}"; + package = packages.sources.${version}; } ) platformVersions; @@ -130,7 +130,7 @@ rec { import ./lldb.nix { inherit deployAndroidPackage os autoPatchelfHook pkgs; inherit (stdenv) lib; - package = packages.lldb."${version}"; + package = packages.lldb.${version}; } ) lldbVersions; @@ -138,27 +138,27 @@ rec { import ./cmake.nix { inherit deployAndroidPackage os autoPatchelfHook pkgs; inherit (stdenv) lib; - package = packages.cmake."${version}"; + package = packages.cmake.${version}; } ) cmakeVersions; ndk-bundle = import ./ndk-bundle { inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs platform-tools; inherit (stdenv) lib; - package = packages.ndk-bundle."${ndkVersion}"; + package = packages.ndk-bundle.${ndkVersion}; }; google-apis = map (version: deployAndroidPackage { inherit os; - package = addons.addons."${version}".google_apis; + package = addons.addons.${version}.google_apis; } ) (builtins.filter (platformVersion: platformVersion < "26") platformVersions); # API level 26 and higher include Google APIs by default google-tv-addons = map (version: deployAndroidPackage { inherit os; - package = addons.addons."${version}".google_tv_addon; + package = addons.addons.${version}.google_tv_addon; } ) platformVersions; @@ -226,10 +226,10 @@ rec { # Link extras ${stdenv.lib.concatMapStrings (identifier: let - path = addons.extras."${identifier}".path; + path = addons.extras.${identifier}.path; addon = deployAndroidPackage { inherit os; - package = addons.extras."${identifier}"; + package = addons.extras.${identifier}; }; in '' diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix index 9957168f7af36..92f53e5a7c20c 100644 --- a/pkgs/development/mobile/androidenv/tools.nix +++ b/pkgs/development/mobile/androidenv/tools.nix @@ -19,8 +19,8 @@ if toolsVersion == "26.0.1" then import ./tools/26.nix { }; } else if toolsVersion == "26.1.1" then import ./tools/26.nix { inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall; - package = packages.tools."${toolsVersion}"; + package = packages.tools.${toolsVersion}; } else import ./tools/25.nix { inherit deployAndroidPackage lib autoPatchelfHook makeWrapper os pkgs pkgs_i686 postInstall; - package = packages.tools."${toolsVersion}"; + package = packages.tools.${toolsVersion}; } diff --git a/pkgs/development/node-packages/composition-v10.nix b/pkgs/development/node-packages/composition-v10.nix index 9f723a6da4707..9e2521717efc1 100644 --- a/pkgs/development/node-packages/composition-v10.nix +++ b/pkgs/development/node-packages/composition-v10.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 ./node-env.nix { diff --git a/pkgs/development/node-packages/composition-v12.nix b/pkgs/development/node-packages/composition-v12.nix index 4f05009f3efd4..4ed0336ec5c4f 100644 --- a/pkgs/development/node-packages/composition-v12.nix +++ b/pkgs/development/node-packages/composition-v12.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs-6_x}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index b4a4e012560e0..d92cf543f8030 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -25,7 +25,7 @@ let param = { key = "1764"; sha256 = "0wgx65y1wkgf22ihpqmspqfp95fqbj3pldhp1p3b1mi8rmc37zwj"; }; -}."${builtins.substring 0 4 ocaml.version}"; +}.${builtins.substring 0 4 ocaml.version}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/ocaml-modules/lwt/legacy.nix b/pkgs/development/ocaml-modules/lwt/legacy.nix index cd40a5051be9e..d93f87aac0da3 100644 --- a/pkgs/development/ocaml-modules/lwt/legacy.nix +++ b/pkgs/development/ocaml-modules/lwt/legacy.nix @@ -14,7 +14,7 @@ let sha256 = { "3.0.0" = "0wwhnl9hppixcsdisinj1wmffx0nv6hkpm01z9qvkngkrazi3i88"; "2.7.1" = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w"; "2.6.0" = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w"; -}."${version}"; in +}.${version}; in let optionals = stdenv.lib.optionals (!stdenv.lib.versionAtLeast version "3"); in diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 2aa74d751dbfe..262c621a94a55 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -20,7 +20,7 @@ let param = { "4.07" = { version = "5.1+4.06.0"; sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; -}."${ocaml.meta.branch}"; +}.${ocaml.meta.branch}; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-ppx_tools-${param.version}"; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 10a1df8876cb1..45972a710da50 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -5,7 +5,7 @@ let cfg = writeTextFile { name = "site.cfg"; text = (lib.generators.toINI {} { - "${blasImplementation}" = { + ${blasImplementation} = { include_dirs = "${blas}/include"; library_dirs = "${blas}/lib"; } // lib.optionalAttrs (blasImplementation == "mkl") { diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix index d9a67454fe6a1..b091c3b7d56cb 100644 --- a/pkgs/development/python-modules/spacy/models.nix +++ b/pkgs/development/python-modules/spacy/models.nix @@ -13,7 +13,7 @@ let meta = with stdenv.lib; { description = "Models for the spaCy NLP library"; homepage = "https://github.com/explosion/spacy-models"; - license = licenses."${license}"; + license = licenses.${license}; maintainers = with maintainers; [ rvl ]; }; }; diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index c31dfb63b3cd4..0812ff590a503 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -52,7 +52,7 @@ let name else let - gem = gems."${pname}"; + gem = gems.${pname}; version = gem.version; in "${pname}-${version}"; @@ -70,7 +70,7 @@ let maybeCopyAll = pkgname: if pkgname == null then "" else let - mainGem = gems."${pkgname}" or (throw "bundlerEnv: gem ${pkgname} not found"); + mainGem = gems.${pkgname} or (throw "bundlerEnv: gem ${pkgname} not found"); in copyIfBundledByPath mainGem; diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix index 6324f27e9faf4..a093cc4dc95c7 100644 --- a/pkgs/development/ruby-modules/bundled-common/functions.nix +++ b/pkgs/development/ruby-modules/bundled-common/functions.nix @@ -42,21 +42,21 @@ in rec { converge expandDependencies directlyMatchingGems; platformMatches = {rubyEngine, version, ...}: attrs: ( - !(attrs ? "platforms") || + !(attrs ? platforms) || builtins.length attrs.platforms == 0 || builtins.any (platform: platform.engine == rubyEngine && - (!(platform ? "version") || platform.version == version.majMin) + (!(platform ? version) || platform.version == version.majMin) ) attrs.platforms ); groupMatches = groups: attrs: - groups == null || !(attrs ? "groups") || + groups == null || !(attrs ? groups) || (intersectLists (groups ++ [ "default" ]) attrs.groups) != []; applyGemConfigs = attrs: - (if gemConfig ? "${attrs.gemName}" - then attrs // gemConfig."${attrs.gemName}" attrs + (if gemConfig ? ${attrs.gemName} + then attrs // gemConfig.${attrs.gemName} attrs else attrs); genStubsScript = { lib, ruby, confFiles, bundler, groups, binPaths, ... }: '' @@ -88,6 +88,6 @@ in rec { inherit (attrs.source) type; source = removeAttrs attrs.source ["type"]; gemName = name; - gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []); + gemPath = map (gemName: gems.${gemName}) (attrs.dependencies or []); }); } diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix index b3f91b678c44a..9e9ccb128cf9a 100644 --- a/pkgs/development/ruby-modules/bundler-env/default.nix +++ b/pkgs/development/ruby-modules/bundler-env/default.nix @@ -49,7 +49,7 @@ in postBuild = genStubsScript { inherit lib ruby bundler groups; confFiles = basicEnv.confFiles; - binPaths = [ basicEnv.gems."${pname}" ]; + binPaths = [ basicEnv.gems.${pname} ]; } + lib.optionalString (postBuild != null) postBuild; meta = { platforms = ruby.meta.platforms; } // meta; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index df8ccfc0e4a09..a7da68da54404 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -46,11 +46,11 @@ let srcs.io_bazel_rules_sass srcs.platforms (if stdenv.hostPlatform.isDarwin - then srcs.${"java_tools_javac11_darwin-v2.0.zip"} - else srcs.${"java_tools_javac11_linux-v2.0.zip"}) - srcs.${"coverage_output_generator-v1.0.zip"} + then srcs."java_tools_javac11_darwin-v2.0.zip" + else srcs."java_tools_javac11_linux-v2.0.zip") + srcs."coverage_output_generator-v1.0.zip" srcs.build_bazel_rules_nodejs - srcs.${"android_tools_pkg-0.7.tar.gz"} + srcs."android_tools_pkg-0.7.tar.gz" ]); distDir = runCommand "bazel-deps" {} '' diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index b5ee5d7581700..94304f052fdc3 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -3,11 +3,11 @@ let # See https://mesonbuild.com/Reference-tables.html#cpu-families cpuFamilies = { - "aarch64" = "aarch64"; - "armv6l" = "arm"; - "armv7l" = "arm"; - "i686" = "x86"; - "x86_64" = "x86_64"; + aarch64 = "aarch64"; + armv6l = "arm"; + armv7l = "arm"; + i686 = "x86"; + x86_64 = "x86_64"; }; in python3Packages.buildPythonApplication rec { diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index ce88838cc731c..5e96ec499bf0f 100644 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -4,16 +4,16 @@ with stdenv.lib; let inherit (builtins) elemAt; archOverrides = { - "i686" = "x86"; + i686 = "x86"; }; info = splitString "-" stdenv.hostPlatform.system; arch = (elemAt info 0); - elasticArch = archOverrides."${arch}" or arch; + elasticArch = archOverrides.${arch} or arch; plat = elemAt info 1; shas = { - "x86_64-linux" = "0hzr47hyw54b9j4c33n6f6n3pala6kjhyvinfszgikbghyhb7fsa"; - "i686-linux" = "0bka4h31cw10ii4pfygc81pwc3wr32pzw3v4k4bi8rnqbk280fmn"; - "x86_64-darwin" = "0jqc2g89rqkla0alqxr14sh4pccfn514jrwr7mkjivxdapygh1ll"; + x86_64-linux = "0hzr47hyw54b9j4c33n6f6n3pala6kjhyvinfszgikbghyhb7fsa"; + i686-linux = "0bka4h31cw10ii4pfygc81pwc3wr32pzw3v4k4bi8rnqbk280fmn"; + x86_64-darwin = "0jqc2g89rqkla0alqxr14sh4pccfn514jrwr7mkjivxdapygh1ll"; }; in stdenv.mkDerivation rec { pname = "kibana"; @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${elasticArch}.tar.gz"; - sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); + sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index 0d052f3409582..d8b01b2e375f0 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -18,12 +18,12 @@ let shas = if enableUnfree then { - "x86_64-linux" = "1i3zmzxihplwd8n994lfxhhgygdg3qxjqgrj1difa8w3vss0zbfn"; - "x86_64-darwin" = "09a96ms9id77infxd9xxfs6r7j01mn0rz5yw3g9sl92j9ri7r52c"; + x86_64-linux = "1i3zmzxihplwd8n994lfxhhgygdg3qxjqgrj1difa8w3vss0zbfn"; + x86_64-darwin = "09a96ms9id77infxd9xxfs6r7j01mn0rz5yw3g9sl92j9ri7r52c"; } else { - "x86_64-linux" = "166rhxr0qlv1yarj2mg1c3b8mxvhl70jhz53azq7ic6laj55q7fk"; - "x86_64-darwin" = "0ngngkbl036p2mzwhp8qafi3aqzk398a218w12srfqny5n630vdk"; + x86_64-linux = "166rhxr0qlv1yarj2mg1c3b8mxvhl70jhz53azq7ic6laj55q7fk"; + x86_64-darwin = "0ngngkbl036p2mzwhp8qafi3aqzk398a218w12srfqny5n630vdk"; }; in stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz"; - sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); + sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); }; patches = [ diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index e8435549f4aa5..dbf9a713781cf 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -18,12 +18,12 @@ let shas = if enableUnfree then { - "x86_64-linux" = "1mzycd0ljnkslz9p9jhq279bkpk35r7svhngxjnmsh11ampsvxb8"; - "x86_64-darwin" = "1bz409njdpmsagh5dg062114wpa96w7pmxwfjsizwksqyyjdwdv7"; + x86_64-linux = "1mzycd0ljnkslz9p9jhq279bkpk35r7svhngxjnmsh11ampsvxb8"; + x86_64-darwin = "1bz409njdpmsagh5dg062114wpa96w7pmxwfjsizwksqyyjdwdv7"; } else { - "x86_64-linux" = "1x3gjc9xa03m4jfnl5vjxigzcnb8ysnhxgd8618v85x4l0010v38"; - "x86_64-darwin" = "1nsbmrswv2jv2z7686i2sf6rrmxysbqi5ih6jjrbrqnk64xi18j2"; + x86_64-linux = "1x3gjc9xa03m4jfnl5vjxigzcnb8ysnhxgd8618v85x4l0010v38"; + x86_64-darwin = "1nsbmrswv2jv2z7686i2sf6rrmxysbqi5ih6jjrbrqnk64xi18j2"; }; in stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz"; - sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); + sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); }; patches = [ diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index 4a4203a2f59d1..a7ef6d7bedd3c 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -22,7 +22,7 @@ let param = { "4.08" = { version = "4.08+1"; sha256 = "0qplawvxwai25bi27niw2cgz2al01kcnkj8wxwhxslpi21z6pyx1"; }; - }."${ocaml.meta.branch}"; + }.${ocaml.meta.branch}; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index e6fb1b353d2ac..e535ba29aeb44 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = { "2.7" = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj"; "2.8.4" = "098ph50s9kqw6rc3qjn39zv9b5swdf4qr44afwqfkkjgjs5d7vbl"; - }."${version}"; + }.${version}; }; buildInputs = [ ocaml findlib menhir ocsigen_deriving ocamlbuild diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 5937b00f45943..eff06daac064a 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -4,18 +4,18 @@ }: let allSpecs = { - "x86_64-linux" = { + x86_64-linux = { system = "linux64"; sha256 = "04wb6h57daxmnv3a3xrcsznawbx7r8wyi1vk1g26z2l2ppcnsbzv"; }; - "x86_64-darwin" = { + x86_64-darwin = { system = "mac64"; sha256 = "0f8j7m8ardaaw8pv02vxhwkqbcm34366bln0np0j0ig21d4fag09"; }; }; - spec = allSpecs."${stdenv.hostPlatform.system}" + spec = allSpecs.${stdenv.hostPlatform.system} or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}"); libs = stdenv.lib.makeLibraryPath [ diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix index 10fbc98d51ab3..bbdaeb5d29265 100644 --- a/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/pkgs/development/web/remarkjs/nodepkgs.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 ../../node-packages/node-env.nix { diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index b5c80a0a56dc7..291e32b6406cc 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -18,12 +18,12 @@ let # Other srcs are avilable like 32-bit mac & win, but I have only # included the ones most likely to be needed by Nixpkgs users. platforms = { - "x86_64-linux" = "linux"; - "i686-linux" = "linux32"; - "x86_64-darwin" = "osx"; - "i686-darwin" = "osx32"; - "x86_64-cygwin" = "win"; - "i686-cygwin" = "win32"; + x86_64-linux = "linux"; + i686-linux = "linux32"; + x86_64-darwin = "osx"; + i686-darwin = "osx32"; + x86_64-cygwin = "win"; + i686-cygwin = "win32"; }; dfVersionTriple = splitString "." dfVersion; diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index e7b4f81f7e044..735ea62324717 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 ebea49d9540a9..779325c99b0b0 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 68220392fd001..d95eb85168e20 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 851aa9f3f8824..978fd9b9e0390 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 44bc7ec3ced1d..fad9503559b16 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 423f39f9bbccc..f4ebea8e43831 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 { diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 93b6f4a620974..2c8d999b2df18 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -38,14 +38,14 @@ let HOST_SH = "${buildPackages.bash}/bin/sh"; MACHINE_ARCH = { - "i686" = "i386"; + i686 = "i386"; }.${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; MACHINE = { - "x86_64" = "amd64"; - "aarch64" = "evbarm64"; - "i686" = "i386"; + x86_64 = "amd64"; + aarch64 = "evbarm64"; + i686 = "i386"; }.${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name; diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index bb9dc0a03b5fd..d25edff49560f 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -14,9 +14,9 @@ let minSdkVersion = "9.0"; iosPlatformArch = { parsed, ... }: { - "armv7a" = "armv7"; - "aarch64" = "arm64"; - "x86_64" = "x86_64"; + armv7a = "armv7"; + aarch64 = "arm64"; + x86_64 = "x86_64"; }.${parsed.cpu.name}; in diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index d2e1a35cb2e69..33efad8c91294 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -16,9 +16,9 @@ lib.overrideDerivation (buildLinux (args // rec { }; defconfig = { - "armv6l-linux" = "bcmrpi_defconfig"; - "armv7l-linux" = "bcm2709_defconfig"; - "aarch64-linux" = "bcmrpi3_defconfig"; + armv6l-linux = "bcmrpi_defconfig"; + armv7l-linux = "bcm2709_defconfig"; + aarch64-linux = "bcmrpi3_defconfig"; }.${stdenv.hostPlatform.system} or (throw "linux_rpi not supported on '${stdenv.hostPlatform.system}'"); features = { diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 11695d753e286..871e335628ce0 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -33,13 +33,13 @@ let "-DUSE_OPTIMIZE_FOR_ARCHITECTURE=OFF" # also avoid using builder's /proc/cpuinfo ] ++ - { "westmere" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "sandybridge" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "ivybridge" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "haswell" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "broadwell" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "skylake" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - "skylake-avx512" = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + { westmere = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + sandybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + ivybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + haswell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + broadwell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + skylake = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; + skylake-avx512 = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; }.${stdenv.hostPlatform.platform.gcc.arch or ""} or [ "-DHAVE_SSE42=OFF" "-DASM_OPTIMIZATIONS=OFF" ]; enableParallelBuilding = true; diff --git a/pkgs/servers/search/elasticsearch/7.x.nix b/pkgs/servers/search/elasticsearch/7.x.nix index ddb1d2299cbb4..b94a736a4ca8f 100644 --- a/pkgs/servers/search/elasticsearch/7.x.nix +++ b/pkgs/servers/search/elasticsearch/7.x.nix @@ -17,12 +17,12 @@ let shas = if enableUnfree then { - "x86_64-linux" = "1jkfllafcjqhfydsy90jx2ghpv5cmm6gabv206niwg9qc6y6r1ik"; - "x86_64-darwin" = "1lgyxq3yahdww0wpqmpc1mz57kmk5hy2drb1dha69k9l0ibmjf18"; + x86_64-linux = "1jkfllafcjqhfydsy90jx2ghpv5cmm6gabv206niwg9qc6y6r1ik"; + x86_64-darwin = "1lgyxq3yahdww0wpqmpc1mz57kmk5hy2drb1dha69k9l0ibmjf18"; } else { - "x86_64-linux" = "0pg22wi2xcjla44azfvn9c58r4xq3x9jiwh7qb0d8f3nv30vfd10"; - "x86_64-darwin" = "0d9xg3bf06mr7mw2bd16gb2xrfjncrhj19846rrj4j5gb2qjz0x2"; + x86_64-linux = "0pg22wi2xcjla44azfvn9c58r4xq3x9jiwh7qb0d8f3nv30vfd10"; + x86_64-darwin = "0d9xg3bf06mr7mw2bd16gb2xrfjncrhj19846rrj4j5gb2qjz0x2"; }; in stdenv.mkDerivation (rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation (rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}-${plat}-${arch}.tar.gz"; - sha256 = shas."${stdenv.hostPlatform.system}" or (throw "Unknown architecture"); + sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); }; patches = [ ./es-home-6.x.patch ]; diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix index 75e28e2382e2f..2e0bbd2eab920 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages.nix +++ b/pkgs/servers/web-apps/cryptpad/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/stdenv/default.nix b/pkgs/stdenv/default.nix index 1f752f021524a..b0db1be5f4466 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -39,25 +39,25 @@ in if crossSystem != localSystem || crossOverlays != [] then stagesCross else if config ? replaceStdenv then stagesCustom else { # switch - "i686-linux" = stagesLinux; - "x86_64-linux" = stagesLinux; - "armv5tel-linux" = stagesLinux; - "armv6l-linux" = stagesLinux; - "armv6m-linux" = stagesLinux; - "armv7a-linux" = stagesLinux; - "armv7l-linux" = stagesLinux; - "armv7r-linux" = stagesLinux; - "armv7m-linux" = stagesLinux; - "armv8a-linux" = stagesLinux; - "armv8r-linux" = stagesLinux; - "armv8m-linux" = stagesLinux; - "aarch64-linux" = stagesLinux; - "mipsel-linux" = stagesLinux; - "powerpc-linux" = /* stagesLinux */ stagesNative; - "powerpc64le-linux" = stagesLinux; - "x86_64-darwin" = stagesDarwin; - "x86_64-solaris" = stagesNix; - "i686-cygwin" = stagesNative; - "x86_64-cygwin" = stagesNative; - "x86_64-freebsd" = stagesFreeBSD; + i686-linux = stagesLinux; + x86_64-linux = stagesLinux; + armv5tel-linux = stagesLinux; + armv6l-linux = stagesLinux; + armv6m-linux = stagesLinux; + armv7a-linux = stagesLinux; + armv7l-linux = stagesLinux; + armv7r-linux = stagesLinux; + armv7m-linux = stagesLinux; + armv8a-linux = stagesLinux; + armv8r-linux = stagesLinux; + armv8m-linux = stagesLinux; + aarch64-linux = stagesLinux; + mipsel-linux = stagesLinux; + powerpc-linux = /* stagesLinux */ stagesNative; + powerpc64le-linux = stagesLinux; + x86_64-darwin = stagesDarwin; + x86_64-solaris = stagesNix; + i686-cygwin = stagesNative; + x86_64-cygwin = stagesNative; + x86_64-freebsd = stagesFreeBSD; }.${localSystem.system} or stagesNative diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 89e2a7a8031cd..5277190d16931 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -152,7 +152,7 @@ let '' + (builtins.getAttr reason remediation) attrs; - handler = if config ? "handleEvalIssue" + handler = if config ? handleEvalIssue then config.handleEvalIssue reason else throw; in handler msg; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 390c7f1123ecc..8344c9dfb2b87 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -8,21 +8,21 @@ , bootstrapFiles ? let table = { - "glibc" = { - "i686-linux" = import ./bootstrap-files/i686.nix; - "x86_64-linux" = import ./bootstrap-files/x86_64.nix; - "armv5tel-linux" = import ./bootstrap-files/armv5tel.nix; - "armv6l-linux" = import ./bootstrap-files/armv6l.nix; - "armv7l-linux" = import ./bootstrap-files/armv7l.nix; - "aarch64-linux" = import ./bootstrap-files/aarch64.nix; - "mipsel-linux" = import ./bootstrap-files/loongson2f.nix; - "powerpc64le-linux" = import ./bootstrap-files/ppc64le.nix; + glibc = { + i686-linux = import ./bootstrap-files/i686.nix; + x86_64-linux = import ./bootstrap-files/x86_64.nix; + armv5tel-linux = import ./bootstrap-files/armv5tel.nix; + armv6l-linux = import ./bootstrap-files/armv6l.nix; + armv7l-linux = import ./bootstrap-files/armv7l.nix; + aarch64-linux = import ./bootstrap-files/aarch64.nix; + mipsel-linux = import ./bootstrap-files/loongson2f.nix; + powerpc64le-linux = import ./bootstrap-files/ppc64le.nix; }; - "musl" = { - "aarch64-linux" = import ./bootstrap-files/aarch64-musl.nix; - "armv6l-linux" = import ./bootstrap-files/armv6l-musl.nix; - "x86_64-linux" = import ./bootstrap-files/x86_64-musl.nix; - "powerpc64le-linux" = import ./bootstrap-files/ppc64le-musl.nix; + musl = { + aarch64-linux = import ./bootstrap-files/aarch64-musl.nix; + armv6l-linux = import ./bootstrap-files/armv6l-musl.nix; + x86_64-linux = import ./bootstrap-files/x86_64-musl.nix; + powerpc64le-linux = import ./bootstrap-files/ppc64le-musl.nix; }; }; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index ba53a6f1d1421..f6e0df161ad00 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -121,8 +121,8 @@ in cc = let nativePrefix = { # switch - "i686-solaris" = "/usr/gnu"; - "x86_64-solaris" = "/opt/local/gcc47"; + i686-solaris = "/usr/gnu"; + x86_64-solaris = "/opt/local/gcc47"; }.${system} or "/usr"; in import ../../build-support/cc-wrapper { diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 2df63ea1e15a7..3eac61257a01f 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -8,11 +8,11 @@ let # switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script pulumiArchPackage = { - "x86_64-linux" = { + x86_64-linux = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz"; sha256 = "13ajgc8x5l3s93hmz6jg88if10bvd319jmkljy4n26zdp30vfqmw"; }; - "x86_64-darwin" = { + x86_64-darwin = { url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz"; sha256 = "0chpbnz2s4icwgmfq6kl8blz5mg4lpdqg061w3nh0p04adpgrn48"; }; diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix index 0ed70ade82957..814c02267ba94 100644 --- a/pkgs/tools/backup/lvmsync/default.nix +++ b/pkgs/tools/backup/lvmsync/default.nix @@ -3,7 +3,7 @@ let pname = "lvmsync"; - version = (import ./gemset.nix)."${pname}".version; + version = (import ./gemset.nix).${pname}.version; in stdenv.mkDerivation rec { diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 4ddc75542945e..cc46e3e241d99 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -2,9 +2,9 @@ let archids = { - "x86_64-linux" = { hostarch = "x86_64"; efiPlatform = "x64"; }; - "i686-linux" = rec { hostarch = "ia32"; efiPlatform = hostarch; }; - "aarch64-linux" = rec { hostarch = "aarch64"; efiPlatform = "aa64"; }; + x86_64-linux = { hostarch = "x86_64"; efiPlatform = "x64"; }; + i686-linux = rec { hostarch = "ia32"; efiPlatform = hostarch; }; + aarch64-linux = rec { hostarch = "aarch64"; efiPlatform = "aa64"; }; }; inherit diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index a176ef13fccbf..8ea7a0fa0a2a4 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -10,22 +10,22 @@ with stdenv.lib; let pcSystems = { - "i686-linux".target = "i386"; - "x86_64-linux".target = "i386"; + i686-linux.target = "i386"; + x86_64-linux.target = "i386"; }; efiSystemsBuild = { - "i686-linux".target = "i386"; - "x86_64-linux".target = "x86_64"; - "aarch64-linux".target = "aarch64"; + i686-linux.target = "i386"; + x86_64-linux.target = "x86_64"; + aarch64-linux.target = "aarch64"; }; # For aarch64, we need to use '--target=aarch64-efi' when building, # but '--target=arm64-efi' when installing. Insanity! efiSystemsInstall = { - "i686-linux".target = "i386"; - "x86_64-linux".target = "x86_64"; - "aarch64-linux".target = "arm64"; + i686-linux.target = "i386"; + x86_64-linux.target = "x86_64"; + aarch64-linux.target = "arm64"; }; canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix index 19d8afb185752..6b796dedb0ade 100644 --- a/pkgs/tools/misc/grub/pvgrub_image/default.nix +++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -3,9 +3,9 @@ with stdenv.lib; let efiSystemsBuild = { - "i686-linux".target = "i386"; - "x86_64-linux".target = "x86_64"; - "aarch64-linux".target = "aarch64"; + i686-linux.target = "i386"; + x86_64-linux.target = "x86_64"; + aarch64-linux.target = "aarch64"; }; in ( diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 7b432df3e8b88..1033a489c7670 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -6,8 +6,8 @@ with stdenv.lib; let pcSystems = { - "i686-linux".target = "i386"; - "x86_64-linux".target = "i386"; + i686-linux.target = "i386"; + x86_64-linux.target = "i386"; }; inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix index 8fe405e1b3e90..4377681e20d83 100644 --- a/pkgs/tools/networking/airfield/node.nix +++ b/pkgs/tools/networking/airfield/node.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/tools/networking/envoy/default.nix b/pkgs/tools/networking/envoy/default.nix index 2800139f8fac1..f35a902735300 100644 --- a/pkgs/tools/networking/envoy/default.nix +++ b/pkgs/tools/networking/envoy/default.nix @@ -127,7 +127,7 @@ let # Generate the BUILD file. buildFile = let field = name: attrs: - if attrs ? "${name}" then " ${name} = ${attrs.${name}},\n" else ""; + if attrs ? ${name} then " ${name} = ${attrs.${name}},\n" else ""; in '' licenses(["notice"]) # Apache 2 diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index b42b3ff5b7390..8dfaae63ffaf2 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -11,7 +11,7 @@ let inherit (stdenv) lib; sslSupportEnabled = sslSupport != false; sslLibs = { - "libressl" = libressl; + libressl = libressl; }; in diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index 8fe405e1b3e90..4377681e20d83 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.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/tools/security/bitwarden-cli/node-packages.nix b/pkgs/tools/security/bitwarden-cli/node-packages.nix index 41e23864c44d8..66560873b4c50 100644 --- a/pkgs/tools/security/bitwarden-cli/node-packages.nix +++ b/pkgs/tools/security/bitwarden-cli/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/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index e6874d085d297..d94e02c4adcad 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -16,11 +16,11 @@ let pname = "bitwarden"; version = { - "x86_64-linux" = "1.15.2"; + x86_64-linux = "1.15.2"; }.${system} or ""; sha256 = { - "x86_64-linux" = "0yz4hkqqwq2zrdjfxk5kybhs90n80k6bkn0625m47b09lwl2di4f"; + x86_64-linux = "0yz4hkqqwq2zrdjfxk5kybhs90n80k6bkn0625m47b09lwl2di4f"; }.${system} or ""; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index d33cdeb1c56fc..87f2e922ff743 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -6,23 +6,23 @@ let sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { - "x86_64-linux" = fetchurl { + x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; sha256 = "293b88f4d31f6bcdcc8b508eccb7b856a0423270adebfa0f52f04144c5a22ae0"; }; - "i686-linux" = fetchurl { + i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; sha256 = "9f2fb99e08fa3d25af1497516d08b5d2d8a73bcacd5354ddec024e9628795867"; }; - "x86_64-darwin" = fetchurl { + x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; sha256 = "a0a7a242f8299ac4a00af8aa10ccedaf63013c8a068f56eadfb9d730b87155ea"; }; - "i686-darwin" = fetchurl { + i686-darwin = fetchurl { url = "${base}/vault_${version}_darwin_386.zip"; sha256 = "50542cfb37abb06e8bb6b8ba41f5ca7d72a4d6a4396d4e3f4a8391bed14f63be"; }; - "aarch64-linux" = fetchurl { + aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; sha256 = "c243dce14b2e48e3667c2aa5b7fb37009dd7043b56032d6ebe50dd456715fd3f"; }; @@ -32,7 +32,7 @@ in stdenv.mkDerivation { pname = "vault-bin"; inherit version; - src = sources."${stdenv.hostPlatform.system}" or (throw "unsupported system: ${stdenv.hostPlatform.system}"); + src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); nativeBuildInputs = [ unzip ]; diff --git a/pkgs/tools/typesetting/kindlegen/default.nix b/pkgs/tools/typesetting/kindlegen/default.nix index 2c0e2f29d24f2..80023e05ec464 100644 --- a/pkgs/tools/typesetting/kindlegen/default.nix +++ b/pkgs/tools/typesetting/kindlegen/default.nix @@ -5,22 +5,22 @@ let fileVersion = builtins.replaceStrings [ "." ] [ "_" ] version; sha256 = { - "x86_64-linux" = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q"; - "i686-linux" = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q"; - "x86_64-darwin" = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs"; - "i686-darwin" = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs"; - "x86_64-cygwin" = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h"; - "i686-cygwin" = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h"; - }."${stdenv.hostPlatform.system}" or (throw "system #{stdenv.hostPlatform.system.} is not supported"); + x86_64-linux = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q"; + i686-linux = "15i20kzhdcmi94w7wfhqbl6j20v47cdakjm2mn3x8w495iddna4q"; + x86_64-darwin = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs"; + i686-darwin = "0zniyn0s41fxqrajbgwxbcsj5vzf9m7a6yvdz2b11mphr00kpbbs"; + x86_64-cygwin = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h"; + i686-cygwin = "02slfh1bbpijay4skj85cjiv7z43ha8vm5aa1lwiqjk86qbl1f3h"; + }.${stdenv.hostPlatform.system} or (throw "system #{stdenv.hostPlatform.system.} is not supported"); url = { - "x86_64-linux" = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz"; - "i686-linux" = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz"; - "x86_64-darwin" = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip"; - "i686-darwin" = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip"; - "x86_64-cygwin" = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip"; - "i686-cygwin" = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip"; - }."${stdenv.hostPlatform.system}" or (throw "system #{stdenv.hostPlatform.system.} is not supported"); + x86_64-linux = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz"; + i686-linux = "http://kindlegen.s3.amazonaws.com/kindlegen_linux_2.6_i386_v${fileVersion}.tar.gz"; + x86_64-darwin = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip"; + i686-darwin = "http://kindlegen.s3.amazonaws.com/KindleGen_Mac_i386_v${fileVersion}.zip"; + x86_64-cygwin = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip"; + i686-cygwin = "http://kindlegen.s3.amazonaws.com/kindlegen_win32_v${fileVersion}.zip"; + }.${stdenv.hostPlatform.system} or (throw "system #{stdenv.hostPlatform.system.} is not supported"); in stdenv.mkDerivation rec { pname = "kindlegen"; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index a3b58e7274ded..651ff88b6f2e6 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -84,8 +84,8 @@ let # the fake derivations are used for filtering of hyphenation patterns else { inherit pname version; tlType = "run"; } )] - ++ lib.optional (attrs.sha512 ? "doc") (mkPkgV "doc") - ++ lib.optional (attrs.sha512 ? "source") (mkPkgV "source") + ++ lib.optional (attrs.sha512 ? doc) (mkPkgV "doc") + ++ lib.optional (attrs.sha512 ? source) (mkPkgV "source") ++ lib.optional (bin ? ${pname}) ( bin.${pname} // { inherit pname; tlType = "bin"; } ) ++ combinePkgs (attrs.deps or {}); diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 86e8228f1870d..49bfc58adf067 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -105,7 +105,7 @@ in { (pkgs.lib.attrNames compiler); in pkgs.recurseIntoAttrs (pkgs.lib.genAttrs integerSimpleGhcNames - (name: compiler."${name}".override { enableIntegerSimple = true; })); + (name: compiler.${name}.override { enableIntegerSimple = true; })); }; # Default overrides that are applied to all package sets. @@ -176,9 +176,9 @@ in { integerSimpleGhcNames = pkgs.lib.filter (name: ! builtins.elem name integerSimpleExcludes) (pkgs.lib.attrNames packages); - in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages."${name}".override { - ghc = bh.compiler.integer-simple."${name}"; - buildHaskellPackages = bh.packages.integer-simple."${name}"; + in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages.${name}.override { + ghc = bh.compiler.integer-simple.${name}; + buildHaskellPackages = bh.packages.integer-simple.${name}; overrides = _self : _super : { integer-simple = null; integer-gmp = null; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 9f4b63293ef60..4fe067694dcdc 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -169,9 +169,9 @@ let then "localSystem" else "crossSystem"} = { parsed = stdenv.hostPlatform.parsed // { abi = { - "gnu" = lib.systems.parse.abis.musl; - "gnueabi" = lib.systems.parse.abis.musleabi; - "gnueabihf" = lib.systems.parse.abis.musleabihf; + gnu = lib.systems.parse.abis.musl; + gnueabi = lib.systems.parse.abis.musleabi; + gnueabihf = lib.systems.parse.abis.musleabihf; }.${stdenv.hostPlatform.parsed.abi.name} or lib.systems.parse.abis.musl; }; @@ -217,9 +217,9 @@ let crossSystem = { parsed = stdenv.hostPlatform.parsed // { abi = { - "gnu" = lib.systems.parse.abis.musl; - "gnueabi" = lib.systems.parse.abis.musleabi; - "gnueabihf" = lib.systems.parse.abis.musleabihf; + gnu = lib.systems.parse.abis.musl; + gnueabi = lib.systems.parse.abis.musleabi; + gnueabihf = lib.systems.parse.abis.musleabihf; }.${stdenv.hostPlatform.parsed.abi.name} or lib.systems.parse.abis.musl; }; |