From dcbe21065834f77c94a60002eb4bb201ba2d94fe Mon Sep 17 00:00:00 2001 From: redianthus Date: Mon, 22 Dec 2025 15:08:19 +0100 Subject: [PATCH 1/3] ocamlPackages.synchronizer: 0.1 -> 0.2 --- .../ocaml-modules/synchronizer/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/synchronizer/default.nix b/pkgs/development/ocaml-modules/synchronizer/default.nix index 8d827b2c0bd9..f61c99238f43 100644 --- a/pkgs/development/ocaml-modules/synchronizer/default.nix +++ b/pkgs/development/ocaml-modules/synchronizer/default.nix @@ -3,30 +3,35 @@ fetchFromGitHub, buildDunePackage, prelude, + alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "synchronizer"; - version = "0.1"; + version = "0.2"; minimalOCamlVersion = "5.1"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "synchronizer"; - tag = version; - hash = "sha256-VlKqORXTXafT88GXHIYkz+A1VkEL3jP9SMqDdMyEdrw="; + tag = "${finalAttrs.version}"; + hash = "sha256-0XtPHpDlyH1h8W2ZlRvJbZjCN9WP5mzk2N01WFd8eLQ="; }; propagatedBuildInputs = [ prelude ]; + checkInputs = [ + alcotest + ]; + meta = { homepage = "https://github.com/OCamlPro/synchronizer"; description = "Synchronizer to make datastructures thread-safe"; - changelog = "https://raw.githubusercontent.com/OCamlPro/synchronizer/${src.rev}/CHANGES.md"; + changelog = "https://raw.githubusercontent.com/OCamlPro/synchronizer/${finalAttrs.src.rev}/CHANGES.md"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ redianthus ]; }; -} +}) From c949ccb8be6cee6af176a75fffac42655c7c75f4 Mon Sep 17 00:00:00 2001 From: redianthus Date: Mon, 22 Dec 2025 15:12:45 +0100 Subject: [PATCH 2/3] ocamlPackages.smtml: 0.15.0 -> 0.17.0 --- pkgs/development/ocaml-modules/smtml/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/smtml/default.nix b/pkgs/development/ocaml-modules/smtml/default.nix index e3d891720ca0..0d5753568d74 100644 --- a/pkgs/development/ocaml-modules/smtml/default.nix +++ b/pkgs/development/ocaml-modules/smtml/default.nix @@ -16,7 +16,6 @@ mtime, # fix eval on legacy ocaml versions ocaml_intrinsics ? null, - patricia-tree, prelude, scfg, yojson, @@ -28,13 +27,13 @@ buildDunePackage (finalAttrs: { pname = "smtml"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "formalsec"; repo = "smtml"; tag = "v${finalAttrs.version}"; - hash = "sha256-z3DDdzU39tg2F3+pAFPILiKY3pQxOpehdoxwckyhZBI="; + hash = "sha256-IFjaZcwBiM/xA39W+FuJ87OSEvAhvhEsZ1cF2KrxrhY="; }; nativeBuildInputs = [ @@ -52,7 +51,6 @@ buildDunePackage (finalAttrs: { menhirLib mtime ocaml_intrinsics - patricia-tree prelude scfg yojson @@ -82,6 +80,9 @@ buildDunePackage (finalAttrs: { downloadPage = "https://github.com/formalsec/smtml"; changelog = "https://github.com/formalsec/smtml/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.ethancedwards8 ]; + maintainers = with lib.maintainers; [ + ethancedwards8 + redianthus + ]; }; }) From f7aeddee20bced229c27d41ed0c59cf9ba986919 Mon Sep 17 00:00:00 2001 From: redianthus Date: Mon, 22 Dec 2025 15:19:03 +0100 Subject: [PATCH 3/3] owi: 0.2-unstable-2025-12-13 -> 0.2-unstable-2025-12-22 --- pkgs/by-name/ow/owi/package.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ow/owi/package.nix b/pkgs/by-name/ow/owi/package.nix index 83c2ae8f4d13..b94a14af7dc9 100644 --- a/pkgs/by-name/ow/owi/package.nix +++ b/pkgs/by-name/ow/owi/package.nix @@ -11,18 +11,18 @@ }: let - ocamlPackages = ocaml-ng.ocamlPackages_5_2; + ocamlPackages = ocaml-ng.ocamlPackages_5_3; in ocamlPackages.buildDunePackage { pname = "owi"; - version = "0.2-unstable-2025-12-13"; + version = "0.2-unstable-2025-12-22"; src = fetchFromGitHub { owner = "ocamlpro"; repo = "owi"; - rev = "0ce0a3136bfeaca01bbf9c596d79c093282cff3f"; + rev = "014840cd9d87c912577822b171407bf7453373f0"; fetchSubmodules = true; - hash = "sha256-2WrUbrwi3dSXf/eEdZCK1SnYzo52aJeTfqtN65bjW60="; + hash = "sha256-Mjd2XyPmAsonCcV98L8p9S0yYlJV8OEg2TPjZhzVBj8="; }; nativeBuildInputs = with ocamlPackages; [ @@ -42,15 +42,11 @@ ocamlPackages.buildDunePackage { bos cmdliner digestif - dolmen_type dune-build-info dune-site - hc - integers menhirLib ocaml_intrinsics ocamlgraph - patricia-tree prelude processor scfg @@ -61,7 +57,6 @@ ocamlPackages.buildDunePackage { xmlm yojson z3 - zarith ]; postInstall = '' @@ -88,7 +83,10 @@ ocamlPackages.buildDunePackage { homepage = "https://ocamlpro.github.io/owi/"; downloadPage = "https://github.com/OCamlPro/owi"; license = lib.licenses.agpl3Plus; - maintainers = [ lib.maintainers.ethancedwards8 ]; + maintainers = with lib.maintainers; [ + ethancedwards8 + redianthus + ]; teams = with lib.teams; [ ngi ]; mainProgram = "owi"; badPlatforms = lib.platforms.darwin;