Merge remote-tracking branch 'origin/master' into staging

Conflicts:
	pkgs/development/libraries/poppler/default.nix

pkgs/development/ocaml-modules/calendar/default.nix

@@ -1,9 +1,9 @@
 {stdenv, fetchurl, ocaml, findlib}:
 
 stdenv.mkDerivation {
-  name = "ocaml-calendar-2.03.2";
+  name = "ocaml-calendar-2.5";
   src = fetchurl {
-    url = https://forge.ocamlcore.org/frs/download.php/915/calendar-2.03.2.tar.gz;
+    url = https://forge.ocamlcore.org/frs/download.php/915/calendar-2.5.tar.bz2;
     sha256 = "04pvhwb664g3s644c7v7419a3kvf5s3pynkhmk5j59dvlfm1yf0f";
     };
 

pkgs/development/ocaml-modules/camlimages/default.nix

@@ -1,7 +1,6 @@
 {stdenv, fetchurl, omake, ocaml, omake_rc1, libtiff, libjpeg, libpng, giflib, findlib, libXpm, freetype, graphicsmagick, ghostscript }:
 
 let
-  ocaml_version = (builtins.parseDrvName ocaml.name).version;
   pname = "camlimages";
   version = "4.0.1";
 in
@@ -14,9 +13,9 @@ stdenv.mkDerivation {
     sha256 = "b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4";
   };
 
-  buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript libtiff libjpeg libpng giflib freetype libXpm ];
+  buildInputs = [ocaml omake_rc1 findlib graphicsmagick ghostscript ];
 
-  propagatedbuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ];
+  propagatedBuildInputs = [libtiff libjpeg libpng giflib freetype libXpm ];
 
   createFindlibDestdir = true;
 
@@ -32,12 +31,10 @@ stdenv.mkDerivation {
     omake install
   '';
 
-  #makeFlags = "BINDIR=$(out)/bin  MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib";
-
-  meta = {
-    homepage = http://cristal.inria.fr/camlimages;
-    description = "Image manipulation library";
-    license = stdenv.lib.licenses.gpl2;
-#    maintainers = [ stdenv.lib.maintainers.roconnor ];
+  meta = with stdenv.lib; {
+    homepage = https://bitbucket.org/camlspotter/camlimages;
+    description = "OCaml image processing library";
+    license = licenses.lgpl2;
+    maintainers = [ maintainers.vbgl ];
   };
 }

pkgs/development/ocaml-modules/http/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib}:
+{stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     sha256 = "070xw033r4pk6f4l0wcknm75y9qm4mp622a4cgzmcfhm58v6kssn";
   };
 
-  buildInputs = [ocaml_pcre ocamlnet ocaml findlib];
+  buildInputs = [ocaml_pcre ocamlnet ocaml findlib camlp4];
 
   createFindlibDestdir = true;
 
@@ -30,10 +30,10 @@ stdenv.mkDerivation {
     make all opt
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://upsilon.cc/~zack/hacking/software/ocaml-http/";
     description = "do it yourself (OCaml) HTTP daemon";
-    license = stdenv.lib.licenses.lgpl2;
-    maintainers = [ stdenv.lib.maintainers.roconnor ];
+    license = licenses.lgpl2;
+    maintainers = with maintainers; [ roconnor vbgl ];
   };
 }

pkgs/development/ocaml-modules/lablgl/META.patch

@@ -0,0 +1,18 @@
+diff -r 562eb6ecb8ca META
+--- a/META	Wed Oct 01 20:09:24 2014 +0100
++++ b/META	Wed Oct 01 20:22:15 2014 +0100
+@@ -1,6 +1,5 @@
+-description "Bindings for OpenGL"
++description="Bindings for OpenGL"
+ version="1.05"
+-directory="+lablGL"
+ archive(byte) = "lablgl.cma"
+ archive(native) = "lablgl.cmxa"
+ 
+@@ -16,4 +15,4 @@
+   requires = "lablgl"
+   archive(byte) = "lablglut.cma"
+   archive(native) = "lablglut.cmxa"
+-)
+\ No newline at end of file
++)

pkgs/development/ocaml-modules/lablgl/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut } :
+{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp4 } :
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -14,9 +14,10 @@ stdenv.mkDerivation {
     sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq";
   };
 
