pyrox.dev
haskell: update use of Cabal 1.18.1.6 to 1.18.1.7
This affects GHC versions 7.2.x and earlier, which cannot compile more
recent versions of Cabal.
+2
-2
pkgs/development/haskell-modules/configuration-common.nix
+2
-2
pkgs/development/haskell-modules/configuration-common.nix
···
5
5
self: super: {
6
6
7
7
# Some packages need a non-core version of Cabal.
8
-
Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
8
+
Cabal_1_18_1_7 = dontCheck super.Cabal_1_18_1_7;
9
9
Cabal_1_20_0_4 = dontCheck super.Cabal_1_20_0_4;
10
10
Cabal_1_22_4_0 = dontCheck super.Cabal_1_22_4_0;
11
11
cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_4_0; });
12
-
cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; });
12
+
cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_7; });
13
13
14
14
# Link statically to avoid runtime dependency on GHC.
15
15
jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
+5
-5
pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+5
-5
pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
···
53
53
deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1;
54
54
55
55
# Newer versions don't compile.
56
-
Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
56
+
Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
57
57
58
58
# We have no working cabal-install at the moment.
59
59
cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0;
···
63
63
hashable = dontCheck super.hashable;
64
64
65
65
# Needs Cabal >= 1.18.x.
66
-
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; };
66
+
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_7; };
67
67
68
68
# Haddock chokes on the prologue from the cabal file.
69
69
ChasingBottoms = dontHaddock super.ChasingBottoms;
···
83
83
vector = self.vector_0_10_9_3;
84
84
85
85
# These packages need more recent versions of core libraries to compile.
86
-
happy = addBuildTools super.happy [self.Cabal_1_18_1_6 self.containers_0_4_2_1];
87
-
network-uri = addBuildTool super.network-uri self.Cabal_1_18_1_6;
88
-
stm = addBuildTool super.stm self.Cabal_1_18_1_6;
86
+
happy = addBuildTools super.happy [self.Cabal_1_18_1_7 self.containers_0_4_2_1];
87
+
network-uri = addBuildTool super.network-uri self.Cabal_1_18_1_7;
88
+
stm = addBuildTool super.stm self.Cabal_1_18_1_7;
89
89
split = super.split_0_1_4_3;
90
90
91
91
# Needs hashable on pre 7.10.x compilers.
+1
-1
pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+1
-1
pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
···
47
47
hashable = dontCheck super.hashable;
48
48
49
49
# Newer versions don't compile.
50
-
Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
50
+
Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
51
51
cabal-install = self.cabal-install_1_18_1_0;
52
52
53
53
# https://github.com/peti/jailbreak-cabal/issues/9
+1
-1
pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+1
-1
pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
···
45
45
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; };
46
46
47
47
# Newer versions don't compile.
48
-
Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
48
+
Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
49
49
cabal-install = self.cabal-install_1_18_1_0;
50
50
51
51
# https://github.com/tibbe/hashable/issues/85