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

haskell-configuration-ghc-7.8.x: cosmetic changes to amazonka environment

Browse Source
This commit is contained in:
Peter Simons 2015-01-17 11:44:50 +01:00
parent 7c1eae89f0
commit a317a4ae11
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ self: super: {
doCheck = false; doCheck = false;
hyperlinkSource = false; hyperlinkSource = false;
extraLibraries = (drv.extraLibraries or []) ++ [ ( extraLibraries = (drv.extraLibraries or []) ++ [ (
if builtins.elem drv.pname [ if pkgs.stdenv.lib.elem drv.pname [
"Cabal" "Cabal"
"time" "time"
"unix" "unix"
@ -71,15 +71,12 @@ self: super: {
}); });
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;
transformers-compat = overrideCabal super.transformers-compat (drv: { configureFlags = []; }); transformers-compat = disableCabalFlag super.transformers-compat "three";
aeson = disableCabalFlag super.aeson "old-locale";
hscolour = super.hscolour; hscolour = super.hscolour;
time = self.time_1_5_0_1; time = self.time_1_5_0_1;
unix = self.unix_2_7_1_0; unix = self.unix_2_7_1_0;
directory = self.directory_1_2_1_0; directory = self.directory_1_2_1_0;
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 amazonkaEnv amazonka amazonka-cloudwatch; inherit amazonka-core amazonkaEnv amazonka amazonka-cloudwatch;
}; };
Cabal = self.Cabal_1_18_1_6.overrideScope amazonkaEnv; Cabal = self.Cabal_1_18_1_6.overrideScope amazonkaEnv;
@ -87,11 +84,10 @@ self: super: {
overrideCabal (super.amazonka-core.overrideScope amazonkaEnv) (drv: { overrideCabal (super.amazonka-core.overrideScope amazonkaEnv) (drv: {
# https://github.com/brendanhay/amazonka/pull/57 # https://github.com/brendanhay/amazonka/pull/57
prePatch = "sed -i 's|nats >= 0.1.3 && < 1|nats|' amazonka-core.cabal"; prePatch = "sed -i 's|nats >= 0.1.3 && < 1|nats|' amazonka-core.cabal";
extraLibraries = (drv.extraLibraries or []) ++ [ Cabal ]; extraLibraries = (drv.extraLibraries or []) ++ [ Cabal ];
}); });
useEnvCabal = p: overrideCabal (p.overrideScope amazonkaEnv) (drv: { useEnvCabal = p: overrideCabal (p.overrideScope amazonkaEnv) (drv: {
extraLibraries = (drv.extraLibraries or []) ++ [ Cabal ]; buildDepends = (drv.buildDepends or []) ++ [ Cabal ];
}); });
amazonka = useEnvCabal super.amazonka; amazonka = useEnvCabal super.amazonka;
amazonka-cloudwatch = useEnvCabal super.amazonka-cloudwatch; amazonka-cloudwatch = useEnvCabal super.amazonka-cloudwatch;