diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 126 | ||||
-rw-r--r-- | pkgs/top-level/beam-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/dotnet-packages.nix | 12 | ||||
-rw-r--r-- | pkgs/top-level/emscripten-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/haxe-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/lua-packages.nix | 13 | ||||
-rw-r--r-- | pkgs/top-level/make-tarball.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/php-packages.nix | 42 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/release-small.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/release.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/stage.nix | 12 |
13 files changed, 119 insertions, 112 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 106080ae519..4ac7927bf8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2377,7 +2377,7 @@ in m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; - mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc rec { + mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { python = python2; inherit (python2Packages) gyp; protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); @@ -2525,7 +2525,7 @@ in curl = callPackage ../tools/networking/curl { }; - curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; + curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { }; curlie = callPackage ../tools/networking/curlie { }; @@ -3043,7 +3043,7 @@ in m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { }; - mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc rec { + mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc { python = python2; inherit (python2Packages) gyp; protobuf = pkgs.protobuf3_6.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); @@ -4689,12 +4689,7 @@ in makefile2graph = callPackage ../development/tools/analysis/makefile2graph { }; - # See https://github.com/NixOS/nixpkgs/issues/15849. I'm switching on isLinux because - # it looks like gnulib is broken on non-linux, so it seems likely that this would cause - # trouble on bsd and/or cygwin as well. - man = if stdenv.isLinux then man-db else man-old; - - man-old = callPackage ../tools/misc/man { }; + man = man-db; man-db = callPackage ../tools/misc/man-db { }; @@ -4879,7 +4874,7 @@ in mt-st = callPackage ../tools/backup/mt-st {}; - multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in rec { + multitran = recurseIntoAttrs (let callPackage = newScope pkgs.multitran; in { multitrandata = callPackage ../tools/text/multitran/data { }; libbtree = callPackage ../tools/text/multitran/libbtree { }; @@ -7347,6 +7342,24 @@ in then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {} else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {}; + adoptopenjdk-bin-8-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix; + adoptopenjdk-bin-8-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix; + + adoptopenjdk-hotspot-bin-8 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-8-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-8-packages-darwin.jdk-hotspot {}; + adoptopenjdk-jre-hotspot-bin-8 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-8-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-8-packages-darwin.jre-hotspot {}; + + adoptopenjdk-openj9-bin-8 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-8-packages-linux.jdk-openj9 {} + else callPackage adoptopenjdk-bin-8-packages-darwin.jdk-openj9 {}; + + adoptopenjdk-jre-openj9-bin-8 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-8-packages-linux.jre-openj9 {} + else callPackage adoptopenjdk-bin-8-packages-darwin.jre-openj9 {}; + adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11; adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11; @@ -7930,15 +7943,15 @@ in hugs = callPackage ../development/interpreters/hugs { }; - bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; }; + openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; - openjfx11 = - if stdenv.isDarwin then - null + openjfx12 = callPackage ../development/compilers/openjdk/openjfx/12.nix { }; + + openjdk8-bootstrap = + if adoptopenjdk-hotspot-bin-8.meta.available then + adoptopenjdk-hotspot-bin-8 else - callPackage ../development/compilers/openjdk/openjfx/11.nix { - openjdk = openjdk11; - }; + callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; /* legacy jdk for use as needed by older apps */ openjdk8 = @@ -7946,10 +7959,21 @@ in callPackage ../development/compilers/openjdk/darwin/8.nix { } else callPackage ../development/compilers/openjdk/8.nix { - bootjdk = bootjdk.override { version = "8"; }; inherit (gnome2) GConf gnome_vfs; }; + openjdk8_headless = + if stdenv.isDarwin || stdenv.isAarch64 then + openjdk8 + else + openjdk8.override { headless = true; }; + + openjdk11-bootstrap = + if adoptopenjdk-hotspot-bin-11.meta.available then + adoptopenjdk-hotspot-bin-11 + else + callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; }; + /* currently maintained LTS JDK */ openjdk11 = if stdenv.isDarwin then @@ -7960,62 +7984,43 @@ in inherit (gnome2) GConf gnome_vfs; }; - openjfx12 = + openjdk11_headless = if stdenv.isDarwin then - null + openjdk11 else - callPackage ../development/compilers/openjdk/openjfx/12.nix { - openjdk = openjdk12; - bootjdk = openjdk11; - }; + openjdk11.override { headless = true; }; /* current JDK */ openjdk12 = if stdenv.isDarwin then - callPackage ../development/compilers/openjdk/darwin/default.nix { } + callPackage ../development/compilers/openjdk/darwin { } else - callPackage ../development/compilers/openjdk/default.nix { + callPackage ../development/compilers/openjdk { openjfx = openjfx12; inherit (gnome2) GConf gnome_vfs; - bootjdk = openjdk11; }; + openjdk12_headless = + if stdenv.isDarwin then + openjdk12 + else + openjdk12.override { headless = true; }; + openjdk = openjdk8; + openjdk_headless = openjdk8_headless; - jdk8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; - jre8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" - (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - (openjdk8.jre // { outputs = [ "jre" ]; })); - jre8_headless = - if stdenv.isAarch32 || stdenv.isAarch64 then - oraclejre8 - else if stdenv.isDarwin then - jre8 - else - lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}-headless" - (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); + jdk8 = openjdk8; + jre8 = openjdk8.jre; + jre8_headless = openjdk8_headless.jre; - jdk11 = openjdk11 // { outputs = [ "out" ]; }; - jdk11_headless = - if stdenv.isDarwin then - jdk11 - else - lib.setName "openjdk-${lib.getVersion pkgs.openjdk11}-headless" - (lib.addMetaAttrs {} - ((openjdk11.override { minimal = true; }) // {})); + jdk11 = openjdk11; + jdk11_headless = openjdk11_headless; - jdk12 = openjdk12 // { outputs = [ "out" ]; }; - jdk12_headless = - if stdenv.isDarwin then - jdk12 - else - lib.setName "openjdk-${lib.getVersion pkgs.openjdk12}-headless" - (lib.addMetaAttrs {} - ((openjdk12.override { minimal = true; }) // {})); + jdk12 = openjdk12; + jdk12_headless = openjdk12_headless; jdk = jdk8; - jre = if stdenv.isAarch32 || stdenv.isAarch64 then adoptopenjdk-jre-bin else jre8; + jre = jre8; jre_headless = jre8_headless; inherit (callPackages ../development/compilers/graalvm { }) mx jvmci8 graalvm8; @@ -8946,7 +8951,7 @@ in ruby_2_5 ruby_2_6; - ruby = ruby_2_5; + ruby = ruby_2_6; rubyPackages_2_3 = recurseIntoAttrs ruby_2_3.gems; rubyPackages_2_4 = recurseIntoAttrs ruby_2_4.gems; @@ -12554,7 +12559,7 @@ in libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; - libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: rec { + libyamlcpp_0_3 = pkgs.libyamlcpp.overrideAttrs (oldAttrs: { src = pkgs.fetchurl { url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz"; sha256 = "12aszqw6svwlnb6nzhsbqhz3c7vnd5ahd0k6xlj05w8lm83hx3db"; @@ -19187,7 +19192,7 @@ in links2 = callPackage ../applications/networking/browsers/links2 { }; - linphone = callPackage ../applications/networking/instant-messengers/linphone rec { + linphone = callPackage ../applications/networking/instant-messengers/linphone { polarssl = mbedtls_1_3; }; @@ -21164,6 +21169,7 @@ in libva = null; libwebp = null; xwayland = null; + pipewire = null; }; chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {}; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index df9d3dbcff5..7496449c044 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -82,7 +82,7 @@ rec { # Each field in this tuple represents all Beam packages in nixpkgs built with # appropriate Erlang/OTP version. - packages = rec { + packages = { # Packages built with default Erlang version. erlang = packagesWith interpreters.erlang; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index e89a7d9df2a..f06b4f1c286 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -430,14 +430,14 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - Deedle = fetchNuGet rec { + Deedle = fetchNuGet { baseName = "Deedle"; version = "1.2.5"; sha256 = "0g19ll6bp97ixprcnpwwvshr1n9jxxf9xjhkxp0r63mg46z48jnw"; outputFiles = [ "*" ]; }; - ExcelDna = buildDotnetPackage rec { + ExcelDna = buildDotnetPackage { baseName = "Excel-DNA"; version = "0.32.0"; @@ -496,7 +496,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - ExtCore = buildDotnetPackage rec { + ExtCore = buildDotnetPackage { baseName = "ExtCore"; version = "0.8.46"; @@ -564,7 +564,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - FSharpCompilerService = buildDotnetPackage rec { + FSharpCompilerService = buildDotnetPackage { baseName = "FSharp.Compiler.Service"; version = "0.0.90"; @@ -667,7 +667,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { # }; # }; - GitVersionTree = buildDotnetPackage rec { + GitVersionTree = buildDotnetPackage { baseName = "GitVersionTree"; version = "2013-10-01"; @@ -927,7 +927,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - UnionArgParser = buildDotnetPackage rec { + UnionArgParser = buildDotnetPackage { baseName = "UnionArgParser"; version = "0.8.7"; diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index 5b5b32b89da..a36c89fac0a 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -134,7 +134,7 @@ rec { zlib = (pkgs.zlib.override { stdenv = pkgs.emscriptenStdenv; }).overrideDerivation - (old: rec { + (old: { buildInputs = old.buildInputs ++ [ pkgconfig ]; # we need to reset this setting! NIX_CFLAGS_COMPILE=""; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 86e8228f187..49bfc58adf0 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/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix index 35b0b42da3f..06b82a478a8 100644 --- a/pkgs/top-level/haxe-packages.nix +++ b/pkgs/top-level/haxe-packages.nix @@ -99,7 +99,7 @@ let hxnodejs_6 = let libname = "hxnodejs"; version = "6.9.0"; - in stdenv.mkDerivation rec { + in stdenv.mkDerivation { name = "${libname}-${version}"; src = fetchFromGitHub { owner = "HaxeFoundation"; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 2d34bdaabc0..c9e9305666e 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -64,17 +64,18 @@ in with self; { getLuaPathList = majorVersion: [ - "lib/lua/${majorVersion}/?.lua" "share/lua/${majorVersion}/?.lua" - "share/lua/${majorVersion}/?/init.lua" "lib/lua/${majorVersion}/?/init.lua" + "share/lua/${majorVersion}/?.lua" + "share/lua/${majorVersion}/?/init.lua" ]; getLuaCPathList = majorVersion: [ - "lib/lua/${majorVersion}/?.so" "share/lua/${majorVersion}/?.so" "share/lua/${majorVersion}/?/init.so" + "lib/lua/${majorVersion}/?.so" ]; # helper functions for dealing with LUA_PATH and LUA_CPATH - getPath = lib : type : "${lib}/lib/lua/${lua.luaversion}/?.${type};${lib}/share/lua/${lua.luaversion}/?.${type}"; - getLuaPath = lib : getPath lib "lua"; - getLuaCPath = lib : getPath lib "so"; + getPath = drv: pathListForVersion: + lib.concatMapStringsSep ";" (path: "${drv}/${path}") (pathListForVersion lua.luaversion); + getLuaPath = drv: getPath drv getLuaPathList; + getLuaCPath = drv: getPath drv getLuaCPathList; #define build lua package function buildLuaPackage = callPackage ../development/lua-modules/generic { diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 6f30bd06a81..288971403f1 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -11,7 +11,7 @@ with pkgs; -releaseTools.sourceTarball rec { +releaseTools.sourceTarball { name = "nixpkgs-tarball"; src = nixpkgs; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 879ffc9f441..fc6d7674338 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -15,7 +15,7 @@ let isPhp73 = pkgs.lib.versionAtLeast php.version "7.3"; - apcu = buildPecl rec { + apcu = buildPecl { version = "5.1.17"; pname = "apcu"; @@ -29,7 +29,7 @@ let outputs = [ "out" "dev" ]; }; - apcu_bc = buildPecl rec { + apcu_bc = buildPecl { version = "1.0.5"; pname = "apcu_bc"; @@ -38,7 +38,7 @@ let buildInputs = [ apcu (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ]; }; - ast = buildPecl rec { + ast = buildPecl { version = "1.0.3"; pname = "ast"; @@ -142,7 +142,7 @@ let ]; }; - event = buildPecl rec { + event = buildPecl { version = "2.5.3"; pname = "event"; @@ -167,7 +167,7 @@ let }; }; - igbinary = buildPecl rec { + igbinary = buildPecl { version = "3.0.1"; pname = "igbinary"; @@ -178,7 +178,7 @@ let outputs = [ "out" "dev" ]; }; - imagick = buildPecl rec { + imagick = buildPecl { version = "3.4.4"; pname = "imagick"; @@ -189,7 +189,7 @@ let buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ]; }; - mailparse = buildPecl rec { + mailparse = buildPecl { version = "3.0.3"; pname = "mailparse"; @@ -232,7 +232,7 @@ let ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; }; - oci8 = buildPecl rec { + oci8 = buildPecl { version = "2.2.0"; pname = "oci8"; @@ -245,14 +245,14 @@ let ''; }; - pcs = buildPecl rec { + pcs = buildPecl { version = "1.3.3"; pname = "pcs"; sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p"; }; - pdo_sqlsrv = buildPecl rec { + pdo_sqlsrv = buildPecl { version = "5.6.1"; pname = "pdo_sqlsrv"; @@ -427,7 +427,7 @@ let pinba = if isPhp73 then pinba73 else pinba7; - pinba7 = assert !isPhp73; buildPecl rec { + pinba7 = assert !isPhp73; buildPecl { version = "1.1.1"; pname = "pinba"; @@ -448,7 +448,7 @@ let }; }; - pinba73 = assert isPhp73; buildPecl rec { + pinba73 = assert isPhp73; buildPecl { version = "1.1.2-dev"; pname = "pinba"; @@ -469,7 +469,7 @@ let }; }; - protobuf = buildPecl rec { + protobuf = buildPecl { version = "3.9.0"; pname = "protobuf"; @@ -529,7 +529,7 @@ let buildInputs = with pkgs; [ pcre.dev ]; }; - pthreads32-dev = assert (pkgs.config.php.zts or false); assert isPhp73; buildPecl rec { + pthreads32-dev = assert (pkgs.config.php.zts or false); assert isPhp73; buildPecl { version = "3.2.0-dev"; pname = "pthreads"; @@ -543,14 +543,14 @@ let buildInputs = with pkgs; [ pcre2.dev ]; }; - redis = buildPecl rec { + redis = buildPecl { version = "5.0.2"; pname = "redis"; sha256 = "0b5pw17lzqknhijfymksvf8fm1zilppr97ypb31n599jw3mxf62f"; }; - sqlsrv = buildPecl rec { + sqlsrv = buildPecl { version = "5.6.1"; pname = "sqlsrv"; @@ -559,7 +559,7 @@ let buildInputs = [ pkgs.unixODBC ]; }; - v8 = buildPecl rec { + v8 = buildPecl { version = "0.2.2"; pname = "v8"; @@ -570,7 +570,7 @@ let meta.broken = true; }; - v8js = assert !isPhp73; buildPecl rec { + v8js = assert !isPhp73; buildPecl { version = "2.1.0"; pname = "v8js"; @@ -581,7 +581,7 @@ let meta.broken = true; }; - xdebug = buildPecl rec { + xdebug = buildPecl { version = "2.7.1"; pname = "xdebug"; @@ -591,7 +591,7 @@ let checkTarget = "test"; }; - yaml = buildPecl rec { + yaml = buildPecl { version = "2.0.4"; pname = "yaml"; @@ -604,7 +604,7 @@ let nativeBuildInputs = [ pkgs.pkgconfig ]; }; - zmq = assert !isPhp73; buildPecl rec { + zmq = assert !isPhp73; buildPecl { version = "1.1.3"; pname = "zmq"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8aecd2f07e1..aa4d6521c00 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2673,7 +2673,7 @@ in { pycares = callPackage ../development/python-modules/pycares { }; - pycuda = callPackage ../development/python-modules/pycuda rec { + pycuda = callPackage ../development/python-modules/pycuda { cudatoolkit = pkgs.cudatoolkit_7_5; inherit (pkgs.stdenv) mkDerivation; }; @@ -3982,10 +3982,10 @@ in { blas = pkgs.openblasCompat; }; numpy_2 = numpy_.overridePythonAttrs(oldAttrs: rec { - version = "1.16.4"; + version = "1.16.5"; src = oldAttrs.src.override { inherit version; - sha256 = "1ivrwh66cmly7xh1dl7pybizfz5rcicn4kkkx5g29v4gll9bwhkj"; + sha256 = "8bb452d94e964b312205b0de1238dd7209da452343653ab214b5d681780e7a0c"; }; }); in if pythonOlder "3.5" then numpy_2 else numpy_; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 17239c6d879..1ed3601270f 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -14,7 +14,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; officialRelease = false; }; -} // (mapTestOn (rec { +} // (mapTestOn ({ aspell = all; at = linux; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 2068478872b..da81a696337 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -185,7 +185,7 @@ let }; }; - } // (mapTestOn ((packagePlatforms pkgs) // rec { + } // (mapTestOn ((packagePlatforms pkgs) // { haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskellPackages = packagePlatforms pkgs.haskellPackages; idrisPackages = packagePlatforms pkgs.idrisPackages; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 9f4b63293ef..4fe067694dc 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; }; |