Switching haskell-packages.nix to callPackage ...

svn path=/nixpkgs/trunk/; revision=23551

pkgs/development/libraries/haskell/AspectAG/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "AspectAG";
-  version = "0.1.5";
-  sha256 = "4cefc7e3404a723f0a75b29797bd9fe685c2a1b3150826b3ba09ade94565f6ff";
+  version = "0.2";
+  sha256 = "5184ba55bc89d4afd12d1fe5f20e5d62b3b7306e771a7418db805afb70638ce7";
   propagatedBuildInputs = [HList mtl];
   meta = {
     description = "Attribute Grammars in the form of an EDSL";

pkgs/development/libraries/haskell/HList/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "HList";
-  version = "0.2";
-  sha256 = "410a77f8815cb873aff03896622e00918aaf99813bb55822942af4cc8c1a01b5";
+  version = "0.2.3";
+  sha256 = "1efbe0c2cb361ab0a9d864a09f9c58075132cb50094207260cb1363fe73c2908";
   meta = {
     description = "Heterogeneous lists";
   };

pkgs/development/libraries/haskell/benchpress/default.nix

@@ -1,12 +1,12 @@
-{cabal}:
+{cabal, mtl}:
 
 cabal.mkDerivation (self : {
   pname = "benchpress";
   version = "0.2.2";
   sha256 = "185j2viimr1vbbgh9havdj2nskim8apih1fyvwln76jfrwypy194";
+  propagatedBuildInputs = [mtl];
   meta = {
     description = "Benchmarks actions and produces statistics such as min, mean, and median execution time.";
   };
-  propagatedBuildInputs = [];
 })
 

pkgs/development/libraries/haskell/polyparse/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "polyparse";
-  version = "1.3";
-  sha256 = "6d82f08634f0856c7919c9413199f4d5f91e753a6d796a0b61e46d7cd1ce4a24";
+  version = "1.4";
+  sha256 = "6e599fb0771e8ce2e1d3a3bbe5eddc2d77b2b4bbb54602f01005dc55dc039d44";
   meta = {
     description = "A variety of alternative parser combinator libraries";
   };

pkgs/top-level/all-packages.nix

@@ -1759,14 +1759,14 @@ let
 
   # Helper functions to abstract away from repetitive instantiations.
   haskellPackagesFun610 = ghcPath : profDefault : recurseIntoAttrs (import ./haskell-packages.nix {
-    inherit pkgs;
+    inherit pkgs newScope;
     enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] profDefault;
     ghc = callPackage ghcPath {
       ghc = ghc6101Binary;    };
   });
 
   haskellPackagesFun612 = ghcPath : profDefault : recurseIntoAttrs (import ./haskell-packages.nix {
-    inherit pkgs;
+    inherit pkgs newScope;
     enableLibraryProfiling = getConfig [ "cabal" "libraryProfiling" ] profDefault;
     ghc = callPackage ghcPath {
       ghc = ghc6101Binary;    };