haskellng: Make amazonka env externally visible

This commit is contained in:
Shea Levy
2015-01-12 18:13:40 -05:00
parent 005508a96d
commit 9e114ccd26
@@ -44,6 +44,17 @@ self: super: {
amazonkaEnv = let self_ = self; in self: super: { amazonkaEnv = let self_ = self; in self: super: {
mkDerivation = drv: super.mkDerivation (drv // { mkDerivation = drv: super.mkDerivation (drv // {
doCheck = false; doCheck = false;
hyperlinkSource = false;
extraLibraries = (drv.extraLibraries or []) ++ [ (
if builtins.elem drv.pname [
"Cabal"
"time"
"unix"
"directory"
"process"
"jailbreak-cabal"
] then null else self.Cabal_1_18_1_6
) ];
}); });
mtl = self.mtl_2_2_1; mtl = self.mtl_2_2_1;
transformers = self.transformers_0_4_2_0; transformers = self.transformers_0_4_2_0;
@@ -56,27 +67,8 @@ self: super: {
process = overrideCabal self.process_1_2_1_0 (drv: { process = overrideCabal self.process_1_2_1_0 (drv: {
coreSetup = true; coreSetup = true;
}); });
inherit amazonka-core; inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch;
} // (builtins.listToAttrs (map (name: { };
inherit name;
value = overrideCabal super.${name} (drv: {
extraLibraries = (drv.extraLibraries or []) ++ [ self.Cabal_1_18_1_6 ];
});
}) [
"conduit-extra"
"streaming-commons"
"http-client"
"cryptohash-conduit"
"xml-conduit"
"x509"
"x509-store"
"x509-system"
"x509-validation"
"tls"
"connection"
"http-client-tls"
"http-conduit"
]));
Cabal = self.Cabal_1_18_1_6.overrideScope amazonkaEnv; Cabal = self.Cabal_1_18_1_6.overrideScope amazonkaEnv;
amazonka-core = amazonka-core =
overrideCabal (super.amazonka-core.overrideScope amazonkaEnv) (drv: { overrideCabal (super.amazonka-core.overrideScope amazonkaEnv) (drv: {
@@ -88,8 +80,8 @@ self: super: {
useEnvCabal = p: overrideCabal (p.overrideScope amazonkaEnv) (drv: { useEnvCabal = p: overrideCabal (p.overrideScope amazonkaEnv) (drv: {
extraLibraries = (drv.extraLibraries or []) ++ [ Cabal ]; extraLibraries = (drv.extraLibraries or []) ++ [ Cabal ];
}); });
in {
inherit amazonka-core;
amazonka = useEnvCabal super.amazonka; amazonka = useEnvCabal super.amazonka;
amazonka-cloudwatch = useEnvCabal super.amazonka-cloudwatch; amazonka-cloudwatch = useEnvCabal super.amazonka-cloudwatch;
in {
inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch;
}) })