From 920b55163eb4da6aae088431ea5cec834d1f9d45 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 27 Nov 2025 07:48:49 +0100 Subject: [PATCH 1/5] ocamlPackages.markup: small cleaning (cherry picked from commit dc0e174bbb7c8f6c41bd51c809fac103437d6e4e) --- .../ocaml-modules/markup/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/markup/default.nix b/pkgs/development/ocaml-modules/markup/default.nix index 85a9afd80a22..4ef00e759c96 100644 --- a/pkgs/development/ocaml-modules/markup/default.nix +++ b/pkgs/development/ocaml-modules/markup/default.nix @@ -8,17 +8,15 @@ ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "markup"; version = "1.0.3"; - useDune2 = true; - src = fetchFromGitHub { owner = "aantron"; repo = "markup.ml"; - rev = version; - sha256 = "sha256-tsXz39qFSyL6vPYKG7P73zSEiraaFuOySL1n0uFij6k="; + tag = finalAttrs.version; + hash = "sha256-tsXz39qFSyL6vPYKG7P73zSEiraaFuOySL1n0uFij6k="; }; propagatedBuildInputs = [ @@ -27,13 +25,13 @@ buildDunePackage rec { ]; checkInputs = [ ounit2 ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + doCheck = true; - meta = with lib; { + meta = { homepage = "https://github.com/aantron/markup.ml/"; description = "Pair of best-effort parsers implementing the HTML5 and XML specifications"; - license = licenses.mit; - maintainers = with maintainers; [ gal_bolle ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gal_bolle ]; }; -} +}) From 1e8a7dbd83c2c9353297cc69d687670c25406f7b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 27 Nov 2025 07:48:52 +0100 Subject: [PATCH 2/5] ocamlPackages.opti: small cleaning (cherry picked from commit e38f06740a231e28b08f3fd04d7fd3e87288b666) --- .../development/ocaml-modules/opti/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/opti/default.nix b/pkgs/development/ocaml-modules/opti/default.nix index c0eec8aa06c7..31f2f91c26e5 100644 --- a/pkgs/development/ocaml-modules/opti/default.nix +++ b/pkgs/development/ocaml-modules/opti/default.nix @@ -4,23 +4,19 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "opti"; version = "1.0.3"; - useDune2 = true; - - minimalOCamlVersion = "4.02"; - src = fetchurl { - url = "https://github.com/magnusjonsson/opti/releases/download/${version}/opti-${version}.tbz"; - sha256 = "ed9ba56dc06e9d2b1bf097964cc65ea37db787d4f239c13d0dd74693f5b50a1e"; + url = "https://github.com/magnusjonsson/opti/releases/download/${finalAttrs.version}/opti-${finalAttrs.version}.tbz"; + hash = "sha256-7ZulbcBunSsb8JeWTMZeo323h9TyOcE9DddGk/W1Ch4="; }; - meta = with lib; { + meta = { description = "DSL to generate fast incremental C code from declarative specifications"; - license = licenses.bsd3; - maintainers = [ maintainers.jmagnusj ]; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.jmagnusj ]; homepage = "https://github.com/magnusjonsson/opti"; }; -} +}) From c310e8aba710532ac8154f7299ff02be8e69f048 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 27 Nov 2025 07:48:56 +0100 Subject: [PATCH 3/5] ocamlPackages.ptmap: small cleaning (cherry picked from commit ed09646e90589d94c59a143fb028017864197638) --- pkgs/development/ocaml-modules/ptmap/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/ptmap/default.nix b/pkgs/development/ocaml-modules/ptmap/default.nix index da24c5757f36..1dd944ede8ac 100644 --- a/pkgs/development/ocaml-modules/ptmap/default.nix +++ b/pkgs/development/ocaml-modules/ptmap/default.nix @@ -6,15 +6,13 @@ stdlib-shims, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ptmap"; version = "2.0.5"; - useDune2 = true; - src = fetchurl { - url = "https://github.com/backtracking/ptmap/releases/download/${version}/ptmap-${version}.tbz"; - sha256 = "1apk61fc1y1g7x3m3c91fnskvxp6i0vk5nxwvipj56k7x2pzilgb"; + url = "https://github.com/backtracking/ptmap/releases/download/${finalAttrs.version}/ptmap-${finalAttrs.version}.tbz"; + hash = "sha256-69H4r+hnmiJv3LzbMjeI5vY9tXUhsVFHPy/4wFww86o="; }; buildInputs = [ stdlib-shims ]; @@ -28,4 +26,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21; maintainers = [ ]; }; -} +}) From c07327640cbeef870b9a7d36c7be68777ae2159b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 27 Nov 2025 07:48:58 +0100 Subject: [PATCH 4/5] ocamlPackages.ptset: small cleaning (cherry picked from commit 256a78f4df194abd554cfca62317402032793112) --- pkgs/development/ocaml-modules/ptset/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/ptset/default.nix b/pkgs/development/ocaml-modules/ptset/default.nix index bdf39ad27e3e..9058730fade6 100644 --- a/pkgs/development/ocaml-modules/ptset/default.nix +++ b/pkgs/development/ocaml-modules/ptset/default.nix @@ -5,15 +5,13 @@ stdlib-shims, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ptset"; version = "1.0.1"; - useDune2 = true; - src = fetchurl { - url = "https://github.com/backtracking/ptset/releases/download/${version}/ptset-${version}.tbz"; - sha256 = "1pr80mgk12l93mdq1wfsv2b6ccraxs334d5h92qzjh7bw2g13424"; + url = "https://github.com/backtracking/ptset/releases/download/${finalAttrs.version}/ptset-${finalAttrs.version}.tbz"; + hash = "sha256-RJARnuDrQPmxSLA0MobuKjNmltja8YBbHYmKMF8FKN8="; }; doCheck = true; @@ -26,4 +24,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From bcd099a64ac1894f780fd6d819c7da8513d46165 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 27 Nov 2025 07:49:01 +0100 Subject: [PATCH 5/5] ocamlPackages.vector: small cleaning (cherry picked from commit 8e47ff9991b67efd5820f0772c3d0014b688ebaa) --- pkgs/development/ocaml-modules/vector/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/vector/default.nix b/pkgs/development/ocaml-modules/vector/default.nix index e2c3240697bf..4c0ece18e94b 100644 --- a/pkgs/development/ocaml-modules/vector/default.nix +++ b/pkgs/development/ocaml-modules/vector/default.nix @@ -4,15 +4,13 @@ fetchurl, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "vector"; version = "1.0.0"; - useDune2 = true; - src = fetchurl { - url = "https://github.com/backtracking/vector/releases/download/${version}/vector-${version}.tbz"; - sha256 = "sha256:0hb6prpada4c5z07sxf5ayj5xbahsnwall15vaqdwdyfjgbd24pj"; + url = "https://github.com/backtracking/vector/releases/download/${finalAttrs.version}/vector-${finalAttrs.version}.tbz"; + hash = "sha256-8hLR1pPON96w2iVQqrjVUK1epFfFdX3AL4yopm6+ZkE="; }; doCheck = true; @@ -24,4 +22,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; }; -} +})