JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haskell: drop obsolete jailbreaking overrides

Browse Source
This commit is contained in:
Peter Simons 2016-10-19 15:11:51 +02:00
parent ad81560afc
commit 6a35164874
8 changed files with 9 additions and 24 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

@ -8,7 +8,7 @@ self: super: {
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; });
# 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 = self.Cabal_1_20_0_4; };
# Apply NixOS-specific patches.
ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch;
@ -969,7 +969,7 @@ self: super: {
});
# https://github.com/commercialhaskell/stack/issues/2263
stack = (dontJailbreak super.stack).overrideScope (self: super: {
stack = super.stack.overrideScope (self: super: {
http-client = self.http-client_0_5_3_2;
http-client-tls = self.http-client-tls_0_3_3;
http-conduit = self.http-conduit_2_2_3;

6
pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
View File

@ -49,12 +49,6 @@ self: super: {
transformers = self.transformers_0_4_3_0;
xhtml = self.xhtml_3000_2_1;
# The jailbreak is unnecessary in this package set.
deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1;
# Newer versions don't compile.
Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
# We have no working cabal-install at the moment.
cabal-install = markBroken super.cabal-install;

5
pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
View File

@ -46,12 +46,9 @@ self: super: {
# https://github.com/tibbe/hashable/issues/85
hashable = dontCheck super.hashable;
# Newer versions don't compile.
Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
# https://github.com/peti/jailbreak-cabal/issues/9
jailbreak-cabal = super.jailbreak-cabal.override {
Cabal = dontJailbreak (self.Cabal_1_20_0_4.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; });
Cabal = self.Cabal_1_20_0_4.override { deepseq = self.deepseq_1_3_0_1; };
};
# Haddock chokes on the prologue from the cabal file.

7
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -37,10 +37,7 @@ self: super: {
xhtml = null;
# Enable latest version of cabal-install.
cabal-install = (doDistribute (dontJailbreak (dontCheck (super.cabal-install)))).overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; });
# Jailbreaking is required for the test suite only (which we don't run).
Cabal_1_24_0_0 = dontJailbreak (dontCheck super.Cabal_1_24_0_0);
cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; });
# Build jailbreak-cabal with the latest version of Cabal.
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_0_0; };
@ -148,7 +145,7 @@ self: super: {
tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts");
# http://hub.darcs.net/ivanm/graphviz/issue/5
graphviz = dontCheck (dontJailbreak (appendPatch super.graphviz ./patches/graphviz-fix-ghc710.patch));
graphviz = dontCheck (appendPatch super.graphviz ./patches/graphviz-fix-ghc710.patch);
# https://github.com/HugoDaniel/RFC3339/issues/14
timerep = dontCheck super.timerep;

5
pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
View File

@ -44,15 +44,12 @@ self: super: {
# https://github.com/haskell/cabal/issues/2322
Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_4_1; process = self.process_1_2_3_0; };
# Newer versions don't compile.
Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
# https://github.com/tibbe/hashable/issues/85
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_4.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; });
Cabal = self.Cabal_1_20_0_4.override { deepseq = self.deepseq_1_3_0_1; };
};
# 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;
# https://github.com/peti/jailbreak-cabal/issues/9
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; };
# Haddock chokes on the prologue from the cabal file.
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;
# https://github.com/peti/jailbreak-cabal/issues/9
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; };
# Haddock chokes on the prologue from the cabal file.
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;
# https://github.com/peti/jailbreak-cabal/issues/9
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = 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; };