From d43bda008630a6a818090a29c737b933795f595c Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Mon, 20 Dec 2010 14:58:56 +0000
Subject: [PATCH] * Update lablgtk2 (and enable hydra build)

svn path=/nixpkgs/trunk/; revision=25213
---
 pkgs/development/libraries/lablgtk/default.nix | 10 ++++++++--
 pkgs/top-level/all-packages.nix                | 17 ++++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/lablgtk/default.nix b/pkgs/development/libraries/lablgtk/default.nix
index 27a990dbf7c..4b223ce05ef 100644
--- a/pkgs/development/libraries/lablgtk/default.nix
+++ b/pkgs/development/libraries/lablgtk/default.nix
@@ -1,15 +1,21 @@
 {stdenv, fetchurl, ocaml, pkgconfig, gtk, libgnomecanvas}:
 
 stdenv.mkDerivation (rec {
-  version = "2.12.0";
+  version = "2.14.2";
   name = "lablgtk-${version}";
   src = fetchurl {
     url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${name}.tar.gz";
-    sha256 = "1kflrg4rqqzrz0ffdzlhz510m82k21m5x78yr5nxd98avcd39qxk";
+    sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9";
   };
 
   buildInputs = [ocaml pkgconfig gtk libgnomecanvas];
 
   configureFlags = "--with-libdir=$(out)/lib/ocaml";
   buildFlags = "world";
+  meta = {
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.z77z
+    ];
+  };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23a52dd1c9d..51c2c99aeba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2001,6 +2001,10 @@ let
 
     findlib = callPackage ../development/tools/ocaml/findlib { };
 
+    lablgtk = callPackage ../development/libraries/lablgtk {
+      inherit (gnome) libgnomecanvas;
+    };
+
     menhir = callPackage ../development/ocaml-modules/menhir { };
 
     ocaml_batteries = callPackage ../development/ocaml-modules/batteries { };
@@ -3246,10 +3250,6 @@ let
 
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix { };
 
-  lablgtk = callPackage ../development/libraries/lablgtk {
-    inherit (gnome) libgnomecanvas;
-  };
-
   lcms = lcms1;
 
   lcms1 = callPackage ../development/libraries/lcms { };
@@ -6119,7 +6119,8 @@ let
   };
 
   monotoneViz = builderDefsPackage (import ../applications/version-management/monotone-viz/mtn-head.nix) {
-    inherit ocaml lablgtk graphviz pkgconfig autoconf automake libtool;
+    inherit ocaml graphviz pkgconfig autoconf automake libtool;
+    inherit (ocamlPackages) lablgtk;
     inherit (gnome) gtk libgnomecanvas glib;
   };
 
@@ -6432,7 +6433,9 @@ let
     boost = boostFull;
   };
 
-  unison = callPackage ../applications/networking/sync/unison { };
+  unison = callPackage ../applications/networking/sync/unison {
+    inherit (ocamlPackages) lablgtk;
+  };
 
   uucp = callPackage ../tools/misc/uucp { };
 
@@ -7012,7 +7015,7 @@ let
   ### SCIENCE/LOGIC
 
   coq = callPackage ../applications/science/logic/coq {
-    inherit (ocamlPackages) findlib;
+    inherit (ocamlPackages) findlib lablgtk;
     camlp5 = ocamlPackages.camlp5_transitional;
   };