Preparing for the upcoming Haskell Platform release.

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

22 files changed, 122 insertions, 15 deletions

diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
index 9fa0690ad6b..0b0b04b2a90 100644
--- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
+++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "GLUT";
-  version = "2.1.2.1"; # Haskell Platform 2010.1.0.0
+  version = "2.1.2.1"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
   sha256 = "0230bfacbfb85c126f1fba45fcd8d02f20da9ee19180b5ada698224362d17264";
   propagatedBuildInputs = [OpenGL glut libSM libICE libXmu libXi mesa];
   meta = {
diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
index 0600a957883..23b09543707 100644
--- a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
+++ b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "HTTP";
-  version = "4000.0.9"; # Haskell Platform 2010.1.0.0
+  version = "4000.0.9"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
   sha256 = "1e2b4a8b782ad1417c8755bb0d248851bc142b351366ed460e07f2945a5e95ba";
   propagatedBuildInputs = [mtl network parsec];
   meta = {
diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
index 9f52ed4048f..a2cd4665e79 100644
--- a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
+++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "HUnit";
-  version = "1.2.2.1"; # Haskell Platform 2010.1.0.0
+  version = "1.2.2.1"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
   sha256 = "47235503b666658588181795540d29212283059b21edc42e1b4f1998e46ac853";
   meta = {
     description = "A unit testing framework for Haskell";
diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
index e3cb4bdf4e6..46e0fd0dad7 100644
--- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
+++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "OpenGL";
-  version = "2.2.3.0"; # Haskell Platform 2010.1.0.0
+  version = "2.2.3.0"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
   sha256 = "a75c3277bb20fda9a4ac1eb0e838fe4b5baf92f5539466b92bd255626afb0502";
   propagatedBuildInputs = [mesa libX11];
   meta = {
diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix
new file mode 100644
index 00000000000..6ad15d15380
--- /dev/null
+++ b/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix
@@ -0,0 +1,14 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "QuickCheck";
+  version = "2.1.0.3"; # Haskell Platform 2010.1.0.0
+  sha256 = "91a861233fe0a37a032d092dd5e8ec40c2c99fbbf0701081394eb244f23757b1";
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "Automatic testing of Haskell programs";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix b/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix
index 6ad15d15380..f4463394ea1 100644
--- a/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix
+++ b/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "QuickCheck";
-  version = "2.1.0.3"; # Haskell Platform 2010.1.0.0
-  sha256 = "91a861233fe0a37a032d092dd5e8ec40c2c99fbbf0701081394eb244f23757b1";
+  version = "2.1.1.1"; # Haskell Platform 2010.2.0.0
+  sha256 = "626a6f7a69e2bea3b4fe7c573d0bc8da8c77f97035cb2d3a5e1c9fca382b59c9";
   propagatedBuildInputs = [mtl];
   meta = {
     description = "Automatic testing of Haskell programs";
diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix
new file mode 100644
index 00000000000..d425e84d692
--- /dev/null
+++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix
@@ -0,0 +1,12 @@
+{cabal, mtl, network, parsec, xhtml}:
+
+cabal.mkDerivation (self : {
+  pname = "cgi";
+  version = "3001.1.7.3"; # Haskell Platform 2010.2.0.0
+  sha256 = "f1f4bc6b06e8a191db4ddb43617fee3ef37635e380d6a17c29efb5641ce91df0";
+  propagatedBuildInputs = [mtl network parsec xhtml];
+  meta = {
+    description = "A library for writing CGI programs";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/deepseq/default.nix b/pkgs/development/libraries/haskell/deepseq/default.nix
index 6658f86de75..eb84d629fdb 100644
--- a/pkgs/development/libraries/haskell/deepseq/default.nix
+++ b/pkgs/development/libraries/haskell/deepseq/default.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "deepseq";
-  version = "1.1.0.0"; # Haskell Platform 2010.1.0.0
+  version = "1.1.0.0"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
   sha256 = "947c45e7ee862159f190fb8e905c1328f7672cb9e6bf3abd1d207bbcf1eee50a";
   meta = {
     description = "Provides a deep version of seq, for fully evaluating data structures";
diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
new file mode 100644
index 00000000000..0c326683a4f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
@@ -0,0 +1,12 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "fgl";
+  version = "5.4.2.3"; # Haskell Platform 2010.2.0.0
+  sha256 = "e72142b555a5ab6c5cdced317b42e8cafdbb54b7e2e46ed14e6ca18d71d486b8";
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "Martin Erwig's Functional Graph Library";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
new file mode 100644
index 00000000000..95ee5e6beb3
--- /dev/null
+++ b/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
@@ -0,0 +1,22 @@
+{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl,
+ haskellSrc, html, network, parallel, regexBase, regexCompat, regexPosix,
+ stm, xhtml, zlib, cabalInstall, alex, happy, haddock, ghc}:
+
+cabal.mkDerivation (self : {
+  pname = "haskell-platform";
+  version = "2010.2.0.0";
+  src = fetchurl {
+    url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz";
+    sha256 = "b0f4e6827d653f68865f39679c7c4fd5c22030ef5d7d24df3270aa6db4b016d4";
+  };
+  propagatedBuildInputs = [
+    GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
+    haskellSrc html network parallel regexBase regexCompat regexPosix
+    stm xhtml zlib cabalInstall alex happy ghc haddock
+  ];
+  meta = {
+    description = "Haskell Platform meta package";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/haskell-src/default.nix b/pkgs/development/libraries/haskell/haskell-src/default.nix
index 365138b28a7..0cc7e888a20 100644
--- a/pkgs/development/libraries/haskell/haskell-src/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-src/default.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "haskell-src";
-  version = "1.0.1.3"; # Haskell Platform 2009.0.0
+  version = "1.0.1.3"; # Haskell Platform 2009.0.0 and 2010.1.0.0 and 2010.2.0.0
   sha256 = "a7872900acd2293775a6bdc6dc8f70438ccd80e62d2d1e2394ddff15b1883e89";
   extraBuildInputs = [happy];
   meta = {
diff --git a/pkgs/development/libraries/haskell/html/default.nix b/pkgs/development/libraries/haskell/html/default.nix
index 024985c8269..3540d397778 100644
--- a/pkgs/development/libraries/haskell/html/default.nix
+++ b/pkgs/development/libraries/haskell/html/default.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "html";
-  version = "1.0.1.2"; # Haskell Platform 2009.0.0
+  version = "1.0.1.2"; # Haskell Platform 2009.0.0 and 2010.1.0.0 and 2010.2.0.0
   sha256 = "0c35495ea33d65e69c69bc7441ec8e1af69fbb43433c2aa3406c0a13a3ab3061";
   meta = {
     description = "HTML combinator library";
diff --git a/pkgs/development/libraries/haskell/mtl/default.nix b/pkgs/development/libraries/haskell/mtl/default.nix
index 6c8b1cf960d..f06f92976b3 100644
--- a/pkgs/development/libraries/haskell/mtl/default.nix
+++ b/pkgs/development/libraries/haskell/mtl/default.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "mtl";
-  version = "1.1.0.2"; # Haskell Platform 2009.0.0 and 2010.1.0.0
+  version = "1.1.0.2"; # Haskell Platform 2009.0.0 and 2010.1.0.0 and 2010.2.0.0
   sha256 = "a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e4c135d2b31b8421a58d36";
   meta = {
     description = "Monad transformer library";
diff --git a/pkgs/development/libraries/haskell/network/2.2.1.7.nix b/pkgs/development/libraries/haskell/network/2.2.1.7.nix
index e04af7a932b..6c740b0ef05 100644
--- a/pkgs/development/libraries/haskell/network/2.2.1.7.nix
+++ b/pkgs/development/libraries/haskell/network/2.2.1.7.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "network";
-  version = "2.2.1.7"; # Haskell Platform 2010.1.0.0
+  version = "2.2.1.7"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
   sha256 = "0e65b28a60764245c1ab6661a3566f286feb36e0e6f0296d6cd2b84adcd45d58";
   propagatedBuildInputs = [parsec];
   meta = {
diff --git a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
index 38ec8247076..7cec49c9e53 100644
--- a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
+++ b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "parallel";
-  version = "2.2.0.1"; # Haskell Platform 2010.1.0.0
+  version = "2.2.0.1"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
   sha256 = "255310023138ecf618c8b450203fa2fc65feb68cd08ee4d369ceae72054168fd";
   propagatedBuildInputs = [deepseq];
   meta = {
diff --git a/pkgs/development/libraries/haskell/parsec/default.nix b/pkgs/development/libraries/haskell/parsec/default.nix
index b0dcf5ef0e4..8b8827bfa06 100644
--- a/pkgs/development/libraries/haskell/parsec/default.nix
+++ b/pkgs/development/libraries/haskell/parsec/default.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "parsec";
-  version = "2.1.0.1"; # Haskell Platform 2009.0.0 and 2010.1.0.0
+  version = "2.1.0.1"; # Haskell Platform 2009.0.0 and 2010.1.0.0 and 2010.2.0.0
   sha256 = "2d85e5b5c8b2b1f341037ce67e1db7fa47b31c083136796cfef9e5b945c656df";
   meta = {
     description = "Monadic parser combinators";
diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix
new file mode 100644
index 00000000000..3f9d23e9533
--- /dev/null
+++ b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix
@@ -0,0 +1,12 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "regex-base";
+  version = "0.93.2"; # Haskell Platform 2010.2.0.0
+  sha256 = "20dc5713a16f3d5e2e6d056b4beb9cfdc4368cd09fd56f47414c847705243278";
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "Replaces/Ehances Text.Regex";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
new file mode 100644
index 00000000000..749e6baaf73
--- /dev/null
+++ b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
@@ -0,0 +1,12 @@
+{cabal, regexBase, regexPosix}:
+
+cabal.mkDerivation (self : {
+  pname = "regex-compat";
+  version = "0.93.1"; # Haskell Platform 2010.2.0.0
+  sha256 = "ee0374f780378e8c04a63d9cbaca525e116dbe2bdce4cff3abaffc28d4e99afe";
+  propagatedBuildInputs = [regexBase regexPosix];
+  meta = {
+    description = "Replaces/Enhances Text.Regex";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
new file mode 100644
index 00000000000..871805c63f0
--- /dev/null
+++ b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
@@ -0,0 +1,12 @@
+{cabal, regexBase}:
+
+cabal.mkDerivation (self : {
+  pname = "regex-posix";
+  version = "0.94.2"; # Haskell Platform 2010.2.0.0
+  sha256 = "ea0c1ed0ab49ade4dba1eea7a42197652ccb18b7a98c4040e37ba11d26f33067";
+  propagatedBuildInputs = [regexBase];
+  meta = {
+    description = "Replaces/Enhances Text.Regex";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix
new file mode 100644
index 00000000000..976f0054a4a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix
@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "stm";
+  version = "2.1.2.1"; # Haskell Platform 2010.2.0.0
+  sha256 = "0d7d8babd2f07c726909030461e1f9b3aaf02dc809fd5e1c0509a67d23b784b8";
+  meta = {
+    description = "Software Transactional Memory";
+  };
+})  
+
diff --git a/pkgs/development/libraries/haskell/xhtml/default.nix b/pkgs/development/libraries/haskell/xhtml/default.nix
index c09ed444d3e..78dc8486a81 100644
--- a/pkgs/development/libraries/haskell/xhtml/default.nix
+++ b/pkgs/development/libraries/haskell/xhtml/default.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "xhtml";
-  version = "3000.2.0.1"; # Haskell Platform 2009.0.0 and 2010.1.0.0
+  version = "3000.2.0.1"; # Haskell Platform 2009.0.0 and 2010.1.0.0 and 2010.2.0.0
   sha256 = "60d7a44ae6d607475e2d60c5bf9909b8a3bd88850d52b08ff1532aa6d58bec96";
   meta = {
     description = "An XHTML combinator library";
diff --git a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix
index d97e18ccf23..80bf428c706 100644
--- a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix
+++ b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix
@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "zlib";
-  version = "0.5.2.0"; # Haskell Platform 2010.1.0.0
+  version = "0.5.2.0"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
   sha256 = "4119fb627e0adc2b129acd86fe5724cf05a49d8de5b64eb7a6e519d3befd3b8f";
   # TODO: find out exactly why propagated is needed here (to build other
   # packages depending on zlib):