* Added Leksah, an IDE for Haskell. It requires a newer version of

  gtksourceview than the one provided in gnome/default.nix.  The
  stdenv branch already has this.
* Updated gtk2hs to 0.10.1.

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

7 files changed, 77 insertions, 18 deletions

diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 6af4fd032d89..3b59476ac6c9 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -172,6 +172,21 @@ rec {
     input = desktop.gtksourceview;
   };
 
+  gtksourceview_24 = stdenv.mkDerivation {
+    name = "gtksourceview-2.4.2";
+
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/gnome/sources/gtksourceview/2.4/gtksourceview-2.4.2.tar.bz2;
+      sha256 = "1grc2y817c0xd225l0m92ja35x2bgld5npa4w3g21amkqhdnpka9";
+    };
+    
+    buildInputs = [
+      perl perlXMLParser pkgconfig gnomevfs libbonobo GConf
+      libgnomeprintui libgnomecanvas gettext intltool
+    ];
+    propagatedBuildInputs = [gtk libxml2 libgnomeprint];
+  };
+
   scrollkeeper = import ./scrollkeeper.nix {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser
             libxml2 libxslt docbook_xml_dtd_42;
diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix
index 081779fd3124..53aee9ca5b9e 100644
--- a/pkgs/development/libraries/haskell/binary/default.nix
+++ b/pkgs/development/libraries/haskell/binary/default.nix
@@ -2,10 +2,9 @@
 
 cabal.mkDerivation (self : {
   pname = "binary";
-  version = "0.4.1";
-  sha256 = "bb74824306843da25f6d97c271e2a06ee3a7e05fc529156fb81d7c576688e549";
+  version = "0.5.0.1";
+  sha256 = "1j5injgrwkjwl7lv6sqx4m033s3rrkspq690cb0ckfh267vsyig1";
   meta = {
     description = "Efficient, pure binary serialisation using lazy ByteStrings";
   };
 })  
-
diff --git a/pkgs/development/libraries/haskell/gtk2hs/default.nix b/pkgs/development/libraries/haskell/gtk2hs/default.nix
index e49f4d7113ec..3c10861d6244 100644
--- a/pkgs/development/libraries/haskell/gtk2hs/default.nix
+++ b/pkgs/development/libraries/haskell/gtk2hs/default.nix
@@ -1,20 +1,30 @@
-{stdenv, fetchurl, pkgconfig, ghc, gtk, cairo, GConf, libglade
-, glib, libgtkhtml, gtkhtml}:
+{ stdenv, fetchurl, pkgconfig, gnome, cairo
+, ghc, mtl
+}:
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   pname = "gtk2hs";
-  version = "0.9.12.1";
+  version = "0.10.0";
   fname = "${pname}-${version}";
-  name = "haskell-${fname}";
+  name = "haskell-${pname}-ghc${ghc.ghc.version}-${version}";
+  
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${fname}.tar.gz";
-    sha256 = "110z6v9gzhg6nzlz5gs8aafmipbva6rc50b8z1jgq0k2g25hfy22";
+    sha256 = "03ii8j13cphjpw23nnyp0idxqgd2r8m4f2jpb251g7vxrb56dw0v";
   };
 
-  buildInputs = [pkgconfig ghc gtk glib cairo GConf libglade libgtkhtml gtkhtml];
+  propagatedBuildInputs = [mtl];
 
-  configureFlags = [
-    "--enable-cairo"
+  buildInputs = [
+    pkgconfig cairo gnome.glib gnome.gtk gnome.libglade gnome.GConf
+    gnome.gtksourceview_24 gnome.librsvg
+    ghc
   ];
 
-})
+  postInstall =
+    ''
+      local confDir=$out/lib/ghc-pkgs/ghc-${ghc.ghc.version}
+      ensureDir $confDir
+      cp $out/lib/gtk2hs/*.conf $confDir/
+    ''; # */
+}
diff --git a/pkgs/development/libraries/haskell/regex-posix/default.nix b/pkgs/development/libraries/haskell/regex-posix/default.nix
index 07980b1a1e12..fbaf5938b046 100644
--- a/pkgs/development/libraries/haskell/regex-posix/default.nix
+++ b/pkgs/development/libraries/haskell/regex-posix/default.nix
@@ -4,7 +4,7 @@ cabal.mkDerivation (self : {
   pname = "regex-posix";
   version = "0.72.0.3"; # Haskell Platform 2009.0.0
   sha256 = "327ab87f3d4f5315a9414331eb382b8b997de8836d577c3f7d232c574606feb1";
-  extraBuildInputs = [regexBase];
+  propagatedBuildInputs = [regexBase];
   meta = {
     description = "Replaces/Enhances Text.Regex";
   };
diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix
new file mode 100644
index 000000000000..2f2fd5ac2c9a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/utf8-string/default.nix
@@ -0,0 +1,10 @@
+{cabal}:
+
+cabal.mkDerivation (self : {
+  pname = "utf8-string";
+  version = "0.3.4";
+  sha256 = "1gd5b5q5jw70mg0z8jjgqigc0wmvnc7fx2k3yfdsz20b9wsjfw7r";
+  meta = {
+    description = "A UTF8 layer for IO and Strings";
+  };
+})  
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8e266f4ba996..a949f8480dd7 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -53,8 +53,8 @@ rec {
   };
   
   gtk2hs = import ../development/libraries/haskell/gtk2hs {
-    inherit (pkgs) pkgconfig stdenv fetchurl cairo ghc;
-    inherit (pkgs.gnome) gtk glib GConf libglade libgtkhtml gtkhtml;
+    inherit ghc mtl;
+    inherit (pkgs) stdenv fetchurl pkgconfig gnome cairo;
   };
 
   haskellSrc = import ../development/libraries/haskell/haskell-src {
@@ -152,6 +152,10 @@ rec {
     inherit cabal;
   };
 
+  utf8_string = import ../development/libraries/haskell/utf8-string {
+    inherit cabal;
+  };
+
   uuagc = import ../development/tools/haskell/uuagc {
     inherit cabal uulib;
   };
@@ -236,6 +240,7 @@ rec {
     inherit (pkgs) perl;
   };
 
+  
   # Applications.
 
   darcs = import ../applications/version-management/darcs/darcs-2.nix {
@@ -243,6 +248,11 @@ rec {
     inherit (pkgs) zlib curl;
   };
 
+  leksah = import ../applications/editors/leksah {
+    inherit cabal gtk2hs binary parsec regexPosix utf8_string;
+    inherit (pkgs) libedit;
+  };
+  
   xmobar = import ../applications/misc/xmobar {
     inherit cabal;
     inherit (pkgs) X11;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index a2601c14ce06..78c02c778d43 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -121,8 +121,6 @@ in {
   gcc34 = linux;
   gcc43multi = ["x86_64-linux"];
   gdb = all;
-  ghc683 = ghcSupported;
-  ghc6102 = ghcSupported;
   ghostscript = linux;
   ghostscriptX = linux;
   gimp = linux;
@@ -329,6 +327,23 @@ in {
     gtk = linux;
   };
 
+  haskellPackages_ghc683 = {
+    ghc = ghcSupported;
+  };
+
+  haskellPackages_ghc6101 = {
+    ghc = ghcSupported;
+    leksah = ghcSupported;
+  };
+
+  haskellPackages_ghc6102 = {
+    darcs = ghcSupported;
+    ghc = ghcSupported;
+    gtk2hs = ghcSupported;
+    lhs2tex = ghcSupported;
+    xmonad = ghcSupported;
+  };
+
   kde3 = {
     kdebase = linux;
     kdelibs = linux;