From 9117f1dca99418fb838eee70da45898494f452bf Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 21 Nov 2025 06:41:16 +0100
Subject: [PATCH 1/3] ocamlPackages.bheap: small cleaning

---
 .../ocaml-modules/bheap/default.nix            | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/ocaml-modules/bheap/default.nix b/pkgs/development/ocaml-modules/bheap/default.nix
index 255aa62b7a5e..aff7ae9679fb 100644
--- a/pkgs/development/ocaml-modules/bheap/default.nix
+++ b/pkgs/development/ocaml-modules/bheap/default.nix
@@ -5,26 +5,24 @@
   stdlib-shims,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "bheap";
   version = "2.0.0";
 
   src = fetchurl {
-    url = "https://github.com/backtracking/${pname}/releases/download/${version}/${pname}-${version}.tbz";
-    sha256 = "0dpnpla20lgiicrxl2432m2fcr6y68msw3pnjxqb11xw6yrdfhsz";
+    url = "https://github.com/backtracking/bheap/releases/download/${finalAttrs.version}/bheap-${finalAttrs.version}.tbz";
+    hash = "sha256-X0PXsje8h7Bwl/YOrisy3mTmRBWDCNozi/FRIBS99jY=";
   };
 
-  useDune2 = true;
-
   doCheck = true;
   checkInputs = [
     stdlib-shims
   ];
 
-  meta = with lib; {
-    description = "OCaml binary heap implementation by Jean-Christophe Filliatre";
-    license = licenses.lgpl21Only;
-    maintainers = [ maintainers.sternenseemann ];
+  meta = {
+    description = "OCaml binary heap implementation by Jean-Christophe Filliâtre";
+    license = lib.licenses.lgpl21Only;
+    maintainers = [ lib.maintainers.sternenseemann ];
     homepage = "https://github.com/backtracking/bheap";
   };
-}
+})

From 252e420ba33e83616616ee525ed53d1954329e63 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 21 Nov 2025 06:41:20 +0100
Subject: [PATCH 2/3] ocamlPackages.bigarray-compat: small cleaning

---
 .../ocaml-modules/bigarray-compat/default.nix | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/ocaml-modules/bigarray-compat/default.nix b/pkgs/development/ocaml-modules/bigarray-compat/default.nix
index 476e9a3b33b0..ae3a84fd6f9f 100644
--- a/pkgs/development/ocaml-modules/bigarray-compat/default.nix
+++ b/pkgs/development/ocaml-modules/bigarray-compat/default.nix
@@ -1,28 +1,22 @@
 {
   lib,
   buildDunePackage,
-  fetchFromGitHub,
+  fetchurl,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "bigarray-compat";
   version = "1.1.0";
 
-  useDune2 = true;
-
-  minimalOCamlVersion = "4.02";
-
-  src = fetchFromGitHub {
-    owner = "mirage";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-2JVopggK2JuXWEPu8qn12F1jQIJ9OV89XY1rHtUqLkI=";
+  src = fetchurl {
+    url = "https://github.com/mirage/bigarray-compat/releases/download/v${finalAttrs.version}/bigarray-compat-${finalAttrs.version}.tbz";
+    hash = "sha256-Q0RppI1chOgNYhsT2V6wZ/gTjBZQof1a5gCaGbk3GNU=";
   };
 
   meta = {
     description = "Compatibility library to use Stdlib.Bigarray when possible";
-    inherit (src.meta) homepage;
+    homepage = "https://github.com/mirage/bigarray-compat";
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})

From 492fb942031fea80f6b75bd3056a860f8d378a13 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 21 Nov 2025 06:41:23 +0100
Subject: [PATCH 3/3] ocamlPackages.cairo2: small cleaning

---
 .../ocaml-modules/cairo2/default.nix            | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix
index 9c1073346ff0..bf09c94f1892 100644
--- a/pkgs/development/ocaml-modules/cairo2/default.nix
+++ b/pkgs/development/ocaml-modules/cairo2/default.nix
@@ -9,18 +9,15 @@
   cairo,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "cairo2";
   version = "0.6.5";
 
   src = fetchurl {
-    url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz";
-    sha256 = "sha256-JdxByUNtmrz1bKrZoQWUT/c0YEG4zGoqZUq4hItlc3I=";
+    url = "https://github.com/Chris00/ocaml-cairo/releases/download/${finalAttrs.version}/cairo2-${finalAttrs.version}.tbz";
+    hash = "sha256-JdxByUNtmrz1bKrZoQWUT/c0YEG4zGoqZUq4hItlc3I=";
   };
 
-  minimalOCamlVersion = "4.02";
-  useDune2 = true;
-
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     cairo
@@ -34,7 +31,7 @@ buildDunePackage rec {
       || lib.versionAtLeast ocaml.version "4.10"
     );
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/Chris00/ocaml-cairo";
     description = "Binding to Cairo, a 2D Vector Graphics Library";
     longDescription = ''
@@ -43,10 +40,10 @@ buildDunePackage rec {
       the X Window System, Quartz, Win32, image buffers, PostScript, PDF,
       and SVG file output.
     '';
-    license = licenses.lgpl3;
-    maintainers = with maintainers; [
+    license = lib.licenses.lgpl3;
+    maintainers = with lib.maintainers; [
       jirkamarsik
       vbgl
     ];
   };
-}
+})