summary refs log tree commit diff
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2022-11-24 19:18:15 +0800
committerRick van Schijndel <Mindavi@users.noreply.github.com>2022-11-24 22:53:10 +0100
commitbee931454b4a2e40505dc7fd3590466d13b57759 (patch)
tree3b247fd9e4d089048f78c7bfbd8319207b7cbcb3
parent2da473132f8a6ccce1c70c33ad19c023431faa51 (diff)
downloadnixpkgs-bee931454b4a2e40505dc7fd3590466d13b57759.tar
nixpkgs-bee931454b4a2e40505dc7fd3590466d13b57759.tar.gz
nixpkgs-bee931454b4a2e40505dc7fd3590466d13b57759.tar.bz2
nixpkgs-bee931454b4a2e40505dc7fd3590466d13b57759.tar.lz
nixpkgs-bee931454b4a2e40505dc7fd3590466d13b57759.tar.xz
nixpkgs-bee931454b4a2e40505dc7fd3590466d13b57759.tar.zst
nixpkgs-bee931454b4a2e40505dc7fd3590466d13b57759.zip
hydra_unstable: 2022-10-22 -> 2022-11-24
-rw-r--r--pkgs/development/tools/misc/hydra/unstable.nix15
1 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix
index fdae764dc45..3afc807b074 100644
--- a/pkgs/development/tools/misc/hydra/unstable.nix
+++ b/pkgs/development/tools/misc/hydra/unstable.nix
@@ -46,7 +46,6 @@
 , cacert
 , glibcLocales
 , fetchFromGitHub
-, fetchpatch
 , nixosTests
 }:
 
@@ -127,23 +126,15 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "hydra";
-  version = "2022-10-22";
+  version = "2022-11-24";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "312cb42275e593eea5c44d8430ab09375fdb2fdb";
-    sha256 = "sha256-ablHzPwN2Pvju0kyo8N5Wavqkl60gKHCPLnruwqvwTg=";
+    rev = "14d4624dc20956ec9ff54882e70c5c0bc377921a";
+    sha256 = "sha256-xY3CDFjLG3po2tdaTZToqZmLCQnSwsUqAn8sIXFrybw=";
   };
 
-  patches = [
-    # https://github.com/NixOS/hydra/pull/1215: scmdiff: Hardcode --git-dir
-    (fetchpatch {
-      url = "https://github.com/NixOS/hydra/commit/b6ea85a601ddac9cb0716d8cb4d446439fa0778f.patch";
-      sha256 = "sha256-QHjwLYQucdkBs6OsFI8kWo5ugkPXXlTgdbGFxKBHAHo=";
-    })
-  ];
-
   buildInputs =
     [
       libpqxx