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/configuration-ghc-7.10.x.nix | |
| 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/configuration-ghc-7.10.x.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 7 |
1 files changed, 2 insertions, 5 deletions
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; |