summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2016-01-25 11:15:11 +0100
committerPeter Simons <simons@cryp.to>2016-01-27 00:33:25 +0100
commitc68c8655f1420ed546f963123bf2efc934a88b5e (patch)
treea2c7aaca0c3b09b1508e0ebe31bce17ac1e627c1 /pkgs/development/haskell-modules/configuration-common.nix
parent2e3c8d55f743aa8ac1400d33cbfd904b9fa318a2 (diff)
downloadnixlib-c68c8655f1420ed546f963123bf2efc934a88b5e.tar
nixlib-c68c8655f1420ed546f963123bf2efc934a88b5e.tar.gz
nixlib-c68c8655f1420ed546f963123bf2efc934a88b5e.tar.bz2
nixlib-c68c8655f1420ed546f963123bf2efc934a88b5e.tar.lz
nixlib-c68c8655f1420ed546f963123bf2efc934a88b5e.tar.xz
nixlib-c68c8655f1420ed546f963123bf2efc934a88b5e.tar.zst
nixlib-c68c8655f1420ed546f963123bf2efc934a88b5e.zip
haskell: update use of Cabal 1.20.0.3 to 1.20.0.4
This affects mostly jailbreak-cabal, which uses the old version on most
platforms due to bugs introduced to Cabal in later releases.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1b5b3b74f184..28fec422cfa8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -6,13 +6,13 @@ self: super: {
 
   # Some packages need a non-core version of Cabal.
   Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
-  Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3;
+  Cabal_1_20_0_4 = dontCheck super.Cabal_1_20_0_4;
   Cabal_1_22_4_0 = dontCheck super.Cabal_1_22_4_0;
   cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_4_0; });
   cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; });
 
   # Link statically to avoid runtime dependency on GHC.
-  jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = dontJailbreak self.Cabal_1_20_0_3; };
+  jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
 
   # Apply NixOS-specific patches.
   ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch;