JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #102532 from grahamc/nixUnstable-bump

Browse Source 
nixUnstable: 3.0pre20201020_e0ca98c -> 2.4pre20201102_550e11f
This commit is contained in:
Graham Christensen 2020-11-02 17:15:14 -05:00 committed by GitHub
commit 43b99f23b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/tools/package-management/nix/default.nix
View File

@ -32,8 +32,8 @@ common =
inherit name src;
version = lib.getVersion name;
is30 = lib.versionAtLeast version "3.0pre";
isExactly30 = lib.versionAtLeast version "2.3" && lib.versionOlder version "3.0";
is24 = lib.versionAtLeast version "2.4pre";
isExactly24 = lib.versionAtLeast version "2.4" && lib.versionOlder version "2.4";
VERSION_SUFFIX = suffix;
@ -41,7 +41,7 @@ common =
nativeBuildInputs =
[ pkgconfig ]
++ lib.optionals is30
++ lib.optionals is24
[ autoreconfHook
autoconf-archive
bison flex
@ -54,7 +54,7 @@ common =
brotli boost editline
]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals is30 [ libarchive gmock ]
++ lib.optionals is24 [ libarchive gmock ]
++ lib.optional withLibseccomp libseccomp
++ lib.optional withAWS
((aws-sdk-cpp.override {
@ -93,9 +93,9 @@ common =
patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.*
''}
'' +
# For Nix 3.0, patch around an issue where the Nix configure step pulls in the
# For Nix 2.4, patch around an issue where the Nix configure step pulls in the
# build system's bash and other utilities when cross-compiling
lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly30) ''
lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly24) ''
mkdir tmp/
substitute corepkgs/config.nix.in tmp/config.nix.in \
--subst-var-by bash ${bash}/bin/bash \
@ -198,14 +198,14 @@ in rec {
});
nixUnstable = lib.lowPrio (callPackage common rec {
name = "nix-3.0${suffix}";
suffix = "pre20201020_e0ca98c";
name = "nix-2.4${suffix}";
suffix = "pre20201102_550e11f";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "e0ca98c2071b815578470e280df8fdb750c7e23b";
hash = "sha256-KVS/Z6FzMBOl5XCyOLwfiVoX7G2LQRa9HMGNnJRPCoo=";
rev = "550e11f077ae508abde5a33998a9d4029880e7b2";
sha256 = "186grfxsfqg7r92wgwbma66xc7p3iywn43ff7s59m4g6bvb0qgcl";
};
inherit storeDir stateDir confDir boehmgc;