git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Fix caching of `check-hydra` script (#1340)
c8f7755Hamish Mackenzie
build.nix+4−2
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -8,6 +8,8 @@ in
8{ nixpkgs ? haskellNix.sources.nixpkgs-2111
8{ nixpkgs ? haskellNix.sources.nixpkgs-2111
9, nixpkgsArgs ? haskellNix.nixpkgsArgs
9, nixpkgsArgs ? haskellNix.nixpkgsArgs
10, pkgs ? import nixpkgs nixpkgsArgs
10, pkgs ? import nixpkgs nixpkgsArgs
11+, nixpkgsForHydra ? haskellNix.sources.nixpkgs-2105
12+, pkgsForHydra ? import nixpkgsForHydra nixpkgsArgs
11, ifdLevel ? 1000
13, ifdLevel ? 1000
12, compiler-nix-name ? throw "No `compiler-nix-name` passed to build.nix"
14, compiler-nix-name ? throw "No `compiler-nix-name` passed to build.nix"
13}:
15}:
@@ -57,7 +59,7 @@ in rec {
57 # it uses `pkgs.buildPackages.callPackage` not `haskell.callPackage`
59 # it uses `pkgs.buildPackages.callPackage` not `haskell.callPackage`
58 # (We could pull in darcs from a known good haskell.nix for hydra to
60 # (We could pull in darcs from a known good haskell.nix for hydra to
59 # use)
61 # use)
60− check-hydra = pkgs.buildPackages.callPackage ./scripts/check-hydra.nix {};
62+ check-hydra = pkgsForHydra.buildPackages.callPackage ./scripts/check-hydra.nix {};
61 check-closure-size = pkgs.buildPackages.callPackage ./scripts/check-closure-size.nix {
63 check-closure-size = pkgs.buildPackages.callPackage ./scripts/check-closure-size.nix {
62 # Includes cabal-install since this is commonly used.
64 # Includes cabal-install since this is commonly used.
63 nix-tools = pkgs.linkFarm "common-tools" [
65 nix-tools = pkgs.linkFarm "common-tools" [
@@ -72,7 +74,7 @@ in rec {
72 # These are pure parts of maintainer-script so they can be built by hydra
74 # These are pure parts of maintainer-script so they can be built by hydra
73 # and added to the cache to speed up buildkite.
75 # and added to the cache to speed up buildkite.
74 maintainer-script-cache = pkgs.recurseIntoAttrs (
76 maintainer-script-cache = pkgs.recurseIntoAttrs (
75− (pkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isWindows {
77+ (pkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
76 inherit (maintainer-scripts) check-hydra;
78 inherit (maintainer-scripts) check-hydra;
77 })
79 })
78 // (pkgs.lib.optionalAttrs (ifdLevel > 2) {
80 // (pkgs.lib.optionalAttrs (ifdLevel > 2) {