ocamlPackages.uri: 3.1.0 → 4.0.0

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

@@ -1,19 +1,21 @@
 { lib, fetchurl, buildDunePackage, ounit
-, re, stringext
+, angstrom, stringext
 }:
 
 buildDunePackage rec {
   minimumOCamlVersion = "4.03";
   pname = "uri";
-  version = "3.1.0";
+  version = "4.0.0";
+
+  useDune2 = true;
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
-    sha256 = "0hxc2mshmqxz2qmjya47dzf858s6lsf3xvqswpzprkvhv0zq4ln4";
+    sha256 = "13r9nkgym9z3dqxkyf0yyaqlrk5r3pjdw0kfzvrc90bmhwl9j380";
   };
 
-  buildInputs = [ ounit ];
-  propagatedBuildInputs = [ re stringext ];
+  checkInputs = [ ounit ];
+  propagatedBuildInputs = [ angstrom stringext ];
   doCheck = true;
 
   meta = {

pkgs/development/ocaml-modules/uri/sexp.nix

@@ -6,8 +6,9 @@ else
 
 buildDunePackage {
   pname = "uri-sexp";
-  inherit (uri) version src doCheck meta;
+  inherit (uri) version useDune2 src meta;
 
-  buildInputs = [ ounit ];
+  checkInputs = [ ounit ];
   propagatedBuildInputs = [ ppx_sexp_conv sexplib0 uri ];
+  doCheck = lib.versionAtLeast ocaml.version "4.08";
 }