Improve GHC 8.0.x package set configuration.

+13 -16
+13 -16
pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
··· 3 3 with import ./lib.nix { inherit pkgs; }; 4 4 5 5 self: super: { 6 + 7 + # Suitable LLVM version. 8 + llvmPackages = pkgs.llvmPackages_35; 9 + 6 10 # Disable GHC 8.0.x core libraries. 7 11 array = null; 8 12 base = null; ··· 30 34 unix = null; 31 35 xhtml = null; 32 36 33 - Cabal_1_23_0_0 = overrideCabal super.Cabal_1_22_4_0 (drv: { 34 - version = "1.23.0.0"; 35 - src = pkgs.fetchFromGitHub { 36 - owner = "haskell"; 37 - repo = "cabal"; 38 - rev = "18fcd9c1aaeddd9d10a25e44c0e986c9889f06a7"; 39 - sha256 = "1bakw7h5qadjhqbkmwijg3588mjnpvdhrn8lqg8wq485cfcv6vn3"; 40 - }; 41 - jailbreak = false; 42 - doHaddock = false; 43 - postUnpack = "sourceRoot+=/Cabal"; 44 - postPatch = '' 45 - setupCompileFlags+=" -DMIN_VERSION_binary_0_8_0=1" 46 - ''; 47 - }); 37 + # jailbreak-cabal can use the native Cabal library. 48 38 jailbreak-cabal = super.jailbreak-cabal.override { 49 - Cabal = self.Cabal_1_23_0_0; 39 + Cabal = null; 50 40 mkDerivation = drv: self.mkDerivation (drv // { 51 41 preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal"; 52 42 }); 53 43 }; 44 + 45 + # Older versions of QuickCheck don't support our version of Template Haskell. 46 + QuickCheck = self.QuickCheck_2_8_2; 47 + 48 + # https://github.com/hspec/HUnit/issues/7 49 + HUnit = dontCheck super.HUnit; 50 + 54 51 }