purify nix evaluation of hydra jobs

input-output-hk · Nov 23, 2022 · a9203c2 · a9203c2
1 parent 0dc3f16
commit a9203c2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/nix/default.nix b/nix/default.nix
@@ -7,8 +7,10 @@ let
   sources = import ./sources.nix { inherit pkgs; }
     // sourcesOverride;
   iohkNix = import sources.iohk-nix {};
-  haskellNix = import sources."haskell.nix" {};
-  nixpkgs = haskellNix.sources.nixpkgs-2105;
+  haskellNix = import sources."haskell.nix" {
+    pkgs = import nixpkgs { inherit system; };
+  };
+  nixpkgs = iohkNix.nixpkgs;
 
   # for inclusion in pkgs:
   overlays =

diff --git a/release.nix b/release.nix
@@ -30,7 +30,10 @@
 , sourcesOverride ? {}
 
 # Import pkgs, including IOHK common nix lib
-, pkgs ? import ./nix { inherit sourcesOverride; }
+, pkgs ? import ./nix {
+  inherit sourcesOverride;
+  system = builtins.head supportedSystems;
+}
 
 }: