@@ -13,7 +13,7 @@ common =
1313 , bash, coreutils, gzip, gnutar
1414 , pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json
1515 , autoreconfHook, autoconf-archive, bison, flex
16− , jq, libarchive
16+ , jq, libarchive, libcpuid
1717 , lowdown, mdbook
1818 # Used by tests
1919 , gmock
@@ -55,7 +55,7 @@ common =
5555 ]
5656 ++ lib.optionals stdenv.isDarwin [ Security ]
5757 ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
58− ++ lib.optionals is24 [ libarchive gmock lowdown ]
58+ ++ lib.optionals is24 [ libarchive gmock lowdown libcpuid ]
5959 ++ lib.optional withLibseccomp libseccomp
6060 ++ lib.optional withAWS
6161 ((aws-sdk-cpp.override {
@@ -212,28 +212,15 @@ in rec {
212212
213213 nixUnstable = lib.lowPrio (callPackage common rec {
214214 name = "nix-2.4${suffix}";
215− suffix = "pre20201205_a5d85d0";
215+ suffix = "pre20210308_1c0e3e4";
216216
217217 src = fetchFromGitHub {
218218 owner = "NixOS";
219219 repo = "nix";
220− rev = "a5d85d07faa94cf3518e98273be4bee3d495f06a";
221− sha256 = "0g9jjhh0vs4hjrff5yx88x6sh7rk87ngvni3gnyxajqia957dipg";
220+ rev = "1c0e3e453d41b869e4ac7e25dc1c00c349a7c411";
221+ sha256 = "17killwp42d25f17yq2jida64j7d0ipz6zish78iqi450yrd9wrd";
222222 };
223223
224− patches = [
225− (fetchpatch { # Fix build on gcc10
226− url = "https://github.com/NixOS/nix/commit/d4870462f8f539adeaa6dca476aff6f1f31e1981.patch";
227− sha256 = "mTvLvuxb2QVybRDgntKMq+b6da/s3YgM/ll2rWBeY/Y=";
228− })
229− # Fix the ETag bug. PR merged. Remove when updating to >= 20210125
230− # https://github.com/NixOS/nixpkgs/pull/109309#issuecomment-768331750
231− (fetchpatch {
232− url = "https://github.com/NixOS/nix/commit/c5b42c5a42138329c6d02da0d8a53cb59c6077f4.patch";
233− sha256 = "sha256-d4RNOKMxa4NMbFgYcqWRv2ByHt8F/XUWV+6P9qHz7S4=";
234− })
235− ];
236−
237224 inherit storeDir stateDir confDir boehmgc;
238225 });
239226