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

nixUnstable: 2.4pre20210503_6d2553a -> 2.4pre20210601_5985b8b5 

(cherry picked from commit f7fe3008d106b8b8834a4f64868ae386a9b26e08)
This commit is contained in:
Jonathan Ringer 2021-06-01 10:15:55 -07:00 committed by Jonathan Ringer
parent 7953561a9d
commit b78bd862e3
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,9 +119,12 @@ common =
[ "--with-store-dir=${storeDir}" [ "--with-store-dir=${storeDir}"
"--localstatedir=${stateDir}" "--localstatedir=${stateDir}"
"--sysconfdir=${confDir}" "--sysconfdir=${confDir}"
"--disable-init-state"
"--enable-gc" "--enable-gc"
] ]
++ lib.optionals (!is24) [
# option was removed in 2.4
"--disable-init-state"
]
++ lib.optionals stdenv.isLinux [ ++ lib.optionals stdenv.isLinux [
"--with-sandbox-shell=${sh}/bin/busybox" "--with-sandbox-shell=${sh}/bin/busybox"
] ]
@ -208,23 +211,17 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec { nixUnstable = lib.lowPrio (callPackage common rec {
pname = "nix"; pname = "nix";
version = "2.4${suffix}"; version = "2.4${suffix}";
suffix = "pre20210503_6d2553a"; suffix = "pre20210601_5985b8b";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nix"; repo = "nix";
rev = "6d2553ae1496288554e871c530836428f405fd67"; rev = "5985b8b5275605ddd5e92e2f0a7a9f494ac6e35d";
sha256 = "sha256-YeSeyOKhBAXHlkzo4mwYr8QIjIP9AgdpJ7YdhqOO2CA="; sha256 = "sha256-2So7ZsD8QJlOXCYqdoj8naNgBw6O4Vw1MM2ORsaqlXc=";
}; };
inherit storeDir stateDir confDir boehmgc; inherit storeDir stateDir confDir boehmgc;
patches = [
(fetchpatch {
url = "https://github.com/NixOS/nix/commit/8c7e043de2f673bc355d83f1e873baa93f30be62.patch";
sha256 = "sha256-aTcUnZXheewnyCT7yQKnTqQDKS2uDoN9plMQgxJH8Ag=";
})
];
}); });
} }