summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-05-20 12:13:13 +0200
committerPeter Simons <simons@cryp.to>2015-05-21 14:57:16 +0200
commit493663d785eff00cc3c2a9a6a580e26bfec301d8 (patch)
tree4cfc6241d32f47b45563b8c141ec512b696b582c /pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
parent06d002acb53bd78c5eb0cda821b95602207ffd2d (diff)
downloadnixlib-493663d785eff00cc3c2a9a6a580e26bfec301d8.tar
nixlib-493663d785eff00cc3c2a9a6a580e26bfec301d8.tar.gz
nixlib-493663d785eff00cc3c2a9a6a580e26bfec301d8.tar.bz2
nixlib-493663d785eff00cc3c2a9a6a580e26bfec301d8.tar.lz
nixlib-493663d785eff00cc3c2a9a6a580e26bfec301d8.tar.xz
nixlib-493663d785eff00cc3c2a9a6a580e26bfec301d8.tar.zst
nixlib-493663d785eff00cc3c2a9a6a580e26bfec301d8.zip
jailbreak-cabal: always build the tool with Cabal 1.20
This change mitigates the effects of https://github.com/peti/jailbreak-cabal/issues/9.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix6
1 files changed, 4 insertions, 2 deletions
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;