Merge pull request #620 from NixOS/hydra-main

flake.nix: Track hydra master branch

Author: mweinelt

build/common.nix

@@ -15,6 +15,14 @@
 
   nixpkgs.config.allowUnfree = true;
 
+  nixpkgs.overlays = [
+    (_prev: final: {
+      # fails to find nix-main against nix 2.28.x
+      # https://github.com/NixOS/infra/pull/620#issuecomment-2784979947
+      nixos-option = final.nixos-option.override { nix = pkgs.nixVersions.nix_2_24; };
+    })
+  ];
+
   hardware.enableAllFirmware = true;
   hardware.cpu.amd.updateMicrocode = true;
   hardware.cpu.intel.updateMicrocode = true;

build/flake-module.nix

@@ -14,7 +14,17 @@ let
     nixpkgs.overlays = [
       inputs.nix.overlays.default
       inputs.hydra.overlays.default
-      inputs.nixos-channel-scripts.overlays.default
+      (
+        final: prev:
+        inputs.nixos-channel-scripts.overlays.default (
+          final
+          // {
+            # Doesn't yet work with Nix 2.28
+            # https://github.com/NixOS/nixos-channel-scripts/issues/79
+            nix = final.nixVersions.nix_2_24;
+          }
+        ) prev
+      )
       inputs.rfc39.overlays.default
     ];
   };

flake.lock

@@ -10,12 +10,8 @@
     agenix.url = "github:ryantm/agenix";
     agenix.inputs.nixpkgs.follows = "nixpkgs";
 
-    nix-eval-jobs.url = "github:nix-community/nix-eval-jobs?rev=ca94443b9621c610af09ff1806434bd84cd817e6";
-    nix-eval-jobs.inputs.nixpkgs.follows = "nixpkgs";
-
-    hydra.url = "github:NixOS/hydra/hydra.nixos.org";
+    hydra.url = "github:NixOS/hydra";
     hydra.inputs.nixpkgs.follows = "nixpkgs";
-    hydra.inputs.nix-eval-jobs.follows = "nix-eval-jobs";
     nix.follows = "hydra/nix";
 
     nixos-channel-scripts.url = "github:NixOS/nixos-channel-scripts";