-  buildInputs = [ocaml findlib lablgtk mesa freeglut ];
+  buildInputs = [ocaml findlib lablgtk freeglut camlp4];
+  propagatedBuildInputs = [ mesa ];
 
-  patches = [ ./Makefile.config.patch ];
+  patches = [ ./Makefile.config.patch ./META.patch ];
 
   preConfigure = ''
     substituteInPlace Makefile.config \
@@ -35,10 +36,10 @@ stdenv.mkDerivation {
     cp ./META $out/lib/ocaml/${ocaml_version}/site-lib/lablgl
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html;
     description = "OpenGL bindings for ocaml";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.pSub ];
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ pSub vbgl ];
   };
 }

pkgs/development/ocaml-modules/lablgtk/default.nix

@@ -3,16 +3,16 @@
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
   pname = "lablgtk";
-  version = "2.16.0";
+  version = "2.18.2";
 in
 
 assert stdenv.lib.versionAtLeast ocaml_version "3.12";
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation {
   name = "${pname}-${version}";
   src = fetchurl {
-    url = "https://forge.ocamlcore.org/frs/download.php/979/${name}.tar.gz";
-    sha256 = "a0ea9752eb257dadcfc2914408fff339d4c34357802f02c63329dd41b777de2f";
+    url = https://forge.ocamlcore.org/frs/download.php/1456/lablgtk-2.18.2.tar.gz;
+    sha256 = "0f9rs4av0v7p5k8hifcq4b49xx8jmmfch3sdk9pij8a8jfgwxvfy";
   };
 
   buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4];
@@ -25,14 +25,13 @@ stdenv.mkDerivation (rec {
     export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     platforms = ocaml.meta.platforms;
-    maintainers = [
-      stdenv.lib.maintainers.z77z
-      stdenv.lib.maintainers.roconnor
+    maintainers = with maintainers; [
+      z77z roconnor vbgl
     ];
-    homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html;
-    description = "LablGTK is is an Objective Caml interface to gtk+";
-    license = stdenv.lib.licenses.lgpl21Plus;
+    homepage = http://lablgtk.forge.ocamlcore.org/;
+    description = "An OCaml interface to gtk+";
+    license = licenses.lgpl21Plus;
   };
-})
+}

pkgs/development/ocaml-modules/macaque/default.nix

@@ -0,0 +1,22 @@
+{stdenv, fetchurl, ocaml, findlib, pgocaml, camlp4}:
+
+stdenv.mkDerivation {
+  name = "ocaml-macaque-0.7.1";
+  src = fetchurl {
+    url = https://github.com/ocsigen/macaque/archive/0.7.1.tar.gz;
+    sha256 = "0wnq3pgpcrfpivr8j7p827rhag6hdx0yr0bdvma0hw1g30vwf9qa";
+  };
+
+  buildInputs = [ ocaml findlib camlp4 ];
+  propagatedBuildInputs = [ pgocaml ];
+
+  createFindlibDestdir = true;
+
+  meta = with stdenv.lib; {
+    description = "Macros for Caml Queries";
+    homepage = https://github.com/ocsigen/macaque;
+    license = licenses.lgpl2;
+    platforms = ocaml.meta.platforms;
+    maintainers = with maintainers; [ vbgl ];
+  };
+}

pkgs/development/ocaml-modules/odn/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, ounit}:
+{stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, ounit, camlp4}:
 
 stdenv.mkDerivation {
   name = "ocaml-data-notation-0.0.11";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj";
   };
 
-  buildInputs = [ocaml findlib ocaml_typeconv ounit];
+  buildInputs = [ocaml findlib ocaml_typeconv ounit camlp4];
 
   createFindlibDestdir = true;
 
@@ -16,13 +16,13 @@ stdenv.mkDerivation {
   buildPhase     = "ocaml setup.ml -build";
   installPhase   = "ocaml setup.ml -install";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Store data using OCaml notation";
     homepage = https://forge.ocamlcore.org/projects/odn/;
-    license = stdenv.lib.licenses.lgpl21;
+    license = licenses.lgpl21;
     platforms = ocaml.meta.platforms;
-    maintainers = with stdenv.lib.maintainers; [
-      z77z
+    maintainers = with maintainers; [
+      vbgl z77z
     ];
   };
 }

pkgs/development/ocaml-modules/pgocaml/default.nix

