From a3947a1605e0fb9b7e5169228a862b273f9b47f7 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Fri, 17 Dec 2010 20:34:29 +0000
Subject: [PATCH 01/17] Finish removing all patches.

svn path=/nixpkgs/trunk/; revision=25187
---
 pkgs/applications/networking/browsers/firefox/3.6.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/3.6.nix b/pkgs/applications/networking/browsers/firefox/3.6.nix
index a1d0a9eb9fc9..a972c9809827 100644
--- a/pkgs/applications/networking/browsers/firefox/3.6.nix
+++ b/pkgs/applications/networking/browsers/firefox/3.6.nix
@@ -101,10 +101,6 @@ rec {
 
     inherit src;
 
-    # To be removed when the change gets upstream. I don't know if the patch
-    # affects xulrunner or firefox.
-    patches = [ ./symlinks-bug551152.patch ];
-
     buildInputs =
       [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
         dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify

From c04f8e236c503e30183dad8e95fea070755a0735 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Fri, 17 Dec 2010 23:18:21 +0000
Subject: [PATCH 02/17] Bump kmplayer to latest release 0.11.2.c

This also fixes build failure related to docbook versions.

svn path=/nixpkgs/trunk/; revision=25190
---
 pkgs/applications/video/kmplayer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix
index a665670d9c98..a762bed0e28c 100644
--- a/pkgs/applications/video/kmplayer/default.nix
+++ b/pkgs/applications/video/kmplayer/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, lib, cmake, qt4, perl, gettext, pango, gtk, dbus_glib, kdelibs, automoc4, phonon}:
 
 stdenv.mkDerivation {
-  name = "kmplayer-0.11.2b";
+  name = "kmplayer-0.11.2c";
   src = fetchurl {
-    url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.2b.tar.bz2;
-    sha256 = "00a1pw31p849cbgskyfi8jni9ar6yi2ivr625vza2za6apdxvkr7";
+    url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.2c.tar.bz2;
+    sha256 = "1qhafq865bzpz6m9k7cjdv4884qfpn481ak77ly0nidpq2ab0l9m";
   };
   builder = ./builder.sh;
   buildInputs = [ cmake qt4 perl gettext stdenv.gcc.libc pango gtk dbus_glib kdelibs automoc4 phonon ];

From 206aeef557afb22b315e530e8e5b1d01401e7527 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 18 Dec 2010 17:42:55 +0000
Subject: [PATCH 03/17] * Memtest86+ updated to 4.10.

svn path=/nixpkgs/trunk/; revision=25191
---
 pkgs/tools/misc/memtest86/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix
index 5df5fd31382b..480a29c63c95 100644
--- a/pkgs/tools/misc/memtest86/default.nix
+++ b/pkgs/tools/misc/memtest86/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "memtest86+-4.00";
+  name = "memtest86+-4.10";
   
   src = fetchurl {
-    url = http://www.memtest.org/download/4.00/memtest86+-4.00.tar.gz;
-    sha256 = "193chqvwmcxsrvpcfy3mbz1vakvpfhxvjmawzidp26x8kma2zi3f";
+    url = http://www.memtest.org/download/4.10/memtest86+-4.10.tar.gz;
+    sha256 = "0kxa2m7vfcm543wp53fv16sjjf5p12mzdz5rm87mrrr6hw43a6gq";
   };
 
   preBuild = ''
@@ -17,10 +17,7 @@ stdenv.mkDerivation {
     fi
   '';
 
-  # Override the default optimisation setting (`-Os') to prevent lots
-  # of spurious errors.  See
-  # https://bugs.launchpad.net/fedora/+source/memtest86+/+bug/246412.
-  NIX_CFLAGS_COMPILE = "-O1 -I.";
+  NIX_CFLAGS_COMPILE = "-I.";
   
   installPhase = ''
     ensureDir $out

From 56032641f4c32e48bc5f5d9465b87e63dfc10a89 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 19 Dec 2010 14:59:26 +0000
Subject: [PATCH 04/17] Updated disnixos

svn path=/nixpkgs/trunk/; revision=25199
---
 pkgs/tools/package-management/disnix/disnixos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 5572ffe67975..9c29c413dd8a 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -3,8 +3,8 @@
 stdenv.mkDerivation {
   name = "disnixos";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/811135/download/1/disnixos-0.1pre25150.tar.gz;
-    sha256 = "004i4k0c9lfvfmmv5iqwnqk3h2lip166dp8vpn3k3mvmpl17cn3j";
+    url = http://hydra.nixos.org/build/812969/download/1/disnixos-0.1pre25198.tar.gz;
+    sha256 = "1bvn89177cb2ab3vl1lva99hy3r6dznmv7x5hnxmmqncw5kmd42j";
   };
   buildInputs = [ socat pkgconfig disnix ];
   dontStrip = true;

From c93a60d7a395f80dfb68197c4f0417c38b8b9781 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 19 Dec 2010 15:28:11 +0000
Subject: [PATCH 05/17] Bumped version of disnixos again

svn path=/nixpkgs/trunk/; revision=25201
---
 pkgs/tools/package-management/disnix/disnixos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 9c29c413dd8a..317a47e0783e 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -3,8 +3,8 @@
 stdenv.mkDerivation {
   name = "disnixos";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/812969/download/1/disnixos-0.1pre25198.tar.gz;
-    sha256 = "1bvn89177cb2ab3vl1lva99hy3r6dznmv7x5hnxmmqncw5kmd42j";
+    url = http://hydra.nixos.org/build/812999/download/1/disnixos-0.1pre25200.tar.gz;
+    sha256 = "1cw0wg5x65nanrjfj67nk1jxngaqh2l7msx03s536hssm9g2mv7r";
   };
   buildInputs = [ socat pkgconfig disnix ];
   dontStrip = true;

From d3f00b9cf5436c5b137a6b3d62145185b3a8cf8d Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Mon, 20 Dec 2010 09:53:41 +0000
Subject: [PATCH 06/17] * Add findlib to hydra

svn path=/nixpkgs/trunk/; revision=25205
---
 pkgs/development/tools/ocaml/findlib/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index e1f85f745759..48728e02b172 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -50,5 +50,9 @@ stdenv.mkDerivation {
     homepage = http://projects.camlcity.org/projects/findlib.html;
     description = "O'Caml library manager";
     license = "MIT/X11";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.z77z
+    ];
   };
 }

From e7accaf8d36247216678c5f4870000a4a50236da Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Mon, 20 Dec 2010 10:32:22 +0000
Subject: [PATCH 07/17] * Update camlp5

svn path=/nixpkgs/trunk/; revision=25206
---
 .../science/logic/coq/default.nix             | 16 ++--
 pkgs/development/tools/ocaml/camlp5/META      | 94 +++++++++++++++++++
 .../tools/ocaml/camlp5/default.nix            | 15 ++-
 pkgs/top-level/all-packages.nix               | 21 +++--
 4 files changed, 127 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/tools/ocaml/camlp5/META

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index d72a2104370c..741b780a2377 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -1,7 +1,7 @@
 # TODO:
 # - coqide compilation should be optional or (better) separate;
 
-{stdenv, fetchurl, ocaml, camlp5, lablgtk, ncurses}:
+{stdenv, fetchurl, ocaml, findlib, camlp5, lablgtk, ncurses}:
 
 let
   version = "8.3";
@@ -15,15 +15,17 @@ stdenv.mkDerivation {
     sha256 = "02iy4rxz1n1kc85fb3vs4xpxqfxjw87y2gvmi39fxrj8742qx0dx";
   };
 
-  buildInputs = [ ocaml camlp5 ncurses lablgtk ];
+  buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ];
 
   prefixKey = "-prefix ";
 
