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

haskell: update use of Cabal 1.18.1.6 to 1.18.1.7

Browse source 
This affects GHC versions 7.2.x and earlier, which cannot compile more
recent versions of Cabal.
This commit is contained in:
Peter Simons 2016-01-25 11:54:27 +01:00
parent c68c8655f1
commit d487783174
4 changed files with 9 additions and 9 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

@ -5,11 +5,11 @@ with import ./lib.nix { inherit pkgs; };
self: super: { 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_7 = dontCheck super.Cabal_1_18_1_7;
Cabal_1_20_0_4 = dontCheck super.Cabal_1_20_0_4; 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_7; });
# 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_4; }; jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };

10
pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
View file

@ -53,7 +53,7 @@ self: super: {
deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1; deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1;
# Newer versions don't compile. # Newer versions don't compile.
Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6; Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
# We have no working cabal-install at the moment. # We have no working cabal-install at the moment.
cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0; cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0;
@ -63,7 +63,7 @@ self: super: {
hashable = dontCheck super.hashable; hashable = dontCheck super.hashable;
# Needs Cabal >= 1.18.x. # Needs Cabal >= 1.18.x.
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; }; jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_7; };
# 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;
@ -83,9 +83,9 @@ self: super: {
vector = self.vector_0_10_9_3; vector = self.vector_0_10_9_3;
# These packages need more recent versions of core libraries to compile. # These packages need more recent versions of core libraries to compile.
happy = addBuildTools super.happy [self.Cabal_1_18_1_6 self.containers_0_4_2_1]; happy = addBuildTools super.happy [self.Cabal_1_18_1_7 self.containers_0_4_2_1];
network-uri = addBuildTool super.network-uri self.Cabal_1_18_1_6; network-uri = addBuildTool super.network-uri self.Cabal_1_18_1_7;
stm = addBuildTool super.stm self.Cabal_1_18_1_6; stm = addBuildTool super.stm self.Cabal_1_18_1_7;
split = super.split_0_1_4_3; split = super.split_0_1_4_3;
# Needs hashable on pre 7.10.x compilers. # Needs hashable on pre 7.10.x compilers.

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

@ -47,7 +47,7 @@ self: super: {
hashable = dontCheck super.hashable; hashable = dontCheck super.hashable;
# Newer versions don't compile. # Newer versions don't compile.
Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6; Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
cabal-install = self.cabal-install_1_18_1_0; cabal-install = self.cabal-install_1_18_1_0;
# https://github.com/peti/jailbreak-cabal/issues/9 # https://github.com/peti/jailbreak-cabal/issues/9

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

@ -45,7 +45,7 @@ self: super: {
Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_0_1; process = self.process_1_2_3_0; }; Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_0_1; process = self.process_1_2_3_0; };
# Newer versions don't compile. # Newer versions don't compile.
Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6; Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
cabal-install = self.cabal-install_1_18_1_0; cabal-install = self.cabal-install_1_18_1_0;
# https://github.com/tibbe/hashable/issues/85 # https://github.com/tibbe/hashable/issues/85