summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-12-18 19:49:20 +0100
committerPeter Simons <simons@cryp.to>2014-12-19 07:45:11 +0100
commitb441fa9f195cba6d9da3d52c89d8c0da357f4450 (patch)
tree0b12788f6938621671f56afc32907243f3377396 /pkgs/top-level
parentc9a2bbdf653be7b21aee2a047bf8882ce38ecdf0 (diff)
downloadnixlib-b441fa9f195cba6d9da3d52c89d8c0da357f4450.tar
nixlib-b441fa9f195cba6d9da3d52c89d8c0da357f4450.tar.gz
nixlib-b441fa9f195cba6d9da3d52c89d8c0da357f4450.tar.bz2
nixlib-b441fa9f195cba6d9da3d52c89d8c0da357f4450.tar.lz
nixlib-b441fa9f195cba6d9da3d52c89d8c0da357f4450.tar.xz
nixlib-b441fa9f195cba6d9da3d52c89d8c0da357f4450.tar.zst
nixlib-b441fa9f195cba6d9da3d52c89d8c0da357f4450.zip
haskell-defaults.nix: always build jailbreak-cabal with the latest possible Cabal version
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/haskell-defaults.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 538686b73ac4..74e4b19ea62b 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -23,6 +23,7 @@
   ghc783Prefs = self : super : ghcHEADPrefs self super // {
     cabalInstall_1_20_0_4 = super.cabalInstall_1_20_0_4.override { Cabal = self.Cabal_1_20_0_2; };
     codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; };
+    jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_20_0_2; };
     MonadRandom = self.MonadRandom_0_2_0_1; # newer versions require transformers >= 0.4.x
     mtl = self.mtl_2_1_3_1;
   };
@@ -81,7 +82,6 @@
     binary = self.binary_0_7_2_2;       # core package in ghc >= 7.2.2
     caseInsensitive = super.caseInsensitive; # undo the override from ghc 7.2.2
     HsSyck = self.HsSyck_0_51;
-    jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; };
     random = null;                      # core package in ghc <= 7.0.x
   };
 
@@ -94,6 +94,7 @@
     deepseq = self.deepseq_1_2_0_1;
     dlist = super.dlist.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     exceptions = null;                  # none of our versions compile
+    jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; };
     logict = super.logict.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
     monadPar = self.monadPar_0_1_0_3;
     nats = null;                        # none of our versions compile