Merging from trunk. I solved some trivial merge conflicts.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25188

27 files changed, 365 insertions, 88 deletions

diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix
index c4ed06a00eaf..70d309472243 100644
--- a/pkgs/development/compilers/eql/default.nix
+++ b/pkgs/development/compilers/eql/default.nix
@@ -47,6 +47,7 @@ rec {
     TMP=.
     TMPDIR=.
     XKB_BINDIR="${xkbcomp}/bin" Xvfb -once -reset -terminate :2 -xkbdir ${xkeyboard_config}/etc/X11/xkb &
+    sleep 10;
     DISPLAY=:2 ./first_metatype_id
   '') ["doUnpack" "addInputs"];
 
diff --git a/pkgs/development/compilers/ocaml/3.11.1.nix b/pkgs/development/compilers/ocaml/3.11.1.nix
index a1d03b7cdf87..60dc51575016 100644
--- a/pkgs/development/compilers/ocaml/3.11.1.nix
+++ b/pkgs/development/compilers/ocaml/3.11.1.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
          documentation generator (ocamldoc).
        '';
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = [
       stdenv.lib.maintainers.z77z
     ];
diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index 8277021b0dc3..3080a2c24cda 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -8,7 +8,7 @@ in
 
 composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-  version = "5.3.3";
+  version = "5.3.4";
 
   name = "php_configurable-${version}";
 
@@ -151,7 +151,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
   src = args.fetchurl {
     url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
-    sha256 = "16iz1cprpjw60nf6n5z6isdziyzj56i3r8161si58j65yd86g1zj";
+    sha256 = "1391yibyc7kcrnprv6g57s2m6ld6n9j2iybzvwd2srdihl8q6cm8";
     name = "php-${version}.tar.bz2";
   };
 
