From 3dc5be9ec53814f8f81a391c9225313bd5c9069c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 12 Jan 2015 20:58:57 +0000 Subject: [PATCH] More amazonka packages on 7.8 --- .../haskell-modules/configuration-ghc-7.8.x.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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 34d7936719ea..f70b5d1a445a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -56,6 +56,7 @@ self: super: { process = overrideCabal self.process_1_2_1_0 (drv: { coreSetup = true; }); + inherit amazonka-core; } // (builtins.listToAttrs (map (name: { inherit name; value = overrideCabal super.${name} (drv: { @@ -67,9 +68,16 @@ self: super: { "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; -in { amazonka-core = overrideCabal (super.amazonka-core.overrideScope amazonkaEnv) (drv: { # https://github.com/brendanhay/amazonka/pull/57 @@ -77,4 +85,11 @@ in { extraLibraries = (drv.extraLibraries or []) ++ [ Cabal ]; }); + useEnvCabal = p: overrideCabal (p.overrideScope amazonkaEnv) (drv: { + extraLibraries = (drv.extraLibraries or []) ++ [ Cabal ]; + }); +in { + inherit amazonka-core; + amazonka = useEnvCabal super.amazonka; + amazonka-cloudwatch = useEnvCabal super.amazonka-cloudwatch; })