on iko/ghcjs-patch-master help sign in
Fix caching of `check-hydra` script (#1340)

Gets hydra from 21.05 for now

commitc8f775517fbf8867a6c41dbaa334f35e656fcc21 authorHamish Mackenzie <Hamish.Mackenzie@iohk.io> dateSat 8 Jan 2022, 23:35 (5 years ago) parent200e4b6
1 file changed+4−2
build.nix+4−2
build.nix+4−2
@@ -8,6 +8,8 @@ in
88{ nixpkgs ? haskellNix.sources.nixpkgs-2111
99, nixpkgsArgs ? haskellNix.nixpkgsArgs
1010, pkgs ? import nixpkgs nixpkgsArgs
11+, nixpkgsForHydra ? haskellNix.sources.nixpkgs-2105
12+, pkgsForHydra ? import nixpkgsForHydra nixpkgsArgs
1113, ifdLevel ? 1000
1214, compiler-nix-name ? throw "No `compiler-nix-name` passed to build.nix"
1315}:
@@ -57,7 +59,7 @@ in rec {
5759 # it uses `pkgs.buildPackages.callPackage` not `haskell.callPackage`
5860 # (We could pull in darcs from a known good haskell.nix for hydra to
5961 # use)
60− check-hydra = pkgs.buildPackages.callPackage ./scripts/check-hydra.nix {};
62+ check-hydra = pkgsForHydra.buildPackages.callPackage ./scripts/check-hydra.nix {};
6163 check-closure-size = pkgs.buildPackages.callPackage ./scripts/check-closure-size.nix {
6264 # Includes cabal-install since this is commonly used.
6365 nix-tools = pkgs.linkFarm "common-tools" [
@@ -72,7 +74,7 @@ in rec {
7274 # These are pure parts of maintainer-script so they can be built by hydra
7375 # and added to the cache to speed up buildkite.
7476 maintainer-script-cache = pkgs.recurseIntoAttrs (
75− (pkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isWindows {
77+ (pkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
7678 inherit (maintainer-scripts) check-hydra;
7779 })
7880 // (pkgs.lib.optionalAttrs (ifdLevel > 2) {