diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index 6e1754c5f3bf..f6b2b2304b93 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -50,8 +50,10 @@ self: super: { Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6; cabal-install = self.cabal-install_1_18_1_0; - # Needs Cabal >= 1.18.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; }; + # https://github.com/peti/jailbreak-cabal/issues/9 + 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. ChasingBottoms = dontHaddock super.ChasingBottoms; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 1d7eee6d3a44..66e2f8d4299f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -41,8 +41,8 @@ self: super: { # Cabal_1_22_1_1 requires filepath >=1 && <1.4 cabal-install = dontCheck (super.cabal-install.override { Cabal = null; }); - # We have Cabal 1.22.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; + # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9. + jailbreak-cabal = pkgs.haskell.packages.ghc784.jailbreak-cabal; # GHC 7.10.x's Haddock binary cannot generate hoogle files. # https://ghc.haskell.org/trac/ghc/ticket/9921 diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 4a8d4242bdc9..98bad4fa1be0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -50,8 +50,10 @@ self: super: { # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; - # Needs Cabal >= 1.18.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; }; + # https://github.com/peti/jailbreak-cabal/issues/9 + 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. ChasingBottoms = dontHaddock super.ChasingBottoms; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 56f1edb66201..88fa300e2e7f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -43,8 +43,8 @@ self: super: { # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; - # Needs Cabal >= 1.18.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; }; + # https://github.com/peti/jailbreak-cabal/issues/9 + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; }; # Haddock chokes on the prologue from the cabal file. ChasingBottoms = dontHaddock super.ChasingBottoms; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 0970108eef7f..2ee401054398 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -45,8 +45,8 @@ self: super: { # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; - # Needs Cabal >= 1.18.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; }; + # https://github.com/peti/jailbreak-cabal/issues/9 + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; }; # Haddock chokes on the prologue from the cabal file. ChasingBottoms = dontHaddock super.ChasingBottoms; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index b7430c455b1c..8c5b399e68c0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -37,6 +37,9 @@ self: super: { unix = 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_1 = super.mtl.override { transformers = self.transformers_0_4_3_0; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index cef72a2b1884..291f050e1746 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -33,8 +33,8 @@ self: super: { unix = null; xhtml = null; - # We have Cabal 1.22.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; + # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9. + jailbreak-cabal = pkgs.haskell.packages.ghc784.jailbreak-cabal; # GHC 7.10.x's Haddock binary cannot generate hoogle files. # https://ghc.haskell.org/trac/ghc/ticket/9921