From 6f7a8a63fa880b790078301a929b57ebbb62541e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 25 Nov 2025 07:27:15 +0100 Subject: [PATCH 1/4] ocamlPackages.mparser: small cleaning --- pkgs/development/ocaml-modules/mparser/default.nix | 9 ++++----- pkgs/development/ocaml-modules/mparser/pcre.nix | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/mparser/default.nix b/pkgs/development/ocaml-modules/mparser/default.nix index d9fa6326e93f..78f852371e9b 100644 --- a/pkgs/development/ocaml-modules/mparser/default.nix +++ b/pkgs/development/ocaml-modules/mparser/default.nix @@ -4,16 +4,15 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mparser"; version = "1.3"; - useDune2 = true; src = fetchFromGitHub { owner = "murmour"; repo = "mparser"; - rev = version; - sha256 = "16j19v16r42gcsii6a337zrs5cxnf12ig0vaysxyr7sq5lplqhkx"; + tag = finalAttrs.version; + hash = "sha256-fUJMLy1Yn+y79mqDF0VwtrOi8z9jKBOjZk+QbMJOQZo="; }; meta = { @@ -22,4 +21,4 @@ buildDunePackage rec { homepage = "https://github.com/murmour/mparser"; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) diff --git a/pkgs/development/ocaml-modules/mparser/pcre.nix b/pkgs/development/ocaml-modules/mparser/pcre.nix index c2f81d1c149a..5b9c15797dc1 100644 --- a/pkgs/development/ocaml-modules/mparser/pcre.nix +++ b/pkgs/development/ocaml-modules/mparser/pcre.nix @@ -6,7 +6,6 @@ buildDunePackage { pname = "mparser-pcre"; - useDune2 = true; inherit (mparser) src version; From 68bd08d01ac4bc742f4bc9ad691438ae65cffb3a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 25 Nov 2025 07:27:19 +0100 Subject: [PATCH 2/4] ocamlPackages.safepass: small cleaning --- pkgs/development/ocaml-modules/safepass/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/safepass/default.nix b/pkgs/development/ocaml-modules/safepass/default.nix index 363c8edf71ee..45d89da7f9bb 100644 --- a/pkgs/development/ocaml-modules/safepass/default.nix +++ b/pkgs/development/ocaml-modules/safepass/default.nix @@ -4,24 +4,22 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "safepass"; version = "3.1"; - useDune2 = true; - src = fetchFromGitHub { owner = "darioteixeira"; repo = "ocaml-safepass"; - rev = "v${version}"; - sha256 = "1cwslwdb1774lfmhcclj9kymvidbcpjx1vp16jnjirqdqgl4zs5q"; + tag = "v${finalAttrs.version}"; + hash = "sha256-uOhP6MMN5yitNOHu0OVlq8Vd/UySMgaro+ScsBqnmrM="; }; meta = { - inherit (src.meta) homepage; + homepage = "https://github.com/darioteixeira/ocaml-safepass"; description = "OCaml library offering facilities for the safe storage of user passwords"; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) From b17601302456bcd9de387cb6872de5b3829c55e7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 25 Nov 2025 07:27:22 +0100 Subject: [PATCH 3/4] ocamlPackages.ezxmlm: small cleaning --- .../development/ocaml-modules/ezxmlm/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/ezxmlm/default.nix b/pkgs/development/ocaml-modules/ezxmlm/default.nix index d0ac55f6787e..7e38b9b14c2d 100644 --- a/pkgs/development/ocaml-modules/ezxmlm/default.nix +++ b/pkgs/development/ocaml-modules/ezxmlm/default.nix @@ -5,20 +5,18 @@ xmlm, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ezxmlm"; version = "1.1.0"; - useDune2 = true; - src = fetchurl { - url = "https://github.com/mirage/ezxmlm/releases/download/v${version}/ezxmlm-v${version}.tbz"; - sha256 = "123dn4h993mlng9gzf4nc6mw75ja7ndcxkbkwfs48j5jk1z05j6d"; + url = "https://github.com/mirage/ezxmlm/releases/download/v${finalAttrs.version}/ezxmlm-v${finalAttrs.version}.tbz"; + hash = "sha256-zcgCfpiySES043PNzpo9SpbDq2GWuP/Ss7SOlCCxbYg="; }; propagatedBuildInputs = [ xmlm ]; - meta = with lib; { + meta = { description = "Combinators to use with xmlm for parsing and selection"; longDescription = '' An "easy" interface on top of the xmlm library. This version provides @@ -31,8 +29,8 @@ buildDunePackage rec { types in this library are more specific than Xmlm, it should interoperate just fine with it if you decide to switch over. ''; - maintainers = [ maintainers.carlosdagos ]; + maintainers = [ lib.maintainers.carlosdagos ]; homepage = "https://github.com/mirage/ezxmlm/"; - license = licenses.isc; + license = lib.licenses.isc; }; -} +}) From a72350e9eae19804c4878fe9eec2491e5e4ead8e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 25 Nov 2025 07:27:24 +0100 Subject: [PATCH 4/4] ocamlPackages.ocaml-print-intf: small cleaning --- .../ocaml-print-intf/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix b/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix index 2073ae6962b1..21ce5510bd4a 100644 --- a/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix @@ -5,20 +5,16 @@ dune-build-info, bos, }: -let - author = "avsm"; + +buildDunePackage (finalAttrs: { pname = "ocaml-print-intf"; version = "1.2.0"; -in -buildDunePackage rec { - inherit pname version; - useDune2 = true; src = fetchFromGitHub { - owner = author; - repo = pname; - rev = "v${version}"; - sha256 = "0hw4gl7irarcywibdjqxmrga8f7yj52wgy7sc7n0wyy74jzxb8np"; + owner = "avsm"; + repo = "ocaml-print-intf"; + tag = "v${finalAttrs.version}"; + hash = "sha256-16LVvyTHew7sYfr4x0WR/jikXq4dy7Yi9yyrHA99hEM="; }; buildInputs = [ @@ -28,8 +24,8 @@ buildDunePackage rec { meta = { description = "Pretty print an OCaml cmi/cmt/cmti file in human-readable OCaml signature form"; - homepage = "https://github.com/${author}/${pname}"; + homepage = "https://github.com/avsm/ocaml-print-intf"; license = lib.licenses.isc; maintainers = [ lib.maintainers.nerdypepper ]; }; -} +})