-  configureFlags =
-    "-camldir ${ocaml}/bin " +
-    "-camlp5dir ${camlp5}/lib/ocaml/camlp5 " +
-    "-lablgtkdir ${lablgtk}/lib/ocaml/lablgtk2 " +
-    "-opt -coqide opt";
+  preConfigure = ''
+    configureFlagsArray=(
+      -camldir ${ocaml}/bin
+      -camlp5dir $(ocamlfind query camlp5)
+      -lablgtkdir ${lablgtk}/lib/ocaml/lablgtk2 -opt -coqide opt
+    )
+  '';
 
   buildFlags = "world"; # Debug with "world VERBOSE=1";
 
diff --git a/pkgs/development/tools/ocaml/camlp5/META b/pkgs/development/tools/ocaml/camlp5/META
new file mode 100644
index 000000000000..e13b108ff247
--- /dev/null
+++ b/pkgs/development/tools/ocaml/camlp5/META
@@ -0,0 +1,94 @@
+# Specifications for the "camlp5" preprocessor:
+requires = ""
+version = "[distributed with Ocaml]"
+description = "Base for camlp5 syntax extensions"
+
+# For the toploop:
+archive(byte,toploop,camlp5o) = "camlp5o.cma"
+archive(byte,toploop,camlp5r) = "camlp5r.cma"
+
+# Scheme-like syntax:
+# Do #predicates "syntax,camlp5scheme", followed by #require "camlp5"
+archive(byte,toploop,camlp5scheme) = "camlp5sch.cma"
+
+# Standard ML-like syntax:
+# Do #predicates "syntax,camlp5sml", followed by #require "camlp5"
+archive(byte,toploop,camlp5sml) = "gramlib.cma camlp5_top.cma pa_sml.cmo"
+
+# Lisp-like syntax:
+# Do #predicates "syntax,camlp5lisp", followed by #require "camlp5"
+archive(byte,toploop,camlp5lisp) = "gramlib.cma camlp5_top.cma pa_lisp.cmo"
+
+# For the preprocessor itself:
+archive(syntax,preprocessor,camlp5o) = "pa_o.cmo pa_op.cmo pr_dump.cmo"
+archive(syntax,preprocessor,camlp5r) = "pa_r.cmo pa_rp.cmo pr_dump.cmo"
+archive(syntax,preprocessor,camlp5sml) = "pa_sml.cmo pr_dump.cmo"
+archive(syntax,preprocessor,camlp5scheme) = "pa_scheme.cmo pr_dump.cmo"
+archive(syntax,preprocessor,camlp5lisp) = "pa_lisp.cmo pr_dump.cmo"
+preprocessor = "camlp5 -nolib"
+
+package "gramlib" (
+  requires(toploop) = "camlp5"
+  version = "[distributed with Ocaml]"
+  description = "Grammar library to create syntax extensions"
+  archive(byte) = "gramlib.cma"
+  archive(byte,toploop) = ""  # already contained in camlp5*.cma
+  archive(native) = "gramlib.cmxa"
+)
+
+package "quotations" (
+  requires = "camlp5"
+  version = "[distributed with Ocaml]"
+  description = "Syntax extension: Quotations to create AST nodes"
+  archive(syntax,preprocessor) = "q_MLast.cmo"
+  archive(syntax,toploop) = "q_MLast.cmo"
+)
+
+package "phony_quotations" (
+  requires = "camlp5"
+  version = "[distributed with Ocaml]"
+  description = "Syntax extension: Phony quotations"
+  archive(syntax,preprocessor) = "q_phony.cmo"
+  archive(syntax,toploop) = "q_phony.cmo"
+)
+
+package "extend" (
+  requires = "camlp5"
+  version = "[distributed with Ocaml]"
+  description = "Syntax extension: EXTEND the camlp5 grammar"
+  archive(syntax,preprocessor) = "pa_extend.cmo"
+  archive(syntax,toploop) = "pa_extend.cmo"
+)
+
+package "extfun" (
+  requires = "camlp5"
+  version = "[distributed with Ocaml]"
+  description = "Syntax extension: Extensible functions"
+  archive(syntax,preprocessor) = "pa_extfun.cmo"
+  archive(syntax,toploop) = "pa_extfun.cmo"
+)
+
+package "fstream" (
+  requires = "camlp5"
+  version = "[distributed with Ocaml]"
+  description = "Syntax extension: Functional stream parsers"
+  archive(syntax,preprocessor) = "pa_fstream.cmo"
+  archive(syntax,toploop) = "pa_fstream.cmo"
+)
+
+package "macro" (
+  requires = "camlp5"
+  version = "[distributed with Ocaml]"
+  description = "Syntax extension: Conditional compilation"
+  archive(syntax,preprocessor) = "pa_macro.cmo"
+  archive(syntax,toploop) = "pa_macro.cmo"
+)
+
+package "unit_constraints" (
+  requires = "camlp5"
+  version = "[distributed with Ocaml]"
+  description = "Syntax extension: Type constraints of type unit (revised syntax only)"
+  archive(syntax,preprocessor,camlp5r) = "pa_ru.cmo"
+  archive(syntax,toploop,camlp5r) = "pa_ru.cmo"
+  error(syntax,-camlp5r) = "Not available"
+)
diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index 7c87243054bd..7247041cb1d4 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -1,9 +1,11 @@
 {stdenv, fetchurl, ocaml, transitional ? false}:
 
 let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
   pname = "camlp5";
