swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues 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;
hyperlinkSource = false;
extraLibraries = (drv.extraLibraries or []) ++ [ (
if builtins.elem drv.pname [
if pkgs.stdenv.lib.elem drv.pname [
"Cabal"
"time"
"unix"
@ -71,15 +71,12 @@ self: super: {
});
mtl = self.mtl_2_2_1;
transformers = self.transformers_0_4_2_0;
transformers-compat = overrideCabal super.transformers-compat (drv: { configureFlags = []; });
aeson = disableCabalFlag super.aeson "old-locale";
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_1_0 (drv: {
coreSetup = true;
});
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;
@ -87,11 +84,10 @@ self: super: {
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: {
extraLibraries = (drv.extraLibraries or []) ++ [ Cabal ];
buildDepends = (drv.buildDepends or []) ++ [ Cabal ];
});
amazonka = useEnvCabal super.amazonka;
amazonka-cloudwatch = useEnvCabal super.amazonka-cloudwatch;