public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
ghcjs: fix build
This commit is contained in:
Peter Simons 2016-07-27 19:56:38 +02:00 committed by GitHub
commit 63ea36c49d
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -173,7 +173,7 @@ self: super: {
hwsl2 = dontCheck super.hwsl2; hwsl2 = dontCheck super.hwsl2;
# https://github.com/haskell/haddock/issues/427 # https://github.com/haskell/haddock/issues/427
haddock = dontCheck super.haddock; haddock = dontCheck self.haddock_2_16_1;
# haddock-api >= 2.17 is GHC 8.0 only # haddock-api >= 2.17 is GHC 8.0 only
haddock-api = self.haddock-api_2_16_1; haddock-api = self.haddock-api_2_16_1;
@ -214,4 +214,6 @@ self: super: {
# Moved out from common as no longer the case for GHC8 # Moved out from common as no longer the case for GHC8
ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; }; ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; };
generic-deriving = self.generic-deriving_1_10_5;
} }

5
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -44,8 +44,11 @@ extra-packages:
- control-monad-free < 0.6 # newer versions don't compile with anything but GHC 7.8.x - control-monad-free < 0.6 # newer versions don't compile with anything but GHC 7.8.x
- deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3 - deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3
- descriptive < 0.1 # required for structured-haskell-mode-1.0.8 - descriptive < 0.1 # required for structured-haskell-mode-1.0.8
- generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x
- gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x
- haddock-api < 2.16 # required on GHC 7.8.x - haddock < 2.17 # required on GHC 7.10.x
- haddock-api == 2.15.* # required on GHC 7.8.x
- haddock-api == 2.16.* # required on GHC 7.10.x
- haskell-src-exts < 1.16 # required for structured-haskell-mode-1.0.8 - haskell-src-exts < 1.16 # required for structured-haskell-mode-1.0.8
- mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
- mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms

21
pkgs/development/haskell-modules/hackage-packages.nix
View File

@ -74874,6 +74874,27 @@ self: {
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
}) {}; }) {};
"haddock_2_16_1" = callPackage
({ mkDerivation, base, Cabal, directory, filepath, haddock-api
, process
}:
mkDerivation {
pname = "haddock";
version = "2.16.1";
sha256 = "46ecd130cb5ad2b5c7452c843f9b75e976f1416d1cf17e6436d65c2c0bdbd6d6";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base haddock-api ];
testHaskellDepends = [ base Cabal directory filepath process ];
jailbreak = true;
doCheck = false;
preCheck = "unset GHC_PACKAGE_PATH";
homepage = "http://www.haskell.org/haddock/";
description = "A documentation-generation tool for Haskell libraries";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"haddock" = callPackage "haddock" = callPackage
({ mkDerivation, base, filepath, haddock-api, hspec }: ({ mkDerivation, base, filepath, haddock-api, hspec }:
mkDerivation { mkDerivation {