Merge remote-tracking branch 'nixpkgs/nixos-unstable'

3 files changed, 9 insertions, 30 deletions

diff --git a/nixpkgs/pkgs/development/tools/misc/hydra/common.nix b/nixpkgs/pkgs/development/tools/misc/hydra/common.nix
index cf56e6c1a9c9..0cc7769d3c50 100644
--- a/nixpkgs/pkgs/development/tools/misc/hydra/common.nix
+++ b/nixpkgs/pkgs/development/tools/misc/hydra/common.nix
@@ -1,11 +1,11 @@
-{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub
+{ stdenv, nix, perlPackages, buildEnv
 , makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx
 , top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt
-, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
-, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
+, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
+, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, xz, gnutar
 , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null
 , migration ? false, patches ? []
-, tests ? {}
+, tests ? {}, mdbook
 }:
 
 with stdenv;
@@ -89,10 +89,10 @@ in stdenv.mkDerivation rec {
 
   hydraPath = lib.makeBinPath (
     [ sqlite subversion openssh nix coreutils findutils pixz
-      gzip bzip2 lzma gnutar unzip git top-git mercurial /*darcs*/ gnused breezy
+      gzip bzip2 xz gnutar unzip git top-git mercurial /*darcs*/ gnused breezy
     ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
 
-  nativeBuildInputs = [ autoreconfHook pkg-config ];
+  nativeBuildInputs = [ autoreconfHook pkg-config mdbook ];
 
   configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
 
diff --git a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix
index 1636ad6dd71f..40a480a09098 100644
--- a/nixpkgs/pkgs/development/tools/misc/hydra/default.nix
+++ b/nixpkgs/pkgs/development/tools/misc/hydra/default.nix
@@ -2,16 +2,13 @@
 
 {
   hydra-unstable = callPackage ./common.nix {
-    version = "2020-10-20";
+    version = "2021-03-29";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "hydra";
-      rev = "79d34ed7c93af2daf32cf44ee0e3e0768f13f97c";
-      sha256 = "1lql899430137l6ghnhyz0ivkayy83fdr087ck2wq3gf1jv8pccj";
+      rev = "9bb04ed97af047968196bad1728f927f7a6d905f";
+      sha256 = "sha256-gN/zNI2hGDMnYUjeGnU7SAuXP4KCmNqG+AYOVfINaQE=";
     };
-    patches = [
-      ./hydra-nix-receiveContents.patch
-    ];
     nix = nixFlakes;
 
     tests = {
diff --git a/nixpkgs/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch b/nixpkgs/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch
deleted file mode 100644
index 61957e2190cd..000000000000
--- a/nixpkgs/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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);