Merge staging-next into staging

4 files changed, 19 insertions, 11 deletions

diff --git a/pkgs/development/ocaml-modules/jingoo/default.nix b/pkgs/development/ocaml-modules/jingoo/default.nix
index d7bcd201c54e1..ec25e8e7f418f 100644
--- a/pkgs/development/ocaml-modules/jingoo/default.nix
+++ b/pkgs/development/ocaml-modules/jingoo/default.nix
@@ -3,7 +3,9 @@
 
 buildDunePackage rec {
   pname = "jingoo";
-  version = "1.4.1";
+  version = "1.4.2";
+
+  useDune2 = true;
 
   minimumOCamlVersion = "4.04";
 
@@ -11,7 +13,7 @@ buildDunePackage rec {
     owner = "tategakibunko";
     repo = "jingoo";
     rev = "v${version}";
-    sha256 = "16wzggwi3ri13v93mjk8w7zxwp65qmi1rnng2kpk9vffx5g1kv6f";
+    sha256 = "0q947aik4i4z5wjllhwlkxh60qczwgra21yyrrzwhi9y5bnf8346";
   };
 
   buildInputs = [ menhir ];
diff --git a/pkgs/development/ocaml-modules/mirage-vnetif/default.nix b/pkgs/development/ocaml-modules/mirage-vnetif/default.nix
index cafb50309ce62..876bc1a98177a 100644
--- a/pkgs/development/ocaml-modules/mirage-vnetif/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-vnetif/default.nix
@@ -35,6 +35,6 @@ buildDunePackage rec {
     description = "Virtual network interface and software switch for Mirage";
     homepage = "https://github.com/mirage/${pname}";
     license = licenses.isc;
-    mantainers = [ maintainers.sternenseemann ];
+    maintainers = [ maintainers.sternenseemann ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/sedlex/2.nix b/pkgs/development/ocaml-modules/sedlex/2.nix
index b1a892d5b804a..927acc1819eb9 100644
--- a/pkgs/development/ocaml-modules/sedlex/2.nix
+++ b/pkgs/development/ocaml-modules/sedlex/2.nix
@@ -14,28 +14,33 @@ then throw "sedlex is not available for OCaml ${ocaml.version}"
 else
 
 let
+  unicodeVersion = "12.1.0";
+  baseUrl = "https://www.unicode.org/Public/${unicodeVersion}";
+
   DerivedCoreProperties = fetchurl {
-    url = "https://www.unicode.org/Public/12.1.0/ucd/DerivedCoreProperties.txt";
+    url = "${baseUrl}/ucd/DerivedCoreProperties.txt";
     sha256 = "0s6sn1yr9qmb2i6gf8dir2zpsbjv1frdfzy3i2yjylzvf637msx6";
   };
   DerivedGeneralCategory = fetchurl {
-    url = "https://www.unicode.org/Public/12.1.0/ucd/extracted/DerivedGeneralCategory.txt";
+    url = "${baseUrl}/ucd/extracted/DerivedGeneralCategory.txt";
     sha256 = "1rifzq9ba6c58dn0lrmcb5l5k4ksx3zsdkira3m5p6h4i2wriy3q";
   };
   PropList = fetchurl {
-    url = "https://www.unicode.org/Public/12.1.0/ucd/PropList.txt";
+    url = "${baseUrl}/ucd/PropList.txt";
     sha256 = "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk";
   };
 in
 buildDunePackage rec {
   pname = "sedlex";
-  version = "2.1";
+  version = "2.2";
+
+  useDune2 = true;
 
   src = fetchFromGitHub {
     owner = "ocaml-community";
     repo = "sedlex";
     rev = "v${version}";
-    sha256 = "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26";
+    sha256 = "18dwl2is5j26z6b1c47b81wvcpxw44fasppdadsrs9vsw63rwcm3";
   };
 
   propagatedBuildInputs = [
@@ -43,6 +48,7 @@ buildDunePackage rec {
   ];
 
   preBuild = ''
+    rm src/generator/data/dune
     ln -s ${DerivedCoreProperties} src/generator/data/DerivedCoreProperties.txt
     ln -s ${DerivedGeneralCategory} src/generator/data/DerivedGeneralCategory.txt
     ln -s ${PropList} src/generator/data/PropList.txt
diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix
index f9996eb6af629..175004c71bba0 100644
--- a/pkgs/development/ocaml-modules/zarith/default.nix
+++ b/pkgs/development/ocaml-modules/zarith/default.nix
@@ -6,9 +6,9 @@
 let source =
   if stdenv.lib.versionAtLeast ocaml.version "4.02"
   then {
-    version = "1.10";
-    url = "https://github.com/ocaml/Zarith/archive/release-1.10.tar.gz";
-    sha256 = "1qxrl0v2mk9wghc1iix3n0vfz2jbg6k5wpn1z7p02m2sqskb0zhb";
+    version = "1.11";
+    url = "https://github.com/ocaml/Zarith/archive/release-1.11.tar.gz";
+    sha256 = "111n33flg4aq5xp5jfksqm4yyz6mzxx9ps9a4yl0dz8h189az5pr";
   } else {
     version = "1.3";
     url = "http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz";