diff options
author | Peter Simons <simons@cryp.to> | 2016-10-19 15:11:51 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2016-10-20 13:40:10 +0200 |
commit | 6a35164874514660c698e826a0fb99daa3b04c57 (patch) | |
tree | aefd762da7365415c6ac19bf7214d71ee1391b5f /pkgs/development/haskell-modules | |
parent | ad81560afc8a8b74344d4ddc9b55a7fe2a2457b7 (diff) | |
download | nixlib-6a35164874514660c698e826a0fb99daa3b04c57.tar nixlib-6a35164874514660c698e826a0fb99daa3b04c57.tar.gz nixlib-6a35164874514660c698e826a0fb99daa3b04c57.tar.bz2 nixlib-6a35164874514660c698e826a0fb99daa3b04c57.tar.lz nixlib-6a35164874514660c698e826a0fb99daa3b04c57.tar.xz nixlib-6a35164874514660c698e826a0fb99daa3b04c57.tar.zst nixlib-6a35164874514660c698e826a0fb99daa3b04c57.zip |
haskell: drop obsolete jailbreaking overrides
Diffstat (limited to 'pkgs/development/haskell-modules')
8 files changed, 9 insertions, 24 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4addee1b09f7..3b8a93f2108f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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; diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix index 1207a8c68bca..32348f2c9095 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -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; 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 4cbe3b6b1483..16c1ff4f0652 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -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. diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index c06e0f7d11b1..95629c375329 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -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; 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 385df64fadbe..5aea83e7567d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -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. 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 aca043e240ba..32d3c89d5fe3 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_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; 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 06836080bcfd..1c579b9d6e2c 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_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; 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 1b5f01c8475b..f74106898668 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_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; }; |