Haskell Platform 2010.1.0.0

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

pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix

@@ -0,0 +1,12 @@
+{cabal, OpenGL, glut, libSM, libICE, libXmu, libXi, mesa}:
+
+cabal.mkDerivation (self : {
+  pname = "GLUT";
+  version = "2.1.2.1"; # Haskell Platform 2010.1.0.0
+  sha256 = "0230bfacbfb85c126f1fba45fcd8d02f20da9ee19180b5ada698224362d17264";
+  propagatedBuildInputs = [OpenGL glut libSM libICE libXmu libXi mesa];
+  meta = {
+    description = "A binding for the OpenGL Utility Toolkit";
+  };
+})  
+

pkgs/development/libraries/haskell/HTTP/4000.0.9.nix

@@ -0,0 +1,12 @@
+{cabal, mtl, network, parsec}:
+
+cabal.mkDerivation (self : {
+  pname = "HTTP";
+  version = "4000.0.9"; # Haskell Platform 2010.1.0.0
+  sha256 = "1e2b4a8b782ad1417c8755bb0d248851bc142b351366ed460e07f2945a5e95ba";
+  propagatedBuildInputs = [mtl network parsec];
+  meta = {
+    description = "a Haskell library for client-side HTTP";
+  };
+})
+

pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix

@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "HUnit";
+  version = "1.2.2.1"; # Haskell Platform 2010.1.0.0
+  sha256 = "47235503b666658588181795540d29212283059b21edc42e1b4f1998e46ac853";
+  meta = {
+    description = "A unit testing framework for Haskell";
+  };
+})  
+

pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix

@@ -0,0 +1,12 @@
+{cabal, mesa, libX11}:
+
+cabal.mkDerivation (self : {
+  pname = "OpenGL";
+  version = "2.2.3.0"; # Haskell Platform 2010.1.0.0
+  sha256 = "a75c3277bb20fda9a4ac1eb0e838fe4b5baf92f5539466b92bd255626afb0502";
+  propagatedBuildInputs = [mesa libX11];
+  meta = {
+    description = "A binding for the OpenGL graphics system";
+  };
+})  
+

pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "QuickCheck";
-  version = "2.1.0.2";
-  sha256 = "1adeea5aa52cba7b8bcd27f9cdd9fe944e9a4a22d22fdf0570b526f580981e58";
+  version = "2.1.0.3"; # Haskell Platform 2010.1.0.0
+  sha256 = "91a861233fe0a37a032d092dd5e8ec40c2c99fbbf0701081394eb244f23757b1";
   propagatedBuildInputs = [mtl];
   meta = {
     description = "Automatic testing of Haskell programs";

pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix

@@ -0,0 +1,12 @@
+{cabal, mtl, network, parsec, xhtml}:
+
+cabal.mkDerivation (self : {
+  pname = "cgi";
+  version = "3001.1.7.2"; # Haskell Platform 2010.1.0.0
+  sha256 = "ad35971388fa1809a5cd71bb2f051d69d753e4153b43d843b431674cf79a1c39";
+  propagatedBuildInputs = [mtl network parsec xhtml];
+  meta = {
+    description = "A library for writing CGI programs";
+  };
+})  
+

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

@@ -0,0 +1,11 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "deepseq";
+  version = "1.1.0.0"; # Haskell Platform 2010.1.0.0
+  sha256 = "947c45e7ee862159f190fb8e905c1328f7672cb9e6bf3abd1d207bbcf1eee50a";
+  meta = {
+    description = "Provides a deep version of seq, for fully evaluating data structures";
+  };
+})
+

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

