haskell-configuration-ghc-7.8.x: clean up amazonkaEnv
This commit is contained in:
parent
3318c403f1
commit
80518eab94
|
@ -69,11 +69,12 @@ self: super: {
|
|||
// # packages relating to amazonka
|
||||
|
||||
(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 // {
|
||||
doCheck = false;
|
||||
hyperlinkSource = false;
|
||||
extraLibraries = (drv.extraLibraries or []) ++ [ (
|
||||
buildTools = (drv.buildTools or []) ++ [ (
|
||||
if pkgs.stdenv.lib.elem drv.pname [
|
||||
"Cabal"
|
||||
"time"
|
||||
|
@ -81,7 +82,7 @@ self: super: {
|
|||
"directory"
|
||||
"process"
|
||||
"jailbreak-cabal"
|
||||
] then null else self.Cabal_1_18_1_6
|
||||
] then null else Cabal
|
||||
) ];
|
||||
});
|
||||
mtl = self.mtl_2_2_1;
|
||||
|
@ -94,18 +95,11 @@ self: super: {
|
|||
process = overrideCabal self.process_1_2_1_0 (drv: { coreSetup = true; });
|
||||
inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch;
|
||||
};
|
||||
Cabal = self.Cabal_1_18_1_6.overrideScope amazonkaEnv;
|
||||
amazonka-core =
|
||||
overrideCabal (super.amazonka-core.overrideScope amazonkaEnv) (drv: {
|
||||
# https://github.com/brendanhay/amazonka/pull/57
|
||||
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;
|
||||
amazonka = super.amazonka.overrideScope amazonkaEnv;
|
||||
amazonka-cloudwatch = super.amazonka-cloudwatch.overrideScope amazonkaEnv;
|
||||
amazonka-core = super.amazonka-core.overrideScope amazonkaEnv;
|
||||
amazonka-kms = super.amazonka-kms.overrideScope amazonkaEnv;
|
||||
in {
|
||||
inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch;
|
||||
inherit amazonkaEnv;
|
||||
inherit amazonka amazonka-cloudwatch amazonka-core amazonka-kms;
|
||||
})
|
||||
|
|
Loading…
Reference in New Issue