jailbreak-cabal: use native Cabal library with GHC 8.0.x or later

+3 -23
+1 -6
pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
··· 35 35 xhtml = null; 36 36 37 37 # jailbreak-cabal can use the native Cabal library. 38 - jailbreak-cabal = super.jailbreak-cabal.override { 39 - Cabal = null; 40 - mkDerivation = drv: self.mkDerivation (drv // { 41 - preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal"; 42 - }); 43 - }; 38 + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; 44 39 45 40 # Older versions of QuickCheck don't support our version of Template Haskell. 46 41 QuickCheck = self.QuickCheck_2_8_2;
+2 -17
pkgs/development/haskell-modules/configuration-ghc-head.nix
··· 33 33 unix = null; 34 34 xhtml = null; 35 35 36 - # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9. 37 - Cabal_1_23_0_0 = overrideCabal super.Cabal_1_22_4_0 (drv: { 38 - version = "1.23.0.0"; 39 - src = pkgs.fetchFromGitHub { 40 - owner = "haskell"; 41 - repo = "cabal"; 42 - rev = "fe7b8784ac0a5848974066bdab76ce376ba67277"; 43 - sha256 = "1d70ryz1l49pkr70g8r9ysqyg1rnx84wwzx8hsg6vwnmg0l5am7s"; 44 - }; 45 - jailbreak = false; 46 - doHaddock = false; 47 - postUnpack = "sourceRoot+=/Cabal"; 48 - }); 49 - jailbreak-cabal = overrideCabal super.jailbreak-cabal (drv: { 50 - executableHaskellDepends = [ self.Cabal_1_23_0_0 ]; 51 - preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal"; 52 - }); 36 + # jailbreak-cabal can use the native Cabal library. 37 + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; 53 38 54 39 # haddock: No input file(s). 55 40 nats = dontHaddock super.nats;