jailbreak-cabal: always build the tool with Cabal 1.20

This change mitigates the effects of https://github.com/peti/jailbreak-cabal/issues/9.
This commit is contained in:
Peter Simons 2015-05-20 12:13:13 +02:00
parent 06d002acb5
commit 493663d785
7 changed files with 19 additions and 12 deletions

View file

@ -50,8 +50,10 @@ self: super: {
Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6; Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
cabal-install = self.cabal-install_1_18_1_0; cabal-install = self.cabal-install_1_18_1_0;
# Needs Cabal >= 1.18.x. # https://github.com/peti/jailbreak-cabal/issues/9
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; }; jailbreak-cabal = super.jailbreak-cabal.override {
Cabal = dontJailbreak (self.Cabal_1_20_0_3.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; });
};
# Haddock chokes on the prologue from the cabal file. # Haddock chokes on the prologue from the cabal file.
ChasingBottoms = dontHaddock super.ChasingBottoms; ChasingBottoms = dontHaddock super.ChasingBottoms;

View file

@ -41,8 +41,8 @@ self: super: {
# Cabal_1_22_1_1 requires filepath >=1 && <1.4 # Cabal_1_22_1_1 requires filepath >=1 && <1.4
cabal-install = dontCheck (super.cabal-install.override { Cabal = null; }); cabal-install = dontCheck (super.cabal-install.override { Cabal = null; });
# We have Cabal 1.22.x. # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; jailbreak-cabal = pkgs.haskell.packages.ghc784.jailbreak-cabal;
# GHC 7.10.x's Haddock binary cannot generate hoogle files. # GHC 7.10.x's Haddock binary cannot generate hoogle files.
# https://ghc.haskell.org/trac/ghc/ticket/9921 # https://ghc.haskell.org/trac/ghc/ticket/9921

View file

@ -50,8 +50,10 @@ self: super: {
# https://github.com/tibbe/hashable/issues/85 # https://github.com/tibbe/hashable/issues/85
hashable = dontCheck super.hashable; hashable = dontCheck super.hashable;
# Needs Cabal >= 1.18.x. # https://github.com/peti/jailbreak-cabal/issues/9
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; }; jailbreak-cabal = super.jailbreak-cabal.override {
Cabal = dontJailbreak (self.Cabal_1_20_0_3.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; });
};
# Haddock chokes on the prologue from the cabal file. # Haddock chokes on the prologue from the cabal file.
ChasingBottoms = dontHaddock super.ChasingBottoms; ChasingBottoms = dontHaddock super.ChasingBottoms;

View file

@ -43,8 +43,8 @@ self: super: {
# https://github.com/tibbe/hashable/issues/85 # https://github.com/tibbe/hashable/issues/85
hashable = dontCheck super.hashable; hashable = dontCheck super.hashable;
# Needs Cabal >= 1.18.x. # https://github.com/peti/jailbreak-cabal/issues/9
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; }; jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; };
# Haddock chokes on the prologue from the cabal file. # Haddock chokes on the prologue from the cabal file.
ChasingBottoms = dontHaddock super.ChasingBottoms; ChasingBottoms = dontHaddock super.ChasingBottoms;

View file

@ -45,8 +45,8 @@ self: super: {
# https://github.com/tibbe/hashable/issues/85 # https://github.com/tibbe/hashable/issues/85
hashable = dontCheck super.hashable; hashable = dontCheck super.hashable;
# Needs Cabal >= 1.18.x. # https://github.com/peti/jailbreak-cabal/issues/9
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; }; jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; };
# Haddock chokes on the prologue from the cabal file. # Haddock chokes on the prologue from the cabal file.
ChasingBottoms = dontHaddock super.ChasingBottoms; ChasingBottoms = dontHaddock super.ChasingBottoms;

View file

@ -37,6 +37,9 @@ self: super: {
unix = null; unix = null;
xhtml = null; xhtml = null;
# https://github.com/peti/jailbreak-cabal/issues/9
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; };
# mtl 2.2.x needs the latest transformers. # mtl 2.2.x needs the latest transformers.
mtl_2_2_1 = super.mtl.override { transformers = self.transformers_0_4_3_0; }; mtl_2_2_1 = super.mtl.override { transformers = self.transformers_0_4_3_0; };

View file

@ -33,8 +33,8 @@ self: super: {
unix = null; unix = null;
xhtml = null; xhtml = null;
# We have Cabal 1.22.x. # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; jailbreak-cabal = pkgs.haskell.packages.ghc784.jailbreak-cabal;
# GHC 7.10.x's Haddock binary cannot generate hoogle files. # GHC 7.10.x's Haddock binary cannot generate hoogle files.
# https://ghc.haskell.org/trac/ghc/ticket/9921 # https://ghc.haskell.org/trac/ghc/ticket/9921