Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 73e04714629b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6c76f5981064
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 2, 2020

  1. nixUnstable: 3.0pre20201020_e0ca98c -> 2.4pre20201102_550e11f 

    (cherry picked from commit f4f9f30)
    @grahamc
    grahamc committed Nov 2, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    72c540d View commit details

  2. Merge pull request #102538 from grahamc/backport-nix-2.4pnov02 

    nixUnstable: 3.0pre20201020_e0ca98c -> 2.4pre20201102_550e11f
    @grahamc
    grahamc authored Nov 2, 2020
    Copy the full SHA
    6c76f59 View commit details
Showing with 10 additions and 10 deletions.
  1. +10 −10 pkgs/tools/package-management/nix/default.nix
20 changes: 10 additions & 10 deletions pkgs/tools/package-management/nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -33,16 +33,16 @@ 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;

outputs = [ "out" "dev" "man" "doc" ];

nativeBuildInputs =
[ pkgconfig ]
++ lib.optionals is30
++ lib.optionals is24
[ autoreconfHook
autoconf-archive
bison flex
@@ -55,7 +55,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 {
@@ -94,9 +94,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 \
@@ -201,14 +201,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;