From 536a134b32fe1a1a2afc466a9c90a33883d4cc3b Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 24 Apr 2021 17:07:46 +0800 Subject: [PATCH] nixbld: Hydra sysbuild patch merged upstream https://github.com/NixOS/hydra/issues/784 --- nixbld-etc-nixos/configuration.nix | 1 - nixbld-etc-nixos/hydra-unbreak-sysbuild.patch | 25 ------------------- 2 files changed, 26 deletions(-) delete mode 100644 nixbld-etc-nixos/hydra-unbreak-sysbuild.patch diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix index bf11ebe8..63576e81 100644 --- a/nixbld-etc-nixos/configuration.nix +++ b/nixbld-etc-nixos/configuration.nix @@ -447,7 +447,6 @@ in hydra-unstable = super.hydra-unstable.overrideAttrs(oa: { patches = oa.patches or [] ++ [ ./hydra-conda.patch - ./hydra-unbreak-sysbuild.patch ./hydra-restrictdist.patch ./hydra-giteastatus.patch ]; diff --git a/nixbld-etc-nixos/hydra-unbreak-sysbuild.patch b/nixbld-etc-nixos/hydra-unbreak-sysbuild.patch deleted file mode 100644 index 31a96b7d..00000000 --- a/nixbld-etc-nixos/hydra-unbreak-sysbuild.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/lib/Hydra/Schema/Builds.pm b/src/lib/Hydra/Schema/Builds.pm -index d4334300..014d07ce 100644 ---- a/src/lib/Hydra/Schema/Builds.pm -+++ b/src/lib/Hydra/Schema/Builds.pm -@@ -608,6 +608,7 @@ makeQueries('', ""); - makeQueries('ForProject', "and project = ?"); - makeQueries('ForJobset', "and jobset_id = ?"); - makeQueries('ForJob', "and jobset_id = ? and job = ?"); -+makeQueries('ForJobName', "and jobset_id = (select id from jobsets j where j.name = ?) and job = ?"); - - - my %hint = ( -diff --git a/src/script/hydra-eval-jobset b/src/script/hydra-eval-jobset -index ea336bfc..2f208418 100755 ---- a/src/script/hydra-eval-jobset -+++ b/src/script/hydra-eval-jobset -@@ -142,7 +142,7 @@ sub fetchInputSystemBuild { - $projectName ||= $project->name; - $jobsetName ||= $jobset->name; - -- my @latestBuilds = $db->resultset('LatestSucceededForJob') -+ my @latestBuilds = $db->resultset('LatestSucceededForJobName') - ->search({}, {bind => [$jobsetName, $jobName]}); - - my @validBuilds = ();