Merge branch 'staging-next' into staging

pkgs/development/ocaml-modules/bigarray-compat/default.nix

@@ -4,6 +4,8 @@ buildDunePackage rec {
   pname = "bigarray-compat";
   version = "1.0.0";
 
+  useDune2 = true;
+
   src = fetchFromGitHub {
     owner = "mirage";
     repo = pname;

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

@@ -4,6 +4,8 @@ buildDunePackage rec {
   pname = "biniou";
   version = "1.2.1";
 
+  useDune2 = true;
+
   src = fetchFromGitHub {
     owner = "ocaml-community";
     repo = pname;

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

@@ -5,13 +5,13 @@
 
 buildDunePackage rec {
   pname = "digestif";
-  version = "0.9.0";
+  version = "1.0.0";
 
   useDune2 = true;
 
   src = fetchurl {
     url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-v${version}.tbz";
-    sha256 = "0vk9prgjp46xs8qizq7szkj6mqjj2ymncs2016bc8zswcdc1a3q4";
+    sha256 = "11188ya6ksb0p0zvs6saz3qxv4a8pyy8m3sq35f3qfxrxhghqi99";
   };
 
   propagatedBuildInputs = [ bigarray-compat eqaf stdlib-shims ];

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

@@ -0,0 +1,33 @@
+{ lib, fetchFromGitHub, buildDunePackage }:
+
+buildDunePackage rec {
+  pname = "directories";
+  version = "0.2";
+  useDune2 = true;
+
+  minimumOCamlVersion = "4.07";
+
+  src = fetchFromGitHub {
+    owner = "ocamlpro";
+    repo = pname;
+    rev = version;
+    sha256 = "0s7ginh0g0fhw8xf9v58cx99a8q9jqsf4i0p134m5qzf84qpjwff";
+  };
+
+  meta = {
+    homepage = "https://github.com/ocamlpro/directories";
+    description = "An OCaml library that provides configuration, cache and data paths (and more!) following the suitable conventions on Linux, macOS and Windows";
+    longDescription = ''
+      directories is an OCaml library that provides configuration, cache and
+      data paths (and more!) following the suitable conventions on Linux, macOS
+      and Windows. It is inspired by similar libraries for other languages such
+      as directories-jvm.
+
+      The following conventions are used: XDG Base Directory Specification and
+      xdg-user-dirs on Linux, Known Folders on Windows, Standard Directories on
+      macOS.
+    '';
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ bcc32 ];
+  };
+}

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

@@ -1,9 +1,11 @@
-{ lib, fetchzip, buildDunePackage }:
+{ lib, fetchzip, buildDunePackage, ocaml }:
 
 buildDunePackage rec {
   pname = "integers";
   version = "0.4.0";
 
+  useDune2 = lib.versionAtLeast ocaml.version "4.08";
+
   src = fetchzip {
     url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz";
     sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd";

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

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildOasisPackage
+{ lib, fetchFromGitHub, buildOasisPackage
 , ctypes, mariadb, libmysqlclient }:
 
 buildOasisPackage rec {