nixos-asus: hydra: fix loading /build/<id> with ca-derivations

See NixOS/hydra#1374
Mindavi · Apr 3, 2024 · 1bfccee · 1bfccee
1 parent 1a2b8ea
commit 1bfccee
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/machines/nixos-asus/default.nix b/machines/nixos-asus/default.nix
@@ -135,14 +135,15 @@
     #                Let's just wait until nix_2_20 works in nixpkgs, that makes it a lot easier to update hydra.
     package = (pkgs.hydra_unstable.overrideAttrs(oldAttrs: rec {
       version = "unstable-2024-03-08_nix_2_20";
-    #  patches = (oldAttrs.patches or []) ++ [
+      patches = (oldAttrs.patches or []) ++ [
     #    (pkgs.fetchpatch2 {
     #      url = "https://patch-diff.githubusercontent.com/raw/NixOS/hydra/pull/1354.patch";
     #      name = "nix_2_20_support.patch";
     #      hash = "sha256-AyluH3+9um83upYpjO6QsZ4Nv2Vv8Nlhj0c4IBhe0Gs=";
     #      revert = true;
     #    })
-    #  ];
+        ./patches/hydra-ca-outpaths-patch.diff
+      ];
       src = pkgs.fetchFromGitHub {
         owner = "NixOS";
         repo = "hydra";

diff --git a/machines/nixos-asus/patches/hydra-ca-outpaths-patch.diff b/machines/nixos-asus/patches/hydra-ca-outpaths-patch.diff
@@ -0,0 +1,13 @@
+diff --git a/src/lib/Hydra/Helper/Nix.pm b/src/lib/Hydra/Helper/Nix.pm
+index 71a8a7d7..b6a9eb19 100644
+--- a/src/lib/Hydra/Helper/Nix.pm
++++ b/src/lib/Hydra/Helper/Nix.pm
+@@ -180,6 +180,8 @@ sub getDrvLogPath {
+ sub findLog {
+     my ($c, $drvPath, @outPaths) = @_;
+
++    @outPaths = grep {defined} @outPaths;
++
+     if (defined $drvPath) {
+         my $logPath = getDrvLogPath($drvPath);
+         return $logPath if defined $logPath;