b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

haskell-configuration-ghc-7.8.x: various build fixes

Browse source 
- mtl-2.2.x needs transformers 0.4.x.
 - time-1.5.x can't build its test suite.
 - provide deep overrides for amazonka-* stuff to build with GHC 7.8.x
This commit is contained in:
Peter Simons 2015-01-08 16:52:24 +01:00
parent 3c8b33eee4
commit 388848fa9f
3 changed files with 42 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -32,6 +32,9 @@ self: super: {
# Won't find it's header files without help.
sfml-audio = overrideCabal super.sfml-audio (drv: { configureFlags = drv.configureFlags or [] ++ ["--extra-include-dirs=${pkgs.openal}/include/AL"]; });
# https://github.com/haskell/time/issues/23
time_1_5_0_1 = overrideCabal super.time_1_5_0_1 (drv: { doCheck = false; });
# Hacks to make packages compile.
abstract-deque = overrideCabal super.abstract-deque (drv: { doCheck = false; });
accelerate-cuda = overrideCabal super.accelerate-cuda (drv: { jailbreak = true; });

26
pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
View file

@ -34,6 +34,13 @@ self: super: {
unix = null;
xhtml = null;
# mtl 2.2.x needs the latest transformers.
mtl_2_2_1 = super.mtl_2_2_1.override { transformers = self.transformers_0_4_2_0; };
}
// # packages related to ghcjs
{
ghcjs-prim = self.mkDerivation {
pname = "ghcjs-prim";
version = "0.1.0.0";
@ -47,5 +54,22 @@ self: super: {
};
ghcjs = self.callPackage ../compilers/ghcjs { Cabal = self.Cabal_1_22_0_0; };
}
// # packages related to amazonka
(let
amazonkaEnv = self: super: {
mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; });
mtl = self.mtl_2_2_1;
nats = self.nats_0_2;
transformers = self.transformers_0_4_2_0;
transformers-compat = overrideCabal super.transformers-compat (drv: { configureFlags = []; });
};
in
{
# These packages need mtl 2.2.x to compile.
amazonka-core = super.amazonka-core.overrideScope amazonkaEnv;
amazonka = super.amazonka.overrideScope amazonkaEnv;
amazonka-cloudwatch = super.amazonka-cloudwatch.overrideScope amazonkaEnv;
})

14
pkgs/development/haskell-modules/hackage-packages.nix
View file

@ -79482,6 +79482,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
"nats_0_2" = callPackage
({ mkDerivation, base, hashable }:
mkDerivation {
pname = "nats";
version = "0.2";
sha256 = "05skqs5ahbrnwlsxjihkvmsw0n49k9mqdhrv9nqh4dmd1j622r73";
editedCabalFile = "e401a5253358858109c85e8f17a4b63e7dd86b59cc77ac4baa6a421b6645b439";
buildDepends = [ base hashable ];
configureFlags = [ "-fhashable" ];
homepage = "http://github.com/ekmett/nats/";
description = "Natural numbers";
license = stdenv.lib.licenses.bsd3;
}) {};
"nats" = callPackage
({ mkDerivation, base, hashable }:
mkDerivation {