Merge commit '683c68232e91f76386db979c461d8fbe2a018782'

20 files changed, 111 insertions, 209 deletions

diff --git a/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix b/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix
index 21482266c287..b05190ed4911 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix
@@ -2,15 +2,15 @@
 
 buildDunePackage rec {
   pname = "angstrom";
-  version = "0.12.1";
+  version = "0.13.0";
 
-  minimumOCamlVersion = "4.03";
+  minimumOCamlVersion = "4.04";
 
   src = fetchFromGitHub {
     owner  = "inhabitedtype";
     repo   = pname;
     rev    = version;
-    sha256 = "0w0wavqzdy2hrh7cjyl9w72ad4vndhwhknwvyacvkwkja5wys5b2";
+    sha256 = "0vzbwd8j34iv7n6gwqq2mf25q7rqpnpxnifb9ssxhq55p5dd1kp4";
   };
 
   checkInputs = [ alcotest ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/async_find/default.nix b/nixpkgs/pkgs/development/ocaml-modules/async_find/default.nix
deleted file mode 100644
index aa797cdace35..000000000000
--- a/nixpkgs/pkgs/development/ocaml-modules/async_find/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, buildOcaml, fetchurl, async_p4, core_p4, sexplib_p4}:
-
-buildOcaml rec {
-  name = "async_find";
-  version = "111.28.00";
-
-  minimumSupportedOcamlVersion = "4.02";
-
-  src = fetchurl {
-    url = "https://github.com/janestreet/async_find/archive/${version}.tar.gz";
-    sha256 = "4e3fda72f50174f05d96a5a09323f236c041b1a685890c155822956f3deb8803";
-  };
-
-  propagatedBuildInputs = [ async_p4 core_p4 sexplib_p4 ];
-
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/janestreet/async_find";
-    description = "Directory traversal with Async";
-    license = licenses.asl20;
-    maintainers = [ maintainers.ericbmerritt ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/async_shell/default.nix b/nixpkgs/pkgs/development/ocaml-modules/async_shell/default.nix
deleted file mode 100644
index 62b64a492d6f..000000000000
--- a/nixpkgs/pkgs/development/ocaml-modules/async_shell/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, buildOcaml, fetchurl, async_p4, core_p4, core_extended_p4}:
-
-buildOcaml rec {
-  name = "async_shell";
-  version = "109.28.03";
-
-  minimumSupportedOcamlVersion = "4.02";
-
-  src = fetchurl {
-    url = "https://github.com/janestreet/async_shell/archive/${version}.tar.gz";
-    sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105";
-  };
-
-  propagatedBuildInputs = [ async_p4 core_p4 core_extended_p4 ];
-
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/janestreet/async_shell";
-    description = "Shell helpers for Async";
-    license = licenses.asl20;
-    maintainers = [ maintainers.ericbmerritt ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/bigstring/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bigstring/default.nix
new file mode 100644
index 000000000000..98687262c33b
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/bigstring/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchFromGitHub, buildDunePackage }:
+
+buildDunePackage rec {
+  pname = "bigstring";
+  version = "0.2";
+
+  minimumOCamlVersion = "4.03";
+
+  src = fetchFromGitHub {
+    owner = "c-cube";
+    repo = "ocaml-bigstring";
+    rev = version;
+    sha256 = "0ypdf29cmwmjm3djr5ygz8ls81dl41a4iz1xx5gbcdpbrdiapb77";
+  };
+
+  doCheck = true;
+
+  meta = with lib; {
+    homepage = "https://github.com/c-cube/ocaml-bigstring";
+    description = "Bigstring built on top of bigarrays, and convenient functions";
+    license = licenses.bsd2;
+    maintainers = [ maintainers.alexfmpe ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/core_extended/default.nix b/nixpkgs/pkgs/development/ocaml-modules/core_extended/default.nix
deleted file mode 100644
index b657e812fdf3..000000000000
--- a/nixpkgs/pkgs/development/ocaml-modules/core_extended/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{stdenv, buildOcaml, fetchurl, bin_prot_p4, comparelib, core_p4, custom_printf,
- fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils_p4, re2_p4, sexplib_p4}:
-
-buildOcaml rec {
-  name = "core_extended";
-  version = "112.24.00";
-
-  minimumSupportedOcamlVersion = "4.02";
-
-  src = fetchurl {
-    url = "https://github.com/janestreet/core_extended/archive/${version}.tar.gz";
-    sha256 = "f87b0661b6c2cfb545ec61d1cb2ab1b9c4967b6ac14e651de41d3a6fb7f0f1e3";
-  };
-
-  preConfigure = stdenv.lib.optionalString stdenv.isLinux ''
-    patch lib/extended_unix_stubs.c <<EOF
-    0a1
-    > #define _LINUX_QUOTA_VERSION 2
-    EOF
-  '';
-
-  hasSharedObjects = true;
-  buildInputs = [ pa_bench pa_test pa_ounit ];
-  propagatedBuildInputs = [bin_prot_p4 comparelib core_p4 custom_printf fieldslib_p4
-                           pipebang textutils_p4 re2_p4 sexplib_p4 ];
-
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/janestreet/core_extended";
-    description = "Jane Street Capital's standard library overlay";
-    license = licenses.asl20;
-    maintainers = [ maintainers.ericbmerritt ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix
index 2a4d7004faa0..787854f8e416 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix
@@ -1,30 +1,29 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib
-, ocamlbuild, topkg
+{ lib, fetchurl, buildDunePackage, alcotest
 , uri, xmlm, omd, ezjsonm }:
 
-stdenv.mkDerivation rec {
-  version = "2.2.0";
-  pname = "ocaml-cow";
+buildDunePackage rec {
+  minimumOCamlVersion = "4.02.3";
 
-  src = fetchFromGitHub {
-    owner  = "mirage";
-    repo   = "ocaml-cow";
-    rev    = "v${version}";
-    sha256 = "0snhabg7rfrrcq2ksr3qghiawd61cw3y4kp6rl7vs87j4cnk3kr2";
+  version = "2.4.0";
+  pname = "cow";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/ocaml-cow/releases/download/v${version}/cow-v${version}.tbz";
+    sha256 = "1x77lwpskda4zyikwxh500xjn90pgdwz6jm7ca7f36pyav4vl6zx";
   };
 
-  buildInputs = [ ocaml ocamlbuild findlib topkg ];
   propagatedBuildInputs = [ xmlm uri ezjsonm omd ];
+  checkInputs = [ alcotest ];
+  doCheck = true;
 
-  inherit (topkg) buildPhase installPhase;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Caml on the Web";
     longDescription = ''
-      Caml on the Web (COW) is a set of parsers and syntax extensions to let you manipulate HTML, CSS, XML, JSON and Markdown directly from OCaml code.
+      Writing web-applications requires a lot of skills: HTML, XML, JSON and
+      Markdown, to name but a few! This library provides OCaml combinators
+      for these web formats.
     '';
     license = licenses.isc;
     maintainers = [ maintainers.sternenseemann ];
-    inherit (ocaml.meta) platforms;
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix b/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix
index d007533fe45b..0dd0541138c8 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix
@@ -1,10 +1,14 @@
-{ lib, buildDunePackage, dns, ocaml_lwt, mirage-clock, mirage-random, mirage-stack, mtime, randomconv }:
+{ lib, buildDunePackage, dns, ocaml_lwt, mirage-clock, mirage-time
+, mirage-random, mirage-stack, mirage-crypto-rng, mtime, randomconv }:
 
 buildDunePackage {
   pname = "dns-client";
   inherit (dns) src version;
 
-  propagatedBuildInputs = [ dns mtime ocaml_lwt mirage-clock mirage-random mirage-stack randomconv ];
+  useDune2 = true;
+
+  propagatedBuildInputs = [ dns mtime ocaml_lwt randomconv mirage-clock mirage-time
+                            mirage-random mirage-stack mirage-crypto-rng ];
 
   meta = dns.meta // {
     description = "Pure DNS resolver API";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix b/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix
index e2aac3367bfa..01bbffd40b94 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix
@@ -4,13 +4,13 @@
 
 buildDunePackage rec {
   pname = "dns";
-  version = "4.4.1";
+  version = "4.5.0";
 
   minimumOCamlVersion = "4.07";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz";
-    sha256 = "18c09jf0kicv2xz40n367y774rg8qs07rr1vdk8bx8f7hnaa9cn8";
+    sha256 = "10jrnnxvp06rvzk285wibyi9hn15qhjnqjy9xsfbwl8yhmzzqnq0";
   };
 
   propagatedBuildInputs = [ cstruct domain-name duration gmap ipaddr logs lru metrics ptime rresult ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
index 20ade26f9099..b01d4b4a04c2 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
+{ stdenv, fetchFromGitHub, buildDunePackage
+, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm
+}:
 
 buildDunePackage rec {
   pname = "gapi-ocaml";
-  version = "0.3.6";
+  version = "0.3.19";
 
   minimumOCamlVersion = "4.02";
 
@@ -10,10 +12,11 @@ buildDunePackage rec {
     owner = "astrada";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0qgsy51bhkpfgl5rdnjw4bqs5fbh2w4vwrfbl8y3lh1wrqmnwci4";
+    sha256 = "04arif1p1vj5yr24cwicj70b7yx17hrgf4pl47vqg8ngcrdh71v9";
   };
 
-  propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ];
+  propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib ocamlnet yojson ];
+  buildInputs = [ xmlm ];
 
   meta = {
     description = "OCaml client for google services";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/core-extended.nix
deleted file mode 100644
index 19550a82327a..000000000000
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/core-extended.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{stdenv, buildOcamlJane,
- core,
- bin_prot, fieldslib, sexplib, typerep, variantslib,
- ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane,
- re2, textutils}:
-
-buildOcamlJane {
-  name = "core_extended";
-  hash = "1j4ipcn741j8w3h4gpv5sygjzg6b5g6gc2jcrr4n0jyn5dq8b0p5";
-  propagatedBuildInputs =
-    [ core bin_prot fieldslib sexplib typerep variantslib
-      ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane
-      re2 textutils ];
-
-  patchPhase = stdenv.lib.optionalString stdenv.isLinux ''
-    patch src/extended_unix_stubs.c <<EOF
-0a1
-> #define _LINUX_QUOTA_VERSION 2
-EOF
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "https://github.com/janestreet/core_extended";
-    description = "Jane Street Capital's standard library overlay";
-    license = licenses.asl20;
-    maintainers = [ maintainers.maurer maintainers.ericbmerritt ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix
index e4da2216a83d..23b38e469b4b 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, darwin, ocaml, findlib, dune, base, stdio, lapack, blas }:
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.05.0";
-assert (!blas.is64bit) && (!lapack.is64bit);
+assert (!blas.isILP64) && (!lapack.isILP64);
 
 stdenv.mkDerivation rec {
   pname = "ocaml${ocaml.version}-lacaml";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-time/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-time/default.nix
new file mode 100644
index 000000000000..b98fd3b6279c
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-time/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildDunePackage, fetchurl, ocaml_lwt }:
+
+buildDunePackage rec {
+  minimumOCamlVersion = "4.06";
+
+  pname = "mirage-time";
+  version = "2.0.1";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/mirage-time/releases/download/v${version}/mirage-time-v${version}.tbz";
+    sha256 = "1w6mm4g7fc19cs0ncs0s9fsnb1k1s04qqzs9bsqvq8ngsb90cbh0";
+  };
+
+  propagatedBuildInputs = [ ocaml_lwt ];
+
+  meta = with lib; {
+    homepage = "https://github.com/mirage/mirage-time";
+    description = "Time operations for MirageOS";
+    license = licenses.isc;
+    maintainers = with maintainers; [ sternenseemann ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-time/unix.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-time/unix.nix
new file mode 100644
index 000000000000..da5326bc0751
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-time/unix.nix
@@ -0,0 +1,13 @@
+{ buildDunePackage, fetchurl, mirage-time, ocaml_lwt, duration }:
+
+buildDunePackage {
+  pname = "mirage-time-unix";
+
+  inherit (mirage-time) src version minimumOCamlVersion;
+
+  propagatedBuildInputs = [ mirage-time ocaml_lwt duration ];
+
+  meta = mirage-time.meta // {
+    description = "Time operations for MirageOS on Unix";
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix
index 90c449e383fd..dabe7ae52a3e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlfuse/default.nix
@@ -1,22 +1,17 @@
-{ stdenv, fetchFromGitHub, ocaml, camlidl, fuse, findlib }:
+{ stdenv, buildDunePackage, fetchFromGitHub, camlidl, fuse }:
 
-stdenv.mkDerivation rec {
+buildDunePackage {
   pname = "ocamlfuse";
-  version = "2.7.1_cvs5";
+  version = "2.7.1_cvs6_e35e76b";
 
   src = fetchFromGitHub {
     owner = "astrada";
     repo = "ocamlfuse";
-    rev = "v${version}";
-    sha256 = "01ayw2hzpxan95kncbxh9isj9g149cs8scq3xim1vy8bz085wb0m";
+    rev = "e35e76bee3b06806256b5bfca108b7697267cd5c";
+    sha256 = "1v9g0wh7rnjkrjrnw50145g6ry38plyjs8fq8w0nlzwizhf3qhff";
   };
 
-  buildInputs = [ocaml findlib];
-  propagatedBuildInputs = [camlidl fuse];
-  configurePhase = '' ocaml setup.ml -configure --prefix $out '';
-  buildPhase = "ocaml setup.ml -build";
-  installPhase = "ocaml setup.ml -install";
-  createFindlibDestdir = true;
+  propagatedBuildInputs = [ camlidl fuse ];
 
   meta = {
     homepage = "https://sourceforge.net/projects/ocamlfuse";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix
index c84743a8da52..7dd1d525a462 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix
@@ -6,13 +6,11 @@
 , eigen
 , stdio
 , stdlib-shims
-, openblas, blas, lapack
+, openblasCompat
 , owl-base
 , npy
 }:
 
-assert (!blas.is64bit) && (!lapack.is64bit);
-assert blas.implementation == "openblas" && lapack.implementation == "openblas";
 
 buildDunePackage rec {
   pname = "owl";
@@ -22,7 +20,7 @@ buildDunePackage rec {
   checkInputs = [ alcotest ];
   buildInputs = [ dune-configurator ];
   propagatedBuildInputs = [
-    eigen stdio stdlib-shims openblas owl-base npy
+    eigen stdio stdlib-shims openblasCompat owl-base npy
   ];
 
   doCheck = !stdenv.isDarwin;  # https://github.com/owlbarn/owl/issues/462
diff --git a/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix b/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix
index 1bac71d301ff..f614c476140e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, ocb-stubblr }:
 
-if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
 then throw "tsdl is not available for OCaml ${ocaml.version}"
 else
 
 let
   pname = "tsdl";
-  version = "0.9.4";
+  version = "0.9.7";
   webpage = "https://erratique.ch/software/${pname}";
 in
 
@@ -15,11 +15,11 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "13af37w2wybx8yzgjr5zz5l50402ldl614qiwphl1q69hig5mag2";
+    sha256 = "1zwv0ixkigh1gzk5n49rwvz2f2m62jdkkqg40j7dclg4gri7691f";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ ocaml findlib ocamlbuild topkg result ocb-stubblr ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg ];
   propagatedBuildInputs = [ SDL2 ctypes ];
 
   preConfigure = ''
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = webpage;
     description = "Thin bindings to the cross-platform SDL library";
-    license = licenses.bsd3;
+    license = licenses.isc;
     platforms = ocaml.meta.platforms or [];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix
index cfbcc27ba9cc..6a7c03b9bb6b 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix
@@ -3,6 +3,7 @@
 }:
 
 buildDunePackage rec {
+  minimumOCamlVersion = "4.03";
   pname = "uri";
   version = "3.1.0";
 
diff --git a/nixpkgs/pkgs/development/ocaml-modules/uri/legacy.nix b/nixpkgs/pkgs/development/ocaml-modules/uri/legacy.nix
deleted file mode 100644
index 474ab9278855..000000000000
--- a/nixpkgs/pkgs/development/ocaml-modules/uri/legacy.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, re, stringext, ounit
-, sexplib, ppx_sexp_conv
-, legacyVersion ? false
-, sexplib_p4
-}:
-
-if !stdenv.lib.versionAtLeast ocaml.version "4"
-|| legacyVersion && stdenv.lib.versionAtLeast ocaml.version "4.03"
-then throw "uri${stdenv.lib.optionalString legacyVersion "_p4"} is not available for OCaml ${ocaml.version}" else
-
-with
-  if legacyVersion
-  then {
-    version = "1.9.1";
-    sha256 = "0v3jxqgyi4kj92r3x83rszfpnvvzy9lyb913basch4q64yka3w85";
-  } else {
-    version = "1.9.2";
-    sha256 = "137pg8j654x7r0d1664iy2zp3l82nki1kkh921lwdrwc5qqdl6jx";
-  };
-
-stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-uri-${version}";
-
-  src = fetchzip {
-    url = "https://github.com/mirage/ocaml-uri/archive/v${version}.tar.gz";
-    inherit sha256;
-  };
-
-  buildInputs = [ ocaml findlib ocamlbuild ounit ]
-  ++ stdenv.lib.optional (!legacyVersion) ppx_sexp_conv;
-  propagatedBuildInputs = [ re (if legacyVersion then sexplib_p4 else sexplib) stringext ];
-
-  configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests";
-  buildPhase = ''
-    ocaml setup.ml -build
-    ocaml setup.ml -doc
-  '';
-  doCheck = true;
-  checkPhase = "ocaml setup.ml -test";
-  installPhase = "ocaml setup.ml -install";
-
-  createFindlibDestdir = true;
-
-  meta = {
-    homepage = "https://github.com/mirage/ocaml-uri";
-    platforms = ocaml.meta.platforms or [];
-    description = "RFC3986 URI parsing library for OCaml";
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix
index 99f2cf582cb9..a76fa5eeebe0 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix
@@ -1,19 +1,18 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.02"
- || stdenv.lib.versionAtLeast ocaml.version "4.08"
 then throw "wasm is not available for OCaml ${ocaml.version}"
 else
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-wasm-${version}";
-  version = "1.0";
+  version = "1.1";
 
   src = fetchFromGitHub {
     owner = "WebAssembly";
     repo = "spec";
     rev = "v${version}";
-    sha256 = "0r0wj31s2yg4vn4hyw2afc8wp8b0k3q130yiypwq3dlvfxrr70m6";
+    sha256 = "1jsgrjqzsdmm6f5pgd947nikj7pnxx1mqdnz16j7s62rg8x06h7d";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix b/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix
index d30b23aa3ee3..eae40d4dfaed 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix
@@ -8,11 +8,11 @@ buildDunePackage rec {
   minimumOCamlVersion = "4.07";
 
   pname = "x509";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchurl {
     url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz";
-    sha256 = "0gcs3vpmixxxx2q4b2iphb1xw1jffya1wkp0p1xbmsfcghzrj20m";
+    sha256 = "1vmjqwmxf7zz157rlp3wp3zp88kw62m4f22i0xmxhinssd0dvr9c";
   };
 
   useDune2 = true;