configuration-ghc-7.8.x.nix: remove amazonka-related overrides

These overrides allow us to build amazonka packages, but we have no way to
actually use those build results within Nix, because the replaced GHC core
libraries collide with the real ones when we try to compose a ghc-with-packages
environment.

Closes https://github.com/NixOS/nixpkgs/issues/6584.
This commit is contained in:
Peter Simons 2015-03-12 13:19:49 +01:00
parent 14e5333e3c
commit fdd821f1ef

View file

@ -98,44 +98,3 @@ self: super: {
incremental-computing = dontCheck super.incremental-computing;
}
// # packages relating to amazonka
(let
Cabal = self.Cabal_1_18_1_6.overrideScope amazonkaEnv;
amazonkaEnv = self: super: {
mkDerivation = drv: super.mkDerivation (drv // {
doCheck = false;
hyperlinkSource = false;
buildTools = (drv.buildTools or []) ++ [ (
if pkgs.stdenv.lib.elem drv.pname [
"Cabal"
"time"
"unix"
"directory"
"process"
"jailbreak-cabal"
] then null else Cabal
) ];
});
mtl = self.mtl_2_2_1;
transformers = self.transformers_0_4_3_0;
transformers-compat = disableCabalFlag super.transformers-compat "three";
hscolour = super.hscolour;
time = self.time_1_5_0_1;
unix = self.unix_2_7_1_0;
directory = self.directory_1_2_1_0;
process = overrideCabal self.process_1_2_2_0 (drv: { coreSetup = true; });
inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch amazonka-glacier amazonka-ecs;
};
amazonka = super.amazonka.overrideScope amazonkaEnv;
amazonka-cloudwatch = super.amazonka-cloudwatch.overrideScope amazonkaEnv;
amazonka-core = super.amazonka-core.overrideScope amazonkaEnv;
amazonka-ecs = super.amazonka-ecs.overrideScope amazonkaEnv;
amazonka-glacier = super.amazonka-glacier.overrideScope amazonkaEnv;
amazonka-kms = super.amazonka-kms.overrideScope amazonkaEnv;
amazonka-ssm = super.amazonka-ssm.overrideScope amazonkaEnv;
in {
inherit amazonkaEnv;
inherit amazonka amazonka-cloudwatch amazonka-core amazonka-ecs amazonka-kms amazonka-glacier amazonka-ssm;
})