diff options
Diffstat (limited to 'pkgs/development/haskell-modules')
6 files changed, 7 insertions, 7 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; 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 6147be8f0f4b..a4f2d9b7ea7e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -52,7 +52,7 @@ self: super: { # 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; }); + Cabal = dontJailbreak (self.Cabal_1_20_0_4.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; }); }; # Haddock chokes on the prologue from the cabal file. 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 771e24b3fe28..b20572aa0b2b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -53,7 +53,7 @@ self: super: { # 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; }); + Cabal = dontJailbreak (self.Cabal_1_20_0_4.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; }); }; # Haddock chokes on the prologue from the cabal file. 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 16d3a43f6680..a1dad7f3cd9a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -50,7 +50,7 @@ self: super: { hashable = dontCheck super.hashable; # https://github.com/peti/jailbreak-cabal/issues/9 - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; }; + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_4; }; # 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 63ca4663caa4..c5e5802903db 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -49,7 +49,7 @@ self: super: { hashable = dontCheck super.hashable; # https://github.com/peti/jailbreak-cabal/issues/9 - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; }; + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_4; }; # 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 81379ce9c371..c7ef534d7855 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -38,7 +38,7 @@ self: super: { xhtml = null; # https://github.com/peti/jailbreak-cabal/issues/9 - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; }; + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_4; }; # mtl 2.2.x needs the latest transformers. mtl_2_2_1 = super.mtl.override { transformers = self.transformers_0_4_3_0; }; |