* 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

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";
   };
 })  
-

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/
+    ''; # */
+}

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";
   };

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";
+  };
+})