about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/ocaml-modules
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules')
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/cmarkit/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/eio/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix2
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix11
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/janestreet/0.16.nix3
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/luv/default.nix8
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix28
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix5
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix7
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix5
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/msat/default.nix36
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix7
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix12
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix25
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/pgocaml/ppx.nix2
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/trace/default.nix6
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/trace/tef.nix9
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix4
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix10
-rw-r--r--nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix12
20 files changed, 100 insertions, 102 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/cmarkit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cmarkit/default.nix
index ce6d98064a6b..0a36ea196d47 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/cmarkit/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/cmarkit/default.nix
@@ -14,11 +14,11 @@ else
 
 stdenv.mkDerivation rec {
   pname = "cmarkit";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchurl {
     url = "https://erratique.ch/software/cmarkit/releases/cmarkit-${version}.tbz";
-    hash = "sha256-86RuGB5pLbw/ThPGz9+qLaZRH7xvxbYrZWFLLIkc5Mk=";
+    hash = "sha256-RouM5iU7VeTT0+4yhBgdEmxROeP/X31iqDjd1VI7z5c=";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/development/ocaml-modules/eio/default.nix b/nixpkgs/pkgs/development/ocaml-modules/eio/default.nix
index 005364039e02..5b10865b15fc 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/eio/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/eio/default.nix
@@ -1,6 +1,6 @@
 { lib
 , ocaml
-, version ? if lib.versionAtLeast ocaml.version "5.1" then "0.13" else "0.12"
+, version ? if lib.versionAtLeast ocaml.version "5.1" then "0.14" else "0.12"
 , buildDunePackage
 , bigstringaf
 , cstruct
@@ -24,9 +24,9 @@ let
       minimalOCamlVersion = "5.0";
       hash = "sha256-2EhHzoX/t4ZBSWrSS+PGq1zCxohc7a1q4lfsrFnZJqA=";
     };
-    "0.13" = {
+    "0.14" = {
       minimalOCamlVersion = "5.1";
-      hash = "sha256-glN+4cWxgp/eggdhSk459WC9WCMyhBKQ7V73ZpHzr3A=";
+      hash = "sha256-UvhblH0+DecJQLW7qsDT54hB/qVkjnOvfYp1SrUchxs=";
     };
   }."${version}";
 in
diff --git a/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix
index fac5789dcdd1..d1c0462c4dca 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/eliom/default.nix
@@ -12,7 +12,6 @@
 , js_of_ocaml-lwt
 , js_of_ocaml-tyxml
 , lwt_ppx
-, ocamlnet
 , ocsipersist
 }:
 
@@ -33,7 +32,6 @@ buildDunePackage rec {
   buildInputs = [
     js_of_ocaml-ocamlbuild
     js_of_ocaml-ppx_deriving_json
-    ocamlnet
     ppx_optcomp
   ];
 
diff --git a/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
index dc8bc2568415..1db8180934bf 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -1,12 +1,11 @@
 { lib, fetchFromGitHub, buildDunePackage, ocaml
-, cryptokit, ocamlnet, ocurl, yojson
+, camlp-streams, cppo, cryptokit, ocurl, yojson
 , ounit2
 }:
 
 buildDunePackage rec {
   pname = "gapi-ocaml";
-  version = "0.4.4";
-  duneVersion = "3";
+  version = "0.4.5";
 
   minimalOCamlVersion = "4.08";
 
@@ -14,10 +13,12 @@ buildDunePackage rec {
     owner = "astrada";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-+UNFW5tmIh5dVyTDEOfOmy1j+gV4P28jlnBTdpQNAjE=";
+    hash = "sha256-qlQEE8l/H22bb1VcK9YehR+9L5XepMu8JY7OLw1OIXg=";
   };
 
-  propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ];
+  nativeBuildInputs = [ cppo ];
+
+  propagatedBuildInputs = [ camlp-streams cryptokit ocurl yojson ];
 
   doCheck = true;
   checkInputs = [ ounit2 ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.16.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.16.nix
index 2df4c08e7d58..2c7044540574 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.16.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.16.nix
@@ -141,6 +141,7 @@ with self;
   };
 
   async_ssl = janePackage {
+    version = "0.16.1";
     pname = "async_ssl";
     hash = "sha256-83YKxvVb/JwBnQG4R/R1Ztik9T/hO4cbiNTfFnErpG4=";
     meta.description = "Async wrappers for SSL";
@@ -647,6 +648,7 @@ with self;
   };
 
   ppx_accessor = janePackage {
+    version = "0.16.1";
     pname = "ppx_accessor";
     hash = "sha256-o70q8eSbPeuGkIcCnKoK0BpaqPhy/NS7x2YYR6wfki8=";
     meta.description = "[@@deriving] plugin to generate accessors for use with the Accessor libraries";
@@ -1143,6 +1145,7 @@ with self;
   };
 
   streamable = janePackage {
+    version = "0.16.1";
     pname = "streamable";
     hash = "sha256-3djrUW2tPKaEmoOIpdjN6ok7U9i07yreqbi1kP+6pnY=";
     meta.description = "A collection of types suitable for incremental serialization";
diff --git a/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix b/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix
index da7f9ba1808f..3f2d462fd15e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix
@@ -6,12 +6,13 @@
 
 buildDunePackage rec {
   pname = "luv";
-  version = "0.5.11";
-  useDune2 = true;
+  version = "0.5.12";
+
+  minimalOCamlVersion = "4.03";
 
   src = fetchurl {
     url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz";
-    sha256 = "sha256-zOz0cxGzhLi3Q36qyStNCz8JGXHtECQfZysMKiyKOkM=";
+    sha256 = "sha256-dp9qCIYqSdROIAQ+Jw73F3vMe7hnkDe8BgZWImNMVsA=";
   };
 
   postConfigure = ''
@@ -23,6 +24,7 @@ buildDunePackage rec {
   nativeBuildInputs = [ file ];
   propagatedBuildInputs = [ ctypes result ];
   checkInputs = [ alcotest ];
+  # Alcotest depends on fmt that needs 4.08 or newer
   doCheck = lib.versionAtLeast ocaml.version "4.08";
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix b/nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix
deleted file mode 100644
index d47c0c4f11c5..000000000000
--- a/nixpkgs/pkgs/development/ocaml-modules/macaque/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, pgocaml, camlp4 }:
-
-stdenv.mkDerivation rec {
-  pname = "ocaml-macaque";
-  version = "0.7.2";
-
-  src = fetchFromGitHub {
-    owner = "ocsigen";
-    repo = "macaque";
-    rev = version;
-    sha256 = "sha256-W9ZFaINYYtIikKy/ZqdlKeFQSA7DQT9plc3+ZhlSIJI=";
-  };
-
-  nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ];
-  propagatedBuildInputs = [ pgocaml camlp4 ];
-
-  strictDeps = true;
-
-  createFindlibDestdir = true;
-
-  meta = with lib; {
-    description = "Macros for Caml Queries";
-    homepage = "https://github.com/ocsigen/macaque";
-    license = licenses.lgpl2;
-    platforms = ocaml.meta.platforms or [ ];
-    maintainers = with maintainers; [ vbgl ];
-  };
-}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix b/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix
index c82e77adb515..9a0de6212f20 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix
@@ -2,14 +2,13 @@
 
 buildDunePackage rec {
   pname = "metrics";
-  version = "0.4.0";
+  version = "0.4.1";
 
   minimalOCamlVersion = "4.04";
-  duneVersion = "3";
 
   src = fetchurl {
     url = "https://github.com/mirage/metrics/releases/download/v${version}/metrics-${version}.tbz";
-    sha256 = "sha256-kbh1WktQkDcXE8O1WRm+vtagVfSql8S5gr0bXn/jia8=";
+    sha256 = "sha256-d+DCD7XB0GED27DsC8YEW+48YcAK0EI8l4Uqx/PGFE0=";
   };
 
   propagatedBuildInputs = [ fmt ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix b/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix
index 3816dfa8ffb7..0c3a1465c2b1 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix
@@ -6,13 +6,6 @@ buildDunePackage rec {
 
   inherit (metrics) version src;
 
-  duneVersion = "3";
-
-  # Fixes https://github.com/mirage/metrics/issues/57
-  postPatch = ''
-    substituteInPlace src/unix/dune --replace "mtime mtime.clock" "mtime"
-  '';
-
   propagatedBuildInputs = [ gnuplot lwt metrics mtime uuidm ];
 
   nativeCheckInputs = [ gnuplot ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix
index bbc7823e1f09..5fd9e1289a6e 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix
@@ -1,17 +1,16 @@
 { buildDunePackage, mirage-crypto, ounit2, randomconv, dune-configurator
-, cstruct, duration, logs, mtime, ocaml_lwt }:
+, cstruct, duration, logs }:
 
 buildDunePackage rec {
   pname = "mirage-crypto-rng";
 
   inherit (mirage-crypto) version src;
-  duneVersion = "3";
 
   doCheck = true;
   checkInputs = [ ounit2 randomconv ];
 
   buildInputs = [ dune-configurator ];
-  propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ];
+  propagatedBuildInputs = [ cstruct mirage-crypto duration logs ];
 
   strictDeps = true;
 
diff --git a/nixpkgs/pkgs/development/ocaml-modules/msat/default.nix b/nixpkgs/pkgs/development/ocaml-modules/msat/default.nix
new file mode 100644
index 000000000000..d5893dc55e04
--- /dev/null
+++ b/nixpkgs/pkgs/development/ocaml-modules/msat/default.nix
@@ -0,0 +1,36 @@
+{ lib, fetchFromGitHub, buildDunePackage
+, iter
+, containers
+, mdx
+}:
+
+buildDunePackage rec {
+  pname = "msat";
+  version = "0.9.1";
+
+  src = fetchFromGitHub {
+    owner = "Gbury";
+    repo = "mSAT";
+    rev = "v${version}";
+    hash = "sha256-ER7ZUejW+Zy3l2HIoFDYbR8iaKMvLZWaeWrOAAYXjG4=";
+  };
+
+  propagatedBuildInputs = [
+    iter
+  ];
+
+  postPatch = ''
+    substituteInPlace dune --replace mdx ocaml-mdx
+  '';
+
+  doCheck = true;
+  checkInputs = [ containers ];
+  nativeCheckInputs = [ mdx.bin ];
+
+  meta = {
+    description = "A modular sat/smt solver with proof output.";
+    homepage = "https://gbury.github.io/mSAT/";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix
index 86dcbe053eff..7923a24f0401 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix
@@ -1,17 +1,16 @@
 { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, safepass, yojson
 , cohttp-lwt-unix, eliom
 , resource-pooling
-, ocamlnet
 , ocsigen-ppx-rpc
 }:
 
 stdenv.mkDerivation rec {
   pname = "ocaml${ocaml.version}-ocsigen-start";
-  version = "6.1.0";
+  version = "6.1.2";
 
   nativeBuildInputs = [ ocaml findlib eliom ];
   buildInputs = [ ocsigen-ppx-rpc ];
-  propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ocamlnet ];
+  propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ];
 
   strictDeps = true;
 
@@ -21,7 +20,7 @@ stdenv.mkDerivation rec {
     owner = "ocsigen";
     repo = "ocsigen-start";
     rev = version;
-    hash = "sha256-gHFPutoPYKTDsFninwBTc2WOIFd3+ghRYW2hi1y5MUs=";
+    hash = "sha256-GhuH3rNdauJztEhygct6jCf+EmAtbSeyYP45stMzGFU=";
   };
 
   preInstall = ''
diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
index aaa68c214460..b5638229e0c4 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
@@ -5,18 +5,12 @@
 stdenv.mkDerivation rec {
  pname = "ocsigen-toolkit";
  name = "ocaml${ocaml.version}-${pname}-${version}";
- version = "3.2.0";
+ version = "3.3.4";
 
  propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ];
  nativeBuildInputs = [ ocaml findlib opaline eliom ];
 
- # Remove widgets not compatible with jsoo 4.1.0
- # https://github.com/ocsigen/ocsigen-toolkit/issues/221
- preConfigure = ''
-   rm src/widgets/ot_{carousel,drawer,swipe,tongue}.eliom{,i}
- '';
-
-  strictDeps = true;
+ strictDeps = true;
 
  installPhase = ''
     runHook preInstall
@@ -31,7 +25,7 @@ stdenv.mkDerivation rec {
     owner = "ocsigen";
     repo = pname;
     rev = version;
-    sha256 = "sha256:13n0y8a80bl94la4lnp9dr2x7b8plhm17g9zgf0l6x42g3886pw7";
+    hash = "sha256-6ccu8WJxUwpR5YyB4j1jQPWba8GhQDxuw+IDHswQpSA=";
   };
 
   meta = {
diff --git a/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix b/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix
index 76b97103d667..46b239a3d28a 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix
@@ -1,34 +1,27 @@
-{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, ocaml
+{ lib, fetchFromGitHub, buildDunePackage
 , calendar, camlp-streams, csv, hex, ppx_deriving, ppx_sexp_conv, re, rresult, sexplib
 }:
 
-let with-camlp-streams = lib.optional (lib.versionAtLeast ocaml.version "5.0"); in
-
 buildDunePackage rec {
   pname = "pgocaml";
-  version = "4.3.0";
+  version = "4.4.0";
   src = fetchFromGitHub {
     owner = "darioteixeira";
     repo = "pgocaml";
-    rev = version;
-    hash = "sha256-W1fbRnU1l61qqxfVY2qiBnVpGD81xrBO8k0tWr+RXMY=";
+    rev = "v${version}";
+    hash = "sha256-Mz3zVgXas1UivH/BVARx5kWClgr9v9YcGarwaD961tU=";
   };
 
-  # Compatibility with OCaml ≥ 5.0
-  patches = with-camlp-streams (fetchpatch {
-    url = "https://github.com/darioteixeira/pgocaml/commit/906a289dc57da4971e312c31eedd26d81e902ed5.patch";
-    hash = "sha256-/v9Jheg98GhrcD2gcsQpPvq7YiIrvJj22SKvrBRlR9Y=";
-  });
-
   minimalOCamlVersion = "4.08";
 
-  propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re rresult sexplib ]
-  ++ with-camlp-streams camlp-streams;
+  propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re
+    rresult sexplib camlp-streams
+  ];
 
   meta = with lib; {
     description = "An interface to PostgreSQL databases for OCaml applications";
-    inherit (src.meta) homepage;
-    license = licenses.lgpl2;
+    homepage = "https://github.com/darioteixeira/pgocaml";
+    license = licenses.lgpl2Only;
     maintainers = with maintainers; [ vbgl ];
   };
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/pgocaml/ppx.nix b/nixpkgs/pkgs/development/ocaml-modules/pgocaml/ppx.nix
index b649f70d198c..1b76f9a577e7 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/pgocaml/ppx.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/pgocaml/ppx.nix
@@ -4,8 +4,6 @@ buildDunePackage {
   pname = "pgocaml_ppx";
   inherit (pgocaml) src version meta;
 
-  duneVersion = "3";
-
   buildInputs = [ ppx_optcomp ];
   propagatedBuildInputs = [ pgocaml ];
 }
diff --git a/nixpkgs/pkgs/development/ocaml-modules/trace/default.nix b/nixpkgs/pkgs/development/ocaml-modules/trace/default.nix
index a27a61d4baf1..2c7356669860 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/trace/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/trace/default.nix
@@ -2,13 +2,13 @@
 
 buildDunePackage rec {
   pname = "trace";
-  version = "0.3";
+  version = "0.5";
 
   minimalOCamlVersion = "4.07";
 
   src = fetchurl {
-    url = "https://github.com/c-cube/ocaml-trace/releases/download/${version}/trace-${version}.tbz";
-    hash = "sha256-Krq6qYO7tKJktTRjFrdmONPHfjrd81Ighsb9nmG9ZQU=";
+    url = "https://github.com/c-cube/ocaml-trace/releases/download/v${version}/trace-${version}.tbz";
+    hash = "sha256-l0NvWPGBd1WR+b50WXEYfptuCUjda8MlZ/o5YngRNIg=";
   };
 
   meta = {
diff --git a/nixpkgs/pkgs/development/ocaml-modules/trace/tef.nix b/nixpkgs/pkgs/development/ocaml-modules/trace/tef.nix
index c1a6f9251554..eeeda78f580d 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/trace/tef.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/trace/tef.nix
@@ -4,6 +4,15 @@ buildDunePackage {
   pname = "trace-tef";
   inherit (trace) src version;
 
+  # This removes the dependency on the “atomic” package
+  # (not available in nixpkgs)
+  # Said package for OCaml ≥ 4.12 is empty
+  postPatch = ''
+    substituteInPlace src/tef/dune --replace 'atomic ' ""
+  '';
+
+  minimalOCamlVersion = "4.12";
+
   propagatedBuildInputs = [ mtime trace ];
 
   doCheck = true;
diff --git a/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix
index c89a40a50b28..3bad3a84945a 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uucd/default.nix
@@ -6,11 +6,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "ocaml-${pname}-${version}";
-  version = "15.0.0";
+  version = "15.1.0";
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "sha256-DksDi6Dfe/fNGBmeubwxv9dScTHPJRuaPrlX7M8QRrw=";
+    hash = "sha256-HIANZ5SDJcytlpw/W9Ae2eFTutrutJj2PgJCfByobfI=";
   };
 
   nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix
index 476a4529f3fe..7ef10660fbb2 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix
@@ -2,14 +2,14 @@
 
 let
   pname = "uucp";
-  version = "15.0.0";
+  version = "15.1.0";
   webpage = "https://erratique.ch/software/${pname}";
-  minimumOCamlVersion = "4.03";
+  minimalOCamlVersion = "4.03";
   doCheck = true;
 in
 
-if lib.versionOlder ocaml.version minimumOCamlVersion
-then builtins.throw "${pname} needs at least OCaml ${minimumOCamlVersion}"
+if lib.versionOlder ocaml.version minimalOCamlVersion
+then builtins.throw "${pname} needs at least OCaml ${minimalOCamlVersion}"
 else
 
 stdenv.mkDerivation {
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "sha256-rEeU9AWpCzuAtAOe7hJHBmJjP97BZsQsPFQQ8uZLUzA=";
+    hash = "sha256-qR5LiAZHt4oD3ak0x17GqbYXNaJmJxFk/WGoxT+yWYc=";
   };
 
   nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
diff --git a/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix
index 252468061717..4785bbd04051 100644
--- a/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix
+++ b/nixpkgs/pkgs/development/ocaml-modules/uunf/default.nix
@@ -1,11 +1,15 @@
-{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uchar, uutf, cmdliner
+{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf, cmdliner
 , cmdlinerSupport ? lib.versionAtLeast cmdliner.version "1.1"
+, version ? if lib.versionAtLeast ocaml.version "4.14" then "15.1.0" else "15.0.0"
 }:
 
 let
   pname = "uunf";
   webpage = "https://erratique.ch/software/${pname}";
-  version = "15.0.0";
+  hash = {
+    "15.0.0" = "sha256-B/prPAwfqS8ZPS3fyDDIzXWRbKofwOCyCfwvh9veuug=";
+    "15.1.0" = "sha256-D8yvb7hVWaYxMqMZ5089/5tWDfvyGXKUOjhfU/4zSeQ=";
+  }."${version}";
 in
 
 if lib.versionOlder ocaml.version "4.03"
@@ -18,15 +22,13 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    sha256 = "sha256-B/prPAwfqS8ZPS3fyDDIzXWRbKofwOCyCfwvh9veuug=";
+    inherit hash;
   };
 
   nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
   buildInputs = [ topkg uutf ]
   ++ lib.optional cmdlinerSupport cmdliner;
 
-  propagatedBuildInputs = [ uchar ];
-
   strictDeps = true;
 
   prePatch = lib.optionalString stdenv.isAarch64 "ulimit -s 16384";