haskellPackages.hpack: set to newest hpack to avoid conflicting hpack versions in closure
This commit is contained in:
parent
85f892b988
commit
d2c55eb34a
1 changed files with 11 additions and 12 deletions
|
@ -1077,19 +1077,18 @@ self: super: {
|
||||||
haddock-library = doJailbreak (dontCheck super.haddock-library);
|
haddock-library = doJailbreak (dontCheck super.haddock-library);
|
||||||
haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
|
haddock-library_1_6_0 = doJailbreak (dontCheck super.haddock-library_1_6_0);
|
||||||
|
|
||||||
|
# cabal2nix requires hpack >= 0.29.6 but the LTS has hpack-0.28.2.
|
||||||
|
# Lets remove this once the LTS has upraded to 0.29.6.
|
||||||
|
hpack = super.hpack_0_29_6;
|
||||||
|
|
||||||
cabal2nix =
|
cabal2nix =
|
||||||
let
|
# The test suite does not know how to find the 'cabal2nix' binary.
|
||||||
# The test suite does not know how to find the 'cabal2nix' binary.
|
overrideCabal super.cabal2nix (drv: {
|
||||||
drv1 = overrideCabal super.cabal2nix (drv: {
|
preCheck = ''
|
||||||
preCheck = ''
|
export PATH="$PWD/dist/build/cabal2nix:$PATH"
|
||||||
export PATH="$PWD/dist/build/cabal2nix:$PATH"
|
export HOME="$TMPDIR/home"
|
||||||
export HOME="$TMPDIR/home"
|
'';
|
||||||
'';
|
});
|
||||||
});
|
|
||||||
# cabal2nix requires hpack >= 0.29.6 but the LTS has hpack-0.28.2.
|
|
||||||
# Lets remove this once the LTS has upraded to 0.29.6.
|
|
||||||
drv2 = drv1.override { hpack = self.hpack_0_29_6; };
|
|
||||||
in drv2;
|
|
||||||
|
|
||||||
# Break out of "aeson <1.3, temporary <1.3".
|
# Break out of "aeson <1.3, temporary <1.3".
|
||||||
stack = doJailbreak super.stack;
|
stack = doJailbreak super.stack;
|
||||||
|
|
Loading…
Reference in a new issue