From ce5ccbb0ea424aa063a5de7e416273ebececf27d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Mon, 8 Aug 2011 07:41:45 +0000
Subject: [PATCH] Updating leksah.

svn path=/nixpkgs/trunk/; revision=28376
---
 pkgs/applications/editors/leksah/default.nix  | 37 ++++++++-----------
 .../desktop/gtksourceview/default.nix         |  6 +--
 .../libraries/haskell/strict/default.nix      | 14 +++++++
 pkgs/top-level/haskell-packages.nix           |  6 +--
 4 files changed, 36 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/strict/default.nix

diff --git a/pkgs/applications/editors/leksah/default.nix b/pkgs/applications/editors/leksah/default.nix
index dfed15096190..5597b3229602 100644
--- a/pkgs/applications/editors/leksah/default.nix
+++ b/pkgs/applications/editors/leksah/default.nix
@@ -1,27 +1,22 @@
-{cabal, gtk, glib, binary, binaryShared, deepseq, hslogger, ltk, network, parsec,
- leksahServer, processLeksah, regexBase, regexTDFA, utf8String, gtksourceview2,
- makeWrapper}:
+{cabal, binary, binaryShared, deepseq, glib, gtk,
+ gtksourceview2, hslogger, leksahServer, ltk, mtl, network,
+ parsec, processLeksah, regexBase, regexTDFA, strict, utf8String} :
 
 cabal.mkDerivation (self : {
   pname = "leksah";
-  version = "0.8.0.8";
-  sha256 = "1d6n5dlnqlqfckg9f611qf9lvi6b7ghrkk1l0myh6h667fxh8a1r";
-
-  propagatedBuildInputs =
-    [gtk glib binary binaryShared deepseq hslogger ltk network parsec
-     leksahServer processLeksah regexBase regexTDFA utf8String gtksourceview2];
-  extraBuildInputs = [makeWrapper];
-
-  # postInstall =
-  #   ''
-  #     wrapProgram $out/bin/leksah --prefix XDG_DATA_DIRS : ${gtk2hs.gtksourceview}/share
-  #   '';
-  
+  version = "0.10.0.4";
+  sha256 = "1g12w1kl63fxzz1c2x237yrqkaja9awiqyyipkdms5iql0ini7bw";
+  propagatedBuildInputs = [
+    binary binaryShared deepseq glib gtk gtksourceview2 hslogger
+    leksahServer ltk mtl network parsec processLeksah regexBase
+    regexTDFA strict utf8String
+  ];
+  noHaddock = true;
   meta = {
-    homepage = http://leksah.org/;
-    description = "An Integrated Development Environment for Haskell written in Haskell";
+    homepage = "http://www.leksah.org";
+    description = "Haskell IDE written in Haskell";
     license = "GPL";
-    maintainers = [self.stdenv.lib.maintainers.andres];
+    platforms = self.stdenv.lib.platforms.haskellPlatforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
-})  
-
+})
diff --git a/pkgs/desktops/gnome-2.28/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2.28/desktop/gtksourceview/default.nix
index a19c8e5fcd0d..64dbd8e1a6f3 100644
--- a/pkgs/desktops/gnome-2.28/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2.28/desktop/gtksourceview/default.nix
@@ -2,10 +2,10 @@
   libxml2, perl, intltool, gettext}:
 
 stdenv.mkDerivation {
-  name = "gtksourceview-2.8.1";
+  name = "gtksourceview-2.9.9";
   src = fetchurl {
-    url = mirror://gnome/sources/gtksourceview/2.8/gtksourceview-2.8.1.tar.bz2;
-    sha256 = "02irdw8sz374d3k51sx21hm7vmpkcwrhmnpp3v6afa2jcwi84zp6";
+    url = mirror://gnome/sources/gtksourceview/2.9/gtksourceview-2.9.9.tar.bz2;
+    sha256 = "0d0i586nj8jsqqfcjcvaj0yzc3sid3s1a4y62xr0qbddkbn1wllj";
   };
   buildInputs = [pkgconfig atk cairo glib gtk pango libxml2 perl intltool
     gettext];
diff --git a/pkgs/development/libraries/haskell/strict/default.nix b/pkgs/development/libraries/haskell/strict/default.nix
new file mode 100644
index 000000000000..ad8ff7b6739a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/strict/default.nix
@@ -0,0 +1,14 @@
+{cabal} :
+
+cabal.mkDerivation (self : {
+  pname = "strict";
+  version = "0.3.2";
+  sha256 = "08cjajqz9h47fkq98mlf3rc8n5ghbmnmgn8pfsl3bdldjdkmmlrc";
+  meta = {
+    homepage = "http://www.cse.unsw.edu.au/~rl/code/strict.html";
+    description = "Strict data types and String IO.";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.stdenv.lib.platforms.haskellPlatforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 131fba75d054..1ea4f6d78f07 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1045,6 +1045,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   streamproc = callPackage ../development/libraries/haskell/streamproc {};
 
+  strict = callPackage ../development/libraries/haskell/strict {};
+
   # TODO: investigate status of syb in older platform versions
   syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {};
   syb_0_3   = callPackage ../development/libraries/haskell/syb/0.3.nix {};
@@ -1369,9 +1371,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     parsec = self.parsec2;
   };
 
-  leksah = callPackage ../applications/editors/leksah {
-    inherit (pkgs) makeWrapper;
-  };
+  leksah = callPackage ../applications/editors/leksah {};
 
   xmobar = callPackage ../applications/misc/xmobar {};