on iko/ghcjs-patch-master help sign in
Update tools that are built on the test servers (#659)

Now that we are enumerating ghc versions in ci.nix we do not need to do it in build.nix. Also adds ghcide 0.2.0 so it will be cahced. ghcide-object-code is disabled on ghc 8.10.1

commit4bb7893b76dd1d26bee08e49ffae79349fc1e6ce authorHamish Mackenzie <Hamish.Mackenzie@iohk.io> dateMon 8 Jun 2020, 11:58 (6 years ago) parent15fc6b3
1 file changed+12−11
build.nix+12−11
build.nix+12−11
@@ -13,20 +13,21 @@ in
1313
1414let
1515 haskell = pkgs.haskell-nix;
16+ buildHaskell = pkgs.buildPackages.haskell-nix;
17+ tool = buildHaskell.tool;
1618in rec {
1719 tests = import ./test/default.nix { inherit pkgs ifdLevel; };
1820
19− tools = pkgs.lib.optionalAttrs (ifdLevel >= 3)
20− (pkgs.recurseIntoAttrs
21− (pkgs.lib.mapAttrs (_: ghc:
22− let
23− tool = name: version: pkgs.buildPackages.haskell-nix.tool name { inherit version ghc; };
24− in pkgs.recurseIntoAttrs {
25− cabal-32 = tool "cabal" "3.2.0.0";
26− ghcide = tool "ghcide" "object-code";
27− } // pkgs.lib.optionalAttrs (ghc.version == "8.6.5") {
28− cabal-30 = tool "cabal" "3.0.0.0";
29− }) { inherit (pkgs.buildPackages.haskell-nix.compiler) ghc865 ghc883; }));
21+ tools = pkgs.lib.optionalAttrs (ifdLevel >= 3) (
22+ pkgs.recurseIntoAttrs {
23+ ghcide-020 = tool "ghcide" "0.2.0";
24+ } // pkgs.lib.optionalAttrs (buildHaskell.defaultCompilerNixName == "ghc865") {
25+ cabal-30 = tool "cabal" "3.0.0.0";
26+ } // pkgs.lib.optionalAttrs (buildHaskell.defaultCompilerNixName != "ghc8101") {
27+ cabal-32 = tool "cabal" "3.2.0.0";
28+ ghcide-object-code = tool "ghcide" "object-code";
29+ }
30+ );
3031
3132 # Scripts for keeping Hackage and Stackage up to date, and CI tasks.
3233 # The dontRecurseIntoAttrs prevents these from building on hydra