From 7ea00b11c0616f1dccac435566eb915813541b05 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 28 Nov 2025 05:57:31 +0100 Subject: [PATCH 1/5] ocamlPackages.mirage-bootvar-unix: small cleaning --- .../ocaml-modules/mirage-bootvar-unix/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix b/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix index 3adb2349092e..5c6f364d1343 100644 --- a/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix +++ b/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix @@ -6,15 +6,13 @@ parse-argv, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mirage-bootvar-unix"; version = "0.1.0"; - useDune2 = true; - src = fetchurl { - url = "https://github.com/mirage/mirage-bootvar-unix/releases/download/${version}/mirage-bootvar-unix-${version}.tbz"; - sha256 = "0r92s6y7nxg0ci330a7p0hii4if51iq0sixn20cnm5j4a2clprbf"; + url = "https://github.com/mirage/mirage-bootvar-unix/releases/download/${finalAttrs.version}/mirage-bootvar-unix-${finalAttrs.version}.tbz"; + hash = "sha256-buVLmVBElmoZELZHDXAMxUUSIwT3KDBGZOB1e7zRImU="; }; propagatedBuildInputs = [ @@ -28,4 +26,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 2ba2bb81700b40ae62d7cc8bf5fcafc6ceb8ecc6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 28 Nov 2025 05:57:36 +0100 Subject: [PATCH 2/5] ocamlPackages.mirage-device: small cleaning --- .../ocaml-modules/mirage-device/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-device/default.nix b/pkgs/development/ocaml-modules/mirage-device/default.nix index dd036c033c22..f47c0fe9d598 100644 --- a/pkgs/development/ocaml-modules/mirage-device/default.nix +++ b/pkgs/development/ocaml-modules/mirage-device/default.nix @@ -3,23 +3,21 @@ buildDunePackage, fetchurl, fmt, - ocaml_lwt, + lwt, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mirage-device"; version = "2.0.0"; - useDune2 = true; - src = fetchurl { - url = "https://github.com/mirage/mirage-device/releases/download/v${version}/mirage-device-v${version}.tbz"; - sha256 = "18alxyi6wlxqvb4lajjlbdfkgcajsmklxi9xqmpcz07j51knqa04"; + url = "https://github.com/mirage/mirage-device/releases/download/v${finalAttrs.version}/mirage-device-v${finalAttrs.version}.tbz"; + hash = "sha256-BChsZyjygM9uxT3FTmfVUrE3XVtUSkXJ2rhTbqLvVKE="; }; propagatedBuildInputs = [ fmt - ocaml_lwt + lwt ]; meta = { @@ -28,4 +26,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 671613915164f187517fde31c30ec59e7e722d2d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 28 Nov 2025 05:57:39 +0100 Subject: [PATCH 3/5] ocamlPackages.samplerate: small cleaning --- .../ocaml-modules/samplerate/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/samplerate/default.nix b/pkgs/development/ocaml-modules/samplerate/default.nix index 51f80d727f1a..52487dbe3c78 100644 --- a/pkgs/development/ocaml-modules/samplerate/default.nix +++ b/pkgs/development/ocaml-modules/samplerate/default.nix @@ -6,26 +6,24 @@ libsamplerate, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "samplerate"; version = "0.1.6"; - useDune2 = true; - src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-samplerate"; - rev = "v${version}"; - sha256 = "0h0i9v9p9n2givv3wys8qrfi1i7vp8kq7lnkf14s7d3m4r8x4wrp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-N3PSUSZ1tKNJcNPSgye6+8QQXcZIez72jk/YdNNOEUA="; }; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ libsamplerate ]; - meta = with lib; { + meta = { homepage = "https://github.com/savonet/ocaml-samplerate"; description = "Interface for libsamplerate"; - license = licenses.bsd2; - maintainers = with maintainers; [ dandellion ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ dandellion ]; }; -} +}) From 6bfa08651eeb9752ef382bf31bfd53ecd847c7c2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 28 Nov 2025 05:57:43 +0100 Subject: [PATCH 4/5] ocamlPackages.semaphore-compat: small cleaning --- .../ocaml-modules/semaphore-compat/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/semaphore-compat/default.nix b/pkgs/development/ocaml-modules/semaphore-compat/default.nix index 10d91afe8d27..cafa646e5b72 100644 --- a/pkgs/development/ocaml-modules/semaphore-compat/default.nix +++ b/pkgs/development/ocaml-modules/semaphore-compat/default.nix @@ -4,24 +4,22 @@ fetchurl, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "semaphore-compat"; version = "1.0.2"; src = fetchurl { - url = "https://github.com/mirage/semaphore-compat/releases/download/${version}/semaphore-compat-${version}.tbz"; - sha256 = "sha256-4CnZ2vX17IPpnlA7CNeuxZEKfA5HFoeQvwH0tCKNRnY="; + url = "https://github.com/mirage/semaphore-compat/releases/download/${finalAttrs.version}/semaphore-compat-${finalAttrs.version}.tbz"; + hash = "sha256-4CnZ2vX17IPpnlA7CNeuxZEKfA5HFoeQvwH0tCKNRnY="; }; - useDune2 = true; - - meta = with lib; { + meta = { description = "Compatibility Semaphore module"; homepage = "https://github.com/mirage/semaphore-compat"; - license = with licenses; [ + license = with lib.licenses; [ lgpl21Plus ocamlLgplLinkingException ]; - maintainers = [ maintainers.sternenseemann ]; + maintainers = [ lib.maintainers.sternenseemann ]; }; -} +}) From d66b9b57a07e56adde7ebf9b398fbf7f1fea09c8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 28 Nov 2025 05:57:46 +0100 Subject: [PATCH 5/5] ocamlPackages.trie: small cleaning --- pkgs/development/ocaml-modules/trie/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/trie/default.nix b/pkgs/development/ocaml-modules/trie/default.nix index f0101bb73139..d0f6975b9c45 100644 --- a/pkgs/development/ocaml-modules/trie/default.nix +++ b/pkgs/development/ocaml-modules/trie/default.nix @@ -4,24 +4,22 @@ fetchFromGitHub, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "trie"; version = "1.0.0"; - useDune2 = true; - src = fetchFromGitHub { owner = "kandu"; - repo = pname; - rev = version; - sha256 = "0s7p9swjqjsqddylmgid6cv263ggq7pmb734z4k84yfcrgb6kg4g"; + repo = "trie"; + tag = finalAttrs.version; + hash = "sha256-j7xp1svMeYIm+WScVe/B7w0jNjMtvkp9a1hLLLlO92g="; }; meta = { - inherit (src.meta) homepage; + homepage = "https://github.com/kandu/trie/"; license = lib.licenses.mit; description = "Strict impure trie tree"; maintainers = [ lib.maintainers.vbgl ]; }; -} +})