stack: fix the ghc 8.4.x build

This commit is contained in:
Peter Simons 2018-10-22 13:52:22 +02:00
parent 8089b93697
commit c66c169f81
2 changed files with 16 additions and 4 deletions

View file

@ -56,8 +56,20 @@ self: super: {
};
in appendPatch super.hadoop-rpc patch;
# Version 1.9.1 needs Cabal 2.4.x or later, so
# we use the one from the ghc-8.6.1 package set.
stack = markBroken super.stack;
# stack-1.9.1 needs Cabal 2.4.x, a recent version of hpack, and a non-recent
# version of yaml. Go figure. We avoid overrideScope here because using it to
# change Cabal would re-compile every single package instead of just those
# that have it as an actual library dependency. The explicit overrides are
# more verbose but friendlier for Hydra.
stack = (doJailbreak super.stack).override {
Cabal = self.Cabal_2_4_0_1;
hpack = self.hpack_0_31_0;
yaml = self.yaml_0_11_0_0;
hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_0_1; };
};
hpack_0_31_0 = super.hpack_0_31_0.override {
Cabal = self.Cabal_2_4_0_1;
yaml = self.yaml_0_11_0_0;
};
}

View file

@ -6848,7 +6848,7 @@ with pkgs;
cabal-install = haskell.lib.justStaticExecutables haskellPackages.cabal-install;
stack = haskell.lib.justStaticExecutables haskell.packages.ghc861.stack;
stack = haskell.lib.justStaticExecutables haskellPackages.stack;
hlint = haskell.lib.justStaticExecutables haskellPackages.hlint;
all-cabal-hashes = callPackage ../data/misc/hackage { };