From 8c6bef0bb06e62a8dc791bc7dc349c902d2ce5a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 20 Jul 2009 13:02:56 +0000
Subject: [PATCH] Version bump to ghc-6.10.4.

svn path=/nixpkgs/trunk/; revision=16430
---
 pkgs/development/compilers/ghc/6.10.4.nix | 27 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           | 18 ++++++++++-----
 2 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/compilers/ghc/6.10.4.nix

diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix
new file mode 100644
index 000000000000..71643a88f0df
--- /dev/null
+++ b/pkgs/development/compilers/ghc/6.10.4.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, libedit, ghc, perl, gmp, ncurses}:
+
+stdenv.mkDerivation rec {
+  version = "6.10.4";
+  
+  name = "ghc-${version}";
+  
+  homepage = "http://haskell.org/ghc";
+
+  src = fetchurl {
+    url = "${homepage}/dist/${version}/${name}-src.tar.bz2";
+    sha256 = "d66a8e52572f4ff819fe5c4e34c6dd1e84a7763e25c3fadcc222453c0bd8534d";
+  };
+
+  buildInputs = [ghc libedit perl gmp];
+
+  configureFlags=[
+    "--with-gmp-libraries=${gmp}/lib"
+    "--with-gmp-includes=${gmp}/include"
+    "--with-gcc=${stdenv.gcc}/bin/gcc"
+  ];
+
+  meta = {
+    inherit homepage;
+    description = "The Glasgow Haskell Compiler";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 03b98ef5a53c..13f0e8ca3d01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1755,7 +1755,7 @@ let
     inherit fetchurl stdenv perl ncurses gmp libedit;
   });
 
-  haskellPackages = haskellPackages_ghc6103;
+  haskellPackages = haskellPackages_ghc6104;
 
   haskellPackages_ghc642 = import ./haskell-packages.nix {
     inherit pkgs;
@@ -1796,21 +1796,21 @@ let
     };
   });
 
-  haskellPackages_ghc6101 = recurseIntoAttrs (import ./haskell-packages.nix {
+  haskellPackages_ghc6101 = import ./haskell-packages.nix {
     inherit pkgs;
     ghc = import ../development/compilers/ghc/6.10.1.nix {
       inherit fetchurl stdenv perl ncurses gmp libedit;
       ghc = ghc6101Binary;
     };
-  });
+  };
 
-  haskellPackages_ghc6102 = recurseIntoAttrs (import ./haskell-packages.nix {
+  haskellPackages_ghc6102 = import ./haskell-packages.nix {
     inherit pkgs;
     ghc = import ../development/compilers/ghc/6.10.2.nix {
       inherit fetchurl stdenv perl ncurses gmp libedit;
       ghc = ghc6101Binary;
     };
-  });
+  };
 
   haskellPackages_ghc6103 = recurseIntoAttrs (import ./haskell-packages.nix {
     inherit pkgs;
@@ -1820,6 +1820,14 @@ let
     };
   });
 
+  haskellPackages_ghc6104 = recurseIntoAttrs (import ./haskell-packages.nix {
+    inherit pkgs;
+    ghc = import ../development/compilers/ghc/6.10.4.nix {
+      inherit fetchurl stdenv perl ncurses gmp libedit;
+      ghc = ghc6101Binary;
+    };
+  });
+
   falcon = builderDefsPackage (import ../development/interpreters/falcon) {
     inherit cmake;
   };