Make sure to not break hydra

kip93 · Sep 23, 2023 · 419b96c · 419b96c
1 parent bc36e1d
commit 419b96c
Show file tree

Hide file tree

Showing 3 changed files with 98 additions and 10 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -67,7 +67,7 @@
       url = "github:NixOS/hydra/master";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        nix.follows = "nix";
+        # nix.follows = "nix"; # DON'T! See hydra#1182
       };
     };
     impermanence = {

diff --git a/overlays/overrides/default.nix b/overlays/overrides/default.nix
@@ -14,6 +14,23 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 { hydra, nix, ... } @ inputs:
-final: prev: {
-  hydra_unstable = final.hydra;
-} // (hydra.overlays.default final prev) // (nix.overlays.default final prev)
+final: prev:
+let
+  # Avoid infinite recursion by renaming flakes
+  hydra' = hydra;
+  nix' = nix;
+in
+let
+  # A fake overlaid pkgs, to ensure that hydra uses it's own version of nix,
+  # due to hydra#1182
+  hydra_final = final // (hydra'.inputs.nix.overlays.default hydra_final prev);
+  # Get the relevant bits out of the provided overlays
+  inherit (hydra'.overlays.default hydra_final prev) hydra perlPackages;
+  inherit (nix'.overlays.default final prev) lowdown-nix nix;
+
+in
+{
+  # Expose the extracted packages into the overlay
+  inherit lowdown-nix nix;
+  hydra_unstable = hydra;
+}