-  version = "5.12";
+  version = "5.15";
   webpage = http://pauillac.inria.fr/~ddr/camlp5/;
+  metafile = ./META;
 in
 
 stdenv.mkDerivation {
@@ -12,17 +14,20 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "${webpage}/distrib/src/${pname}-${version}.tgz";
-    sha256 = "985a5e373ea75f89667e71bc857c868c395769fce664cba88aa76f93b0ad8461";
+    sha256 = "1sx5wlfpydqskm97gp7887p3avbl3vanlmrwj35wx5mbzj6kn9nq";
   };
 
   buildInputs = [ ocaml ];
 
   prefixKey = "-prefix ";
 
-  configureFlags = if transitional then "--transitional" else "--strict";
+  preConfigure = "configureFlagsArray=(" +  (if transitional then "--transitional" else "--strict") +
+                  " --libdir $out/lib/ocaml/${ocaml_version}/site-lib)";
 
   buildFlags = "world.opt";
 
+  postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml_version}/site-lib/camlp5/META";
+
   meta = {
     description = "Preprocessor-pretty-printer for OCaml";
     longDescription = ''
@@ -31,5 +36,9 @@ stdenv.mkDerivation {
     '';
     homepage = "${webpage}";
     license = "BSD";
+    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 9dc4e280fa6a..23a52dd1c9da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1985,6 +1985,12 @@ let
   mkOcamlPackages = ocaml: self: let callPackage = newScope self; in rec {
     inherit ocaml;
 
+    camlp5_strict = callPackage ../development/tools/ocaml/camlp5 { };
+
+    camlp5_transitional = callPackage ../development/tools/ocaml/camlp5 {
+      transitional = true;
+    };
+
     camlzip = callPackage ../development/ocaml-modules/camlzip { };
 
     camomile = camomile_0_7_3;
@@ -2404,12 +2410,6 @@ let
 
   byacc = callPackage ../development/tools/parsing/byacc { };
 
-  camlp5_strict = callPackage ../development/tools/ocaml/camlp5 { };
-
-  camlp5_transitional = callPackage ../development/tools/ocaml/camlp5 {
-    transitional = true;
-  };
-
   ccache = callPackage ../development/tools/misc/ccache { };
 
   ctags = callPackage ../development/tools/misc/ctags { };
@@ -7012,7 +7012,8 @@ let
   ### SCIENCE/LOGIC
 
   coq = callPackage ../applications/science/logic/coq {
-    camlp5 = camlp5_transitional;
+    inherit (ocamlPackages) findlib;
+    camlp5 = ocamlPackages.camlp5_transitional;
   };
 
   cvc3 = callPackage ../applications/science/logic/cvc3 {};
@@ -7027,7 +7028,9 @@ let
 
   hol = callPackage ../applications/science/logic/hol { };
 
-  hol_light = callPackage ../applications/science/logic/hol_light { };
+  hol_light = callPackage ../applications/science/logic/hol_light {
+    inherit (ocamlPackages) camlp5_transitional;
+  };
 
   hol_light_sources = callPackage ../applications/science/logic/hol_light/sources.nix { };
 
@@ -7056,7 +7059,7 @@ let
   spass = callPackage ../applications/science/logic/spass {};
 
   ssreflect = callPackage ../applications/science/logic/ssreflect {
-    camlp5 = camlp5_transitional;
+    camlp5 = ocamlPackages.camlp5_transitional;
   };
 
   ### SCIENCE / ELECTRONICS

From f0b62c77a9413433c7f67ffa81bdf9ea732cd715 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Dec 2010 12:14:58 +0000
Subject: [PATCH 08/17] * Adobe Reader 9.4.

svn path=/nixpkgs/trunk/; revision=25208
---
 pkgs/applications/misc/adobe-reader/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix
index 14de436379b5..24d01dae0595 100644
--- a/pkgs/applications/misc/adobe-reader/default.nix
+++ b/pkgs/applications/misc/adobe-reader/default.nix
@@ -3,13 +3,13 @@
 assert stdenv.system == "i686-linux";
 
 stdenv.mkDerivation {
-  name = "adobe-reader-9.3.3-1";
+  name = "adobe-reader-9.4-1";
   
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.3.3/enu/AdbeRdr9.3.3-1_i486linux_enu.tar.bz2;
-    sha256 = "1qssbdjy3v07agyh55bhsmvzakq9bs3hd6dw032ikwbpvb2gs807";
+    url = http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.0/enu/AdbeRdr9.4-1_i486linux_enu.tar.bz2;
+    sha256 = "093msw0b5k3ab0vv7bh4n81fxp51s2lynvsm076i5jvlp71l8adf";
   };
 
   # !!! Adobe Reader contains copies of OpenSSL, libcurl, and libicu.

From 0af5585d3cb14e46c044f00c3faa23c1f1f9ab3c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Dec 2010 12:18:37 +0000
Subject: [PATCH 09/17] * Linux 2.6.32.27.

svn path=/nixpkgs/trunk/; revision=25209
---
 pkgs/os-specific/linux/kernel/linux-2.6.32.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
index a81085fd5e2e..1cef6d035f4b 100644
--- a/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
+++ b/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
@@ -198,11 +198,11 @@ in
 import ./generic.nix (
 
   rec {
-    version = "2.6.32.26";
+    version = "2.6.32.27";
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-      sha256 = "1kpkl5ps8xrwddmn90rzynra49am9rdm37smplhf3w3ifvpc1mf3";
+      sha256 = "08zj1mysfhqz81vmly2cassbf6r5nzi9y6sps27c8sz9xfwzly5c";
     };
 
     config = configWithPlatform stdenv.platform;

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 10/17] * 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 27a990dbf7c2..4b223ce05ef8 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 23a52dd1c9da..51c2c99aeba1 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;
   };
 

From 9b4c2f5f567e2d732ef5aa67b83a5bf25764d3fc Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom.stdin@gmail.com>
Date: Tue, 21 Dec 2010 04:40:38 +0000
Subject: [PATCH 11/17] Emacs PHP mode: packaged. Patch by Karn Kallio.

svn path=/nixpkgs/trunk/; revision=25216
---
 pkgs/applications/editors/emacs-modes/php/builder.sh |  7 +++++++
 .../applications/editors/emacs-modes/php/default.nix | 12 ++++++++++++
 pkgs/top-level/all-packages.nix                      |  2 ++
 3 files changed, 21 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/php/builder.sh
 create mode 100644 pkgs/applications/editors/emacs-modes/php/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/php/builder.sh b/pkgs/applications/editors/emacs-modes/php/builder.sh
new file mode 100644
index 000000000000..85c448480571
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/php/builder.sh
@@ -0,0 +1,7 @@
+source $stdenv/setup
+
+mkdir -p $out/share/emacs/site-lisp
+cd $out/share/emacs/site-lisp
+tar xvfz $src
+mv php-mode-*/* .
+rmdir php-mode-*
diff --git a/pkgs/applications/editors/emacs-modes/php/default.nix b/pkgs/applications/editors/emacs-modes/php/default.nix
new file mode 100644
index 000000000000..ec160dccd9fb
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/php/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "php-mode-1.5.0";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/php-mode/${name}.tar.gz";
+    sha256 = "1bffgg4rpiggxqc1hvjcby24sfyzj5728zg7r6f4v6a126a7kcfq";
+  };
+
+  builder = ./builder.sh;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51c2c99aeba1..330cb08659f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5652,6 +5652,8 @@ let
     # we want it to have higher precedence.
     org = hiPrio (callPackage ../applications/editors/emacs-modes/org { });
 
+    phpMode = callPackage ../applications/editors/emacs-modes/php { };
+
     prologMode = callPackage ../applications/editors/emacs-modes/prolog { };
 
     proofgeneral = callPackage ../applications/editors/emacs-modes/proofgeneral { };

From 8235b75b87da9873829d7017c25465e6b74f911c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 21 Dec 2010 05:21:33 +0000
Subject: [PATCH 12/17] Update SBCL

svn path=/nixpkgs/trunk/; revision=25217
---
 pkgs/development/compilers/sbcl/src-for-default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/src-for-default.nix b/pkgs/development/compilers/sbcl/src-for-default.nix
index 13585e504a82..6521bb8c72a4 100644
--- a/pkgs/development/compilers/sbcl/src-for-default.nix
+++ b/pkgs/development/compilers/sbcl/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="1.0.44";
-   name="sbcl-1.0.44";
-   hash="0nl1vrz6mibbhjaxbi64gr0sbq9hf2yjc1h4i05kjw5l6dhws8hg";
-   url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.44/sbcl-1.0.44-source.tar.bz2";
-   advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.44/sbcl-1.0.44-source.tar.bz2";
+   version="1.0.45";
+   name="sbcl-1.0.45";
+   hash="1asl4qy2mizj239cmgnw2dza03h7j3ysrkdavc5gnv9y4gn9miyi";
+   url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.45/sbcl-1.0.45-source.tar.bz2";
+   advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.45/sbcl-1.0.45-source.tar.bz2";
   
   
 }

From 955f9c19a6907a9118dce6db71ca668c1c240e4c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 21 Dec 2010 05:21:54 +0000
Subject: [PATCH 13/17] Update Veracity

svn path=/nixpkgs/trunk/; revision=25218
---
 .../version-management/veracity/src-for-default.nix       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix
index 06a3ad3a2f42..010c3acd929a 100644
--- a/pkgs/applications/version-management/veracity/src-for-default.nix
+++ b/pkgs/applications/version-management/veracity/src-for-default.nix
@@ -1,9 +1,9 @@
 rec {
-   version="0.5.5.10349";
-   name="veracity-0.5.5.10349";
-   hash="1059cf0p0kpmylk9228an1kvz49s3d6sd3ncz6dw804z79q16s66";
+   version="0.5.5.10353";
+   name="veracity-0.5.5.10353";
+   hash="06clsn9li6bxdihmzcjd6ch5n6n5wgydd0sw76mk0ljy7s9ylhjr";
    url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
-   advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.5.10349.tar.gz";
+   advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.5.10353.tar.gz";
   
   
 }

From 2c85e4b96f4a9c7f0bbb93794fd96437e86304da Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Tue, 21 Dec 2010 08:33:37 +0000
Subject: [PATCH 14/17] * Remove the automatic creation of a directory from the
 setupHook of findlib since this can silently produce empty paths in
 derivations

svn path=/nixpkgs/trunk/; revision=25219
---
 pkgs/development/tools/ocaml/findlib/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 48728e02b172..9a2a6b0d94ab 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -40,7 +40,6 @@ stdenv.mkDerivation {
             export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml_version}/site-lib/"
         fi
         export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml_version}/site-lib/"
-        ensureDir ''$OCAMLFIND_DESTDIR
     }
     
     envHooks=(''${envHooks[@]} addOCamlPath)

From eb33e01ac77c711b3efc92a8c4345b37a662f7ea Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Tue, 21 Dec 2010 09:37:35 +0000
Subject: [PATCH 15/17] * Add variable createFindlibDestdir to the setupHook of
 findlib * Set createFindlibDestdir to various ocaml packages.

svn path=/nixpkgs/trunk/; revision=25220
---
 pkgs/development/ocaml-modules/camlzip/default.nix  | 2 ++
 pkgs/development/ocaml-modules/camomile/0.7.3.nix   | 2 +-
 pkgs/development/ocaml-modules/camomile/0.8.1.nix   | 6 +++++-
 pkgs/development/ocaml-modules/cryptgps/default.nix | 2 ++
 pkgs/development/ocaml-modules/menhir/default.nix   | 2 ++
 pkgs/development/ocaml-modules/ounit/default.nix    | 2 ++
 pkgs/development/ocaml-modules/pcre/default.nix     | 2 ++
 pkgs/development/ocaml-modules/sqlite3/default.nix  | 2 ++
 pkgs/development/ocaml-modules/ssl/default.nix      | 2 ++
 pkgs/development/tools/ocaml/findlib/default.nix    | 3 +++
 10 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix
index 9e991a811e6b..03a6dbef23ee 100644
--- a/pkgs/development/ocaml-modules/camlzip/default.nix
+++ b/pkgs/development/ocaml-modules/camlzip/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation {
 
   patches = [ ./makefile.patch ];
 
+  createFindlibDestdir = true;
+
   postPatch = ''
     substitute ${./META} META --subst-var-by VERSION "${version}"
     substituteInPlace Makefile \
diff --git a/pkgs/development/ocaml-modules/camomile/0.7.3.nix b/pkgs/development/ocaml-modules/camomile/0.7.3.nix
index b770b36abf66..12b816dec36a 100644
--- a/pkgs/development/ocaml-modules/camomile/0.7.3.nix
+++ b/pkgs/development/ocaml-modules/camomile/0.7.3.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ocaml findlib];
 
-  #dontAddPrefix = true;
+  createFindlibDestdir = true;
 
   meta = {
     homepage = http://camomile.sourceforge.net/;
diff --git a/pkgs/development/ocaml-modules/camomile/0.8.1.nix b/pkgs/development/ocaml-modules/camomile/0.8.1.nix
index 8d9ab69dfc65..29ce5c59b443 100644
--- a/pkgs/development/ocaml-modules/camomile/0.8.1.nix
+++ b/pkgs/development/ocaml-modules/camomile/0.8.1.nix
@@ -15,7 +15,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ocaml findlib];
 
-  #dontAddPrefix = true;
+  preInstall = ''
+    ensureDir $OCAMLFIND_DESTDIR
+  '';
+
+  createFindlibDestdir = true;
 
   meta = {
     homepage = http://camomile.sourceforge.net/;
diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix
index 63a25dd0b471..7379a62d4244 100644
--- a/pkgs/development/ocaml-modules/cryptgps/default.nix
+++ b/pkgs/development/ocaml-modules/cryptgps/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation {
 
   configurePhase = "true";	# Skip configure phase
 
+  createFindlibDestdir = true;
+
   meta = {
     homepage = http://projects.camlcity.org/projects/cryptgps.html;
     description = "Cryptographic functions for OCaml";
diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix
index 4d92cda5553d..ea706ef511fa 100644
--- a/pkgs/development/ocaml-modules/menhir/default.nix
+++ b/pkgs/development/ocaml-modules/menhir/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation {
 
   configurePhase = "true";	# Skip configure
 
+  createFindlibDestdir = true;
+
   preBuild = ''
     #Fix makefiles.
     RM=$(type -p rm)
diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix
index 62bf7f89c491..b6d14383d5e5 100644
--- a/pkgs/development/ocaml-modules/ounit/default.nix
+++ b/pkgs/development/ocaml-modules/ounit/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation {
 
   checkTarget = "test";
 
+  createFindlibDestdir = true;
+
   meta = {
     homepage = http://www.xs4all.nl/~mmzeeman/ocaml/;
     description = "Unit test framework for OCaml";
diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix
index d16093a6feb9..fdc527791c0b 100644
--- a/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/pkgs/development/ocaml-modules/pcre/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation {
 
   buildInputs = [pcre ocaml findlib];
 
+  createFindlibDestdir = true;
+
   configurePhase = "true";	# Skip configure phase
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix
index d542cfe14f62..9b477fed8517 100644
--- a/pkgs/development/ocaml-modules/sqlite3/default.nix
+++ b/pkgs/development/ocaml-modules/sqlite3/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation {
     ensureDir $out/bin
   '';
 
+  createFindlibDestdir = true;
+
   meta = {
     homepage = "http://ocaml.info/home/ocaml_sources.html#ocaml-sqlite3";
     description = "OCaml bindings to the SQLite 3 database access library";
diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix
index 56ac189b7ba4..9a495002f1de 100644
--- a/pkgs/development/ocaml-modules/ssl/default.nix
+++ b/pkgs/development/ocaml-modules/ssl/default.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation {
 
   configureFlags = "--disable-ldconf";
 
+  createFindlibDestdir = true;
+
   meta = {
     homepage = http://savonet.rastageeks.org/;
     description = "OCaml bindings for libssl ";
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 9a2a6b0d94ab..9a5b9acbef9c 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -40,6 +40,9 @@ stdenv.mkDerivation {
             export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml_version}/site-lib/"
         fi
         export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml_version}/site-lib/"
+        if test -n $createFindlibDestdir; then
+          ensureDir $OCAMLFIND_DESTDIR
+        fi
     }
     
     envHooks=(''${envHooks[@]} addOCamlPath)

From 5e13810a017efef4b90b53ee9545349bbb32838e Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Tue, 21 Dec 2010 09:43:13 +0000
Subject: [PATCH 16/17] * Remove useless code put by error in camomile

svn path=/nixpkgs/trunk/; revision=25221
---
 pkgs/development/ocaml-modules/camomile/0.8.1.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/camomile/0.8.1.nix b/pkgs/development/ocaml-modules/camomile/0.8.1.nix
index 29ce5c59b443..4a838e99f0bd 100644
--- a/pkgs/development/ocaml-modules/camomile/0.8.1.nix
+++ b/pkgs/development/ocaml-modules/camomile/0.8.1.nix
@@ -15,10 +15,6 @@ stdenv.mkDerivation {
 
   buildInputs = [ocaml findlib];
 
-  preInstall = ''
-    ensureDir $OCAMLFIND_DESTDIR
-  '';
-
   createFindlibDestdir = true;
 
   meta = {

From e1a0b9472b0a39259d80050d5e73fd84b590febb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 21 Dec 2010 12:17:47 +0000
Subject: [PATCH 17/17] * NVIDIA X11 driver updated to 260.19.29.

svn path=/nixpkgs/trunk/; revision=25223
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index ff85f8f8b970..dd6c1875362a 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -7,7 +7,7 @@
 
 with stdenv.lib;
 
-let versionNumber = "260.19.21"; in
+let versionNumber = "260.19.29"; in
 
 stdenv.mkDerivation {
   name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
@@ -18,12 +18,12 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "1gr11icpi1jcba39i86mvb6yvawika04hja2c2gri9mz7bbbn1kp";
+        sha256 = "0zbjmpwbc35bzg15j8zs7xy3qlaywhrb8mmps7df8bv59fb0krxn";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "1pl5pwp72vdvw74449pv9h4hnygg5sasz8z3f0vbmch4c8hdmyz9";
+        sha256 = "119dhzafkfijfw94hw7sz0iffp1lshdh6vadvr6d1vr6hpcggdw6";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";