From a317a4ae11a50287d6ed16b48370786cc98ca6a5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 17 Jan 2015 11:44:50 +0100
Subject: [PATCH] haskell-configuration-ghc-7.8.x: cosmetic changes to amazonka
 environment

---
 .../haskell-modules/configuration-ghc-7.8.x.nix      | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 289108571269..4450fb31cdf1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -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;