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

haskell-configuration-ghc-7.8.x: clean up amazonkaEnv

Browse Source
This commit is contained in:
Peter Simons 2015-01-23 10:30:00 +01:00
parent 3318c403f1
commit 80518eab94
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,11 +69,12 @@ self: super: {
// # packages relating to amazonka // # packages relating to amazonka
(let (let
amazonkaEnv = let self_ = self; in self: super: { Cabal = self.Cabal_1_18_1_6.overrideScope amazonkaEnv;
amazonkaEnv = self: super: {
mkDerivation = drv: super.mkDerivation (drv // { mkDerivation = drv: super.mkDerivation (drv // {
doCheck = false; doCheck = false;
hyperlinkSource = false; hyperlinkSource = false;
extraLibraries = (drv.extraLibraries or []) ++ [ ( buildTools = (drv.buildTools or []) ++ [ (
if pkgs.stdenv.lib.elem drv.pname [ if pkgs.stdenv.lib.elem drv.pname [
"Cabal" "Cabal"
"time" "time"
@ -81,7 +82,7 @@ self: super: {
"directory" "directory"
"process" "process"
"jailbreak-cabal" "jailbreak-cabal"
] then null else self.Cabal_1_18_1_6 ] then null else Cabal
) ]; ) ];
}); });
mtl = self.mtl_2_2_1; mtl = self.mtl_2_2_1;
@ -94,18 +95,11 @@ self: super: {
process = overrideCabal self.process_1_2_1_0 (drv: { coreSetup = true; }); process = overrideCabal self.process_1_2_1_0 (drv: { coreSetup = true; });
inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch; inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch;
}; };
Cabal = self.Cabal_1_18_1_6.overrideScope amazonkaEnv; amazonka = super.amazonka.overrideScope amazonkaEnv;
amazonka-core = amazonka-cloudwatch = super.amazonka-cloudwatch.overrideScope amazonkaEnv;
overrideCabal (super.amazonka-core.overrideScope amazonkaEnv) (drv: { amazonka-core = super.amazonka-core.overrideScope amazonkaEnv;
# https://github.com/brendanhay/amazonka/pull/57 amazonka-kms = super.amazonka-kms.overrideScope amazonkaEnv;
prePatch = "sed -i 's|nats >= 0.1.3 && < 1|nats|' amazonka-core.cabal";
extraLibraries = (drv.extraLibraries or []) ++ [ Cabal ];
});
useEnvCabal = p: overrideCabal (p.overrideScope amazonkaEnv) (drv: {
buildDepends = (drv.buildDepends or []) ++ [ Cabal ];
});
amazonka = useEnvCabal super.amazonka;
amazonka-cloudwatch = useEnvCabal super.amazonka-cloudwatch;
in { in {
inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch; inherit amazonkaEnv;
inherit amazonka amazonka-cloudwatch amazonka-core amazonka-kms;
}) })