nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 02:42:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #177884 from NickCao/hydra-bump

Browse Source 
hydra_unstable: 2022-05-03 -> 2022-06-16
This commit is contained in:
Sandro 2022-06-21 18:00:00 +02:00 committed by GitHub
commit 58070dad02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/tools/misc/hydra/eval.patch
View File

@ -1,11 +0,0 @@
diff --git a/src/hydra-eval-jobs/Makefile.am b/src/hydra-eval-jobs/Makefile.am
index 7a4e9c91..90742a30 100644
--- a/src/hydra-eval-jobs/Makefile.am
+++ b/src/hydra-eval-jobs/Makefile.am
@@ -1,5 +1,5 @@
bin_PROGRAMS = hydra-eval-jobs
hydra_eval_jobs_SOURCES = hydra-eval-jobs.cc
-hydra_eval_jobs_LDADD = $(NIX_LIBS)
+hydra_eval_jobs_LDADD = $(NIX_LIBS) -lnixcmd
hydra_eval_jobs_CXXFLAGS = $(NIX_CFLAGS) -I ../libhydra

14
pkgs/development/tools/misc/hydra/unstable.nix
View File

@ -126,16 +126,22 @@ let
in
stdenv.mkDerivation rec {
pname = "hydra";
version = "2022-05-03";
version = "2022-06-16";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "7c133a98f8e689cdc13f8a1adaaa9cd75d039a35";
sha256 = "sha256-LqBLIXYssvDoSp2Hf2+vDDB9O8VSF48HAGwL8pI2WZY=";
rev = "fb26435fe9a54f13143e69a545b8f3cecffaed96";
sha256 = "sha256-kmgN7D7tUC3Ki70D+rdS19PW/lrANlU3tc8gu5gsld0=";
};
patches = [ ./eval.patch ];
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 =
[

2
pkgs/top-level/all-packages.nix
View File

@ -18025,7 +18025,7 @@ with pkgs;
hwloc = callPackage ../development/libraries/hwloc {};
hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_8; };
hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nixVersions.nix_2_9; };
hydra-cli = callPackage ../development/tools/misc/hydra-cli { };