From 7a32e0d87efce09b1299b58720251ce1d20c0eb7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 26 Nov 2025 05:38:10 +0100 Subject: [PATCH 1/5] ocamlPackages.either: small cleaning --- .../development/ocaml-modules/either/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/either/default.nix b/pkgs/development/ocaml-modules/either/default.nix index 5967168061e8..5d69f1d37aa4 100644 --- a/pkgs/development/ocaml-modules/either/default.nix +++ b/pkgs/development/ocaml-modules/either/default.nix @@ -4,21 +4,19 @@ fetchurl, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "either"; version = "1.0.0"; src = fetchurl { - url = "https://github.com/mirage/either/releases/download/${version}/either-${version}.tbz"; - sha256 = "bf674de3312dee7b7215f07df1e8a96eb3d679164b8a918cdd95b8d97e505884"; + url = "https://github.com/mirage/either/releases/download/${finalAttrs.version}/either-${finalAttrs.version}.tbz"; + hash = "sha256-v2dN4zEt7ntyFfB98eipbrPWeRZLipGM3ZW42X5QWIQ="; }; - useDune2 = true; - - meta = with lib; { + meta = { description = "Compatibility Either module"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/mirage/either"; - maintainers = [ maintainers.sternenseemann ]; + maintainers = [ lib.maintainers.sternenseemann ]; }; -} +}) From f5acb63359d38de9ee8ba9632a6dede23f564298 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 26 Nov 2025 05:38:15 +0100 Subject: [PATCH 2/5] ocamlPackages.hashcons: small cleaning --- pkgs/development/ocaml-modules/hashcons/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/hashcons/default.nix b/pkgs/development/ocaml-modules/hashcons/default.nix index 72f81ca051de..a8649341c964 100644 --- a/pkgs/development/ocaml-modules/hashcons/default.nix +++ b/pkgs/development/ocaml-modules/hashcons/default.nix @@ -4,19 +4,17 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "hashcons"; - version = "1.4"; + version = "1.4.0"; src = fetchFromGitHub { owner = "backtracking"; - repo = "ocaml-${pname}"; + repo = "ocaml-hashcons"; rev = "d733325eeb55878bed285120c2c088daf78f0e2b"; - sha256 = "0h4pvwj34pndaw3pajkhl710ywwinhc9pqimgllfmkl37wz2d8zq"; + hash = "sha256-+KMmPj+DzuoofTXimxi0kXMPwqFwSnUHV81eMiTfl0A="; }; - useDune2 = true; - doCheck = true; meta = { @@ -24,4 +22,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.ulrikstrid ]; }; -} +}) From 2146823fd776aac331ad751366fd4c8fc3f1bb17 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 26 Nov 2025 05:38:18 +0100 Subject: [PATCH 3/5] ocamlPackages.irmin-watcher: small cleaning --- .../ocaml-modules/irmin-watcher/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/irmin-watcher/default.nix b/pkgs/development/ocaml-modules/irmin-watcher/default.nix index 62c266750b79..cbbc72d5ff91 100644 --- a/pkgs/development/ocaml-modules/irmin-watcher/default.nix +++ b/pkgs/development/ocaml-modules/irmin-watcher/default.nix @@ -5,25 +5,23 @@ astring, fmt, logs, - ocaml_lwt, + lwt, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "irmin-watcher"; version = "0.5.0"; - useDune2 = true; - src = fetchurl { - url = "https://github.com/mirage/irmin-watcher/releases/download/${version}/irmin-watcher-${version}.tbz"; - sha256 = "sha256-vq4kwaz4QUG9x0fGEbQMAuDGjlT3/6lm8xiXTUqJmZM="; + url = "https://github.com/mirage/irmin-watcher/releases/download/${finalAttrs.version}/irmin-watcher-${finalAttrs.version}.tbz"; + hash = "sha256-vq4kwaz4QUG9x0fGEbQMAuDGjlT3/6lm8xiXTUqJmZM="; }; propagatedBuildInputs = [ astring fmt logs - ocaml_lwt + lwt ]; meta = { @@ -33,4 +31,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From dd704b8b204d0d4849cdea101acfd90e77010193 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 26 Nov 2025 05:38:21 +0100 Subject: [PATCH 4/5] ocamlPackages.lacaml: small cleaning --- .../ocaml-modules/lacaml/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix index d82525956943..ed777f9df77e 100644 --- a/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/pkgs/development/ocaml-modules/lacaml/default.nix @@ -9,17 +9,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "lacaml"; version = "11.1.1"; - useDune2 = true; - - minimalOCamlVersion = "4.08"; - src = fetchurl { - url = "https://github.com/mmottl/lacaml/releases/download/${version}/lacaml-${version}.tbz"; - sha256 = "sha256-NEs7A/lfA+8AE6k19EPW02e1pseDE7HobGSB/ZwLcoc="; + url = "https://github.com/mmottl/lacaml/releases/download/${finalAttrs.version}/lacaml-${finalAttrs.version}.tbz"; + hash = "sha256-NEs7A/lfA+8AE6k19EPW02e1pseDE7HobGSB/ZwLcoc="; }; buildInputs = [ dune-configurator ]; @@ -28,10 +24,10 @@ buildDunePackage rec { blas ]; - meta = with lib; { + meta = { homepage = "https://mmottl.github.io/lacaml"; description = "OCaml bindings for BLAS and LAPACK"; - license = licenses.lgpl21Plus; - maintainers = [ maintainers.vbgl ]; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From e4bea0f1c3e11990bdb7d8ad929fb30efc83dbdb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 26 Nov 2025 05:38:27 +0100 Subject: [PATCH 5/5] ocamlPackages.ladspa: small cleaning --- .../development/ocaml-modules/ladspa/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/ladspa/default.nix b/pkgs/development/ocaml-modules/ladspa/default.nix index 7ff7a0311356..2abd00b92f29 100644 --- a/pkgs/development/ocaml-modules/ladspa/default.nix +++ b/pkgs/development/ocaml-modules/ladspa/default.nix @@ -6,26 +6,24 @@ ladspaH, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ladspa"; version = "0.2.2"; - useDune2 = true; - src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ladspa"; - rev = "v${version}"; - sha256 = "1y83infjaz9apzyvaaqw331zqdysmn3bpidfab061v3bczv4jzbz"; + tag = "v${finalAttrs.version}"; + hash = "sha256-f31J9mdr7GDAUq7Fu4at2jf8wxgcK7X9vyp9JZ2NA/k="; }; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ ladspaH ]; - meta = with lib; { + meta = { homepage = "https://github.com/savonet/ocaml-alsa"; description = "Bindings for the LADSPA API which provides audio effects"; - license = licenses.lgpl21Only; - maintainers = with maintainers; [ dandellion ]; + license = lib.licenses.lgpl21Only; + maintainers = [ lib.maintainers.dandellion ]; }; -} +})