hydra_unstable: 2022-05-03 -> 2022-06-16

This commit is contained in:
Nick Cao 2022-06-16 21:19:47 +08:00
parent 47e5bede09
commit 1747286076
No known key found for this signature in database
GPG Key ID: 068A56CEF48FA2C1
3 changed files with 4 additions and 17 deletions

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

View File

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

View File

@ -17970,7 +17970,7 @@ with pkgs;
hwloc = callPackage ../development/libraries/hwloc {}; 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 { }; hydra-cli = callPackage ../development/tools/misc/hydra-cli { };