Merge staging-next into staging

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

@@ -1,18 +1,25 @@
-{ lib, fetchFromGitHub, buildDunePackage, markup }:
+{ lib, fetchFromGitHub, buildDunePackage, ocaml, markup, ounit2 }:
 
 buildDunePackage rec {
   pname = "lambdasoup";
-  version = "0.7.1";
+  version = "0.7.2";
+
+  minimumOCamlVersion = "4.02";
+
+  useDune2 = true;
 
   src = fetchFromGitHub {
     owner = "aantron";
     repo = pname;
     rev = version;
-    sha256 = "14lndpsnzjjg58sdwxqpsv7kz77mnwn5658lya9jyaclj8azmaks";
+    sha256 = "0php51lyz3ll0psazjd59yw02xb9w84150gkyiwmn3fa0iq8nf7m";
   };
 
   propagatedBuildInputs = [ markup ];
 
+  doCheck = lib.versionAtLeast ocaml.version "4.04";
+  checkInputs = [ ounit2 ];
+
   meta = {
     description = "Functional HTML scraping and rewriting with CSS in OCaml";
     homepage = "https://aantron.github.io/lambdasoup/";

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

@@ -1,23 +1,26 @@
-{ lib, buildDunePackage, fetchzip, uutf }:
+{ lib, buildDunePackage, fetchzip, ocaml, uchar, uutf, ounit2 }:
 
 buildDunePackage rec {
   pname = "markup";
-  version = "0.8.2";
+  version = "1.0.0";
+
+  useDune2 = true;
 
   src = fetchzip {
     url = "https://github.com/aantron/markup.ml/archive/${version}.tar.gz";
-    sha256 = "13zcrwzjmifniv3bvjbkd2ah8wwa3ld75bxh1d8hrzdvfxzh9szn";
-    };
+    sha256 = "09hkrf9pw6hpb9j06p5bddklpnjwdjpqza3bx2179l970yl67an9";
+  };
 
-  propagatedBuildInputs = [ uutf ];
+  propagatedBuildInputs = [ uchar uutf ];
+
+  checkInputs = [ ounit2 ];
+  doCheck = lib.versionAtLeast ocaml.version "4.04";
 
   meta = with lib; {
     homepage = "https://github.com/aantron/markup.ml/";
     description = "A pair of best-effort parsers implementing the HTML5 and XML specifications";
     license = licenses.mit;
-    maintainers = with maintainers; [
-      gal_bolle
-      ];
+    maintainers = with maintainers; [ gal_bolle ];
   };
 
 }