pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #17309 from ryantrinkle/ghcjs-holdbacks-for-ghc-7.10

ghcjs: fix build

authored by Peter Simons and committed by GitHub 63ea36c4 cd1dadf8

+28 -2
unified split
+3 -1
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
··· 173 173 hwsl2 = dontCheck super.hwsl2; 174 174 175 175 # https://github.com/haskell/haddock/issues/427 176 - haddock = dontCheck super.haddock; 176 + haddock = dontCheck self.haddock_2_16_1; 177 177 178 178 # haddock-api >= 2.17 is GHC 8.0 only 179 179 haddock-api = self.haddock-api_2_16_1; ··· 213 213 214 214 # Moved out from common as no longer the case for GHC8 215 215 ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; }; 216 + 217 + generic-deriving = self.generic-deriving_1_10_5; 216 218 217 219 }
+4 -1
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
··· 44 44 - control-monad-free < 0.6 # newer versions don't compile with anything but GHC 7.8.x 45 45 - deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3 46 46 - descriptive < 0.1 # required for structured-haskell-mode-1.0.8 47 + - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x 47 48 - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x 48 - - haddock-api < 2.16 # required on GHC 7.8.x 49 + - haddock < 2.17 # required on GHC 7.10.x 50 + - haddock-api == 2.15.* # required on GHC 7.8.x 51 + - haddock-api == 2.16.* # required on GHC 7.10.x 49 52 - haskell-src-exts < 1.16 # required for structured-haskell-mode-1.0.8 50 53 - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x 51 54 - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms
+21
pkgs/development/haskell-modules/hackage-packages.nix
··· 74874 74874 license = stdenv.lib.licenses.mit; 74875 74875 }) {}; 74876 74876 74877 + "haddock_2_16_1" = callPackage 74878 + ({ mkDerivation, base, Cabal, directory, filepath, haddock-api 74879 + , process 74880 + }: 74881 + mkDerivation { 74882 + pname = "haddock"; 74883 + version = "2.16.1"; 74884 + sha256 = "46ecd130cb5ad2b5c7452c843f9b75e976f1416d1cf17e6436d65c2c0bdbd6d6"; 74885 + isLibrary = false; 74886 + isExecutable = true; 74887 + executableHaskellDepends = [ base haddock-api ]; 74888 + testHaskellDepends = [ base Cabal directory filepath process ]; 74889 + jailbreak = true; 74890 + doCheck = false; 74891 + preCheck = "unset GHC_PACKAGE_PATH"; 74892 + homepage = "http://www.haskell.org/haddock/"; 74893 + description = "A documentation-generation tool for Haskell libraries"; 74894 + license = stdenv.lib.licenses.bsd3; 74895 + hydraPlatforms = stdenv.lib.platforms.none; 74896 + }) {}; 74897 + 74877 74898 "haddock" = callPackage 74878 74899 ({ mkDerivation, base, filepath, haddock-api, hspec }: 74879 74900 mkDerivation {