Author: andres
Date: Sat Jul 17 13:23:48 2010
New Revision: 22620
URL: https://svn.nixos.org/websvn/nix/?rev=22620&sc=1
Log:
Preparing for the upcoming Haskell Platform release.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix
- copied, changed from r22619,
nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/regex-base/0.93.2.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/stm/2.1.2.1.nix
nixpkgs/trunk/pkgs/development/tools/parsing/alex/2.3.3.nix
nixpkgs/trunk/pkgs/development/tools/parsing/happy/happy-1.18.5.nix
nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.8.2.nix
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/deepseq/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/html/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/mtl/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/network/2.2.1.7.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/parsec/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/xhtml/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix
nixpkgs/trunk/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix Fri Jul
16 22:04:56 2010 (r22619)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix Sat Jul
17 13:23:48 2010 (r22620)
@@ -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 = {
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix Fri Jul
16 22:04:56 2010 (r22619)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix Sat Jul
17 13:23:48 2010 (r22620)
@@ -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 = {
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix Fri Jul
16 22:04:56 2010 (r22619)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix Sat Jul
17 13:23:48 2010 (r22620)
@@ -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";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix Fri Jul
16 22:04:56 2010 (r22619)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix Sat Jul
17 13:23:48 2010 (r22620)
@@ -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 = {
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/2.1.0.3.nix (from
r22619,
nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix)
==============================================================================
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix
==============================================================================
---
nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix
Fri Jul 16 22:04:56 2010 (r22619)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/QuickCheck/QuickCheck-2.nix
Sat Jul 17 13:23:48 2010 (r22620)
@@ -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";
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix Sat Jul
17 13:23:48 2010 (r22620)
@@ -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";
+ };
+})
+
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/deepseq/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/deepseq/default.nix
Fri Jul 16 22:04:56 2010 (r22619)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/deepseq/default.nix
Sat Jul 17 13:23:48 2010 (r22620)
@@ -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";
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix Sat Jul
17 13:23:48 2010 (r22620)
@@ -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";
+ };
+})
+
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/2010.2.0.0.nix
Sat Jul 17 13:23:48 2010 (r22620)
@@ -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];
+ };
+})
+
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src/default.nix
Fri Jul 16 22:04:56 2010 (r22619)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src/default.nix
Sat Jul 17 13:23:48 2010 (r22620)
@@ -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 = {
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/html/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/html/default.nix Fri Jul
16 22:04:56 2010 (r22619)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/html/default.nix Sat Jul
17 13:23:48 2010 (r22620)
@@ -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";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/mtl/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/mtl/default.nix Fri Jul
16 22:04:56 2010 (r22619)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/mtl/default.nix Sat Jul
17 13:23:48 2010 (r22620)
@@ -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";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/network/2.2.1.7.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/network/2.2.1.7.nix
Fri Jul 16 22:04:56 2010 (r22619)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/network/2.2.1.7.nix
Sat Jul 17 13:23:48 2010 (r22620)
@@ -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 = {
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
Fri Jul 16 22:04:56 2010 (r22619)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix
Sat Jul 17 13:23:48 2010 (r22620)
@@ -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 = {
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/parsec/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/parsec/default.nix Fri Jul
16 22:04:56 2010 (r22619)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/parsec/default.nix Sat Jul
17 13:23:48 2010 (r22620)
@@ -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";
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/regex-base/0.93.2.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/regex-base/0.93.2.nix
Sat Jul 17 13:23:48 2010 (r22620)
@@ -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";
+ };
+})
+
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix
Sat Jul 17 13:23:48 2010 (r22620)
@@ -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";
+ };
+})
+
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix
Sat Jul 17 13:23:48 2010 (r22620)
@@ -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";
+ };
+})
+
Added: nixpkgs/trunk/pkgs/development/libraries/haskell/stm/2.1.2.1.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/stm/2.1.2.1.nix Sat Jul
17 13:23:48 2010 (r22620)
@@ -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";
+ };
+})
+
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/xhtml/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/xhtml/default.nix Fri Jul
16 22:04:56 2010 (r22619)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/xhtml/default.nix Sat Jul
17 13:23:48 2010 (r22620)
@@ -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";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix Fri Jul
16 22:04:56 2010 (r22619)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix Sat Jul
17 13:23:48 2010 (r22620)
@@ -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):
Modified:
nixpkgs/trunk/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix
==============================================================================
---
nixpkgs/trunk/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix
Fri Jul 16 22:04:56 2010 (r22619)
+++
nixpkgs/trunk/pkgs/development/tools/documentation/haddock/haddock-2.7.2.nix
Sat Jul 17 13:23:48 2010 (r22620)
@@ -2,7 +2,7 @@
cabal.mkDerivation (self : {
pname = "haddock";
- version = "2.7.2"; # Haskell Platform 2010.1.0.0
+ version = "2.7.2"; # Haskell Platform 2010.1.0.0 and 2010.2.0.0
name = self.fname;
sha256 = "4eaaaf62785f0ba3d37ba356cfac4679faef91c0902d8cdbf42837cbe5daab82";
extraBuildInputs = [alex happy];
Added: nixpkgs/trunk/pkgs/development/tools/parsing/alex/2.3.3.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/tools/parsing/alex/2.3.3.nix Sat Jul 17
13:23:48 2010 (r22620)
@@ -0,0 +1,12 @@
+{cabal, perl}:
+
+cabal.mkDerivation (self : {
+ pname = "alex";
+ version = "2.3.3"; # Haskell Platform 2010.2.0.0
+ name = self.fname;
+ sha256 = "338fc492a1fddd6c528d0eb89857cadab211cb42680aeee1f9702bbfa7c5e1c8";
+ extraBuildInputs = [perl];
+ meta = {
+ description = "A lexical analyser generator for Haskell";
+ };
+})
Added: nixpkgs/trunk/pkgs/development/tools/parsing/happy/happy-1.18.5.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/tools/parsing/happy/happy-1.18.5.nix Sat Jul
17 13:23:48 2010 (r22620)
@@ -0,0 +1,13 @@
+{cabal, mtl, perl}:
+
+cabal.mkDerivation (self : {
+ pname = "happy";
+ version = "1.18.5"; # Haskell Platform 2010.2.0.0
+ name = self.fname;
+ sha256 = "91e1c29ac42bc5cabcac2c2e28e693fc59fbdf30636e5c52cb51b779a74d755e";
+ extraBuildInputs = [perl];
+ propagatedBuildInputs = [mtl];
+ meta = {
+ description = "Happy is a parser generator for Haskell";
+ };
+})
Added: nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.8.2.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/tools/package-management/cabal-install/0.8.2.nix Sat Jul
17 13:23:48 2010 (r22620)
@@ -0,0 +1,13 @@
+{cabal, HTTP, network, zlib} :
+
+cabal.mkDerivation (self : {
+ pname = "cabal-install";
+ name = self.fname;
+ version = "0.8.2"; # Haskell Platform 2010.2.0.0
+ sha256 = "8f896ab46ec6c578f620ce4150f7cd04a2088be793113b33cc570b13b6b86e0b";
+ extraBuildInputs = [HTTP network zlib];
+
+ meta = {
+ description = "The command-line interface for Cabal and Hackage";
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Fri Jul 16 22:04:56
2010 (r22619)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sat Jul 17 13:23:48
2010 (r22620)
@@ -78,6 +78,11 @@
network = network2217;
};
+ cgi3001173 = import ../development/libraries/haskell/cgi/3001.1.7.3.nix {
+ inherit cabal mtl parsec xhtml;
+ network = network2217;
+ };
+
cgi = import ../development/libraries/haskell/cgi {
inherit cabal mtl network parsec xhtml;
};
@@ -176,6 +181,10 @@
inherit cabal mtl;
};
+ fgl5423 = import ../development/libraries/haskell/fgl/5.4.2.3.nix {
+ inherit cabal mtl;
+ };
+
gdiff = import ../development/libraries/haskell/gdiff {
inherit cabal;
};
@@ -296,6 +305,11 @@
inherit cabal happy;
};
+ haskellSrcP = import ../development/libraries/haskell/haskell-src {
+ inherit cabal;
+ happy = happy1185;
+ };
+
haskellSrcExts = import ../development/libraries/haskell/haskell-src-exts {
inherit cabal cpphs happy;
};
@@ -304,17 +318,44 @@
inherit cabal haskellSrcExts;
};
+ /*
+ haskellPlatform2010200 = pkgs.lowPrio (import
../development/libraries/haskell/haskell-platform/2010.2.0.0.nix {
+ inherit cabal ghc
+ html xhtml;
+ haskellSrc = haskellSrcP;
+ fgl = fgl5423;
+ cabalInstall = cabalInstall082;
+ GLUT = GLUT2121;
+ OpenGL = OpenGL2230;
+ zlib = zlib0520;
+ alex = alex233;
+ cgi = cgi3001173;
+ QuickCheck = QuickCheck2;
+ HTTP = HTTP400009;
+ HUnit = HUnit1221;
+ network = network2217;
+ parallel = parallel2201;
+ regexBase = regexBase0932;
+ regexCompat = regexCompat0931;
+ regexPosix = regexPosix0942;
+ stm = stm2121;
+ haddock = haddock272P;
+ happy = happy1185;
+ inherit (pkgs) fetchurl;
+ });
+ */
+
haskellPlatform2010100 = pkgs.lowPrio (import
../development/libraries/haskell/haskell-platform/2010.1.0.0.nix {
inherit cabal ghc fgl
haskellSrc html
- stm xhtml happy;
+ stm xhtml;
cabalInstall = cabalInstall080;
GLUT = GLUT2121;
OpenGL = OpenGL2230;
zlib = zlib0520;
alex = alex232;
cgi = cgi3001172;
- QuickCheck = QuickCheck2;
+ QuickCheck = QuickCheck2103;
HTTP = HTTP400009;
HUnit = HUnit1221;
network = network2217;
@@ -323,6 +364,7 @@
regexCompat = regexCompat092;
regexPosix = regexPosix0941;
haddock = haddock272;
+ happy = happy1184;
inherit (pkgs) fetchurl;
});
@@ -595,6 +637,10 @@
inherit cabal;
};
+ QuickCheck2103 = import
../development/libraries/haskell/QuickCheck/2.1.0.3.nix {
+ inherit cabal mtl;
+ };
+
QuickCheck2 = import
../development/libraries/haskell/QuickCheck/QuickCheck-2.nix {
inherit cabal mtl;
};
@@ -618,6 +664,10 @@
inherit cabal mtl;
};
+ regexBase0932 = import
../development/libraries/haskell/regex-base/0.93.2.nix {
+ inherit cabal mtl;
+ };
+
regexBase = import ../development/libraries/haskell/regex-base {
inherit cabal mtl;
};
@@ -628,6 +678,12 @@
regexPosix = regexPosix0941;
};
+ regexCompat0931 = import
../development/libraries/haskell/regex-compat/0.93.1.nix {
+ inherit cabal;
+ regexBase = regexBase0932;
+ regexPosix = regexPosix0942;
+ };
+
regexCompat = import ../development/libraries/haskell/regex-compat {
inherit cabal regexBase regexPosix;
};
@@ -637,6 +693,11 @@
regexBase = regexBase0931;
};
+ regexPosix0942 = import
../development/libraries/haskell/regex-posix/0.94.2.nix {
+ inherit cabal;
+ regexBase = regexBase0932;
+ };
+
regexPosix = import ../development/libraries/haskell/regex-posix {
inherit cabal regexBase;
};
@@ -730,6 +791,10 @@
inherit cabal;
};
+ stm2121 = import ../development/libraries/haskell/stm/2.1.2.1.nix {
+ inherit cabal;
+ };
+
storableComplex = import ../development/libraries/haskell/storable-complex {
inherit cabal;
};
@@ -925,6 +990,11 @@
inherit (pkgs) perl;
};
+ alex233 = import ../development/tools/parsing/alex/2.3.3.nix {
+ inherit cabal;
+ inherit (pkgs) perl;
+ };
+
cpphs = import ../development/tools/misc/cpphs {
inherit cabal;
};
@@ -958,6 +1028,13 @@
ghcPaths = ghcPaths0106;
};
+ haddock272P = import
../development/tools/documentation/haddock/haddock-2.7.2.nix {
+ inherit cabal;
+ alex = alex233;
+ happy = happy1185;
+ ghcPaths = ghcPaths0106;
+ };
+
happy = happy1184;
happy117 = import ../development/tools/parsing/happy/happy-1.17.nix {
@@ -970,6 +1047,11 @@
inherit (pkgs) perl;
};
+ happy1185 = import ../development/tools/parsing/happy/happy-1.18.5.nix {
+ inherit cabal mtl;
+ inherit (pkgs) perl;
+ };
+
hlint = import ../development/tools/haskell/hlint {
inherit cabal haskellSrcExts mtl uniplate hscolour parallel;
};
@@ -1020,6 +1102,13 @@
# Tools.
+ cabalInstall082 = import ../tools/package-management/cabal-install/0.8.2.nix
{
+ inherit cabal;
+ HTTP = HTTP400009;
+ network = network2217;
+ zlib = zlib0520;
+ };
+
cabalInstall080 = import ../tools/package-management/cabal-install/0.8.0.nix
{
inherit cabal;
HTTP = HTTP400009;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
