From 657572abc8b6b36b1de9c0906f3e7f7c1e8cbec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 5 Oct 2010 17:30:17 +0000
Subject: [PATCH] Added new (modular) gtk2hs and threadscope.

svn path=/nixpkgs/trunk/; revision=24086
---
 .../libraries/haskell/cairo/default.nix       |  4 ++--
 .../libraries/haskell/ghc-events/default.nix  | 13 +++++++++++
 .../libraries/haskell/glade/default.nix       | 14 ++++++++++++
 .../libraries/haskell/glib/default.nix        | 13 +++++++++++
 .../libraries/haskell/gtk/default.nix         | 14 ++++++++++++
 .../haskell/gtk2hs-buildtools/default.nix     |  4 ++--
 .../libraries/haskell/pango/default.nix       | 14 ++++++++++++
 .../tools/haskell/threadscope/default.nix     | 14 ++++++++++++
 pkgs/top-level/haskell-packages.nix           | 22 +++++++++++++++++++
 9 files changed, 108 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/haskell/ghc-events/default.nix
 create mode 100644 pkgs/development/libraries/haskell/glade/default.nix
 create mode 100644 pkgs/development/libraries/haskell/glib/default.nix
 create mode 100644 pkgs/development/libraries/haskell/gtk/default.nix
 create mode 100644 pkgs/development/libraries/haskell/pango/default.nix
 create mode 100644 pkgs/development/tools/haskell/threadscope/default.nix

diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix
index df4cdf5b4649..98fc62c05680 100644
--- a/pkgs/development/libraries/haskell/cairo/default.nix
+++ b/pkgs/development/libraries/haskell/cairo/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "cairo";
-  version = "0.11.0";
-  sha256 = "f7971180bbd40c2a19b2e97fe40bd4a296b3aaf3edcf6621009780d723405c5a";
+  version = "0.11.1";
+  sha256 = "6d7209bcdb92b09437980c51646c324f501edd2893393e48aa185462dfc07b58";
   extraBuildInputs = [pkgconfig glibc cairo zlib gtk2hsBuildtools];
   propagatedBuildInputs = [mtl];
   meta = {
diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix
new file mode 100644
index 000000000000..b9d3ee4d13e8
--- /dev/null
+++ b/pkgs/development/libraries/haskell/ghc-events/default.nix
@@ -0,0 +1,13 @@
+{cabal, binary, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "ghc-events";
+  version = "0.2.0.1";
+  sha256 = "18cb82ebe143f58a25bf32ee88118a8bfb333b67a53285c2550e866f2afebbc6";
+  propagatedBuildInputs = [binary mtl];
+  meta = {
+    description = "Library and tool for parsing .eventlog files from GHC";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix
new file mode 100644
index 000000000000..f3152a924830
--- /dev/null
+++ b/pkgs/development/libraries/haskell/glade/default.nix
@@ -0,0 +1,14 @@
+{cabal, cairo, glib, gtk, mtl, pango, gtk2hsBuildtools, pkgconfig, gnome, glibc}:
+
+cabal.mkDerivation (self : {
+  pname = "glade";
+  version = "0.11.1";
+  sha256 = "0d96a8576f89a81aa1ecdaf172e42e9eb1e7b40ce1b23cff36ab473165832c6a";
+  extraBuildInputs = [pkgconfig gtk2hsBuildtools gnome.libglade gnome.gtk glibc];
+  propagatedBuildInputs = [cairo glib gtk mtl pango];
+  meta = {
+    description = "Binding to the glade library";
+    license = "LGPLv2+";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix
new file mode 100644
index 000000000000..d56a9abe5958
--- /dev/null
+++ b/pkgs/development/libraries/haskell/glib/default.nix
@@ -0,0 +1,13 @@
+{cabal, gtk2hsBuildtools, pkgconfig, glib, glibc}:
+
+cabal.mkDerivation (self : {
+  pname = "glib";
+  version = "0.11.2";
+  sha256 = "e0fb5f3c22701807db364dff86d55f2a33a57d8a4e58d37a80d367bca50b3dbb";
+  extraBuildInputs = [pkgconfig glib glibc gtk2hsBuildtools];
+  meta = {
+    description = "Binding to the GLIB library for Gtk2Hs";
+    license = "LGPLv2+";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix
new file mode 100644
index 000000000000..5e940e4e8c5a
--- /dev/null
+++ b/pkgs/development/libraries/haskell/gtk/default.nix
@@ -0,0 +1,14 @@
+{cabal, cairo, glib, mtl, pango, gtk2hsBuildtools, pkgconfig, gtk, glibc}:
+
+cabal.mkDerivation (self : {
+  pname = "gtk";
+  version = "0.11.2";
+  sha256 = "c9de86278780badbd874fb75ef01ca12a70364a9985b75f98957ba940df27aa6";
+  extraBuildInputs = [pkgconfig gtk2hsBuildtools gtk glibc];
+  propagatedBuildInputs = [cairo glib mtl pango];
+  meta = {
+    description = "Binding to the Gtk+ graphical user interface library";
+    license = "LGPLv2+";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
index 41a3ac41e54d..07fa2fbf9a97 100644
--- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
+++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self : {
   pname = "gtk2hs-buildtools";
-  version = "0.9";
-  sha256 = "2586c419394601c1840d827d32cdb9d76bc94d71c03fdfa23c8d04cba99c6b20";
+  version = "0.11.2";
+  sha256 = "330c52830358966bcff308f58a570e84bb0b4d6004b6f01107d55dd88faa54ad";
   extraBuildInputs = [alex happy];
   meta = {
     description = "Tools to build the Gtk2Hs suite of User Interface libraries";
diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix
new file mode 100644
index 000000000000..2a8ba497f3f9
--- /dev/null
+++ b/pkgs/development/libraries/haskell/pango/default.nix
@@ -0,0 +1,14 @@
+{cabal, cairo, glib, mtl, gtk2hsBuildtools, pkgconfig, pango, glibc}:
+
+cabal.mkDerivation (self : {
+  pname = "pango";
+  version = "0.11.2";
+  sha256 = "fb7f5dc303d3d49a330aaa3acf29560f78746edb9c67f6191756baa1b08fb504";
+  extraBuildInputs = [pkgconfig gtk2hsBuildtools pango glibc];
+  propagatedBuildInputs = [cairo glib mtl];
+  meta = {
+    description = "Binding to the Pango text rendering engine";
+    license = "LGPLv2+";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})
diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix
new file mode 100644
index 000000000000..1d1d5ed25a9d
--- /dev/null
+++ b/pkgs/development/tools/haskell/threadscope/default.nix
@@ -0,0 +1,14 @@
+{cabal, binary, cairo, ghcEvents, glade, gtk, mtl}:
+
+cabal.mkDerivation (self : {
+  pname = "threadscope";
+  version = "0.1.2";
+  sha256 = "ce1116016f6b2d38e6063ba3dd147f38147a9c4399160f37aba9c50c96d00a90";
+  propagatedBuildInputs = [binary cairo ghcEvents glade gtk mtl];
+  meta = {
+    description = "A graphical thread profiler";
+    license = "BSD";
+    maintainers = [self.stdenv.lib.maintainers.andres];
+  };
+})  
+
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f4f840678995..15b41b6f3def 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -137,6 +137,8 @@ rec {
 
   ghcCore = callPackage ../development/libraries/haskell/ghc-core {};
 
+  ghcEvents = callPackage ../development/libraries/haskell/ghc-events {};
+
   ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};
 
   ghcPaths_0_1_0_6 = callPackage ../development/libraries/haskell/ghc-paths/0.1.0.6.nix {};
@@ -151,6 +153,14 @@ rec {
     network = network_2_2_1_7;
   };
 
+  glade = callPackage ../development/libraries/haskell/glade {
+    inherit (pkgs) pkgconfig gnome glibc;
+  };
+
+  glib = callPackage ../development/libraries/haskell/glib {
+    inherit (pkgs) pkgconfig glib glibc;
+  };
+
   GlomeVec = callPackage ../development/libraries/haskell/GlomeVec {};
 
   GLUT2121 = callPackage ../development/libraries/haskell/GLUT/2.1.2.1.nix {
@@ -166,6 +176,11 @@ rec {
     inherit (pkgs.xlibs) libSM libICE libXmu libXi;
   };
 
+  gtk = callPackage ../development/libraries/haskell/gtk {
+    inherit (pkgs) pkgconfig glibc;
+    inherit (pkgs.gtkLibs) gtk;
+  };
+
   gtk2hs = callPackage ../development/libraries/haskell/gtk2hs {
     inherit (pkgs) pkgconfig gnome cairo;
   };
@@ -417,6 +432,11 @@ rec {
     random = random_newtime;
   };
 
+  pango = callPackage ../development/libraries/haskell/pango {
+    inherit (pkgs) pkgconfig glibc;
+    inherit (pkgs.gtkLibs) pango;
+  };
+
   parallel_2_2_0_1 = callPackage ../development/libraries/haskell/parallel/2.2.0.1.nix {};
 
   parallel = callPackage ../development/libraries/haskell/parallel {};
@@ -732,6 +752,8 @@ rec {
 
   tar = callPackage ../development/tools/haskell/tar {};
 
+  threadscope = callPackage ../development/tools/haskell/threadscope {};
+
   uuagc = callPackage ../development/tools/haskell/uuagc {};
 
   # Applications.