* Added GHC 6.10.2.

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

pkgs/development/compilers/ghc/6.10.2.nix

@@ -0,0 +1,28 @@
+{stdenv, fetchurl, libedit, ghc, perl, gmp, ncurses}:
+
+stdenv.mkDerivation rec {
+  version = "6.10.2";
+  
+  name = "ghc-${version}";
+  
+  homepage = "http://haskell.org/ghc";
+
+  src = fetchurl {
+    url = "${homepage}/dist/${version}/${name}-src.tar.bz2";
+    sha256 = "0q3wgp8svfl54kpyp55a1kh63cni5vzz811hqjsps84jdg0lg56m";
+  };
+
+  buildInputs = [ghc libedit perl gmp];
+
+  configureFlags=[
+    "--with-gmp-libraries=${gmp}/lib"
+    "--with-gmp-includes=${gmp}/include"
+    #"--with-readline-libraries=${readline}/lib"
+    "--with-gcc=${stdenv.gcc}/bin/gcc"
+  ];
+
+  meta = {
+    inherit homepage;
+    description = "The Glasgow Haskell Compiler";
+  };
+}

pkgs/development/compilers/ghc/6.8.3.nix

@@ -1,6 +1,6 @@
 {stdenv, fetchurl, readline, ghc, perl, m4, gmp, ncurses, haddock}:
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "ghc-6.8.3";
   homepage = "http://www.haskell.org/ghc";
 
@@ -32,6 +32,4 @@ stdenv.mkDerivation (rec {
     # build haddock docs
     echo "HADDOCK_DOCS = YES" >> mk/build.mk
   '';
-
+}
-  installTargets = ["install" "install-docs"];
-})

pkgs/top-level/all-packages.nix

@@ -1867,7 +1867,12 @@ let
     perl = perl58;
   });
 
-  ghc6103Binary = lowPrio (import ../development/compilers/ghc/6.10.2-binary.nix {
+  ghc6102 = import ../development/compilers/ghc/6.10.2.nix {
+    inherit fetchurl stdenv perl ncurses gmp libedit;
+    ghc = ghc6102Binary;
+  };
+
+  ghc6102Binary = lowPrio (import ../development/compilers/ghc/6.10.2-binary.nix {
     inherit fetchurl stdenv perl ncurses gmp libedit;
   });