Author: andres
Date: Mon Aug  8 19:02:17 2011
New Revision: 28399
URL: https://svn.nixos.org/websvn/nix/?rev=28399&sc=1

Log:
Updated a few Haskell packages.

Modified:
   nixpkgs/trunk/pkgs/development/libraries/haskell/smallcheck/default.nix
   nixpkgs/trunk/pkgs/development/libraries/haskell/uulib/default.nix
   nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/default.nix
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/smallcheck/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/smallcheck/default.nix     
Mon Aug  8 18:30:42 2011        (r28398)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/smallcheck/default.nix     
Mon Aug  8 19:02:17 2011        (r28399)
@@ -1,13 +1,13 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "smallcheck";
   version = "0.4";
   sha256 = "0nq13jm3akrmgk6n2clisip16v0jf1xkm0hm678v63s87hxqb1ma";
   meta = {
-    description = "Another lightweight testing library in Haskell";
-    license = "BSD";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    description = "Another lightweight testing library in Haskell.";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.stdenv.lib.platforms.haskellPlatforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
-

Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/uulib/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/uulib/default.nix  Mon Aug 
 8 18:30:42 2011        (r28398)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/uulib/default.nix  Mon Aug 
 8 19:02:17 2011        (r28399)
@@ -1,10 +1,14 @@
-{cabal}:
+{ cabal }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "uulib";
   version = "0.9.13";
   sha256 = "115fxvx5lqyjdwws6gkcixk1gi2p5gkyqinww7gbp54p4n0yy7n0";
   meta = {
-    description = "Haskell Utecht Tools Library";
+    homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";;
+    description = "Haskell Utrecht Tools Library";
+    license = "LGPL";
+    platforms = self.stdenv.lib.platforms.haskellPlatforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })

Modified: nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/default.nix      Mon Aug 
 8 18:30:42 2011        (r28398)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/uuagc/default.nix      Mon Aug 
 8 19:02:17 2011        (r28399)
@@ -1,12 +1,17 @@
-{cabal, uulib}:
+{ cabal, haskellSrcExts, mtl, uulib }:
 
-cabal.mkDerivation (self : {
+cabal.mkDerivation (self: {
   pname = "uuagc";
-  version = "0.9.36";
-  name = self.fname;
-  sha256 = "02sl19apxwhgj7zq37pl6xkl35pafma2683d7hyzyyn6y5kqma1j";
-  extraBuildInputs = [uulib];
+  version = "0.9.38.6";
+  sha256 = "1dr8vxis16rcdvklp0rv2d50bi33jag7n4wynbfqw9bzgyfbagnw";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ haskellSrcExts mtl uulib ];
   meta = {
+    homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";;
     description = "Attribute Grammar System of Universiteit Utrecht";
+    license = "GPL";
+    platforms = self.stdenv.lib.platforms.haskellPlatforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })

Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Mon Aug  8 18:30:42 
2011        (r28398)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Mon Aug  8 19:02:17 
2011        (r28399)
@@ -1028,6 +1028,7 @@
     parsec = self.parsec2;
   };
 
+  # known not to work with anything above ghc-6.10.*
   scion = callPackage ../development/libraries/haskell/scion {};
 
   sendfile = callPackage ../development/libraries/haskell/sendfile {};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to