summary refs log tree commit diff
path: root/pkgs/top-level/haskell-packages.nix
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2015-01-08 09:38:47 -0500
committerShea Levy <shea@shealevy.com>2015-01-08 09:38:47 -0500
commit5cb62016a5260408d1f3fb2c28f4af065c046f5d (patch)
treebf3f1a6a7628575e68881f02a42759e4532e3140 /pkgs/top-level/haskell-packages.nix
parentcca8bae86e092ac9fc2c1e771e3602eacd8fbd7f (diff)
downloadnixpkgs-5cb62016a5260408d1f3fb2c28f4af065c046f5d.tar
nixpkgs-5cb62016a5260408d1f3fb2c28f4af065c046f5d.tar.gz
nixpkgs-5cb62016a5260408d1f3fb2c28f4af065c046f5d.tar.bz2
nixpkgs-5cb62016a5260408d1f3fb2c28f4af065c046f5d.tar.lz
nixpkgs-5cb62016a5260408d1f3fb2c28f4af065c046f5d.tar.xz
nixpkgs-5cb62016a5260408d1f3fb2c28f4af065c046f5d.tar.zst
nixpkgs-5cb62016a5260408d1f3fb2c28f4af065c046f5d.zip
Revert "Add amazonka, amazonka-core, amazonka-cloudwatch haskell packages"
Unnecessary change to the haskell packages infrastructure, will move
this to haskellng packages.

This reverts commit 0f04707953933923cf957b7800c2eba83b4f8f34.
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r--pkgs/top-level/haskell-packages.nix40
1 files changed, 4 insertions, 36 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6c0dda9c20c..5dbc6a5d4dd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -55,14 +55,12 @@
 # modifyPrio argument can be set to lowPrio to make all Haskell packages have
 # low priority.
 
-let override = overrides: self_: let
-  self = self_ // overrides;
+self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
-  callPackage = x : y : modifyPrio (newScope self x y);
 # Indentation deliberately broken at this point to keep the bulk
 # of this file at a low indentation level.
 
-in {
+{
   inherit callPackage;
 
   # GHC and its wrapper
@@ -172,34 +170,6 @@ in {
 
   alsaPcm = callPackage ../development/libraries/haskell/alsa-pcm {};
 
-  inherit (let
-    new-transformers-self = if self.overridden or false
-      then self
-      else override {
-        overridden = true;
-
-        mtl = new-transformers-self.mtl_2_2_1;
-
-        transformers = new-transformers-self.transformers_0_4_2_0;
-
-        cabal = new-transformers-self.cabal.override {
-          enableCheckPhase = false;
-        };
-
-        nats = new-transformers-self.nats_0_2;
-      } new-transformers-self;
-
-    inherit (new-transformers-self) callPackage;
-  in {
-      amazonkaCore =
-        callPackage ../development/libraries/haskell/amazonka-core {};
-
-      amazonka = callPackage ../development/libraries/haskell/amazonka {};
-
-      amazonkaCloudwatch =
-        callPackage ../development/libraries/haskell/amazonka-cloudwatch {};
-  }) amazonka amazonkaCore amazonkaCloudwatch;
-
   amqp = callPackage ../development/libraries/haskell/amqp {};
 
   annotatedWlPprint = callPackage ../development/libraries/haskell/annotated-wl-pprint {};
@@ -1859,9 +1829,7 @@ in {
 
   nat = callPackage ../development/libraries/haskell/nat {};
 
-  nats_1 = callPackage ../development/libraries/haskell/nats/1.nix {};
-  nats_0_2 = callPackage ../development/libraries/haskell/nats/0.2.nix {};
-  nats = self.nats_1;
+  nats = callPackage ../development/libraries/haskell/nats {};
 
   naturals = callPackage ../development/libraries/haskell/naturals {};
 
@@ -3291,4 +3259,4 @@ in {
 
 # End of the main part of the file.
 
-}; in override {}
+}