alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

haskell: update use of Cabal 1.20.0.3 to 1.20.0.4

Browse source 
This affects mostly jailbreak-cabal, which uses the old version on most
platforms due to bugs introduced to Cabal in later releases.
This commit is contained in:
Peter Simons 2016-01-25 11:15:11 +01:00
parent 2e3c8d55f7
commit c68c8655f1
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -6,13 +6,13 @@ self: super: {
# Some packages need a non-core version of Cabal. # Some packages need a non-core version of Cabal.
Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6; 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_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 = (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; }); 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. # 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. # Apply NixOS-specific patches.
ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch; ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch;

2
pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
View file

@ -52,7 +52,7 @@ self: super: {
# https://github.com/peti/jailbreak-cabal/issues/9 # https://github.com/peti/jailbreak-cabal/issues/9
jailbreak-cabal = super.jailbreak-cabal.override { 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. # Haddock chokes on the prologue from the cabal file.

2
pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
View file

@ -53,7 +53,7 @@ self: super: {
# https://github.com/peti/jailbreak-cabal/issues/9 # https://github.com/peti/jailbreak-cabal/issues/9
jailbreak-cabal = super.jailbreak-cabal.override { 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. # Haddock chokes on the prologue from the cabal file.

2
pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
View file

@ -50,7 +50,7 @@ self: super: {
hashable = dontCheck super.hashable; hashable = dontCheck super.hashable;
# https://github.com/peti/jailbreak-cabal/issues/9 # 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. # Haddock chokes on the prologue from the cabal file.
ChasingBottoms = dontHaddock super.ChasingBottoms; ChasingBottoms = dontHaddock super.ChasingBottoms;

2
pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
View file

@ -49,7 +49,7 @@ self: super: {
hashable = dontCheck super.hashable; hashable = dontCheck super.hashable;
# https://github.com/peti/jailbreak-cabal/issues/9 # 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. # Haddock chokes on the prologue from the cabal file.
ChasingBottoms = dontHaddock super.ChasingBottoms; ChasingBottoms = dontHaddock super.ChasingBottoms;

2
pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
View file

@ -38,7 +38,7 @@ self: super: {
xhtml = null; xhtml = null;
# https://github.com/peti/jailbreak-cabal/issues/9 # 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.x needs the latest transformers.
mtl_2_2_1 = super.mtl.override { transformers = self.transformers_0_4_3_0; }; mtl_2_2_1 = super.mtl.override { transformers = self.transformers_0_4_3_0; };