From 107d41f96c26200edbec5b2234d80a052bdc9af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Wed, 3 Jun 2009 08:44:41 +0000
Subject: [PATCH] New Haskell Platform release.

svn path=/nixpkgs/trunk/; revision=15837
---
 .../libraries/haskell/haskell-platform/default.nix        | 8 ++++----
 pkgs/development/libraries/haskell/network/default.nix    | 4 ++--
 .../parsing/happy/{happy-1.18.2.nix => happy-1.18.4.nix}  | 4 ++--
 pkgs/top-level/all-packages.nix                           | 2 +-
 pkgs/top-level/haskell-packages.nix                       | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename pkgs/development/tools/parsing/happy/{happy-1.18.2.nix => happy-1.18.4.nix} (63%)

diff --git a/pkgs/development/libraries/haskell/haskell-platform/default.nix b/pkgs/development/libraries/haskell/haskell-platform/default.nix
index 89b3e386bf41..cacef59bf85b 100644
--- a/pkgs/development/libraries/haskell/haskell-platform/default.nix
+++ b/pkgs/development/libraries/haskell/haskell-platform/default.nix
@@ -1,16 +1,16 @@
-{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl,
+{cabal, fetchurl, GLUT, HTTP, HUnit, OpenGL, QuickCheck, cgi, fgl, editline,
  haskellSrc, html, parallel, regexBase, regexCompat, regexPosix,
  stm, time, xhtml, zlib, cabalInstall, alex, happy, haddock, ghc}:
 
 cabal.mkDerivation (self : {
   pname = "haskell-platform";
-  version = "2009.2.0";
+  version = "2009.2.0.1";
   src = fetchurl {
     url = "http://hackage.haskell.org/platform/${self.version}/cabal/${self.pname}-${self.version}.tar.gz";
-    sha256 = "d2b8cad09128ca6ea62ddf0f56dd7874603623aae243411a74d6d1c5be38d38b";
+    sha256 = "33a828ed6cd1e6cc32cfec3fd55e6ab4d8026bd7451bab65ec0873880c0f11c5";
   };
   propagatedBuildInputs = [
-    GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
+    GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline
     haskellSrc html parallel regexBase regexCompat regexPosix
     stm time xhtml zlib cabalInstall alex happy ghc
   ];
diff --git a/pkgs/development/libraries/haskell/network/default.nix b/pkgs/development/libraries/haskell/network/default.nix
index 16f4ce12d7a2..00752d057387 100644
--- a/pkgs/development/libraries/haskell/network/default.nix
+++ b/pkgs/development/libraries/haskell/network/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "network";
-  version = "2.2.1"; # Haskell Platform 2009.0.0
-  sha256 = "111e4963a0a979570993e79511a778b267ef58df35320d1ddda61a869259b63c";
+  version = "2.2.1.1"; # Haskell Platform 2009.2.0.1
+  sha256 = "2b1fb2a16ed740636871662f2e38dffd9b7c13c61e28d887a1c334da3867da9d";
   propagatedBuildInputs = [parsec];
   meta = {
     description = "Networking-related facilities";
diff --git a/pkgs/development/tools/parsing/happy/happy-1.18.2.nix b/pkgs/development/tools/parsing/happy/happy-1.18.4.nix
similarity index 63%
rename from pkgs/development/tools/parsing/happy/happy-1.18.2.nix
rename to pkgs/development/tools/parsing/happy/happy-1.18.4.nix
index 889630a5e9b1..a5cbfc6e21bb 100644
--- a/pkgs/development/tools/parsing/happy/happy-1.18.2.nix
+++ b/pkgs/development/tools/parsing/happy/happy-1.18.4.nix
@@ -2,9 +2,9 @@
 
 cabal.mkDerivation (self : {
   pname = "happy";
-  version = "1.18.2"; # Haskell Platform 2009.0.0
+  version = "1.18.4"; # Haskell Platform 2009.2.0.1
   name = self.fname;
-  sha256 = "7515922f3cfd32cd844a0abfefe0b4871f403f0d869b8644bf9cbfc0b67996ae";
+  sha256 = "909bec4541a92d3765e74756f752514d2d03ec7a5d3e74c18268a57fe7ffa832";
   extraBuildInputs = [perl];
   propagatedBuildInputs = [mtl];
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00188b4c6fd1..fb3ab0f20143 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1831,7 +1831,7 @@ let
     inherit fetchurl stdenv perl ncurses gmp libedit;
   });
 
-  haskellPackages = haskellPackages_ghc6102;
+  haskellPackages = haskellPackages_ghc6103;
 
   haskellPackages_ghc642 = import ./haskell-packages.nix {
     inherit pkgs;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6de076f7ec4d..48418f52ddb9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -104,7 +104,7 @@ rec {
   };
   
   haskellPlatform = import ../development/libraries/haskell/haskell-platform {
-    inherit cabal GLUT HTTP HUnit OpenGL QuickCheck cgi fgl
+    inherit cabal GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline
       haskellSrc html parallel regexBase regexCompat regexPosix
       stm time xhtml zlib cabalInstall alex happy haddock;
     ghc = ghcReal;
@@ -412,14 +412,14 @@ rec {
     inherit (pkgs) libedit;
   };
 
-  happy = happy1182;
+  happy = happy1184;
 
   happy117 = import ../development/tools/parsing/happy/happy-1.17.nix {
     inherit cabal;
     inherit (pkgs) perl;
   };
 
-  happy1182 = import ../development/tools/parsing/happy/happy-1.18.2.nix {
+  happy1184 = import ../development/tools/parsing/happy/happy-1.18.4.nix {
     inherit cabal mtl;
     inherit (pkgs) perl;
   };