diff --git a/pkgs/development/libraries/box2d/2.0.1.nix b/pkgs/development/libraries/box2d/2.0.1.nix
new file mode 100644
index 000000000000..9aa08caf00f4
--- /dev/null
+++ b/pkgs/development/libraries/box2d/2.0.1.nix
@@ -0,0 +1,82 @@
+x@{builderDefsPackage
+  , unzip, cmake, mesa, freeglut, libX11, xproto
+  , inputproto, libXi
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="box2d";
+    version="2.0.1";
+    name="${baseName}-${version}";
+    url="http://box2d.googlecode.com/files/Box2D_v${version}.zip";
+    hash="62857048aa089b558561074154430883cee491eedd71247f75f488cba859e21f";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  phaseNames = ["fixIncludes" "setVars" "changeSettings" "doMake" "doDeploy"];
+
+  goSrcDir = ''cd Box2D'';
+
+  fixIncludes = a.fullDepEntry ''
+    sed -i Source/Dynamics/Contacts/b2PolyContact.cpp \
+        -i Source/Dynamics/Contacts/b2CircleContact.cpp \
+        -i Source/Dynamics/Contacts/b2PolyAndCircleContact.cpp \
+        -i Source/Common/b2BlockAllocator.cpp \
+        -i Source/Collision/b2BroadPhase.cpp \
+        -i Examples/TestBed/Framework/Render.cpp \
+        -i Examples/TestBed/Tests/BroadPhaseTest.cpp \
+        -i Examples/TestBed/Tests/TestEntries.cpp \
+        -e '1i#include <string.h>'
+  '' ["minInit" "addInputs" "doUnpack"];
+
+  setVars = a.noDepEntry ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lX11 -lXi"
+  '';
+
+  doDeploy = a.fullDepEntry ''
+    ensureDir "$out"/lib
+    ensureDir "$out"/include/Box2D
+    cp Library/* Source/Gen/float/lib*.{a,so} "$out"/lib
+    cp -r Source "$out"/include/Box2D/Source
+    find "$out"/include/Box2D/Source ! -name '*.h' -exec rm '{}' ';'
+    sed -e s@../Source@Box2D/Source@ -i Include/Box2D.h
+    cp Include/Box2D.h "$out"/include/Box2D
+    ensureDir "$out/share"
+    cp -r Examples "$out/share"
+  '' ["minInit" "addInputs" "doMake" "defEnsureDir"];
+
+  changeSettings = a.fullDepEntry ''
+    sed -i Source/Common/b2Settings.h -e 's@b2_maxPolygonVertices .*@b2_maxPolygonVertices = 15;@'
+  '' ["minInit" "addInputs" "doUnpack"];
+      
+  meta = {
+    description = "2D physics engine";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+    license = "bsd";
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://code.google.com/p/box2d/downloads/list";
+    };
+  };
+}) x
+
diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix
new file mode 100644
index 000000000000..9d261191fbba
--- /dev/null
+++ b/pkgs/development/libraries/box2d/default.nix
@@ -0,0 +1,59 @@
+x@{builderDefsPackage
+  , unzip, cmake, mesa, freeglut, libX11, xproto
+  , inputproto, libXi
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+  sourceInfo = rec {
+    baseName="box2d";
+    version="2.1.2";
+    name="${baseName}-${version}";
+    url="http://box2d.googlecode.com/files/Box2D_v${version}.zip";
+    hash="0m5szd74ig8yqazwk2g3zl4z7wwp08k52awawk1pigy6a4z1qd9v";
+  };
+in
+rec {
+  src = a.fetchurl {
+    url = sourceInfo.url;
+    sha256 = sourceInfo.hash;
+  };
+
+  inherit (sourceInfo) name version;
+  inherit buildInputs;
+
+  phaseNames = ["changeSettings" "doCmake" "doMakeInstall"];
+
+  changeSettings = a.fullDepEntry ''
+    sed -i Box2D/Common/b2Settings.h -e 's@b2_maxPolygonVertices .*@b2_maxPolygonVertices 15@'
+  '' ["minInit" "addInputs" "doUnpack"];
+      
+  goSrcDir = ''cd Box2D'';
+
+  doCmake = a.fullDepEntry ''
+    cd Build; 
+    cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out ..
+  '' ["minInit" "addInputs" "doUnpack"];
+      
+  meta = {
+    description = "2D physics engine";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux;
+    license = "bsd";
+  };
+  passthru = {
+    updateInfo = {
+      downloadPage = "http://code.google.com/p/box2d/downloads/list";
+    };
+  };
+}) x
+
diff --git a/pkgs/development/libraries/enchant/default.nix b/pkgs/development/libraries/enchant/default.nix
index 388d042d3aca..78756deb55ea 100644
--- a/pkgs/development/libraries/enchant/default.nix
+++ b/pkgs/development/libraries/enchant/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, aspell, pkgconfig, glib }:
+{ stdenv, fetchurl, aspell, pkgconfig, glib, hunspell, hspell }:
 
 stdenv.mkDerivation rec {
-  name = "enchant-1.3.0";
+  name = "${pname}-${version}";
+  version = "1.6.0";
+  pname = "enchant";
   
   src = fetchurl {
-    url = "http://www.abisource.com/downloads/enchant/1.3.0/${name}.tar.gz";
-    sha256 = "1vwqwsadnp4rf8wj7d4rglvszjzlcli0jyxh06h8inka1sm1al76";
+    url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz";
+    sha256 = "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g";
   };
   
-  buildInputs = [aspell pkgconfig glib];
+  buildInputs = [aspell pkgconfig glib hunspell hspell];
   
   meta = {
     homepage = http://www.abisource.com/enchant;
diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index 676f021a7209..5cb04c80a45e 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -1,19 +1,22 @@
-{stdenv, fetchurl, zlib}:
+{stdenv, fetchurl, zlib, expat}:
 
 stdenv.mkDerivation rec {
-  name = "exiv2-0.18";
+  name = "exiv2-0.21";
   
   src = fetchurl {
     url = "http://www.exiv2.org/${name}.tar.gz";
-    sha256 = "1kg4bdlcqqhw9gcfs68i55sz4hvlf94xxxmqb255hhvhfj692rz5";
+    sha256 = "1r9phzb1h9v8smw1pix2k9lyr44n4nyba15x7qh45c0pwsjdf9yq";
   };
   
-  buildInputs = [zlib];
+  propagatedBuildInputs = [zlib expat];
   
-  configureFlags = "--with-zlib=${zlib} --disable-xmp";
+# configure script finds zlib&expat but it thinks that they're in /usr
+  configureFlags = "--with-zlib=${zlib} --with-expat=${expat}";
 
   meta = {
     homepage = http://www.exiv2.org/;
     description = "A library and command-line utility to manage image metadata";
+    maintainers = [stdenv.lib.maintainers.urkud];
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index 1eb9b9c13382..9f3650c21558 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, readline }:
 
 stdenv.mkDerivation rec {
-  name = "hunspell-1.2.11";
+  name = "hunspell-1.2.12";
 
   src = fetchurl {
     url = "mirror://sf/hunspell/${name}.tar.gz";
-    sha256 = "14vfs1qb01hq30ss1bsiv6lkx673695g0xdyisrq720fdq2mr5rz";
+    sha256 = "0s8fh8zanhks6bgkb7dzwscy97fb6wl4ymvjqz7188fz29qjlnaz";
   };
 
   propagatedBuildInputs = [ ncurses readline ];
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index 6323d7d146a4..c15bbe2491c3 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "icu4c";
-  version = "4.4.1";
+  version = "4.6";
 in
 
 stdenv.mkDerivation {
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
       + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
-    sha256 = "0qrhf9gsj38saxfzpzvlwp1jwdsxr06npdds5dbsc86shg0lz69l";
+    sha256 = "1z6zklqdf6pq7fckk8ar4vmfrnw79bih6yc8gwc7k2vx2alav8dm";
   };
 
   postUnpack = "
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Unicode and globalization support library";
     homepage = http://site.icu-project.org/;
-    maintainers = [stdenv.lib.maintainers.raskin];
+    maintainers = with stdenv.lib.maintainers; [raskin urkud];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix
index 836831594768..a0119866df0c 100644
--- a/pkgs/development/libraries/iso-codes/default.nix
+++ b/pkgs/development/libraries/iso-codes/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, gettext, python}:
 
-stdenv.mkDerivation {
-  name = "iso-codes-3.5";
+stdenv.mkDerivation rec {
+  name = "iso-codes-3.23";
   src = fetchurl {
-    url = ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-3.5.tar.bz2;
-    sha256 = "2aac5f37a9ebb5af9c5d186ba1428f05ad779c7760e279cd8b86897a5d434807";
+    url = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/${name}.tar.bz2";
+    sha256 = "0lf9phrdr10biihqswq1qmwk5cz954nwavgbnpm7a5r6vzfzkfbq";
   };
   patchPhase = ''
     for i in `find . -name \*.py`
@@ -13,4 +13,11 @@ stdenv.mkDerivation {
     done
   '';
   buildInputs = [ gettext ];
+
+  meta = {
+    homepage = http://pkg-isocodes.alioth.debian.org/;
+    description = "Various ISO codes packaged as XML files";
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.all;
+  };
 }
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 7c9223a91fd7..918f84e3b748 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -1,34 +1,27 @@
-{ fetchurl, stdenv, qt4Support ? false, qt4 ? null
-, cairo, freetype, fontconfig, zlib, libjpeg
-, pkgconfig, glib, gtk }:
-
-assert qt4Support -> (qt4 != null);
+{ fetchurl, stdenv, qt4Support ? false, qt4, cairo, freetype, fontconfig, zlib,
+  libjpeg, pixman, curl, libpthreadstubs, libXau, libXdmcp, openjpeg,
+  libxml2, pkgconfig, glib, gtk, cmake, lcms }:
 
 stdenv.mkDerivation rec {
-  name = "poppler-0.12.3";
+  name = "poppler-0.14.5";
 
   src = fetchurl {
-    url = "http://poppler.freedesktop.org/${name}.tar.gz";
-    sha256 = "1k7vilpz0ipnmw9dfpb3rqkhlm4rqcnkn3bhhp14di2h55nzwkvs";
+    url = "${meta.homepage}${name}.tar.gz";
+    sha256 = "0k41cj0yp3l7854y1hlghn2cgqmqq6hw5iz8i84q0w0s9iy321f8";
   };
 
-  buildInputs = [pkgconfig zlib glib cairo freetype fontconfig libjpeg gtk]
+  propagatedBuildInputs = [zlib glib cairo freetype fontconfig libjpeg gtk lcms
+    pixman curl libpthreadstubs libXau libXdmcp openjpeg libxml2 stdenv.gcc.libc]
     ++ (if qt4Support then [qt4] else []);
 
-  configureFlags =
-    ''
-      --enable-exceptions --enable-cairo --enable-splash
-      --enable-poppler-glib --enable-zlib --enable-xpdf-headers
-    ''
-    + (if qt4Support then "--enable-qt-poppler" else "--disable-qt-poppler");
-
-  patches = [ ./GDir-const.patch ];
+  buildInputs = [ pkgconfig cmake ];
 
-  preConfigure = "sed -e '/jpeg_incdirs/s@/usr@${libjpeg}@' -i configure";
+  cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON";
 
   # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files
   # such as `../../../test/unittestcases/UseNone.pdf'.
-  doCheck = !qt4Support;
+#doCheck = !qt4Support;
+  checkTarget = "test";
 
   meta = {
     homepage = http://poppler.freedesktop.org/;
@@ -38,6 +31,10 @@ stdenv.mkDerivation rec {
       Poppler is a PDF rendering library based on the xpdf-3.0 code base.
     '';
 
+    platforms = if qt4Support
+      then qt4.meta.platforms
+      else stdenv.lib.platforms.all;
+
     license = "GPLv2";
   };
 }
diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index 9aef1f446fe9..ce946c3d31fc 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -30,5 +30,9 @@ stdenv.mkDerivation {
       language.
     '';
     license = "LGPL";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.z77z
+    ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/camlzip/META b/pkgs/development/ocaml-modules/camlzip/META
index 85456166101e..72f5a3b8bd02 100644
--- a/pkgs/development/ocaml-modules/camlzip/META
+++ b/pkgs/development/ocaml-modules/camlzip/META
@@ -1,23 +1,6 @@
-# Specifications for the "camlzip" library:
-
-name="zip"
-version="1.04"
-description="A library for handling ZIP and GZIP files in OCaml"
-directory="@INSTALLDIR@"
-
+version="@VERSION@"
+description="reading and writing ZIP, JAR and GZIP files"
 requires="unix"
-requires(byte)="unix"
-requires(native)="unix"
-requires(toploop)="unix"
-
-requires(byte,mt)="unix"
-requires(native,mt)="unix"
-requires(toploop,mt)="unix"
-
-archive(byte)="zip.cma"
-archive(native)="zip.cmxa"
-archive(toploop)="zip.cma"
-
-archive(byte,mt)="zip.cma"
-archive(native,mt)="zip.cmxa"
-archive(toploop,mt)="zip.cma"
+archive(byte)="camlzip.cma"
+archive(native)="camlzip.cmxa"
+linkopts = ""
diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix
index 4e5df2cd75d9..9e991a811e6b 100644
--- a/pkgs/development/ocaml-modules/camlzip/default.nix
+++ b/pkgs/development/ocaml-modules/camlzip/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, zlib, ocaml}:
+{stdenv, fetchurl, zlib, ocaml, findlib}:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -14,25 +14,20 @@ stdenv.mkDerivation {
     sha256 = "1zpchmp199x7f4mzmapvfywgy7f6wy9yynd9nd8yh8l78s5gixbn";
   };
 
-  buildInputs = [zlib ocaml];
+  buildInputs = [zlib ocaml findlib];
 
   patches = [ ./makefile.patch ];
 
-  configurePhase = ''
-    export INSTALLDIR="$out/lib/ocaml/${ocaml_version}/site-lib/zip"
+  postPatch = ''
+    substitute ${./META} META --subst-var-by VERSION "${version}"
     substituteInPlace Makefile \
       --subst-var-by ZLIB_LIBDIR "${zlib}/lib" \
-      --subst-var-by ZLIB_INCLUDE "${zlib}/include" \
-      --subst-var INSTALLDIR
+      --subst-var-by ZLIB_INCLUDE "${zlib}/include"
   '';
 
   buildFlags = "all allopt";
 
-  installTargets = "install installopt";
-
-  postInstall = ''
-    substitute ${./META} $INSTALLDIR/META --subst-var INSTALLDIR
-  '';
+  installTargets = "install";
 
   meta = {
     homepage = "http://cristal.inria.fr/~xleroy/software.html#camlzip";
@@ -43,5 +38,9 @@ stdenv.mkDerivation {
       for reading from and writing to compressed files in these formats.
     '';
     license = "LGPL+linking exceptions";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.z77z
+    ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/camlzip/makefile.patch b/pkgs/development/ocaml-modules/camlzip/makefile.patch
index 10adcd6687b0..07637100d036 100644
--- a/pkgs/development/ocaml-modules/camlzip/makefile.patch
+++ b/pkgs/development/ocaml-modules/camlzip/makefile.patch
@@ -1,7 +1,7 @@
-diff -Naur camlzip-1.04/Makefile camlzip-1.04.nixos/Makefile
+diff -Nuar camlzip-1.04/Makefile camlzip-1.04.nixpkgs/Makefile
 --- camlzip-1.04/Makefile	2002-04-22 17:28:57.000000000 +0200
-+++ camlzip-1.04.nixos/Makefile	2010-08-17 14:40:07.000000000 +0200
-@@ -4,14 +4,14 @@
++++ camlzip-1.04.nixpkgs/Makefile	2010-12-12 18:30:49.000000000 +0100
+@@ -4,14 +4,10 @@
  ZLIB_LIB=-lz
  
  # The directory containing the Zlib library (libz.a or libz.so)
@@ -10,23 +10,45 @@ diff -Naur camlzip-1.04/Makefile camlzip-1.04.nixos/Makefile
  
  # The directory containing the Zlib header file (zlib.h)
 -ZLIB_INCLUDE=/usr/local/include
-+ZLIB_INCLUDE=@ZLIB_INCLUDE@
- 
- # Where to install the library.  By default: sub-directory 'zip' of
- # OCaml's standard library directory.
+-
+-# Where to install the library.  By default: sub-directory 'zip' of
+-# OCaml's standard library directory.
 -INSTALLDIR=`$(OCAMLC) -where`/zip
-+INSTALLDIR=@INSTALLDIR@
++ZLIB_INCLUDE=@ZLIB_INCLUDE@
  
  ### End of configuration section
  
-@@ -59,10 +59,6 @@
- 	cp zip.cma zip.cmi gzip.cmi zip.mli gzip.mli libcamlzip.a $(INSTALLDIR)
- 	if test -f dllcamlzip.so; then \
- 	  cp dllcamlzip.so $(INSTALLDIR); \
+@@ -19,10 +15,13 @@
+ OCAMLOPT=ocamlopt
+ OCAMLDEP=ocamldep
+ OCAMLMKLIB=ocamlmklib
++OCAMLFIND=ocamlfind 
+ 
+ OBJS=zlib.cmo zip.cmo gzip.cmo
+ C_OBJS=zlibstubs.o
+ 
++LIBINSTALL_FILES = $(wildcard *.mli *.cmi *.cma *.cmxa *.a *.so)
++
+ all: libcamlzip.a zip.cma
+ 
+ allopt: libcamlzip.a zip.cmxa
+@@ -55,18 +54,7 @@
+ 	rm -f *.o *.a
+ 
+ install:
+-	mkdir -p $(INSTALLDIR)
+-	cp zip.cma zip.cmi gzip.cmi zip.mli gzip.mli libcamlzip.a $(INSTALLDIR)
+-	if test -f dllcamlzip.so; then \
+-	  cp dllcamlzip.so $(INSTALLDIR); \
 -          ldconf=`$(OCAMLC) -where`/ld.conf; \
 -          installdir=$(INSTALLDIR); \
 -          if test `grep -s -c $$installdir'$$' $$ldconf || :` = 0; \
 -          then echo $$installdir >> $$ldconf; fi \
-         fi
+-        fi
+-
+-installopt:
+-	cp zip.cmxa zip.a zip.cmx gzip.cmx $(INSTALLDIR)
++	$(OCAMLFIND) install camlzip META $(LIBINSTALL_FILES)
  
- installopt:
+ depend:
+ 	gcc -MM -I$(ZLIB_INCLUDE) *.c > .depend
diff --git a/pkgs/development/ocaml-modules/camomile/0.7.3.nix b/pkgs/development/ocaml-modules/camomile/0.7.3.nix
index 4cc214042587..b770b36abf66 100644
--- a/pkgs/development/ocaml-modules/camomile/0.7.3.nix
+++ b/pkgs/development/ocaml-modules/camomile/0.7.3.nix
@@ -21,5 +21,9 @@ stdenv.mkDerivation {
     homepage = http://camomile.sourceforge.net/;
     description = "A comprehensive Unicode library for OCaml";
     license = "LGPL";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.z77z
+    ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/camomile/0.8.1.nix b/pkgs/development/ocaml-modules/camomile/0.8.1.nix
index 1c32bca58b13..8d9ab69dfc65 100644
--- a/pkgs/development/ocaml-modules/camomile/0.8.1.nix
+++ b/pkgs/development/ocaml-modules/camomile/0.8.1.nix
@@ -21,5 +21,9 @@ stdenv.mkDerivation {
     homepage = http://camomile.sourceforge.net/;
     description = "A comprehensive Unicode library for OCaml";
     license = "LGPL";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.z77z
+    ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix
index a9116c09ee76..63a25dd0b471 100644
--- a/pkgs/development/ocaml-modules/cryptgps/default.nix
+++ b/pkgs/development/ocaml-modules/cryptgps/default.nix
@@ -27,5 +27,9 @@ stdenv.mkDerivation {
       itself.
     '';
     license = "MIT/X11";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.z77z
+    ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix
index 1c7e361f3fc3..f4ba9a8d7d7f 100644
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@@ -39,5 +39,9 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://pauillac.inria.fr/~xleroy/software.html";
     description = "A library of cryptographic primitives for OCaml";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.z77z
+    ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 766419aada7c..9ef109063655 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -21,5 +21,9 @@ stdenv.mkDerivation {
     homepage = http://ocsigen.org/lwt;
     description = "Lightweight thread library for Objective Caml";
     license = "LGPL";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.z77z
+    ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix
index 7c1a2bfe829a..4d92cda5553d 100644
--- a/pkgs/development/ocaml-modules/menhir/default.nix
+++ b/pkgs/development/ocaml-modules/menhir/default.nix
@@ -43,5 +43,9 @@ stdenv.mkDerivation {
       and Yann Régis-Gianas.
     '';
     license = "QPL,LGPL+linking exceptions";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.z77z
+    ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
new file mode 100644
index 000000000000..07a781657b3f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -0,0 +1,43 @@
+{stdenv, fetchurl, ncurses, ocaml, findlib, ocaml_pcre, camlzip, openssl, ocaml_ssl}:
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+  version = "3.1";
+in
+
+stdenv.mkDerivation {
+  name = "ocamlnet-${version}";
+
+  src = fetchurl {
+    url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz";
+    sha256 = "0kdc2540ad84j6haj9jxlwryz9cb8q8kjdr48f2wgvcaii38v9f5";
+  };
+
+  buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl];
+
+  dontAddPrefix = true;
+
+  preConfigure = ''
+    configureFlagsArray=(
+      -bindir $out/bin
+      -enable-ssl
+      -enable-zip
+      -datadir $out/lib/ocaml/${ocaml_version}/ocamlnet
+    )
+  '';
+
+  buildPhase = ''
+    make all
+    make opt
+  '';
+
+  meta = {
+    homepage = http://projects.camlcity.org/projects/ocamlnet.html;
+    description = "A library implementing Internet protocols (http, cgi, email, etc.) for OCaml";
+    license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL.";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.z77z
+    ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix
index af208dc5651c..62bf7f89c491 100644
--- a/pkgs/development/ocaml-modules/ounit/default.nix
+++ b/pkgs/development/ocaml-modules/ounit/default.nix
@@ -27,5 +27,9 @@ stdenv.mkDerivation {
     homepage = http://www.xs4all.nl/~mmzeeman/ocaml/;
     description = "Unit test framework for OCaml";
     license = "MIT/X11";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.z77z
+    ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix
index d1287425625c..d16093a6feb9 100644
--- a/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/pkgs/development/ocaml-modules/pcre/default.nix
@@ -22,5 +22,9 @@ stdenv.mkDerivation {
     homepage = "http://www.ocaml.info/home/ocaml_sources.html#pcre-ocaml";
     description = "An efficient C-library for pattern matching with Perl-style regular expressions in OCaml";
     license = "LGPL";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.z77z
+    ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix
index b1757d84b7b6..02420204dbfa 100644
--- a/pkgs/development/ocaml-modules/react/default.nix
+++ b/pkgs/development/ocaml-modules/react/default.nix
@@ -29,5 +29,9 @@ stdenv.mkDerivation {
     homepage = http://erratique.ch/software/react;
     description = "Applicative events and signals for OCaml";
     license = "BSD";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.z77z
+    ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix
new file mode 100644
index 000000000000..d542cfe14f62
--- /dev/null
+++ b/pkgs/development/ocaml-modules/sqlite3/default.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchurl, sqlite, ocaml, findlib}:
+
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+  version = "1.5.8";
+in
+
+stdenv.mkDerivation {
+  name = "ocaml-sqlite3-${version}";
+
+  src = fetchurl {
+    url = "http://hg.ocaml.info/release/ocaml-sqlite3/archive/" +
+          "release-${version}.tar.bz2";
+    sha256 = "0ccy9b4pl9586vlzdkk3kvkz8xqc023ih1aw4nndyjnabkvgl832";
+  };
+
+  buildInputs = [ocaml findlib];
+
+  configureFlags = "--with-sqlite3=${sqlite}";
+
+  preConfigure = ''
+    export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR
+    ensureDir $out/bin
+  '';
+
+  meta = {
+    homepage = "http://ocaml.info/home/ocaml_sources.html#ocaml-sqlite3";
+    description = "OCaml bindings to the SQLite 3 database access library";
+    license = "MIT/X11";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.z77z
+    ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix
index 6d57bd3bbf51..56ac189b7ba4 100644
--- a/pkgs/development/ocaml-modules/ssl/default.nix
+++ b/pkgs/development/ocaml-modules/ssl/default.nix
@@ -23,5 +23,9 @@ stdenv.mkDerivation {
     homepage = http://savonet.rastageeks.org/;
     description = "OCaml bindings for libssl ";
     license = "LGPL+link exception";
+    platforms = ocaml.meta.platforms;
+    maintainers = [
+      stdenv.lib.maintainers.z77z
+    ];
   };
 }