@@ -0,0 +1,22 @@
+{stdenv, fetchurl, ocaml, findlib, camlp4, calendar, csv, ocaml_pcre}:
+
+stdenv.mkDerivation {
+  name = "ocaml-pgocaml-2.1";
+  src = fetchurl {
+    url = http://forge.ocamlcore.org/frs/download.php/1413/pgocaml-2.1.tgz;
+    sha256 = "0m7whlmhm7z58pfaarvkyiwaylmrz05aj6fr773zd9xlv07ljiym";
+  };
+
+  buildInputs = [ocaml findlib camlp4];
+  propagatedBuildInputs = [calendar csv ocaml_pcre];
+
+  createFindlibDestdir = true;
+
+  meta = with stdenv.lib; {
+    description = "An interface to PostgreSQL databases for OCaml applications";
+    homepage = http://pgocaml.forge.ocamlcore.org/;
+    license = licenses.lgpl2;
+    platforms = ocaml.meta.platforms;
+    maintainers = with maintainers; [ vbgl ];
+  };
+}

pkgs/development/ocaml-modules/reactivedata/default.nix

@@ -0,0 +1,34 @@
+{stdenv, fetchurl, ocaml, findlib, ocaml_react, opam}:
+
+let
+  ocamlVersion = stdenv.lib.getVersion ocaml;
+in
+
+assert stdenv.lib.versionAtLeast ocamlVersion "3.11";
+
+stdenv.mkDerivation {
+  name = "ocaml-reactiveData-0.1";
+  src = fetchurl {
+    url = https://github.com/hhugo/reactiveData/archive/0.1.tar.gz;
+    sha256 = "056y9in6j6rpggdf8apailvs1m30wxizpyyrj08xyfxgv91mhxgw";
+  };
+
+  buildInputs = [ocaml findlib opam];
+  propagatedBuildInputs = [ocaml_react];
+
+  buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
+
+  installPhase = ''
+    opam-installer --script --prefix=$out reactiveData.install > install.sh
+    sed -i s!lib/reactiveData!lib/ocaml/${ocamlVersion}/site-lib/reactiveData! install.sh
+    sh install.sh
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An OCaml module for functional reactive programming (FRP) based on React";
+    homepage = https://github.com/hhugo/reactiveData;
+    license = licenses.lgpl21;
+    platforms = ocaml.meta.platforms;
+    maintainers = with maintainers; [ vbgl ];
+  };
+}

pkgs/development/ocaml-modules/ssl/default.nix

@@ -2,7 +2,7 @@
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
-  version = "0.4.4";
+  version = "0.4.7";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://debian/pool/main/o/ocaml-ssl/ocaml-ssl_${version}.orig.tar.gz";
-    sha256 = "1m45d0bd4ndxswaa1symp6c1npzjmm9pz0nf7w0q15gflqhba5ch";
+    sha256 = "0i0j89b10n3xmmawcq4qfwa42133pddw4x5nysmsnpd15srv5gp9";
   };
 
   buildInputs = [which openssl ocaml findlib];

pkgs/development/ocaml-modules/zarith/default.nix

@@ -3,13 +3,16 @@
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
 in
+
+assert stdenv.lib.versionAtLeast ocaml_version "3.12.1";
+
 stdenv.mkDerivation rec {
   name = "zarith-${version}";
-  version = "1.2.1";
+  version = "1.3";
 
   src = fetchurl {
-    url = "http://forge.ocamlcore.org/frs/download.php/1199/${name}.tgz";
-    sha256 = "0i21bsx41br0jgw8xmlpnky5zamzqkpbykrq0z53z7ar77602s4i";
+    url = http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz;
+    sha256 = "1mx3nxcn5h33qhx4gbg0hgvvydwlwdvdhqcnvfwnmf9jy3b8frll";
   };
 
   buildInputs = [ ocaml findlib pkgconfig gmp perl ];
@@ -22,11 +25,11 @@ stdenv.mkDerivation rec {
   '';
   preInstall = "mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "fast, arbitrary precision OCaml integers";
     homepage    = "http://forge.ocamlcore.org/projects/zarith";
-    license     = stdenv.lib.licenses.lgpl2;
+    license     = licenses.lgpl2;
     platforms   = ocaml.meta.platforms;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    maintainers = with maintainers; [ thoughtpolice vbgl ];
   };
 }