From a9203c21eca60ce4be95fd3ccb64e9f1329c1980 Mon Sep 17 00:00:00 2001 From: Robin Stumm Date: Wed, 23 Nov 2022 21:30:08 +0100 Subject: [PATCH] purify nix evaluation of hydra jobs --- nix/default.nix | 6 ++++-- release.nix | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index 2dbaff8..d13d07f 100644 --- 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 index 5281a6b..52f5577 100644 --- 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; +} }: