git.iko.soy/typeable/nixpkgs
on master help sign in
nixUnstable: 2.4pre20201205_a5d85d0 -> 2.4pre20210308_1c0e3e4

hydra-unstable: 2020-10-20 -> 2021-03-10

commit9c5f8a20b45f10c25bf8d24ce14781ee5b22977a authorShea Levy <shea@shealevy.com> dateMon 1 Mar 2021, 18:10 (6 years ago) parentf8a2f67
4 files changed+10−44
pkgs/development/tools/misc/hydra/common.nix+2−2 pkgs/development/tools/misc/hydra/default.nix+3−6 pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch−18 pkgs/tools/package-management/nix/default.nix+5−18
pkgs/development/tools/misc/hydra/common.nix+2−2
@@ -5,7 +5,7 @@
55, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
66, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null
77, migration ? false, patches ? []
8−, tests ? {}
8+, tests ? {}, mdbook
99}:
1010
1111with stdenv;
@@ -84,7 +84,7 @@ in stdenv.mkDerivation rec {
8484 perlDeps perl nix
8585 postgresql # for running the tests
8686 nlohmann_json
87− boost
87+ boost mdbook
8888 ];
8989
9090 hydraPath = lib.makeBinPath (
pkgs/development/tools/misc/hydra/default.nix+3−6
@@ -2,16 +2,13 @@
22
33{
44 hydra-unstable = callPackage ./common.nix {
5− version = "2020-10-20";
5+ version = "2021-03-10";
66 src = fetchFromGitHub {
77 owner = "NixOS";
88 repo = "hydra";
9− rev = "79d34ed7c93af2daf32cf44ee0e3e0768f13f97c";
10− sha256 = "1lql899430137l6ghnhyz0ivkayy83fdr087ck2wq3gf1jv8pccj";
9+ rev = "930f05c38eeac63ad6c3e3250de2667e2df2e96e";
10+ sha256 = "06s2lg119p96i1j4rdbg3z097n25bgvq8ljdn4vcwcw3yz0lnswm";
1111 };
12− patches = [
13− ./hydra-nix-receiveContents.patch
14− ];
1512 nix = nixFlakes;
1613
1714 tests = {
pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patchdeleted−18
@@ -1,18 +0,0 @@
1−Update for https://github.com/NixOS/nix/commit/faa31f40
2−
3−--- a/src/hydra-queue-runner/nar-extractor.cc
4−+++ b/src/hydra-queue-runner/nar-extractor.cc
5−@@ -48,9 +48,9 @@
6−- void receiveContents(unsigned char * data, size_t len) override
7−+ void receiveContents(std::string_view data) override
8− {
9− assert(expectedSize);
10− assert(curMember);
11− assert(hashSink);
12−- *curMember->fileSize += len;
13−- (*hashSink)(data, len);
14−+ *curMember->fileSize += data.size();
15−+ (*hashSink)(data);
16− if (curMember->contents) {
17−- curMember->contents->append((char *) data, len);
18−+ curMember->contents->append(data);
pkgs/tools/package-management/nix/default.nix+5−18
@@ -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