diff options
| author | Orivej Desh <orivej@gmx.fr> | 2020-12-26 11:19:31 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2021-01-06 06:05:52 +0000 |
| commit | de753c64f9d5c67a178fcea016bb9ac3df57a11c (patch) | |
| tree | 838a543be2e1ece535463a4dfcc5bedcc1c23288 /pkgs/development | |
| parent | 4e2a4fc1339814bc242ec760d2fc87ffcfcac057 (diff) | |
| download | nixpkgs-de753c64f9d5c67a178fcea016bb9ac3df57a11c.tar nixpkgs-de753c64f9d5c67a178fcea016bb9ac3df57a11c.tar.gz nixpkgs-de753c64f9d5c67a178fcea016bb9ac3df57a11c.tar.bz2 nixpkgs-de753c64f9d5c67a178fcea016bb9ac3df57a11c.tar.lz nixpkgs-de753c64f9d5c67a178fcea016bb9ac3df57a11c.tar.xz nixpkgs-de753c64f9d5c67a178fcea016bb9ac3df57a11c.tar.zst nixpkgs-de753c64f9d5c67a178fcea016bb9ac3df57a11c.zip | |
hydraUnstable: patch to support nixUnstable 2.4pre20201205_a5d85d0
Upstream PR: https://github.com/NixOS/hydra/pull/840
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/tools/misc/hydra/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch | 18 |
2 files changed, 21 insertions, 0 deletions
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 7aa1e05a88e..1636ad6dd71 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -9,6 +9,9 @@ rev = "79d34ed7c93af2daf32cf44ee0e3e0768f13f97c"; sha256 = "1lql899430137l6ghnhyz0ivkayy83fdr087ck2wq3gf1jv8pccj"; }; + patches = [ + ./hydra-nix-receiveContents.patch + ]; nix = nixFlakes; tests = { diff --git a/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch b/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch new file mode 100644 index 00000000000..61957e2190c --- /dev/null +++ b/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch @@ -0,0 +1,18 @@ +Update for https://github.com/NixOS/nix/commit/faa31f40 + +--- a/src/hydra-queue-runner/nar-extractor.cc ++++ b/src/hydra-queue-runner/nar-extractor.cc +@@ -48,9 +48,9 @@ +- void receiveContents(unsigned char * data, size_t len) override ++ void receiveContents(std::string_view data) override + { + assert(expectedSize); + assert(curMember); + assert(hashSink); +- *curMember->fileSize += len; +- (*hashSink)(data, len); ++ *curMember->fileSize += data.size(); ++ (*hashSink)(data); + if (curMember->contents) { +- curMember->contents->append((char *) data, len); ++ curMember->contents->append(data); |