@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "fgl";
-  version = "5.4.2.2";
+  version = "5.4.2.2"; # Haskell Platform 2010.1.0.0
   sha256 = "8232c337f0792854bf2a12a5fd1bc46726fff05d2f599053286ff873364cd7d2";
   propagatedBuildInputs = [mtl];
   meta = {

pkgs/development/libraries/haskell/ghc-paths/0.1.0.6.nix

@@ -0,0 +1,11 @@
+{ cabal } :
+
+cabal.mkDerivation (self : {
+  pname = "ghc-paths";
+  version = "0.1.0.6";
+  sha256 = "95d8c0e6ce2f182d792e910149b3c81c381b7d2c2052ffc6d96128b071c55243";
+  meta = {
+    description = "Knowledge of GHC's installations directories";
+  };
+})  
+

pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix

@@ -0,0 +1,21 @@
+{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.1.0.0";
+  src = fetchurl {
+    url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz";
+    sha256 = "64c9fec5cdc4b6f515b7f296d59984d2dee05927b7e24ea67324ad5f4ac3e994";
+  };
+  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";
+  };
+})  
+

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
+  version = "1.1.0.2"; # Haskell Platform 2009.0.0 and 2010.1.0.0
   sha256 = "a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e4c135d2b31b8421a58d36";
   meta = {
     description = "Monad transformer library";

pkgs/development/libraries/haskell/network/2.2.1.7.nix

@@ -0,0 +1,12 @@
+{cabal, parsec}:
+
+cabal.mkDerivation (self : {
+  pname = "network";
+  version = "2.2.1.7"; # Haskell Platform 2010.1.0.0
+  sha256 = "0e65b28a60764245c1ab6661a3566f286feb36e0e6f0296d6cd2b84adcd45d58";
+  propagatedBuildInputs = [parsec];
+  meta = {
+    description = "Networking-related facilities";
+  };
+})  
+

pkgs/development/libraries/haskell/parallel/2.2.0.1.nix

@@ -0,0 +1,12 @@
+{cabal, deepseq}:
+
+cabal.mkDerivation (self : {
+  pname = "parallel";
+  version = "2.2.0.1"; # Haskell Platform 2010.1.0.0
+  sha256 = "255310023138ecf618c8b450203fa2fc65feb68cd08ee4d369ceae72054168fd";
+  propagatedBuildInputs = [deepseq];
+  meta = {
+    description = "parallel programming library";
+  };
+})  
+

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
+  version = "2.1.0.1"; # Haskell Platform 2009.0.0 and 2010.1.0.0
   sha256 = "2d85e5b5c8b2b1f341037ce67e1db7fa47b31c083136796cfef9e5b945c656df";
   meta = {
     description = "Monadic parser combinators";

pkgs/development/libraries/haskell/regex-base/0.93.1.nix

@@ -0,0 +1,12 @@
+{cabal, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "regex-base";
+  version = "0.93.1"; # Haskell Platform 2010.1.0.0
+  sha256 = "24a0e76ab308517a53d2525e18744d9058835626ed4005599ecd8dd4e07f3bef";
+  propagatedBuildInputs = [mtl];
+  meta = {
+    description = "Replaces/Ehances Text.Regex";
+  };
+})  
+

pkgs/development/libraries/haskell/regex-compat/0.92.nix

@@ -0,0 +1,12 @@
+{cabal, regexBase, regexPosix}:
+
+cabal.mkDerivation (self : {
+  pname = "regex-compat";
+  version = "0.92"; # Haskell Platform 2010.1.0.0
+  sha256 = "430d251bd704071fca1e38c9b250543f00d4e370382ed552ac3d7407d4f27936";
+  propagatedBuildInputs = [regexBase regexPosix];
+  meta = {
+    description = "Replaces/Enhances Text.Regex";
+  };
+})  
+

pkgs/development/libraries/haskell/regex-posix/0.94.1.nix

@@ -0,0 +1,12 @@
+{cabal, regexBase}:
+
+cabal.mkDerivation (self : {
+  pname = "regex-posix";
+  version = "0.94.1"; # Haskell Platform 2010.1.0.0
+  sha256 = "63e76de0610d35f1b576ae65a25a38e04e758ed64b9b3512de95bdffd649485c";
+  propagatedBuildInputs = [regexBase];
+  meta = {
+    description = "Replaces/Enhances Text.Regex";
+  };
+})  
+

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

@@ -2,7 +2,7 @@
 
 cabal.mkDerivation (self : {
   pname = "stm";
-  version = "2.1.1.2"; # Haskell Platform 2009.0.0
+  version = "2.1.1.2"; # Haskell Platform 2009.0.0 and 2010.1.0.0
   sha256 = "68d550067ae180373142c51f3fa14bdf0a1516310aee9a37e28f9ac7cf3b8c6d";
   meta = {
     description = "Software Transactional Memory";

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
+  version = "3000.2.0.1"; # Haskell Platform 2009.0.0 and 2010.1.0.0
   sha256 = "60d7a44ae6d607475e2d60c5bf9909b8a3bd88850d52b08ff1532aa6d58bec96";
   meta = {
     description = "An XHTML combinator library";

pkgs/development/libraries/haskell/zlib/0.5.2.0.nix

@@ -0,0 +1,13 @@
+{cabal, zlib}:
+
+cabal.mkDerivation (self : {
+  pname = "zlib";
+  version = "0.5.2.0"; # Haskell Platform 2010.1.0.0
+  sha256 = "4119fb627e0adc2b129acd86fe5724cf05a49d8de5b64eb7a6e519d3befd3b8f";
+  # TODO: find out exactly why propagated is needed here (to build other
+  # packages depending on zlib):
+  propagatedBuildInputs = [zlib];
+  meta = {
+    description = "Compression and decompression in the gzip and zlib formats";
+  };
+})

pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix

@@ -0,0 +1,13 @@
+{cabal, ghcPaths, alex, happy}:
+
+cabal.mkDerivation (self : {
+  pname = "haddock";
+  version = "2.7.2"; # Haskell Platform 2010.1.0.0
+  name = self.fname;
+  sha256 = "4eaaaf62785f0ba3d37ba356cfac4679faef91c0902d8cdbf42837cbe5daab82";
+  extraBuildInputs = [alex happy];
+  propagatedBuildInputs = [ghcPaths];
+  meta = {
+    description = "a tool for automatically generating documentation from annotated Haskell source code";
+  };
+})

pkgs/development/tools/parsing/alex/2.3.2.nix

@@ -0,0 +1,12 @@
+{cabal, perl}:
+
+cabal.mkDerivation (self : {
+  pname = "alex";
+  version = "2.3.2"; # Haskell Platform 2010.1.0.0
+  name = self.fname;
+  sha256 = "6715a4c27b15a74d8f31cbb6a7d654b9cb6766d74980c75b65dee7c627049f43";
+  extraBuildInputs = [perl];
+  meta = {
+    description = "A lexical analyser generator for Haskell";
+  };
+})

pkgs/tools/package-management/cabal-install/0.8.0.nix

@@ -0,0 +1,13 @@
+{cabal, HTTP, network, zlib} :
+
+cabal.mkDerivation (self : {
+  pname = "cabal-install";
+  name = self.fname;
+  version = "0.8.0"; # Haskell Platform 2010.1.0.0
+  sha256 = "6d16618ff454f8d732cad64a53b767b5b6bb95ba4970b260a40e8f467035493c";
+  extraBuildInputs = [HTTP network zlib];
+
+  meta = {
+    description = "The command-line interface for Cabal and Hackage";
+  };
+})

pkgs/top-level/haskell-packages.nix

@@ -57,6 +57,11 @@ rec {
     inherit cabal bytestring network;
   };
 
+  cgi3001172 = import ../development/libraries/haskell/cgi/3001.1.7.2.nix {
+    inherit cabal mtl parsec xhtml;
+    network = network2217;
+  };
+
   cgi = import ../development/libraries/haskell/cgi {
     inherit cabal mtl network parsec xhtml;
   };
@@ -97,6 +102,10 @@ rec {
     inherit cabal QuickCheck time;
   };
 
+  deepseq = import ../development/libraries/haskell/deepseq {
+    inherit cabal;
+  };
+
   Diff = import ../development/libraries/haskell/Diff {
     inherit cabal;
   };
@@ -144,6 +153,10 @@ rec {
     inherit cabal pcreLight colorizeHaskell;
   };
 
+  ghcPaths0106 = import ../development/libraries/haskell/ghc-paths/0.1.0.6.nix {
+    inherit cabal;
+  };
+
   ghcPaths = import ../development/libraries/haskell/ghc-paths {
     inherit cabal;
   };
@@ -159,6 +172,14 @@ rec {
       utf8String xhtml zlib;
   };
 
+  GLUT2121 = import ../development/libraries/haskell/GLUT/2.1.2.1.nix {
+    inherit cabal;
+    OpenGL = OpenGL2230;
+    glut = pkgs.freeglut;
+    inherit (pkgs) mesa;
+    inherit (pkgs.xlibs) libSM libICE libXmu libXi;
+  };
+  
   GLUT = import ../development/libraries/haskell/GLUT {
     inherit cabal OpenGL;
     glut = pkgs.freeglut;
@@ -219,14 +240,40 @@ rec {
     inherit cabal haskellSrcExts;
   };
   
+  haskellPlatform2010100 = import ../development/libraries/haskell/haskell-platform/2010.1.0.0.nix {
+    inherit cabal ghc fgl
+      haskellSrc html
+      stm xhtml happy;
+    cabalInstall = cabalInstall080;
+    GLUT = GLUT2121;
+    OpenGL = OpenGL2230;
+    zlib = zlib0520;
+    alex = alex232;
+    cgi = cgi3001172;
+    QuickCheck = QuickCheck2;
+    HTTP = HTTP400009;
+    HUnit = HUnit1221;
+    network = network2217;
+    parallel = parallel2201;
+    regexBase = regexBase0931;
+    regexCompat = regexCompat092;
+    regexPosix = regexPosix0941;
+    haddock = haddock272;
+    inherit (pkgs) fetchurl;
+  };
+
   haskellPlatform = import ../development/libraries/haskell/haskell-platform {
-    inherit cabal GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline
+    inherit cabal ghc GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline
       haskellSrc html parallel regexBase regexCompat regexPosix
       stm time xhtml zlib cabalInstall alex happy haddock;
-    ghc = ghcReal;
     inherit (pkgs) fetchurl;
   };
 
+  HTTP400009 = import ../development/libraries/haskell/HTTP/4000.0.9.nix {
+    inherit cabal mtl parsec;
+    network = network2217;
+  };
+
   HTTP = import ../development/libraries/haskell/HTTP {
     inherit cabal mtl network parsec;
   };
@@ -301,6 +348,10 @@ rec {
     inherit cabal network;
   };
 
+  HUnit1221 = import ../development/libraries/haskell/HUnit/1.2.2.1.nix {
+    inherit cabal;
+  };
+
   HUnit = import ../development/libraries/haskell/HUnit {
     inherit cabal;
   };
@@ -349,6 +400,10 @@ rec {
     inherit cabal syb;
   };
 
+  network2217 = import ../development/libraries/haskell/network/2.2.1.7.nix {
+    inherit cabal parsec;
+  };
+
   network = import ../development/libraries/haskell/network {
     inherit cabal parsec;
   };
@@ -366,6 +421,12 @@ rec {
     inherit (pkgs) openal;
   };
 
+  OpenGL2230 = import ../development/libraries/haskell/OpenGL/2.2.3.0.nix {
+    inherit cabal;
+    inherit (pkgs) mesa;
+    inherit (pkgs.xlibs) libX11;
+  };
+
   OpenGL = import ../development/libraries/haskell/OpenGL {
     inherit cabal;
     inherit (pkgs) mesa;
@@ -376,6 +437,10 @@ rec {
     inherit cabal mtl network parsec utf8String xhtml zipArchive;
   };
 
+  parallel2201 = import ../development/libraries/haskell/parallel/2.2.0.1.nix {
+    inherit cabal deepseq;
+  };
+
   parallel = import ../development/libraries/haskell/parallel {
     inherit cabal;
   };
@@ -424,14 +489,29 @@ rec {
     inherit cabal HTTP network xhtml;
   };
 
+  regexBase0931 = import ../development/libraries/haskell/regex-base/0.93.1.nix {
+    inherit cabal mtl;
+  };
+
   regexBase = import ../development/libraries/haskell/regex-base {
     inherit cabal mtl;
   };
 
+  regexCompat092 = import ../development/libraries/haskell/regex-compat/0.92.nix {
+    inherit cabal;
+    regexBase = regexBase0931;
+    regexPosix = regexPosix0941;
+  };
+
   regexCompat = import ../development/libraries/haskell/regex-compat {
     inherit cabal regexBase regexPosix;
   };
 
+  regexPosix0941 = import ../development/libraries/haskell/regex-posix/0.94.1.nix {
+    inherit cabal;
+    regexBase = regexBase0931;
+  };
+
   regexPosix = import ../development/libraries/haskell/regex-posix {
     inherit cabal regexBase;
   };
@@ -631,6 +711,10 @@ rec {
     inherit (pkgs) zlib;
   };
 
+  zlib0520 = import ../development/libraries/haskell/zlib/0.5.2.0.nix {
+    inherit cabal;
+    inherit (pkgs) zlib;
+  };
 
   # Compilers.
 
@@ -657,6 +741,11 @@ rec {
     inherit (pkgs) perl;
   };
 
+  alex232 = import ../development/tools/parsing/alex/2.3.2.nix {
+    inherit cabal;
+    inherit (pkgs) perl;
+  };
+
   cpphs = import ../development/tools/misc/cpphs {
     inherit cabal;
   };
@@ -683,6 +772,13 @@ rec {
     inherit (pkgs) libedit;
   };
 
+  haddock272 = import ../development/tools/documentation/haddock/haddock-2.7.2.nix {
+    inherit cabal;
+    alex = alex232;
+    happy = happy1184;
+    ghcPaths = ghcPaths0106;
+  };
+
   happy = happy1184;
 
   happy117 = import ../development/tools/parsing/happy/happy-1.17.nix {
@@ -743,6 +839,13 @@ rec {
 
   # Tools.
 
+  cabalInstall080 = import ../tools/package-management/cabal-install/0.8.0.nix {
+    inherit cabal;
+    HTTP = HTTP400009;
+    network = network2217;
+    zlib = zlib0520;
+  };
+
   cabalInstall = import ../tools/package-management/cabal-install {
     inherit cabal HTTP network zlib;
   };