Merge branch 'master' into closure-size

TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.

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

@@ -1,13 +1,13 @@
 { stdenv, fetchzip, ocaml, findlib, qtest }:
 
-let version = "2.3.1"; in
+let version = "2.4.0"; in
 
 stdenv.mkDerivation {
   name = "ocaml-batteries-${version}";
 
   src = fetchzip {
     url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz";
-    sha256 = "1hjbzczchqnnxbn4ck84j5pi6prgfjfjg14kg26fzqz3gql427rl";
+    sha256 = "0bxp5d05w1igwh9vcgvhd8sd6swf2ddsjphw0mkakdck9afnimmd";
   };
 
   buildInputs = [ ocaml findlib qtest ];

pkgs/development/ocaml-modules/easy-format/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchzip, ocaml, findlib }:
 let
   pname = "easy-format";
-  version = "1.1.0";
+  version = "1.2.0";
 in
 stdenv.mkDerivation {
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchzip {
     url = "https://github.com/mjambon/${pname}/archive/v${version}.tar.gz";
-    sha256 = "084blm13k5lakl5wq3qfxbd0l0bwblvk928v75xcxpaqwv426w5a";
+    sha256 = "00ga7mrlycjc99gzp3bgx6iwhf7i6j8856f8xzrf1yas7zwzgzm9";
   };
 
   buildInputs = [ ocaml findlib ];

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

@@ -1,17 +1,20 @@
 { stdenv, fetchzip, ocaml, findlib, cstruct }:
 
-let version = "0.2.0"; in
+let version = "1.0.0"; in
 
 stdenv.mkDerivation {
   name = "ocaml-hex-${version}";
 
   src = fetchzip {
     url = "https://github.com/mirage/ocaml-hex/archive/${version}.tar.gz";
-    sha256 = "13vmpxwg5vb2qvkdqz37rx1ya19r9cp4dwylx8jj15mn77hpy7xg";
+    sha256 = "0g4cq4bsksga15fa5ln083gkglawknbnhi2s4k8yk0yi5xngvwm4";
   };
 
   buildInputs = [ ocaml findlib ];
   propagatedBuildInputs = [ cstruct ];
+  configureFlags = "--enable-tests";
+  doCheck = true;
+  checkTarget = "test";
   createFindlibDestdir = true;
 
   meta = {

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

@@ -0,0 +1,22 @@
+{ stdenv, fetchzip, ocaml, findlib }:
+
+let version = "0.2.4"; in
+
+stdenv.mkDerivation {
+  name = "ocaml-iso8601-${version}";
+  src = fetchzip {
+    url = "https://github.com/sagotch/ISO8601.ml/archive/${version}.tar.gz";
+    sha256 = "0ypdd1p04xdjxxx3b61wp7abswfrq3vcvwwaxvywxwqljw0dhydi";
+  };
+
+  buildInputs = [ ocaml findlib ];
+  createFindlibDestdir = true;
+
+  meta = {
+    homepage = http://sagotch.github.io/ISO8601.ml/;
+    description = "ISO 8601 and RFC 3999 date parsing for OCaml";
+    license = stdenv.lib.licenses.mit;
+    platforms = ocaml.meta.platforms;
+    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+  };
+}

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

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocaml, findlib
-, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20151110" else "20140422"
+, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20151112" else "20140422"
 }@args:
 
 let
   sha256 =
   if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"
-  else if version == "20151110" then "12ijr1gd808f79d7k7ji9zg23xr4szayfgvm6njqamh0jnspq70r"
+  else if version == "20151112" then "0fhfs96gxnj920h5ydsg7c1qypsbrlzqfn2cqzrg9rfj1qq6wq86"
   else throw ("menhir: unknown version " ++ version);
 in
 

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

@@ -0,0 +1,25 @@
+{ stdenv, fetchzip, ocaml, findlib, ipaddr }:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
+
+stdenv.mkDerivation {
+  name = "ocaml-tuntap-1.3.0";
+
+  src = fetchzip {
+    url = https://github.com/mirage/ocaml-tuntap/archive/v1.3.0.tar.gz;
+    sha256 = "1cmd4kky875ks02gm2nb8yr80hmlfcnjdfyc63hvkh49acssy3d5";
+  };
+
+  buildInputs = [ ocaml findlib ];
+  propagatedBuildInputs = [ ipaddr ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "Bindings to the UNIX tuntap facility";
+    license = stdenv.lib.licenses.isc;
+    homepage = https://github.com/mirage/ocaml-tuntap;
+    inherit (ocaml.meta) platforms;
+  };
+
+}