diff --git a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix
index e82a2b4f8ef9..fec68d39cf89 100644
--- a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix
@@ -11,12 +11,12 @@
   uri,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mirage-block-unix";
   version = "2.14.2";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mirage-block-unix/releases/download/v${version}/mirage-block-unix-${version}.tbz";
+    url = "https://github.com/mirage/mirage-block-unix/releases/download/v${finalAttrs.version}/mirage-block-unix-${finalAttrs.version}.tbz";
     sha256 = "sha256-6ReAzd+pCd5ccmXOh6GlSxHo4GuEgptxLha62n+dBsE=";
   };
 
@@ -42,4 +42,4 @@ buildDunePackage rec {
     homepage = "https://github.com/mirage/mirage-block-unix";
     license = lib.licenses.isc;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mirage-block/default.nix b/pkgs/development/ocaml-modules/mirage-block/default.nix
index 71ae282ffaca..2194f1183e38 100644
--- a/pkgs/development/ocaml-modules/mirage-block/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-block/default.nix
@@ -7,14 +7,14 @@
   fmt,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mirage-block";
   version = "3.0.2";
 
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mirage-block/releases/download/v${version}/mirage-block-${version}.tbz";
+    url = "https://github.com/mirage/mirage-block/releases/download/v${finalAttrs.version}/mirage-block-${finalAttrs.version}.tbz";
     hash = "sha256-UALUfeL0G1mfSsLgAb/HpQ6OV12YtY+GUOYG6yhUwAI=";
   };
 
@@ -30,4 +30,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix b/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix
index dd612da48f3f..a43062fe1fea 100644
--- a/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix
@@ -7,7 +7,7 @@
   lwt,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mirage-bootvar-xen";
   version = "0.8.0";
 
@@ -16,7 +16,7 @@ buildDunePackage rec {
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mirage-bootvar-xen/releases/download/v${version}/mirage-bootvar-xen-v${version}.tbz";
+    url = "https://github.com/mirage/mirage-bootvar-xen/releases/download/v${finalAttrs.version}/mirage-bootvar-xen-v${finalAttrs.version}.tbz";
     hash = "sha256:0nk80giq9ng3svbnm68fjby2f1dnarddm3lk7mw7w59av71q0rcv";
   };
 
@@ -32,4 +32,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.sternenseemann ];
     homepage = "https://github.com/mirage/mirage-bootvar-xen";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mirage-clock/default.nix b/pkgs/development/ocaml-modules/mirage-clock/default.nix
index 2cf12cec92ec..c6e86600620c 100644
--- a/pkgs/development/ocaml-modules/mirage-clock/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-clock/default.nix
@@ -4,14 +4,14 @@
   fetchurl,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mirage-clock";
   version = "4.2.0";
 
   minimalOCamlVersion = "4.06";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mirage-clock/releases/download/v${version}/mirage-clock-${version}.tbz";
+    url = "https://github.com/mirage/mirage-clock/releases/download/v${finalAttrs.version}/mirage-clock-${finalAttrs.version}.tbz";
     hash = "sha256-+hfRXVviPHm6dB9ffLiO1xEt4WpEEM6oHHG5gIaImEc=";
   };
 
@@ -21,4 +21,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mirage-console/default.nix b/pkgs/development/ocaml-modules/mirage-console/default.nix
index c22bf4d287f2..21e7a1a279a7 100644
--- a/pkgs/development/ocaml-modules/mirage-console/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-console/default.nix
@@ -6,7 +6,7 @@
   mirage-flow,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mirage-console";
   version = "5.1.0";
 
@@ -14,7 +14,7 @@ buildDunePackage rec {
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mirage-console/releases/download/v${version}/mirage-console-${version}.tbz";
+    url = "https://github.com/mirage/mirage-console/releases/download/v${finalAttrs.version}/mirage-console-${finalAttrs.version}.tbz";
     hash = "sha256-mjYRisbNOJbYoSuWaGoPueXakmqAwmWh0ATvLLsvpNM=";
   };
 
@@ -29,4 +29,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mirage-kv/default.nix b/pkgs/development/ocaml-modules/mirage-kv/default.nix
index cdcde9fee322..271dd924cf15 100644
--- a/pkgs/development/ocaml-modules/mirage-kv/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-kv/default.nix
@@ -9,14 +9,14 @@
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mirage-kv";
   version = "6.1.1";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mirage-kv/releases/download/v${version}/mirage-kv-${version}.tbz";
+    url = "https://github.com/mirage/mirage-kv/releases/download/v${finalAttrs.version}/mirage-kv-${finalAttrs.version}.tbz";
     hash = "sha256-fNXNlaDpb5zUA2rTwi5h1j4v4LQmovxG+Am6u+1guPQ=";
   };
 
@@ -36,4 +36,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mirage-logs/default.nix b/pkgs/development/ocaml-modules/mirage-logs/default.nix
index c5200e186a7e..59bf3576d70c 100644
--- a/pkgs/development/ocaml-modules/mirage-logs/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-logs/default.nix
@@ -11,14 +11,14 @@
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mirage-logs";
   version = "2.1.0";
 
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mirage-logs/releases/download/v${version}/mirage-logs-${version}.tbz";
+    url = "https://github.com/mirage/mirage-logs/releases/download/v${finalAttrs.version}/mirage-logs-${finalAttrs.version}.tbz";
     hash = "sha256-rorCsgw7QCQmjotr465KShQGWdoUM88djpwgqwBGnLs=";
   };
 
@@ -42,4 +42,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mirage-nat/default.nix b/pkgs/development/ocaml-modules/mirage-nat/default.nix
index 80dbbb0ab4f3..a4512ab3a48a 100644
--- a/pkgs/development/ocaml-modules/mirage-nat/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-nat/default.nix
@@ -12,14 +12,14 @@
   mirage-clock-unix,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mirage-nat";
   version = "3.0.2";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
-    url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz";
+    url = "https://github.com/mirage/mirage-nat/releases/download/v${finalAttrs.version}/mirage-nat-${finalAttrs.version}.tbz";
     hash = "sha256-Z1g3qb26x/S6asYv6roTW77r41SHy7OGN7MoZJ/E8Is=";
   };
 
@@ -40,8 +40,8 @@ buildDunePackage rec {
 
   meta = {
     description = "Mirage-nat is a library for network address translation to be used with MirageOS";
-    homepage = "https://github.com/mirage/${pname}";
+    homepage = "https://github.com/mirage/mirage-nat";
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.sternenseemann ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mirage-net/default.nix b/pkgs/development/ocaml-modules/mirage-net/default.nix
index ef8aefa2db53..f02bd9fedd0f 100644
--- a/pkgs/development/ocaml-modules/mirage-net/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-net/default.nix
@@ -9,14 +9,14 @@
   mirage-device,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mirage-net";
   version = "4.0.0";
 
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mirage-net/releases/download/v${version}/mirage-net-v${version}.tbz";
+    url = "https://github.com/mirage/mirage-net/releases/download/v${finalAttrs.version}/mirage-net-v${finalAttrs.version}.tbz";
     hash = "sha256-Zo7/0Ye4GgqzJFCHDBXbuJ/5ETl/8ziolRgH4lDhlM4=";
   };
 
@@ -34,4 +34,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mirage-profile/default.nix b/pkgs/development/ocaml-modules/mirage-profile/default.nix
index ff7a539ece0d..e42c5448cc7c 100644
--- a/pkgs/development/ocaml-modules/mirage-profile/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-profile/default.nix
@@ -8,14 +8,14 @@
   lwt,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mirage-profile";
   version = "0.9.1";
 
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mirage-profile/releases/download/v${version}/mirage-profile-v${version}.tbz";
+    url = "https://github.com/mirage/mirage-profile/releases/download/v${finalAttrs.version}/mirage-profile-v${finalAttrs.version}.tbz";
     sha256 = "0lh3591ad4v7nxpd410b75idmgdq668mqdilvkg4avrwqw1wzdib";
   };
 
@@ -32,4 +32,4 @@ buildDunePackage rec {
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mirage-protocols/default.nix b/pkgs/development/ocaml-modules/mirage-protocols/default.nix
index c0d375a3c627..e6b947751734 100644
--- a/pkgs/development/ocaml-modules/mirage-protocols/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-protocols/default.nix
@@ -8,14 +8,14 @@
   tcpip,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mirage-protocols";
   version = "8.0.0";
 
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mirage-protocols/releases/download/v${version}/mirage-protocols-v${version}.tbz";
+    url = "https://github.com/mirage/mirage-protocols/releases/download/v${finalAttrs.version}/mirage-protocols-v${finalAttrs.version}.tbz";
     hash = "sha256-UDCR4Jq3tw9P/Ilw7T4+3+yi9Q7VFqnHhXeSCvg9dyw=";
   };
 
@@ -32,4 +32,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mirage-random-test/default.nix b/pkgs/development/ocaml-modules/mirage-random-test/default.nix
index f058f4111b56..ecfa1ac78653 100644
--- a/pkgs/development/ocaml-modules/mirage-random-test/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-random-test/default.nix
@@ -6,7 +6,7 @@
   mirage-random,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mirage-random-test";
   version = "0.1.0";
 
@@ -15,7 +15,7 @@ buildDunePackage rec {
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
+    url = "https://github.com/mirage/mirage-random-test/releases/download/v${finalAttrs.version}/mirage-random-test-v${finalAttrs.version}.tbz";
     sha256 = "1jmjyb9a4v7l0xxgdwpr9zshzr8xk3hybra6y2dp51anbwk8kv46";
   };
 
@@ -30,4 +30,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.sternenseemann ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mirage-random/default.nix b/pkgs/development/ocaml-modules/mirage-random/default.nix
index e016f47cd0d5..87d0f45930b3 100644
--- a/pkgs/development/ocaml-modules/mirage-random/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-random/default.nix
@@ -5,14 +5,14 @@
   cstruct,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mirage-random";
   version = "3.0.0";
 
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mirage-random/releases/download/v${version}/mirage-random-v${version}.tbz";
+    url = "https://github.com/mirage/mirage-random/releases/download/v${finalAttrs.version}/mirage-random-v${finalAttrs.version}.tbz";
     sha256 = "sha256-Sf4/KB1kMMwXI+yr5H/JuOmynYPNXwlk9dAA+gFAZs8=";
   };
 
@@ -24,4 +24,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mirage-time/default.nix b/pkgs/development/ocaml-modules/mirage-time/default.nix
index 5453e46a1ef6..8b74175fe3b2 100644
--- a/pkgs/development/ocaml-modules/mirage-time/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-time/default.nix
@@ -5,7 +5,7 @@
   lwt,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   minimalOCamlVersion = "4.08";
 
   pname = "mirage-time";
@@ -14,7 +14,7 @@ buildDunePackage rec {
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mirage-time/releases/download/v${version}/mirage-time-v${version}.tbz";
+    url = "https://github.com/mirage/mirage-time/releases/download/v${finalAttrs.version}/mirage-time-v${finalAttrs.version}.tbz";
     hash = "sha256-DUCUm1jix+i3YszIzgZjRQRiM8jJXQ49F6JC/yicvXw=";
   };
 
@@ -26,4 +26,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ sternenseemann ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mirage-unix/default.nix b/pkgs/development/ocaml-modules/mirage-unix/default.nix
index 836e721ee6d7..8c20a5e8ed9f 100644
--- a/pkgs/development/ocaml-modules/mirage-unix/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-unix/default.nix
@@ -7,14 +7,14 @@
   mirage-runtime,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mirage-unix";
   version = "5.0.1";
 
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz";
+    url = "https://github.com/mirage/mirage-unix/releases/download/v${finalAttrs.version}/mirage-unix-${finalAttrs.version}.tbz";
     hash = "sha256-U1oLznUDBcJLcVygfSiyl5qRLDM27cm/WrjT0vSGhPg=";
   };
 
@@ -31,4 +31,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ sternenseemann ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mirage-vnetif/default.nix b/pkgs/development/ocaml-modules/mirage-vnetif/default.nix
index ec097b2c8175..0372d575518c 100644
--- a/pkgs/development/ocaml-modules/mirage-vnetif/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-vnetif/default.nix
@@ -11,14 +11,14 @@
   logs,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mirage-vnetif";
   version = "0.6.2";
 
   minimalOCamlVersion = "4.06";
 
   src = fetchurl {
-    url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz";
+    url = "https://github.com/mirage/mirage-vnetif/releases/download/v${finalAttrs.version}/mirage-vnetif-${finalAttrs.version}.tbz";
     hash = "sha256-SorcrPRhhCYhHasLQGHvTtLo229/3xVB6f7/XOlFRSI=";
   };
 
@@ -34,8 +34,8 @@ buildDunePackage rec {
 
   meta = {
     description = "Virtual network interface and software switch for Mirage";
-    homepage = "https://github.com/mirage/${pname}";
+    homepage = "https://github.com/mirage/mirage-vnetif";
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.sternenseemann ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mirage-xen/default.nix b/pkgs/development/ocaml-modules/mirage-xen/default.nix
index 8079aa2cb7b4..eb801d8e001c 100644
--- a/pkgs/development/ocaml-modules/mirage-xen/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-xen/default.nix
@@ -16,12 +16,12 @@
   io-page,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mirage-xen";
   version = "8.0.1";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mirage-xen/releases/download/v${version}/mirage-xen-${version}.tbz";
+    url = "https://github.com/mirage/mirage-xen/releases/download/v${finalAttrs.version}/mirage-xen-${finalAttrs.version}.tbz";
     hash = "sha256-x8i2Kbz0EcifZK/lbDIFa9Kwtl1/xzbYV9h9E+EtGP4=";
   };
 
@@ -49,4 +49,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.sternenseemann ];
     homepage = "https://github.com/mirage/mirage-xen";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mldoc/default.nix b/pkgs/development/ocaml-modules/mldoc/default.nix
index db902e49e654..d3739062aeac 100644
--- a/pkgs/development/ocaml-modules/mldoc/default.nix
+++ b/pkgs/development/ocaml-modules/mldoc/default.nix
@@ -28,7 +28,7 @@ let
   });
   uri' = uri.override { angstrom = angstrom'; };
 in
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mldoc";
   version = "1.5.8";
 
@@ -39,7 +39,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "logseq";
     repo = "mldoc";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-7uuNUFMSQEgakTKfpYixp43gnfpQSW++snBzgr0Ni0Y=";
   };
 
@@ -67,4 +67,4 @@ buildDunePackage rec {
     license = lib.licenses.agpl3Only;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mm/default.nix b/pkgs/development/ocaml-modules/mm/default.nix
index 064a7ff4fba8..4d5f4e8ae706 100644
--- a/pkgs/development/ocaml-modules/mm/default.nix
+++ b/pkgs/development/ocaml-modules/mm/default.nix
@@ -10,7 +10,7 @@
   theora,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mm";
   version = "0.8.6";
 
@@ -21,7 +21,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-mm";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-ME6Naza7OvZ/63zEjrPeKq5JwMoMfV2fpkCuZdtCZ/c=";
   };
 
@@ -40,4 +40,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl21Plus;
     maintainers = with lib.maintainers; [ dandellion ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mmap/default.nix b/pkgs/development/ocaml-modules/mmap/default.nix
index 7eb032aa3c59..f3453a9497fc 100644
--- a/pkgs/development/ocaml-modules/mmap/default.nix
+++ b/pkgs/development/ocaml-modules/mmap/default.nix
@@ -5,12 +5,12 @@
   bigarray-compat,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mmap";
   version = "1.2.0";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mmap/releases/download/v${version}/mmap-${version}.tbz";
+    url = "https://github.com/mirage/mmap/releases/download/v${finalAttrs.version}/mmap-${finalAttrs.version}.tbz";
     hash = "sha256-FgKoq8jiMvqUdxpS5UDleAtAwvJ2Lu5q+9koZQIRbds=";
   };
 
@@ -22,8 +22,8 @@ buildDunePackage rec {
     longDescription = ''
       This project provides a Mmap.map_file functions for mapping files in memory.
     '';
-    changelog = "https://raw.githubusercontent.com/mirage/mmap/refs/tags/v${version}/CHANGES.md";
+    changelog = "https://raw.githubusercontent.com/mirage/mmap/refs/tags/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.lgpl21;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mopsa/default.nix b/pkgs/development/ocaml-modules/mopsa/default.nix
index 3975ee9ec968..cdcc477feaf1 100644
--- a/pkgs/development/ocaml-modules/mopsa/default.nix
+++ b/pkgs/development/ocaml-modules/mopsa/default.nix
@@ -17,7 +17,7 @@
   zarith,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mopsa";
   version = "1.1";
 
@@ -26,7 +26,7 @@ buildDunePackage rec {
   src = fetchFromGitLab {
     owner = "mopsa";
     repo = "mopsa-analyzer";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-lO5dtGAl1dq8oJco/hPXrAbN05rKc62Zrci/8CLrQ0c=";
   };
 
@@ -79,4 +79,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.vbgl ];
   };
 
-}
+})
diff --git a/pkgs/development/ocaml-modules/mrmime/default.nix b/pkgs/development/ocaml-modules/mrmime/default.nix
index c7fa461a364a..8148f5b99c88 100644
--- a/pkgs/development/ocaml-modules/mrmime/default.nix
+++ b/pkgs/development/ocaml-modules/mrmime/default.nix
@@ -24,12 +24,12 @@
   uutf,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mrmime";
   version = "0.7.0";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mrmime/releases/download/v${version}/mrmime-${version}.tbz";
+    url = "https://github.com/mirage/mrmime/releases/download/v${finalAttrs.version}/mrmime-${finalAttrs.version}.tbz";
     hash = "sha256-w23xtro9WgyLLwqdwfqLMN/ZDqwpvFcEvurbsqnsJLc=";
   };
 
@@ -68,4 +68,4 @@ buildDunePackage rec {
     maintainers = [ ];
     mainProgram = "mrmime.generate";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/msat/default.nix b/pkgs/development/ocaml-modules/msat/default.nix
index 43d9d0e77694..e7bbe9b936ad 100644
--- a/pkgs/development/ocaml-modules/msat/default.nix
+++ b/pkgs/development/ocaml-modules/msat/default.nix
@@ -7,14 +7,14 @@
   mdx,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "msat";
   version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "Gbury";
     repo = "mSAT";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-ER7ZUejW+Zy3l2HIoFDYbR8iaKMvLZWaeWrOAAYXjG4=";
   };
 
@@ -36,4 +36,4 @@ buildDunePackage rec {
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/msgpck/default.nix b/pkgs/development/ocaml-modules/msgpck/default.nix
index bfee304681bb..c5a0451e9229 100644
--- a/pkgs/development/ocaml-modules/msgpck/default.nix
+++ b/pkgs/development/ocaml-modules/msgpck/default.nix
@@ -6,14 +6,14 @@
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "msgpck";
   version = "1.7";
 
   src = fetchFromGitHub {
     owner = "vbmithr";
     repo = "ocaml-msgpck";
-    rev = "${version}";
+    rev = "${finalAttrs.version}";
     hash = "sha256-gBHIiicmk/5KBkKzRKyV0ymEH8dGCZG8vfE0mtpcDCM=";
   };
 
@@ -29,4 +29,4 @@ buildDunePackage rec {
     homepage = "https://github.com/vbmithr/ocaml-msgpck";
     maintainers = [ lib.maintainers.ulrikstrid ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/multicore-bench/default.nix b/pkgs/development/ocaml-modules/multicore-bench/default.nix
index 4e7ecf88a560..329008420495 100644
--- a/pkgs/development/ocaml-modules/multicore-bench/default.nix
+++ b/pkgs/development/ocaml-modules/multicore-bench/default.nix
@@ -9,12 +9,12 @@
   yojson,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "multicore-bench";
   version = "0.1.7";
 
   src = fetchurl {
-    url = "https://github.com/ocaml-multicore/multicore-bench/releases/download/${version}/multicore-bench-${version}.tbz";
+    url = "https://github.com/ocaml-multicore/multicore-bench/releases/download/${finalAttrs.version}/multicore-bench-${finalAttrs.version}.tbz";
     hash = "sha256-vrp9yiuTwhijhYjeDKPFRGyh/5LeydKWJSyMLZRRXIM=";
   };
 
@@ -32,4 +32,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/multicore-magic/default.nix b/pkgs/development/ocaml-modules/multicore-magic/default.nix
index c8bd30b95544..cf724cc983b8 100644
--- a/pkgs/development/ocaml-modules/multicore-magic/default.nix
+++ b/pkgs/development/ocaml-modules/multicore-magic/default.nix
@@ -8,12 +8,12 @@
   js_of_ocaml,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "multicore-magic";
   version = "2.3.2";
 
   src = fetchurl {
-    url = "https://github.com/ocaml-multicore/multicore-magic/releases/download/${version}/multicore-magic-${version}.tbz";
+    url = "https://github.com/ocaml-multicore/multicore-magic/releases/download/${finalAttrs.version}/multicore-magic-${finalAttrs.version}.tbz";
     hash = "sha256-jY1wqCOq4c4EMDgIQqqIHErIONJFyvJ+0P8ld1CHF18=";
   };
 
@@ -34,4 +34,4 @@ buildDunePackage rec {
     homepage = "https://github.com/ocaml-multicore/multicore-magic";
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/multipart-form-data/default.nix b/pkgs/development/ocaml-modules/multipart-form-data/default.nix
index fc5e9a0bbf6d..013efcc5bab4 100644
--- a/pkgs/development/ocaml-modules/multipart-form-data/default.nix
+++ b/pkgs/development/ocaml-modules/multipart-form-data/default.nix
@@ -8,14 +8,14 @@
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "multipart-form-data";
   version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "cryptosense";
-    repo = pname;
-    rev = version;
+    repo = "multipart-form-data";
+    rev = finalAttrs.version;
     hash = "sha256-3MYJDvVbPIv/JDiB9nKcLRFC5Qa0afyEfz7hk8MWRII=";
   };
 
@@ -36,4 +36,4 @@ buildDunePackage rec {
     license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mustache/default.nix b/pkgs/development/ocaml-modules/mustache/default.nix
index d2f6da48542c..981b5007f2cb 100644
--- a/pkgs/development/ocaml-modules/mustache/default.nix
+++ b/pkgs/development/ocaml-modules/mustache/default.nix
@@ -8,13 +8,13 @@
   ounit2,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mustache";
   version = "3.3.0";
   src = fetchFromGitHub {
     owner = "rgrinberg";
     repo = "ocaml-mustache";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-7rdp7nrjc25/Nuj/cf78qxS3Qy4ufaNcKjSnYh4Ri8U=";
   };
 
@@ -31,6 +31,6 @@ buildDunePackage rec {
     description = "Mustache logic-less templates in OCaml";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vbgl ];
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/netchannel/default.nix b/pkgs/development/ocaml-modules/netchannel/default.nix
index 83df8ad0446d..29e0d68f84ef 100644
--- a/pkgs/development/ocaml-modules/netchannel/default.nix
+++ b/pkgs/development/ocaml-modules/netchannel/default.nix
@@ -18,7 +18,7 @@
   result,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "netchannel";
   version = "2.1.3";
 
@@ -26,7 +26,7 @@ buildDunePackage rec {
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/mirage/mirage-net-xen/releases/download/v${version}/mirage-net-xen-${version}.tbz";
+    url = "https://github.com/mirage/mirage-net-xen/releases/download/v${finalAttrs.version}/mirage-net-xen-${finalAttrs.version}.tbz";
     hash = "sha256-gOpzY4bn9L8wkbeViXy/XQmxKqqJfd99bcHQFitYFOE=";
   };
 
@@ -56,4 +56,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.sternenseemann ];
     homepage = "https://github.com/mirage/mirage-net-xen";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/nice_parser/default.nix b/pkgs/development/ocaml-modules/nice_parser/default.nix
index bb47fe25eb31..9a144efe2638 100644
--- a/pkgs/development/ocaml-modules/nice_parser/default.nix
+++ b/pkgs/development/ocaml-modules/nice_parser/default.nix
@@ -5,7 +5,7 @@
   stdio,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "nice_parser";
   version = "1.0.0";
   minimalOCamlVersion = "4.07";
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "smolkaj";
     repo = "nice-parser";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-h1rqdv19tUH3CsL3OLsTmKir7YCYt4PaW19ymotEvIY=";
   };
 
@@ -22,9 +22,9 @@ buildDunePackage rec {
   ];
 
   meta = {
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     description = "Nice parsers without the boilerplate";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.tiferrei ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix
index fb47a6f0bc9b..fd75593f41b8 100644
--- a/pkgs/development/ocaml-modules/notty/default.nix
+++ b/pkgs/development/ocaml-modules/notty/default.nix
@@ -8,14 +8,14 @@
   lwt,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   version = "0.2.3";
   pname = "notty";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
-    url = "https://github.com/pqwy/notty/releases/download/v${version}/notty-${version}.tbz";
+    url = "https://github.com/pqwy/notty/releases/download/v${finalAttrs.version}/notty-${finalAttrs.version}.tbz";
     sha256 = "sha256-dGWfsUBz20Q4mJiRqyTyS++Bqkl9rBbZpn+aHJwgCCQ=";
   };
 
@@ -38,4 +38,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ sternenseemann ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/npy/default.nix b/pkgs/development/ocaml-modules/npy/default.nix
index 763f159a20c3..b70b44363989 100644
--- a/pkgs/development/ocaml-modules/npy/default.nix
+++ b/pkgs/development/ocaml-modules/npy/default.nix
@@ -6,7 +6,7 @@
   camlzip,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "npy";
   version = "0.0.9";
 
@@ -16,8 +16,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "LaurentMazare";
-    repo = "${pname}-ocaml";
-    rev = version;
+    repo = "npy-ocaml";
+    rev = finalAttrs.version;
     hash = "sha256:1fryglkm20h6kdqjl55b7065b34bdg3g3p6j0jv33zvd1m5888m1";
   };
 
@@ -27,9 +27,9 @@ buildDunePackage rec {
   doCheck = true;
 
   meta = {
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     description = "OCaml implementation of the Npy format spec";
     maintainers = [ lib.maintainers.bcdarwin ];
     license = lib.licenses.asl20;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
index 83ca1daffd9e..04f8867cb0ad 100644
--- a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix
@@ -53,7 +53,7 @@ let
   merlin-lib = merlin-lib_v;
 in
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ocaml-lsp-server";
   inherit (lsp) version src preBuild;
 
@@ -63,18 +63,18 @@ buildDunePackage rec {
       lsp
       re
     ]
-    ++ lib.optional (lib.versionAtLeast version "1.9") spawn
-    ++ lib.optionals (lib.versionAtLeast version "1.10") [
+    ++ lib.optional (lib.versionAtLeast finalAttrs.version "1.9") spawn
+    ++ lib.optionals (lib.versionAtLeast finalAttrs.version "1.10") [
       fiber
       xdg
     ]
-    ++ lib.optional (lib.versionAtLeast version "1.14.2") ocamlc-loc
-    ++ lib.optionals (lib.versionAtLeast version "1.17.0") [
+    ++ lib.optional (lib.versionAtLeast finalAttrs.version "1.14.2") ocamlc-loc
+    ++ lib.optionals (lib.versionAtLeast finalAttrs.version "1.17.0") [
       astring
       camlp-streams
       merlin-lib
     ]
-    ++ lib.optional (lib.versionAtLeast version "1.18.0") base;
+    ++ lib.optional (lib.versionAtLeast finalAttrs.version "1.18.0") base;
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -87,4 +87,4 @@ buildDunePackage rec {
     mainProgram = "ocamllsp";
     broken = lib.versions.majorMinor ocaml.version == "4.13";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix
index 725371018e08..8781250c7bdb 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix
@@ -7,14 +7,14 @@
   ppx_derivers,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ocaml-migrate-parsetree";
   version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
-    repo = pname;
-    rev = "v${version}";
+    repo = "ocaml-migrate-parsetree";
+    rev = "v${finalAttrs.version}";
     sha256 = "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq";
   };
 
@@ -27,7 +27,7 @@ buildDunePackage rec {
     description = "Convert OCaml parsetrees between different major versions";
     license = lib.licenses.lgpl21;
     maintainers = [ lib.maintainers.vbgl ];
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     broken = lib.versionOlder "4.13" ocaml.version;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix
index 129e2a9be198..53c5ade0eca1 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix
@@ -5,14 +5,14 @@
   ocaml,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ocaml-migrate-parsetree";
   version = "2.4.0";
 
   minimalOCamlVersion = "4.02";
 
   src = fetchurl {
-    url = "https://github.com/ocaml-ppx/${pname}/releases/download/${version}/${pname}-${version}.tbz";
+    url = "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/${finalAttrs.version}/ocaml-migrate-parsetree-${finalAttrs.version}.tbz";
     sha256 = "sha256-7EnEUtwzemIFVqtoK/AZi/UBglULUC2PsjClkSYKpqQ=";
   };
 
@@ -26,4 +26,4 @@ buildDunePackage rec {
     homepage = "https://github.com/ocaml-ppx/ocaml-migrate-parsetree";
     broken = lib.versionAtLeast ocaml.version "5.1";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ocaml-monadic/default.nix b/pkgs/development/ocaml-modules/ocaml-monadic/default.nix
index fa28353f1082..0a9cbb464e38 100644
--- a/pkgs/development/ocaml-modules/ocaml-monadic/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-monadic/default.nix
@@ -5,7 +5,7 @@
   ppxlib,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ocaml-monadic";
   version = "0.5.0";
 
@@ -13,17 +13,17 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "zepalmer";
-    repo = pname;
-    rev = version;
+    repo = "ocaml-monadic";
+    rev = finalAttrs.version;
     sha256 = "1ynv3yhdqmkhkgnz6c5kv6ryjcc934sdvw9rhh8rjg2dlzlffgbw";
   };
 
   buildInputs = [ ppxlib ];
 
   meta = {
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     description = "PPX extension to provide an OCaml-friendly monadic syntax";
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix b/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix
index 0de49d843861..3df839c0e2d2 100644
--- a/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix
@@ -12,14 +12,14 @@
   ppx_expect,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ocaml-protoc-plugin";
   version = "4.5.0";
 
   src = fetchFromGitHub {
     owner = "issuu";
     repo = "ocaml-protoc-plugin";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-ZHeOi3y2X11MmkRuthmYFSjPLoGlGTO1pnRfk/XmgPU=";
   };
 
@@ -51,4 +51,4 @@ buildDunePackage rec {
     '';
     maintainers = [ lib.maintainers.GirardR1006 ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ocaml-r/default.nix b/pkgs/development/ocaml-modules/ocaml-r/default.nix
index a2e0bca7092f..9dc2aa7505be 100644
--- a/pkgs/development/ocaml-modules/ocaml-r/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-r/default.nix
@@ -10,7 +10,7 @@
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ocaml-r";
   version = "0.6.0";
 
@@ -20,8 +20,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "pveber";
-    repo = pname;
-    rev = "v${version}";
+    repo = "ocaml-r";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-jPyVMxjeh9+xu0dD1gelAxcOhxouKczyvzVoKZ5oSrs=";
   };
 
@@ -48,9 +48,9 @@ buildDunePackage rec {
 
   meta = {
     description = "OCaml bindings for the R interpreter";
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.bcdarwin ];
   };
 
-}
+})
diff --git a/pkgs/development/ocaml-modules/ocaml-result/default.nix b/pkgs/development/ocaml-modules/ocaml-result/default.nix
index 710f1ede3e78..a59f1b0e3b8e 100644
--- a/pkgs/development/ocaml-modules/ocaml-result/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-result/default.nix
@@ -4,12 +4,12 @@
   fetchurl,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "result";
   version = "1.5";
 
   src = fetchurl {
-    url = "https://github.com/janestreet/result/releases/download/${version}/result-${version}.tbz";
+    url = "https://github.com/janestreet/result/releases/download/${finalAttrs.version}/result-${finalAttrs.version}.tbz";
     sha256 = "0cpfp35fdwnv3p30a06wd0py3805qxmq3jmcynjc3x2qhlimwfkw";
   };
 
@@ -23,4 +23,4 @@ buildDunePackage rec {
     '';
     license = lib.licenses.bsd3;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix
index 02824128b6bb..d13d997dcf4f 100644
--- a/pkgs/development/ocaml-modules/ocaml-version/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix
@@ -5,12 +5,12 @@
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ocaml-version";
   version = "4.1.0";
 
   src = fetchurl {
-    url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz";
+    url = "https://github.com/ocurrent/ocaml-version/releases/download/v${finalAttrs.version}/ocaml-version-${finalAttrs.version}.tbz";
     hash = "sha256-QTfVH6kNu4SkjAylM3ySyIkOYAXQFrffSFkZ2FojjgY=";
   };
 
@@ -27,4 +27,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
index 9653f7192961..977bf64866e2 100644
--- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix
@@ -7,14 +7,14 @@
   dune-configurator,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ocamlfuse";
   version = "2.7.1_cvs13";
 
   src = fetchFromGitHub {
     owner = "astrada";
     repo = "ocamlfuse";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-h1ExohTlr1gP2DwHKQW3PTwz6d3pust5gdeyTHJ2KBk=";
   };
 
@@ -37,4 +37,4 @@ buildDunePackage rec {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ bennofs ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
index 05be14040291..83227f590ea7 100644
--- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
@@ -4,12 +4,12 @@
   buildDunePackage,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ocamlgraph";
   version = "2.2.0";
 
   src = fetchurl {
-    url = "https://github.com/backtracking/ocamlgraph/releases/download/${version}/ocamlgraph-${version}.tbz";
+    url = "https://github.com/backtracking/ocamlgraph/releases/download/${finalAttrs.version}/ocamlgraph-${finalAttrs.version}.tbz";
     hash = "sha256-sJViEIY8wk9IAgO6PC7wbfrlV5U2oFdENk595YgisjA=";
   };
 
@@ -21,4 +21,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl21Only;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ocamline/default.nix b/pkgs/development/ocaml-modules/ocamline/default.nix
index aaec4a22276c..7f5e1dd9197c 100644
--- a/pkgs/development/ocaml-modules/ocamline/default.nix
+++ b/pkgs/development/ocaml-modules/ocamline/default.nix
@@ -5,13 +5,13 @@
   lib,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ocamline";
   version = "1.2";
   src = fetchFromGitHub {
     owner = "chrisnevers";
-    repo = pname;
-    rev = version;
+    repo = "ocamline";
+    rev = finalAttrs.version;
     sha256 = "Sljm/Bfr2Eo0d75tmJRuWUkkfHUYQ0g27+FzXBePnVg=";
   };
 
@@ -23,4 +23,4 @@ buildDunePackage rec {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ mgttlinger ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ocolor/default.nix b/pkgs/development/ocaml-modules/ocolor/default.nix
index cd98527fe90e..ccf320053051 100644
--- a/pkgs/development/ocaml-modules/ocolor/default.nix
+++ b/pkgs/development/ocaml-modules/ocolor/default.nix
@@ -5,7 +5,7 @@
   cppo,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ocolor";
   version = "1.3.1";
 
@@ -13,8 +13,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "marc-chevalier";
-    repo = pname;
-    tag = version;
+    repo = "ocolor";
+    tag = finalAttrs.version;
     sha256 = "osQTZGJp9yDoKNa6WoyhViNbRg1ukcD0Jxiu4VxqeUc=";
   };
 
@@ -28,4 +28,4 @@ buildDunePackage rec {
     maintainers = with lib.maintainers; [ toastal ];
     homepage = "https://github.com/marc-chevalier/ocolor";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix
index 2b54da6f27e1..4af7e8474b3e 100644
--- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix
+++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix
@@ -6,14 +6,14 @@
   cppo,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   version = "1.2";
   pname = "ocplib-endian";
 
   src = fetchFromGitHub {
     owner = "OCamlPro";
     repo = "ocplib-endian";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "sha256-THTlhOfXAPaqTt1qBkht+D67bw6M175QLvXoUMgjks4=";
   };
 
@@ -33,4 +33,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl21;
     maintainers = with lib.maintainers; [ vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
index cb070c0a34b4..ac13f4b662f3 100644
--- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
+++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix
@@ -7,14 +7,14 @@
   zarith,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ocplib-simplex";
   version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "OCamlPro";
-    repo = pname;
-    rev = "v${version}";
+    repo = "ocplib-simplex";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-fLTht+TlyJIsIAsRLmmkFKsnbSeW3BgyAyURFdnGfko=";
   };
 
@@ -40,4 +40,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl21Only;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix
index 1242d52fa5b7..5d962a143887 100644
--- a/pkgs/development/ocaml-modules/octavius/default.nix
+++ b/pkgs/development/ocaml-modules/octavius/default.nix
@@ -4,14 +4,14 @@
   buildDunePackage,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "octavius";
   version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "ocaml-doc";
     repo = "octavius";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-/S6WpIo1c5J9uM3xgtAM/elhnsl0XimnIFsKy3ootbA=";
   };
 
@@ -25,4 +25,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/odate/default.nix b/pkgs/development/ocaml-modules/odate/default.nix
index c952882e7d0e..b8739e5fd346 100644
--- a/pkgs/development/ocaml-modules/odate/default.nix
+++ b/pkgs/development/ocaml-modules/odate/default.nix
@@ -5,7 +5,7 @@
   menhir,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "odate";
   version = "0.7";
 
@@ -13,8 +13,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "hhugo";
-    repo = pname;
-    rev = version;
+    repo = "odate";
+    rev = finalAttrs.version;
     sha256 = "sha256-C11HpftrYOCVyWT31wrqo8FVZuP7mRUkRv5IDeAZ+To=";
   };
 
@@ -22,9 +22,9 @@ buildDunePackage rec {
 
   meta = {
     description = "Date and duration in OCaml";
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vbgl ];
   };
 
-}
+})
diff --git a/pkgs/development/ocaml-modules/odds/default.nix b/pkgs/development/ocaml-modules/odds/default.nix
index 058afef3d8aa..3db10abc9855 100644
--- a/pkgs/development/ocaml-modules/odds/default.nix
+++ b/pkgs/development/ocaml-modules/odds/default.nix
@@ -5,7 +5,7 @@
   menhir,
   cmdliner,
 }:
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "odds";
   version = "1.2";
 
@@ -13,8 +13,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "raphael-proust";
-    repo = pname;
-    tag = version;
+    repo = "odds";
+    tag = finalAttrs.version;
     hash = "sha256-tPDowkpsJQKCoeuXOb9zPORoudUvkRBZ3OzkH2QE2zg=";
   };
 
@@ -32,4 +32,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.Denommus ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ogg/default.nix b/pkgs/development/ocaml-modules/ogg/default.nix
index 8b00e3c8850e..23b258476b34 100644
--- a/pkgs/development/ocaml-modules/ogg/default.nix
+++ b/pkgs/development/ocaml-modules/ogg/default.nix
@@ -6,14 +6,14 @@
   libogg,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ogg";
   version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-xiph";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-mVMuPPjQRfwtQqpoUaEtTilMcGO0MJ4xiOd0D7ucOEQ=";
   };
 
@@ -28,4 +28,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl21Only;
     maintainers = with lib.maintainers; [ dandellion ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ohex/default.nix b/pkgs/development/ocaml-modules/ohex/default.nix
index 49bf6005c686..f61d204c14e5 100644
--- a/pkgs/development/ocaml-modules/ohex/default.nix
+++ b/pkgs/development/ocaml-modules/ohex/default.nix
@@ -5,12 +5,12 @@
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ohex";
   version = "0.2.0";
 
   src = fetchurl {
-    url = "https://github.com/ocaml/opam-source-archives/raw/main/ohex-${version}.tar.gz";
+    url = "https://github.com/ocaml/opam-source-archives/raw/main/ohex-${finalAttrs.version}.tar.gz";
     hash = "sha256-prV7rbo0sAx3S2t4YtjniJEVq43uLXK8ZMsqoMzn2Ow=";
   };
 
@@ -22,4 +22,4 @@ buildDunePackage rec {
     license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/oidc/default.nix b/pkgs/development/ocaml-modules/oidc/default.nix
index 45a739528262..3e33605156ef 100644
--- a/pkgs/development/ocaml-modules/oidc/default.nix
+++ b/pkgs/development/ocaml-modules/oidc/default.nix
@@ -7,12 +7,12 @@
   junit_alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "oidc";
   version = "0.2.0";
 
   src = fetchurl {
-    url = "https://github.com/ulrikstrid/ocaml-oidc/releases/download/v${version}/${pname}-v${version}.tbz";
+    url = "https://github.com/ulrikstrid/ocaml-oidc/releases/download/v${finalAttrs.version}/oidc-v${finalAttrs.version}.tbz";
     hash = "sha256-NE/OW5BesVWhYfTmh3jP+A0TGML7m/Nw+tnafjMCIFo=";
   };
 
@@ -36,4 +36,4 @@ buildDunePackage rec {
       marijanp
     ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/omd/default.nix b/pkgs/development/ocaml-modules/omd/default.nix
index cb0697188eb4..b4526e077c97 100644
--- a/pkgs/development/ocaml-modules/omd/default.nix
+++ b/pkgs/development/ocaml-modules/omd/default.nix
@@ -4,14 +4,14 @@
   fetchurl,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "omd";
   version = "1.3.2";
 
   minimalOCamlVersion = "4.03";
 
   src = fetchurl {
-    url = "https://github.com/ocaml/omd/releases/download/${version}/omd-${version}.tbz";
+    url = "https://github.com/ocaml/omd/releases/download/${finalAttrs.version}/omd-${finalAttrs.version}.tbz";
     sha256 = "sha256-YCPhZCYx8I9njrVyWCCHnte7Wj/+53fN7evCjB+F+ts=";
   };
 
@@ -26,4 +26,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.vbgl ];
     mainProgram = "omd";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/optint/default.nix b/pkgs/development/ocaml-modules/optint/default.nix
index 2726e0aae889..aa87256c746f 100644
--- a/pkgs/development/ocaml-modules/optint/default.nix
+++ b/pkgs/development/ocaml-modules/optint/default.nix
@@ -4,12 +4,12 @@
   fetchurl,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   minimalOCamlVersion = "4.07";
   version = "0.3.0";
   pname = "optint";
   src = fetchurl {
-    url = "https://github.com/mirage/optint/releases/download/v${version}/optint-${version}.tbz";
+    url = "https://github.com/mirage/optint/releases/download/v${finalAttrs.version}/optint-${finalAttrs.version}.tbz";
     sha256 = "sha256-KVz/LBNLA4WxO6gdUAXZ+EG6QNSlAq7RDJl/I57xFHs=";
   };
 
@@ -19,4 +19,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/oseq/default.nix b/pkgs/development/ocaml-modules/oseq/default.nix
index 7d462b10c6a2..ff361fb10904 100644
--- a/pkgs/development/ocaml-modules/oseq/default.nix
+++ b/pkgs/development/ocaml-modules/oseq/default.nix
@@ -6,14 +6,14 @@
   qcheck,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   version = "0.5.1";
   pname = "oseq";
 
   src = fetchFromGitHub {
     owner = "c-cube";
-    repo = pname;
-    rev = "v${version}";
+    repo = "oseq";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-fyr/OKlvvHBfovtdubSW4rd4OwQbMLKWXghyU3uBy/k=";
   };
 
@@ -32,4 +32,4 @@ buildDunePackage rec {
     license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/otfed/default.nix b/pkgs/development/ocaml-modules/otfed/default.nix
index b33036380e17..319f7d7fad14 100644
--- a/pkgs/development/ocaml-modules/otfed/default.nix
+++ b/pkgs/development/ocaml-modules/otfed/default.nix
@@ -9,7 +9,7 @@
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "otfed";
   version = "0.3.1";
 
@@ -17,8 +17,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "gfngfn";
-    repo = pname;
-    rev = version;
+    repo = "otfed";
+    rev = finalAttrs.version;
     hash = "sha256-6QCom9nrz0B5vCmuBzqsM0zCs8tBLJC6peig+vCgMVA=";
   };
 
@@ -44,4 +44,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix
index efeb335cc489..5420a3dfd179 100644
--- a/pkgs/development/ocaml-modules/otr/default.nix
+++ b/pkgs/development/ocaml-modules/otr/default.nix
@@ -10,14 +10,14 @@
   base64,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "otr";
   version = "1.0.0";
 
   minimalOCamlVersion = "4.13";
 
   src = fetchurl {
-    url = "https://github.com/hannesm/ocaml-otr/releases/download/v${version}/otr-${version}.tbz";
+    url = "https://github.com/hannesm/ocaml-otr/releases/download/v${finalAttrs.version}/otr-${finalAttrs.version}.tbz";
     hash = "sha256-/CcVqLbdylB+LqpKNETkpvQ8SEAIcEFCO1MZqvdmJWU=";
   };
 
@@ -38,4 +38,4 @@ buildDunePackage rec {
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ sternenseemann ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ounit2/default.nix b/pkgs/development/ocaml-modules/ounit2/default.nix
index 3980c3a521fd..5f29e70de234 100644
--- a/pkgs/development/ocaml-modules/ounit2/default.nix
+++ b/pkgs/development/ocaml-modules/ounit2/default.nix
@@ -6,14 +6,14 @@
   stdlib-shims,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   minimalOCamlVersion = "4.08";
 
   pname = "ounit2";
   version = "2.2.7";
 
   src = fetchurl {
-    url = "https://github.com/gildor478/ounit/releases/download/v${version}/ounit-${version}.tbz";
+    url = "https://github.com/gildor478/ounit/releases/download/v${finalAttrs.version}/ounit-${finalAttrs.version}.tbz";
     hash = "sha256-kPbmO9EkClHYubL3IgWb15zgC1J2vdYji49cYTwOc4g=";
   };
 
@@ -30,4 +30,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sternenseemann ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/owee/default.nix b/pkgs/development/ocaml-modules/owee/default.nix
index 272f19066e11..cf5cfaafc3ac 100644
--- a/pkgs/development/ocaml-modules/owee/default.nix
+++ b/pkgs/development/ocaml-modules/owee/default.nix
@@ -4,13 +4,13 @@
   fetchurl,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   minimalOCamlVersion = "4.08";
   pname = "owee";
   version = "0.8";
 
   src = fetchurl {
-    url = "https://github.com/let-def/owee/releases/download/v${version}/owee-${version}.tbz";
+    url = "https://github.com/let-def/owee/releases/download/v${finalAttrs.version}/owee-${finalAttrs.version}.tbz";
     hash = "sha256-Bk9iRfWZXV0vTx+cbSmS4v2+Pd4ygha67Hz6vUhXlA0=";
   };
 
@@ -23,4 +23,4 @@ buildDunePackage rec {
       alizter
     ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix
index 47601a60b3c1..07a0f5a6b76c 100644
--- a/pkgs/development/ocaml-modules/paf/default.nix
+++ b/pkgs/development/ocaml-modules/paf/default.nix
@@ -21,12 +21,12 @@
   cstruct,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "paf";
   version = "0.8.0";
 
   src = fetchurl {
-    url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz";
+    url = "https://github.com/dinosaure/paf-le-chien/releases/download/${finalAttrs.version}/paf-${finalAttrs.version}.tbz";
     hash = "sha256-0q07gZpzUyDoWlA4m/P+EGSvvVKAZ7RwVkpOziqzG2M=";
   };
 
@@ -64,4 +64,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.sternenseemann ];
     homepage = "https://github.com/dinosaure/paf-le-chien";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/parany/default.nix b/pkgs/development/ocaml-modules/parany/default.nix
index 621b4a39df70..e54460021e89 100644
--- a/pkgs/development/ocaml-modules/parany/default.nix
+++ b/pkgs/development/ocaml-modules/parany/default.nix
@@ -5,7 +5,7 @@
   cpu,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "parany";
   version = "14.0.1";
 
@@ -13,8 +13,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "UnixJunkie";
-    repo = pname;
-    rev = "v${version}";
+    repo = "parany";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-QR3Rq30iKhft+9tVCgJLOq9bwJe7bcay/kMTXjjCLjE=";
   };
 
@@ -26,4 +26,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.bcdarwin ];
     license = lib.licenses.lgpl2;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/parmap/default.nix b/pkgs/development/ocaml-modules/parmap/default.nix
index feb3884e2fcf..703a2c7622f3 100644
--- a/pkgs/development/ocaml-modules/parmap/default.nix
+++ b/pkgs/development/ocaml-modules/parmap/default.nix
@@ -5,14 +5,14 @@
   dune-configurator,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "parmap";
   version = "1.2.5";
 
   src = fetchFromGitHub {
     owner = "rdicosmo";
-    repo = pname;
-    rev = version;
+    repo = "parmap";
+    rev = finalAttrs.version;
     hash = "sha256-tBu7TGtDOe5FbxLZuz6nl+65aN9FHIngq/O4dJWzr3Q=";
   };
 
@@ -31,4 +31,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl2;
     maintainers = with lib.maintainers; [ bcdarwin ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/parse-argv/default.nix b/pkgs/development/ocaml-modules/parse-argv/default.nix
index b59feac4fb40..2af0427210a4 100644
--- a/pkgs/development/ocaml-modules/parse-argv/default.nix
+++ b/pkgs/development/ocaml-modules/parse-argv/default.nix
@@ -7,14 +7,14 @@
   ounit,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "parse-argv";
   version = "0.2.0";
 
   minimalOCamlVersion = "4.03";
 
   src = fetchurl {
-    url = "https://github.com/mirage/parse-argv/releases/download/v${version}/parse-argv-v${version}.tbz";
+    url = "https://github.com/mirage/parse-argv/releases/download/v${finalAttrs.version}/parse-argv-v${finalAttrs.version}.tbz";
     sha256 = "06dl04fcmwpkydzni2fzwrhk0bqypd55mgxfax9v82x65xrgj5gw";
   };
 
@@ -29,4 +29,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/patch/default.nix b/pkgs/development/ocaml-modules/patch/default.nix
index bb64547e9cc3..87529d16d15d 100644
--- a/pkgs/development/ocaml-modules/patch/default.nix
+++ b/pkgs/development/ocaml-modules/patch/default.nix
@@ -7,7 +7,7 @@
   crowbar,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "patch";
   version = "3.0.0";
 
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "hannesm";
     repo = "patch";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-WIleUxfGp8cvQHYAyRRI6S/MSP4u0BbEyAqlRxCb/To=";
   };
 
@@ -36,4 +36,4 @@ buildDunePackage rec {
     maintainers = with lib.maintainers; [ r17x ];
     license = lib.licenses.isc;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/patricia-tree/default.nix b/pkgs/development/ocaml-modules/patricia-tree/default.nix
index a3f548664a5d..a407e578bf38 100644
--- a/pkgs/development/ocaml-modules/patricia-tree/default.nix
+++ b/pkgs/development/ocaml-modules/patricia-tree/default.nix
@@ -9,7 +9,7 @@
   ppx_inline_test,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "patricia-tree";
   version = "0.11.0";
 
@@ -23,7 +23,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "codex-semantics-library";
     repo = "patricia-tree";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-lpmU0KhsyIHxPBiw38ssA7XFEMsRvOT03MByoJG88Xs=";
   };
 
@@ -43,8 +43,8 @@ buildDunePackage rec {
     description = "Patricia Tree data structure in OCaml";
     homepage = "https://codex.top/api/patricia-tree/";
     downloadPage = "https://github.com/codex-semantics-library/patricia-tree";
-    changelog = "https://github.com/codex-semantics-library/patricia-tree/releases/tag/v${version}";
+    changelog = "https://github.com/codex-semantics-library/patricia-tree/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.lgpl21Only;
     maintainers = [ lib.maintainers.ethancedwards8 ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/pbkdf/default.nix b/pkgs/development/ocaml-modules/pbkdf/default.nix
index b09fcdf56fad..f6f786fdcc11 100644
--- a/pkgs/development/ocaml-modules/pbkdf/default.nix
+++ b/pkgs/development/ocaml-modules/pbkdf/default.nix
@@ -8,12 +8,12 @@
   ohex,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "pbkdf";
   version = "2.0.0";
 
   src = fetchzip {
-    url = "https://github.com/abeaumont/ocaml-pbkdf/archive/${version}.tar.gz";
+    url = "https://github.com/abeaumont/ocaml-pbkdf/archive/${finalAttrs.version}.tar.gz";
     hash = "sha256-D2dXpf1D/wsJrcajU3If37tuLYjahoA/+QoXZKr1vQs=";
   };
 
@@ -34,4 +34,4 @@ buildDunePackage rec {
     license = lib.licenses.bsd2;
     homepage = "https://github.com/abeaumont/ocaml-pbkdf";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/pbrt/default.nix b/pkgs/development/ocaml-modules/pbrt/default.nix
index e1ba66ebc0c9..10df7382f287 100644
--- a/pkgs/development/ocaml-modules/pbrt/default.nix
+++ b/pkgs/development/ocaml-modules/pbrt/default.nix
@@ -4,7 +4,7 @@
   buildDunePackage,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "pbrt";
   version = "2.4";
 
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "mransan";
     repo = "ocaml-protoc";
-    rev = "${version}.0";
+    rev = "${finalAttrs.version}.0";
     hash = "sha256-EXugdcjALukSjB31zAVG9WiN6GMGXi2jlhHWaZ+p+uM=";
   };
 
@@ -23,4 +23,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vyorkin ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/pcap-format/default.nix b/pkgs/development/ocaml-modules/pcap-format/default.nix
index b254dbf9af96..bffab81b4ee5 100644
--- a/pkgs/development/ocaml-modules/pcap-format/default.nix
+++ b/pkgs/development/ocaml-modules/pcap-format/default.nix
@@ -7,7 +7,7 @@
   ounit,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "pcap-format";
   version = "0.6.0";
 
@@ -15,7 +15,7 @@ buildDunePackage rec {
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/mirage/ocaml-pcap/releases/download/v${version}/${pname}-${version}.tbz";
+    url = "https://github.com/mirage/ocaml-pcap/releases/download/v${finalAttrs.version}/pcap-format-${finalAttrs.version}.tbz";
     hash = "sha256-LUjy8Xm6VsnMq1FHKzmJg7uorkTv7cOTsoLwmtNHkaY=";
   };
 
@@ -38,4 +38,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.sternenseemann ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/pecu/default.nix b/pkgs/development/ocaml-modules/pecu/default.nix
index a01ee07beca6..fdeff2e07cab 100644
--- a/pkgs/development/ocaml-modules/pecu/default.nix
+++ b/pkgs/development/ocaml-modules/pecu/default.nix
@@ -9,14 +9,14 @@
   astring,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "pecu";
   version = "0.7";
 
   minimalOCamlVersion = "4.03";
 
   src = fetchurl {
-    url = "https://github.com/mirage/pecu/releases/download/v${version}/pecu-${version}.tbz";
+    url = "https://github.com/mirage/pecu/releases/download/v${finalAttrs.version}/pecu-${finalAttrs.version}.tbz";
     hash = "sha256-rXR3tbFkKNM8MkQAZ2hJU9lO+qQ/qvYghXkYus6f13g=";
   };
 
@@ -35,4 +35,4 @@ buildDunePackage rec {
     homepage = "https://github.com/mirage/pecu";
     maintainers = [ lib.maintainers.sternenseemann ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix
index bd9f7a09a8d8..ea8a52ae2348 100644
--- a/pkgs/development/ocaml-modules/pgocaml/default.nix
+++ b/pkgs/development/ocaml-modules/pgocaml/default.nix
@@ -13,13 +13,13 @@
   sexplib,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "pgocaml";
   version = "4.4.0";
   src = fetchFromGitHub {
     owner = "darioteixeira";
     repo = "pgocaml";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-Mz3zVgXas1UivH/BVARx5kWClgr9v9YcGarwaD961tU=";
   };
 
@@ -43,4 +43,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl2Only;
     maintainers = with lib.maintainers; [ vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix
index 7d88a0b10132..57502ac8356f 100644
--- a/pkgs/development/ocaml-modules/phylogenetics/default.nix
+++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix
@@ -14,12 +14,12 @@
   printbox-text,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "phylogenetics";
   version = "0.3.0";
 
   src = fetchurl {
-    url = "https://github.com/biocaml/phylogenetics/releases/download/v${version}/phylogenetics-${version}.tbz";
+    url = "https://github.com/biocaml/phylogenetics/releases/download/v${finalAttrs.version}/phylogenetics-${finalAttrs.version}.tbz";
     hash = "sha256-3oZ9fMAXqOQ02rQ+8W8PZJWXOJLNe2qERrGOeTk3BKg=";
   };
 
@@ -52,4 +52,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.bcdarwin ];
     mainProgram = "phylosim";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/piaf/default.nix b/pkgs/development/ocaml-modules/piaf/default.nix
index dae4a95291d0..780b5c7ecc0b 100644
--- a/pkgs/development/ocaml-modules/piaf/default.nix
+++ b/pkgs/development/ocaml-modules/piaf/default.nix
@@ -21,12 +21,12 @@
   eio_main,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "piaf";
   version = "0.2.0";
 
   src = fetchurl {
-    url = "https://github.com/anmonteiro/piaf/releases/download/${version}/piaf-${version}.tbz";
+    url = "https://github.com/anmonteiro/piaf/releases/download/${finalAttrs.version}/piaf-${finalAttrs.version}.tbz";
     hash = "sha256-B/qQCaUvrqrm2GEW51AH9SebGFx7x8laq5RV8hBzcPs=";
   };
 
@@ -60,4 +60,4 @@ buildDunePackage rec {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ anmonteiro ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/polynomial/default.nix b/pkgs/development/ocaml-modules/polynomial/default.nix
index e2f77205e70d..c4b44c2c57a7 100644
--- a/pkgs/development/ocaml-modules/polynomial/default.nix
+++ b/pkgs/development/ocaml-modules/polynomial/default.nix
@@ -6,7 +6,7 @@
   ff-sig,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "polynomial";
   version = "0.4.0";
   duneVersion = "3";
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "cryptography/ocaml-polynomial";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-is/PrYLCwStHiQsNq5OVRCwHdXjO2K2Z7FrXgytRfAU=";
   };
 
@@ -31,4 +31,4 @@ buildDunePackage rec {
     homepage = "https://gitlab.com/nomadic-labs/ocaml-polynomial";
     maintainers = [ lib.maintainers.ulrikstrid ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/portaudio/default.nix b/pkgs/development/ocaml-modules/portaudio/default.nix
index 07d32d55e6ef..01ecee3d399e 100644
--- a/pkgs/development/ocaml-modules/portaudio/default.nix
+++ b/pkgs/development/ocaml-modules/portaudio/default.nix
@@ -6,14 +6,14 @@
   portaudio,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "portaudio";
   version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-portaudio";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-rMSE+ta7ughjjCnz4oho1D3VGaAsUlLtxizvxZT0/cQ=";
   };
 
@@ -26,4 +26,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl21Only;
     maintainers = with lib.maintainers; [ dandellion ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/postgresql/default.nix b/pkgs/development/ocaml-modules/postgresql/default.nix
index 8b193e13ea90..a6eb3396d034 100644
--- a/pkgs/development/ocaml-modules/postgresql/default.nix
+++ b/pkgs/development/ocaml-modules/postgresql/default.nix
@@ -7,14 +7,14 @@
   libpq,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "postgresql";
   version = "5.2.0";
 
   minimalOCamlVersion = "4.12";
 
   src = fetchurl {
-    url = "https://github.com/mmottl/postgresql-ocaml/releases/download/${version}/postgresql-${version}.tbz";
+    url = "https://github.com/mmottl/postgresql-ocaml/releases/download/${finalAttrs.version}/postgresql-${finalAttrs.version}.tbz";
     hash = "sha256-uU/K7hvQljGnUzClPRdod32tpVAGd/sGqh3NqIygJ4A=";
   };
 
@@ -25,8 +25,8 @@ buildDunePackage rec {
   meta = {
     description = "Bindings to the PostgreSQL library";
     license = lib.licenses.lgpl21Plus;
-    changelog = "https://raw.githubusercontent.com/mmottl/postgresql-ocaml/refs/tags/${version}/CHANGELOG.md";
+    changelog = "https://raw.githubusercontent.com/mmottl/postgresql-ocaml/refs/tags/${finalAttrs.version}/CHANGELOG.md";
     maintainers = with lib.maintainers; [ bcc32 ];
     homepage = "https://mmottl.github.io/postgresql-ocaml";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/pp/default.nix b/pkgs/development/ocaml-modules/pp/default.nix
index 15d553de737e..d6b94c0a6e2e 100644
--- a/pkgs/development/ocaml-modules/pp/default.nix
+++ b/pkgs/development/ocaml-modules/pp/default.nix
@@ -6,18 +6,18 @@
   version ? "2.0.0",
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "pp";
   inherit version;
 
   src = fetchurl {
-    url = "https://github.com/ocaml-dune/pp/releases/download/${version}/pp-${version}.tbz";
+    url = "https://github.com/ocaml-dune/pp/releases/download/${finalAttrs.version}/pp-${finalAttrs.version}.tbz";
     hash =
       {
         "2.0.0" = "sha256-hlE1FRiwkrSi3vTggXHCdhUvkvtqhKixm2uSnM20RBk=";
         "1.2.0" = "sha256-pegiVzxVr7Qtsp7FbqzR8qzY9lzy3yh44pHeN0zmkJw=";
       }
-      ."${version}";
+      ."${finalAttrs.version}";
   };
 
   minimalOCamlVersion = "4.08";
@@ -31,4 +31,4 @@ buildDunePackage rec {
     platforms = lib.platforms.unix;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/pp_loc/default.nix b/pkgs/development/ocaml-modules/pp_loc/default.nix
index e6cd85d7cf89..757301803f2c 100644
--- a/pkgs/development/ocaml-modules/pp_loc/default.nix
+++ b/pkgs/development/ocaml-modules/pp_loc/default.nix
@@ -4,14 +4,14 @@
   buildDunePackage,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "pp_loc";
   version = "2.1.0";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
-    url = "https://github.com/Armael/pp_loc/releases/download/v${version}/pp_loc-${version}.tbz";
+    url = "https://github.com/Armael/pp_loc/releases/download/v${finalAttrs.version}/pp_loc-${finalAttrs.version}.tbz";
     hash = "sha256-L3NlBdQx6BpP6FGtMQ/ynsTNIMj9N+8FDZ5vEFC6p8s=";
   };
 
@@ -23,4 +23,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.vbgl ];
     homepage = "https://armael.github.io/pp_loc/pp_loc/";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix
index 0284d133d73d..369f075f8893 100644
--- a/pkgs/development/ocaml-modules/pprint/default.nix
+++ b/pkgs/development/ocaml-modules/pprint/default.nix
@@ -4,7 +4,7 @@
   buildDunePackage,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "pprint";
   version = "20230830";
 
@@ -12,15 +12,15 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "fpottier";
-    repo = pname;
-    rev = version;
+    repo = "pprint";
+    rev = finalAttrs.version;
     sha256 = "sha256-avf71vAgCL1MU8O7Q3FNN3wEdCDtbNZP0ipETnn8AqA=";
   };
 
   meta = {
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     description = "OCaml library for pretty-printing textual documents";
     license = lib.licenses.lgpl2Only;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ppx_bap/default.nix b/pkgs/development/ocaml-modules/ppx_bap/default.nix
index 7d2b0af24d19..e8d4f8159e85 100644
--- a/pkgs/development/ocaml-modules/ppx_bap/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_bap/default.nix
@@ -16,7 +16,7 @@
   ppx_sexp_value ? null,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ppx_bap";
   version = "0.14";
 
@@ -24,8 +24,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "BinaryAnalysisPlatform";
-    repo = pname;
-    rev = "v${version}";
+    repo = "ppx_bap";
+    rev = "v${finalAttrs.version}";
     sha256 = "1c6rcdp8bicdiwqc2mb59cl9l2vxlp3y8hmnr9x924fq7acly248";
   };
 
@@ -54,9 +54,9 @@ buildDunePackage rec {
 
   meta = {
     description = "Set of ppx rewriters for BAP";
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vbgl ];
     mainProgram = "ppx-bap";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix
index 3ee11e13618c..1406eab9ba7b 100644
--- a/pkgs/development/ocaml-modules/ppx_blob/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix
@@ -7,14 +7,14 @@
   ppxlib,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ppx_blob";
   version = "0.9.0";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
-    url = "https://github.com/johnwhitington/${pname}/releases/download/${version}/ppx_blob-${version}.tbz";
+    url = "https://github.com/johnwhitington/ppx_blob/releases/download/${finalAttrs.version}/ppx_blob-${finalAttrs.version}.tbz";
     sha256 = "sha256-8RXpCl8Qdc7cnZMKuRJx+GcOzk3uENwRR6s5uK+1cOQ=";
   };
 
@@ -27,4 +27,4 @@ buildDunePackage rec {
     description = "OCaml ppx to include binary data from a file as a string";
     license = lib.licenses.unlicense;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
index 203dda6b99cc..46d7a6c140db 100644
--- a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
@@ -14,7 +14,7 @@
   findlib,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ppx_cstubs";
   version = "0.7.0";
 
@@ -32,7 +32,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "fdopen";
     repo = "ppx_cstubs";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-qMmwRWCIfNyhCQYPKLiufnb57sTR3P+WInOqtPDywFs=";
   };
 
@@ -56,10 +56,10 @@ buildDunePackage rec {
 
   meta = {
     homepage = "https://github.com/fdopen/ppx_cstubs";
-    changelog = "https://github.com/fdopen/ppx_cstubs/raw/${version}/CHANGES.md";
+    changelog = "https://github.com/fdopen/ppx_cstubs/raw/${finalAttrs.version}/CHANGES.md";
     description = "Preprocessor for easier stub generation with ocaml-ctypes";
     license = lib.licenses.lgpl21Plus;
     maintainers = [ lib.maintainers.osener ];
     broken = lib.versionAtLeast ocaml.version "5.2";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/pkgs/development/ocaml-modules/ppx_derivers/default.nix
index e1208fe330e3..a66875c4096a 100644
--- a/pkgs/development/ocaml-modules/ppx_derivers/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_derivers/default.nix
@@ -4,7 +4,7 @@
   buildDunePackage,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ppx_derivers";
   version = "1.2.1";
 
@@ -12,8 +12,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "diml";
-    repo = pname;
-    rev = version;
+    repo = "ppx_derivers";
+    rev = finalAttrs.version;
     sha256 = "0yqvqw58hbx1a61wcpbnl9j30n495k23qmyy2xwczqs63mn2nkpn";
   };
 
@@ -21,6 +21,6 @@ buildDunePackage rec {
     description = "Shared [@@deriving] plugin registry";
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.vbgl ];
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
index 3a7b4586bc72..c00f99dc84d5 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
@@ -36,12 +36,12 @@ let
     ."${version}";
 in
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ppx_deriving";
   inherit version;
 
   src = fetchurl {
-    url = "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v${version}/ppx_deriving-${lib.optionalString (lib.versionOlder version "6.0") "v"}${version}.${
+    url = "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v${finalAttrs.version}/ppx_deriving-${lib.optionalString (lib.versionOlder version "6.0") "v"}${finalAttrs.version}.${
       if lib.versionAtLeast version "6.1.1" then "tar.gz" else "tbz"
     }";
     inherit hash;
@@ -71,4 +71,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.maurer ];
     license = lib.licenses.mit;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix
index 77b9cba4f679..46d0e729a6bd 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix
@@ -11,7 +11,7 @@
   gitUpdater,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ppx_deriving_cmdliner";
   version = "0.6.1";
 
@@ -19,8 +19,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "hammerlab";
-    repo = pname;
-    rev = "v${version}";
+    repo = "ppx_deriving_cmdliner";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-/22KLQnxu3e2ZSca6ZLxTJDfv/rsmgCUkJnZC0RwRi8";
   };
 
@@ -54,4 +54,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.romildo ];
     broken = lib.versionAtLeast ppxlib.version "0.36";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix
index 54db24ea6290..06b733c6b958 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix
@@ -8,14 +8,14 @@
   dune-configurator,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ppx_deriving_protobuf";
   version = "3.0.0";
 
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/ocaml-ppx/ppx_deriving_protobuf/releases/download/v${version}/ppx_deriving_protobuf-v${version}.tbz";
+    url = "https://github.com/ocaml-ppx/ppx_deriving_protobuf/releases/download/v${finalAttrs.version}/ppx_deriving_protobuf-v${finalAttrs.version}.tbz";
     sha256 = "1dc1vxnkd0cnrgac5v3zbaj2lq1d2w8118mp1cmsdxylp06yz1sj";
   };
 
@@ -32,4 +32,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vyorkin ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix
index f2f4cc9d44e0..4f1fedbb9165 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix
@@ -24,7 +24,7 @@ let
       };
 in
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ppx_deriving_yaml";
   inherit (param) version;
 
@@ -37,7 +37,7 @@ buildDunePackage rec {
       };
 
   src = fetchurl {
-    url = "https://github.com/patricoferris/ppx_deriving_yaml/releases/download/v${version}/ppx_deriving_yaml-${version}.tbz";
+    url = "https://github.com/patricoferris/ppx_deriving_yaml/releases/download/v${finalAttrs.version}/ppx_deriving_yaml-${finalAttrs.version}.tbz";
     inherit (param) hash;
   };
 
@@ -60,4 +60,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
index c69bc6fdd15f..8849f608d201 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
@@ -35,7 +35,7 @@ let
       };
 in
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ppx_deriving_yojson";
   inherit (param) version;
 
@@ -47,7 +47,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
     repo = "ppx_deriving_yojson";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     inherit (param) sha256;
   };
 
@@ -63,8 +63,8 @@ buildDunePackage rec {
 
   meta = {
     description = "Yojson codec generator for OCaml >= 4.04";
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
index 929ac87def60..f74ffe3fd795 100644
--- a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix
@@ -5,12 +5,12 @@
   ppxlib,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ppx_gen_rec";
   version = "2.0.0";
 
   src = fetchurl {
-    url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
+    url = "https://github.com/flowtype/ocaml-ppx_gen_rec/releases/download/v${finalAttrs.version}/ppx_gen_rec-v${finalAttrs.version}.tbz";
     sha256 = "sha256-/mMj5UT22KQGVy1sjgEoOgPzyCYyeDPtWJYNDvQ9nlk=";
   };
 
@@ -25,4 +25,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ frontsideair ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ppx_monad/default.nix b/pkgs/development/ocaml-modules/ppx_monad/default.nix
index cb45f5233790..d68fb092328f 100644
--- a/pkgs/development/ocaml-modules/ppx_monad/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_monad/default.nix
@@ -5,7 +5,7 @@
   ppxlib,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ppx_monad";
   version = "0.2.0";
 
@@ -13,8 +13,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "niols";
-    repo = pname;
-    rev = "v${version}";
+    repo = "ppx_monad";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-cbguAddSlUxBK7pmT7vNmtJW9TrVZZjdSJRMT3lqxOA=";
   };
 
@@ -30,6 +30,6 @@ buildDunePackage rec {
     description = "OCaml Syntax Extension for all Monadic Syntaxes";
     license = lib.licenses.lgpl3Plus;
     maintainers = [ lib.maintainers.niols ];
-    homepage = "https://github.com/niols/${pname}";
+    homepage = "https://github.com/niols/ppx_monad";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ppx_show/default.nix b/pkgs/development/ocaml-modules/ppx_show/default.nix
index 2df2ef6412b1..02a8b4baa3cb 100644
--- a/pkgs/development/ocaml-modules/ppx_show/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_show/default.nix
@@ -6,14 +6,14 @@
   ppxlib,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ppx_show";
   version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "thierry-martinez";
-    repo = pname;
-    rev = "v${version}";
+    repo = "ppx_show";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-YwWAdOtb0zg2hqNkGRiigz/Pci8Jy/QD+WyUEohEsns=";
   };
 
@@ -23,9 +23,9 @@ buildDunePackage rec {
   ];
 
   meta = {
-    homepage = "https://github.com/thierry-martinez/${pname}";
+    homepage = "https://github.com/thierry-martinez/ppx_show";
     description = "OCaml PPX deriver for deriving show based on ppxlib";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ niols ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
index 728f95c0e7b6..5d4e4366e4d5 100644
--- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
@@ -5,7 +5,7 @@
   ocaml-migrate-parsetree,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ppx_tools_versioned";
   version = "5.4.0";
 
@@ -13,8 +13,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "ocaml-ppx";
-    repo = pname;
-    rev = version;
+    repo = "ppx_tools_versioned";
+    rev = finalAttrs.version;
     sha256 = "07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66";
   };
 
@@ -26,4 +26,4 @@ buildDunePackage rec {
     license = lib.licenses.gpl2;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix b/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix
index 6ae5cbb1b2b8..54525ee999b5 100644
--- a/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix
@@ -5,7 +5,7 @@
   yojson,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ppx_yojson_conv_lib";
   version = "0.17.0";
 
@@ -13,8 +13,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "janestreet";
-    repo = pname;
-    rev = "v${version}";
+    repo = "ppx_yojson_conv_lib";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-XGgpcAEemBNEagblBjpK+BiL0OUsU2JPqOq+heHbqVk=";
   };
 
@@ -26,4 +26,4 @@ buildDunePackage rec {
     maintainers = [ ];
     license = lib.licenses.mit;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix
index cee4f4c7c619..d7d9f95f2dc5 100644
--- a/pkgs/development/ocaml-modules/ppxlib/default.nix
+++ b/pkgs/development/ocaml-modules/ppxlib/default.nix
@@ -109,12 +109,12 @@ let
     ."${version}";
 in
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ppxlib";
   inherit version;
 
   src = fetchurl {
-    url = "https://github.com/ocaml-ppx/ppxlib/releases/download/${version}/ppxlib-${version}.tbz";
+    url = "https://github.com/ocaml-ppx/ppxlib/releases/download/${finalAttrs.version}/ppxlib-${finalAttrs.version}.tbz";
     inherit (param) sha256;
   };
 
@@ -137,4 +137,4 @@ buildDunePackage rec {
       param ? max_version && lib.versionAtLeast ocaml.version param.max_version
       || param ? min_version && lib.versionOlder ocaml.version param.min_version;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/pratter/default.nix b/pkgs/development/ocaml-modules/pratter/default.nix
index 18ce52f9eb4d..c42a3ea74399 100644
--- a/pkgs/development/ocaml-modules/pratter/default.nix
+++ b/pkgs/development/ocaml-modules/pratter/default.nix
@@ -7,7 +7,7 @@
   qcheck-alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   version = "5.0.1";
   pname = "pratter";
 
@@ -17,7 +17,7 @@ buildDunePackage rec {
     domain = "forge.tedomum.net";
     owner = "koizel";
     repo = "pratter";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-Ib7EplEvOuYcAS9cfzo5994SqCv2eiysLekYfH09IMw=";
   };
 
@@ -32,7 +32,7 @@ buildDunePackage rec {
     description = "Extended Pratt parser";
     homepage = "https://github.com/gabrielhdt/pratter";
     license = lib.licenses.bsd3;
-    changelog = "https://github.com/gabrielhdt/pratter/raw/${version}/CHANGELOG.md";
+    changelog = "https://github.com/gabrielhdt/pratter/raw/${finalAttrs.version}/CHANGELOG.md";
     maintainers = with lib.maintainers; [ bcdarwin ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/prelude/default.nix b/pkgs/development/ocaml-modules/prelude/default.nix
index 06424b840d1a..50f398958b26 100644
--- a/pkgs/development/ocaml-modules/prelude/default.nix
+++ b/pkgs/development/ocaml-modules/prelude/default.nix
@@ -4,7 +4,7 @@
   fetchzip,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "prelude";
   version = "0.5";
 
@@ -12,7 +12,7 @@ buildDunePackage rec {
 
   # upstream git repo is misconfigured and cannot be cloned
   src = fetchzip {
-    url = "https://git.zapashcanon.fr/zapashcanon/prelude/archive/${version}.tar.gz";
+    url = "https://git.zapashcanon.fr/zapashcanon/prelude/archive/${finalAttrs.version}.tar.gz";
     hash = "sha256-lti+q1U/eEasAXo0O5YEu4iw7947V9bdvSHA0IEMS8M=";
   };
 
@@ -22,8 +22,8 @@ buildDunePackage rec {
     description = "Library to enforce good stdlib practices";
     homepage = "https://ocaml.org/p/prelude/";
     downloadPage = "https://git.zapashcanon.fr/zapashcanon/prelude";
-    changelog = "https://git.zapashcanon.fr/zapashcanon/prelude/src/tag/${version}/CHANGES.md";
+    changelog = "https://git.zapashcanon.fr/zapashcanon/prelude/src/tag/${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.agpl3Plus;
     maintainers = [ lib.maintainers.ethancedwards8 ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/prettym/default.nix b/pkgs/development/ocaml-modules/prettym/default.nix
index a5e93870ff98..00dd19e2c19e 100644
--- a/pkgs/development/ocaml-modules/prettym/default.nix
+++ b/pkgs/development/ocaml-modules/prettym/default.nix
@@ -12,12 +12,12 @@
   ptime,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "prettym";
   version = "0.0.3";
 
   src = fetchurl {
-    url = "https://github.com/dinosaure/prettym/releases/download/${version}/prettym-${version}.tbz";
+    url = "https://github.com/dinosaure/prettym/releases/download/${finalAttrs.version}/prettym-${finalAttrs.version}.tbz";
     hash = "sha256-kXDxoRref02YpYSlvlK7a5FBX5ccbnWJQzG0axi5jwk=";
   };
 
@@ -45,4 +45,4 @@ buildDunePackage rec {
     homepage = "https://github.com/dinosaure/prettym";
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix
index d3e7673a5c27..3440313bcb1a 100644
--- a/pkgs/development/ocaml-modules/printbox/default.nix
+++ b/pkgs/development/ocaml-modules/printbox/default.nix
@@ -7,7 +7,7 @@
   gitUpdater,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "printbox";
   version = "0.12";
 
@@ -15,8 +15,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "c-cube";
-    repo = pname;
-    rev = "v${version}";
+    repo = "printbox";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-PQbr2sjASoWz0OHAMV6buAJERpnUJxVpLAigIVnADIc=";
   };
 
@@ -33,4 +33,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.romildo ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/processor/default.nix b/pkgs/development/ocaml-modules/processor/default.nix
index d4eba003ea67..ce6d3736239b 100644
--- a/pkgs/development/ocaml-modules/processor/default.nix
+++ b/pkgs/development/ocaml-modules/processor/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "processor";
   version = "0.1-unstable-2024-07-23";
 
@@ -23,8 +23,8 @@ buildDunePackage rec {
     description = "CPU topology and affinity for ocaml-multicore";
     homepage = "https://haesbaert.github.io/ocaml-processor/processor/index.html";
     downloadPage = "https://github.com/haesbaert/ocaml-processor";
-    changelog = "https://github.com/haesbaert/ocaml-processor/releases/tag/v${version}";
+    changelog = "https://github.com/haesbaert/ocaml-processor/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.ethancedwards8 ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/promise_jsoo/default.nix b/pkgs/development/ocaml-modules/promise_jsoo/default.nix
index d380fa1adb9a..91b88031a86b 100644
--- a/pkgs/development/ocaml-modules/promise_jsoo/default.nix
+++ b/pkgs/development/ocaml-modules/promise_jsoo/default.nix
@@ -9,14 +9,14 @@
   ojs,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "promise_jsoo";
   version = "0.3.1";
   minimalOCamlVersion = "4.08";
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/mnxn/promise_jsoo/releases/download/v${version}/promise_jsoo-v${version}.tbz";
+    url = "https://github.com/mnxn/promise_jsoo/releases/download/v${finalAttrs.version}/promise_jsoo-v${finalAttrs.version}.tbz";
     sha256 = "00pjnsbv0yv3hhxbbl8dsljgr95kjgi9w8j1x46gjyxg9zayrxzl";
   };
 
@@ -37,4 +37,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ jayesh-bhoot ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
index 74798bc3d6fe..1d8408db5cf0 100644
--- a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
+++ b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix
@@ -5,14 +5,14 @@
   menhir,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   version = "0.4.0";
   pname = "psmt2-frontend";
 
   src = fetchFromGitHub {
     owner = "ACoquereau";
-    repo = pname;
-    rev = version;
+    repo = "psmt2-frontend";
+    rev = finalAttrs.version;
     hash = "sha256-cYY9x7QZjH7pdJyHMqfMXgHZ3/zJLp/6ntY6OSIo6Vs=";
   };
 
@@ -24,7 +24,7 @@ buildDunePackage rec {
     description = "Simple parser and type-checker for polomorphic extension of the SMT-LIB 2 language";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.vbgl ];
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
   };
 
-}
+})
diff --git a/pkgs/development/ocaml-modules/psq/default.nix b/pkgs/development/ocaml-modules/psq/default.nix
index e2349aed828a..e10af60b1d5d 100644
--- a/pkgs/development/ocaml-modules/psq/default.nix
+++ b/pkgs/development/ocaml-modules/psq/default.nix
@@ -7,7 +7,7 @@
   qcheck-alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   minimalOCamlVersion = "4.03";
   pname = "psq";
   version = "0.2.1";
@@ -15,7 +15,7 @@ buildDunePackage rec {
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/pqwy/psq/releases/download/v${version}/psq-${version}.tbz";
+    url = "https://github.com/pqwy/psq/releases/download/v${finalAttrs.version}/psq-${finalAttrs.version}.tbz";
     hash = "sha256-QgBfUz6r50sXme4yuJBWVM1moivtSvK9Jmso2EYs00Q=";
   };
 
@@ -30,4 +30,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.vbgl ];
     license = lib.licenses.isc;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/pulseaudio/default.nix b/pkgs/development/ocaml-modules/pulseaudio/default.nix
index 6ec1b4f0cf4d..e59705a095a0 100644
--- a/pkgs/development/ocaml-modules/pulseaudio/default.nix
+++ b/pkgs/development/ocaml-modules/pulseaudio/default.nix
@@ -7,14 +7,14 @@
   pulseaudio,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "pulseaudio";
   version = "0.1.5";
 
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-pulseaudio";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-eG2HS5g3ycDftRDyXGBwPJE7VRnLXNUgcEgNfVm//ds=";
   };
 
@@ -28,4 +28,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl21Only;
     maintainers = with lib.maintainers; [ dandellion ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/pure-splitmix/default.nix b/pkgs/development/ocaml-modules/pure-splitmix/default.nix
index 99b8206b79c1..aa58f0dc6f43 100644
--- a/pkgs/development/ocaml-modules/pure-splitmix/default.nix
+++ b/pkgs/development/ocaml-modules/pure-splitmix/default.nix
@@ -4,14 +4,14 @@
   buildDunePackage,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "pure-splitmix";
   version = "0.3";
 
   src = fetchFromGitHub {
     owner = "Lysxia";
-    repo = pname;
-    rev = version;
+    repo = "pure-splitmix";
+    rev = finalAttrs.version;
     sha256 = "RUnsAB4hMV87ItCyGhc47bHGY1iOwVv9kco2HxnzqbU=";
   };
 
@@ -23,4 +23,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.ulrikstrid ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/pyml/default.nix b/pkgs/development/ocaml-modules/pyml/default.nix
index 23396eb6b437..dc7f13cbcb5a 100644
--- a/pkgs/development/ocaml-modules/pyml/default.nix
+++ b/pkgs/development/ocaml-modules/pyml/default.nix
@@ -7,14 +7,14 @@
   stdcompat,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "pyml";
   version = "20231101";
 
   src = fetchFromGitHub {
     owner = "ocamllibs";
     repo = "pyml";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-0Yy5T/S3Npwt0XJmEsdXGg5AXYi9vV9UG9nMSzz/CEc=";
   };
 
@@ -45,4 +45,4 @@ buildDunePackage rec {
     homepage = "https://github.com/ocamllibs/pyml";
     license = lib.licenses.bsd2;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix
index f9466470cd3d..3e983b925e6f 100644
--- a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix
+++ b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix
@@ -5,14 +5,14 @@
   qcheck-core,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "qcheck-multicoretests-util";
   version = "0.11";
 
   src = fetchFromGitHub {
     owner = "ocaml-multicore";
     repo = "multicoretests";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-QABh33C1k5AAYkOa5zDIExwwJFlhgdvSuxShJt4ESM8=";
   };
 
@@ -28,4 +28,4 @@ buildDunePackage rec {
     license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix
index de1bbca4ef08..a9d71597d44a 100644
--- a/pkgs/development/ocaml-modules/qtest/default.nix
+++ b/pkgs/development/ocaml-modules/qtest/default.nix
@@ -5,14 +5,14 @@
   qcheck,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "qtest";
   version = "2.11.2";
 
   src = fetchFromGitHub {
     owner = "vincent-hugot";
-    repo = pname;
-    rev = "v${version}";
+    repo = "qtest";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-VLY8+Nu6md0szW4RVxTFwlSQ9kyrgUqf7wQEA6GW8BE=";
   };
 
@@ -27,8 +27,8 @@ buildDunePackage rec {
   meta = {
     description = "Inline (Unit) Tests for OCaml";
     mainProgram = "qtest";
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     maintainers = with lib.maintainers; [ vbgl ];
     license = lib.licenses.gpl3;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/randomconv/default.nix b/pkgs/development/ocaml-modules/randomconv/default.nix
index 898318a00b21..82f9193256ae 100644
--- a/pkgs/development/ocaml-modules/randomconv/default.nix
+++ b/pkgs/development/ocaml-modules/randomconv/default.nix
@@ -4,14 +4,14 @@
   fetchurl,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "randomconv";
   version = "0.2.0";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
-    url = "https://github.com/hannesm/randomconv/releases/download/v${version}/randomconv-${version}.tbz";
+    url = "https://github.com/hannesm/randomconv/releases/download/v${finalAttrs.version}/randomconv-${finalAttrs.version}.tbz";
     hash = "sha256-sxce3wfjQaRGj5L/wh4qiGO4LtXDb3R3zJja8F1bY+o=";
   };
 
@@ -22,4 +22,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.vbgl ];
   };
 
-}
+})
diff --git a/pkgs/development/ocaml-modules/raylib/default.nix b/pkgs/development/ocaml-modules/raylib/default.nix
index ec95db2aa769..97e7f3fe4ef4 100644
--- a/pkgs/development/ocaml-modules/raylib/default.nix
+++ b/pkgs/development/ocaml-modules/raylib/default.nix
@@ -15,12 +15,12 @@
   libxrandr,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "raylib";
   version = "1.4.0";
 
   src = fetchurl {
-    url = "https://github.com/tjammer/raylib-ocaml/releases/download/${version}/raylib-${version}.tbz";
+    url = "https://github.com/tjammer/raylib-ocaml/releases/download/${finalAttrs.version}/raylib-${finalAttrs.version}.tbz";
     hash = "sha256-/SeKgQOrhsAgMNk6ODAZlopL0mL0lVfCTx1ugmV1P/s=";
   };
 
@@ -58,4 +58,4 @@ buildDunePackage rec {
     maintainers = with lib.maintainers; [ r17x ];
     license = lib.licenses.mit;
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/raylib/raygui.nix b/pkgs/development/ocaml-modules/raylib/raygui.nix
index 8f10576eae89..5f3748e16394 100644
--- a/pkgs/development/ocaml-modules/raylib/raygui.nix
+++ b/pkgs/development/ocaml-modules/raylib/raygui.nix
@@ -4,12 +4,12 @@
   raylib,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "raygui";
   version = "1.4.0";
 
   src = fetchurl {
-    url = "https://github.com/tjammer/raylib-ocaml/releases/download/${version}/raygui-${version}.tbz";
+    url = "https://github.com/tjammer/raylib-ocaml/releases/download/${finalAttrs.version}/raygui-${finalAttrs.version}.tbz";
     hash = "sha256-PQcVTAQKeTPkOOHk5w3O3Tz0n7jLvkIo3Urvrk66eMs=";
   };
 
@@ -22,4 +22,4 @@ buildDunePackage rec {
   meta = raylib.meta // {
     description = "OCaml bindings for raygui";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/rdbg/default.nix b/pkgs/development/ocaml-modules/rdbg/default.nix
index ba7e71136957..dcb2a438fd4b 100644
--- a/pkgs/development/ocaml-modules/rdbg/default.nix
+++ b/pkgs/development/ocaml-modules/rdbg/default.nix
@@ -8,7 +8,7 @@
   ounit,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "rdbg";
   version = "1.199.0";
 
@@ -24,7 +24,7 @@ buildDunePackage rec {
       };
 
   src = fetchurl {
-    url = "https://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/rdbg.v${version}.tgz";
+    url = "https://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/rdbg.v${finalAttrs.version}.tgz";
     hash = "sha512:6076eaa3608a313f8ac71a4f5aa4fcc64aeb0c646d581e5035110d4c80f94de34f2ba26f90a9a1e92a7f788c9e799f1f7b0e3728c853a21983ad732f0ee60352";
   };
 
@@ -43,4 +43,4 @@ buildDunePackage rec {
     license = lib.licenses.cecill21;
     maintainers = [ lib.maintainers.delta ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix
index 54bd7a664ae2..eff1957679eb 100644
--- a/pkgs/development/ocaml-modules/re/default.nix
+++ b/pkgs/development/ocaml-modules/re/default.nix
@@ -27,20 +27,20 @@ let
       };
 in
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "re";
   version = version_sha.version;
 
   minimalOCamlVersion = "4.02";
 
   src = fetchurl {
-    url = "https://github.com/ocaml/ocaml-re/releases/download/${version}/re-${version}.tbz";
+    url = "https://github.com/ocaml/ocaml-re/releases/download/${finalAttrs.version}/re-${finalAttrs.version}.tbz";
     inherit (version_sha) hash;
   };
 
   propagatedBuildInputs = [ seq ];
   doCheck = lib.versionAtLeast ocaml.version "4.08";
-  checkInputs = [ (if lib.versionAtLeast version "1.12" then ounit2 else ounit) ];
+  checkInputs = [ (if lib.versionAtLeast finalAttrs.version "1.12" then ounit2 else ounit) ];
 
   meta = {
     homepage = "https://github.com/ocaml/ocaml-re";
@@ -48,4 +48,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl2;
     maintainers = with lib.maintainers; [ vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix
index 73e382d0a59d..2c9b1ac42c7a 100644
--- a/pkgs/development/ocaml-modules/reactivedata/default.nix
+++ b/pkgs/development/ocaml-modules/reactivedata/default.nix
@@ -5,7 +5,7 @@
   react,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "reactiveData";
   version = "0.3.1";
   duneVersion = "3";
@@ -14,7 +14,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocsigen";
     repo = "reactiveData";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "sha256-MO9WMe1k2QcC5RynE6uZHohmu3QlpTHvAkvQNgu3P90=";
   };
 
@@ -26,4 +26,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl21;
     maintainers = with lib.maintainers; [ vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/redis/default.nix b/pkgs/development/ocaml-modules/redis/default.nix
index e54e5b3e3cfb..86ee73743184 100644
--- a/pkgs/development/ocaml-modules/redis/default.nix
+++ b/pkgs/development/ocaml-modules/redis/default.nix
@@ -7,14 +7,14 @@
   uuidm,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "redis";
   version = "0.8";
 
   minimalOCamlVersion = "4.03";
 
   src = fetchurl {
-    url = "https://github.com/0xffea/ocaml-redis/releases/download/v${version}/redis-${version}.tbz";
+    url = "https://github.com/0xffea/ocaml-redis/releases/download/v${finalAttrs.version}/redis-${finalAttrs.version}.tbz";
     hash = "sha256-Cli30Elur3tL/0bWK6PBBy229TK4jsQnN/0oVQux01I=";
   };
 
@@ -31,4 +31,4 @@ buildDunePackage rec {
     license = lib.licenses.bsd3;
     homepage = "https://github.com/0xffea/ocaml-redis";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/res/default.nix b/pkgs/development/ocaml-modules/res/default.nix
index 5ae73c967c4b..4a0555b07033 100644
--- a/pkgs/development/ocaml-modules/res/default.nix
+++ b/pkgs/development/ocaml-modules/res/default.nix
@@ -4,14 +4,14 @@
   buildDunePackage,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "res";
   version = "5.0.2";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
-    url = "https://github.com/mmottl/res/releases/download/${version}/res-${version}.tbz";
+    url = "https://github.com/mmottl/res/releases/download/${finalAttrs.version}/res-${finalAttrs.version}.tbz";
     hash = "sha256-hQxRETCYxy7ZHah5cg+XHtH3wCj/ofq1VHxsPHu91FU=";
   };
 
@@ -20,8 +20,8 @@ buildDunePackage rec {
   meta = {
     description = "Library for resizable, contiguous datastructures";
     homepage = "https://github.com/mmottl/res";
-    changelog = "https://github.com/mmottl/res/blob/${version}/CHANGES.md";
+    changelog = "https://github.com/mmottl/res/blob/${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.lgpl2Plus;
     maintainers = with lib.maintainers; [ sixstring982 ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/resource-pooling/default.nix b/pkgs/development/ocaml-modules/resource-pooling/default.nix
index d98e8e8c47e9..aef730c92adf 100644
--- a/pkgs/development/ocaml-modules/resource-pooling/default.nix
+++ b/pkgs/development/ocaml-modules/resource-pooling/default.nix
@@ -5,7 +5,7 @@
   lwt_log,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   version = "1.2";
   pname = "resource-pooling";
 
@@ -13,8 +13,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "ocsigen";
-    repo = pname;
-    rev = version;
+    repo = "resource-pooling";
+    rev = finalAttrs.version;
     sha256 = "sha256-GNYPxjMTo7y40y7aQdseuFyeVF/hSCZKXfEaH/WIO9w=";
   };
 
@@ -23,9 +23,9 @@ buildDunePackage rec {
   doCheck = true;
 
   meta = {
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     description = "Library for pooling resources like connections, threads, or similar";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/rfc7748/default.nix b/pkgs/development/ocaml-modules/rfc7748/default.nix
index 8adf46c3b384..392cf13e0e2c 100644
--- a/pkgs/development/ocaml-modules/rfc7748/default.nix
+++ b/pkgs/development/ocaml-modules/rfc7748/default.nix
@@ -9,14 +9,14 @@
   zarith,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "rfc7748";
   version = "1.0";
 
   src = fetchFromGitHub {
     owner = "burgerdev";
     repo = "ocaml-rfc7748";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-mgZooyfxrKBVQFn01B8PULmFUW9Zq5HJfgHCSJSkJo4=";
   };
 
@@ -45,4 +45,4 @@ buildDunePackage rec {
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ fufexan ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ringo/default.nix b/pkgs/development/ocaml-modules/ringo/default.nix
index 4120d82cb295..06ef0791de53 100644
--- a/pkgs/development/ocaml-modules/ringo/default.nix
+++ b/pkgs/development/ocaml-modules/ringo/default.nix
@@ -4,13 +4,13 @@
   buildDunePackage,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ringo";
   version = "1.1.0";
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "ringo";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-8dThhY7TIjd0lLdCt6kxr0yhgVGDyN6ZMSx0Skfbcwk=";
   };
 
@@ -23,4 +23,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.ulrikstrid ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/rio/default.nix b/pkgs/development/ocaml-modules/rio/default.nix
index e705007d570e..fa0dc3388311 100644
--- a/pkgs/development/ocaml-modules/rio/default.nix
+++ b/pkgs/development/ocaml-modules/rio/default.nix
@@ -5,14 +5,14 @@
   cstruct,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "rio";
   version = "0.0.8";
 
   minimalOCamlVersion = "5.1";
 
   src = fetchurl {
-    url = "https://github.com/leostera/riot/releases/download/${version}/riot-${version}.tbz";
+    url = "https://github.com/leostera/riot/releases/download/${finalAttrs.version}/riot-${finalAttrs.version}.tbz";
     hash = "sha256-SsiDz53b9bMIT9Q3IwDdB3WKy98WSd9fiieU41qZpeE=";
   };
 
@@ -23,8 +23,8 @@ buildDunePackage rec {
   meta = {
     description = "Ergonomic, composable, efficient read/write streams";
     homepage = "https://github.com/leostera/riot";
-    changelog = "https://github.com/leostera/riot/blob/${version}/CHANGES.md";
+    changelog = "https://github.com/leostera/riot/blob/${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/riot/default.nix b/pkgs/development/ocaml-modules/riot/default.nix
index d85f0738e4ba..b09a25b2e14d 100644
--- a/pkgs/development/ocaml-modules/riot/default.nix
+++ b/pkgs/development/ocaml-modules/riot/default.nix
@@ -12,14 +12,14 @@
   tls,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "riot";
   version = "0.0.8";
 
   minimalOCamlVersion = "5.1";
 
   src = fetchurl {
-    url = "https://github.com/leostera/riot/releases/download/${version}/riot-${version}.tbz";
+    url = "https://github.com/leostera/riot/releases/download/${finalAttrs.version}/riot-${finalAttrs.version}.tbz";
     hash = "sha256-SsiDz53b9bMIT9Q3IwDdB3WKy98WSd9fiieU41qZpeE=";
   };
 
@@ -45,9 +45,9 @@ buildDunePackage rec {
   meta = {
     description = "Actor-model multi-core scheduler for OCaml 5";
     homepage = "https://github.com/leostera/riot";
-    changelog = "https://github.com/leostera/riot/blob/${version}/CHANGES.md";
+    changelog = "https://github.com/leostera/riot/blob/${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.mit;
     maintainers = [ ];
     broken = true; # Not compatible with mirage-crypto ≥ 1.0
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/rock/default.nix b/pkgs/development/ocaml-modules/rock/default.nix
index 4ac05b0150b2..f62e462f4443 100644
--- a/pkgs/development/ocaml-modules/rock/default.nix
+++ b/pkgs/development/ocaml-modules/rock/default.nix
@@ -9,14 +9,14 @@
   sexplib0,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "rock";
   version = "0.20.0";
   minimalOCamlVersion = "4.08";
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/rgrinberg/opium/releases/download/${version}/opium-${version}.tbz";
+    url = "https://github.com/rgrinberg/opium/releases/download/${finalAttrs.version}/opium-${finalAttrs.version}.tbz";
     hash = "sha256-MmuRhm3pC69TX4t9Sy/yPjnZUuVzwEs8E/EFS1n/L7Y=";
   };
 
@@ -35,4 +35,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.vbgl ];
   };
 
-}
+})
diff --git a/pkgs/development/ocaml-modules/rosetta/default.nix b/pkgs/development/ocaml-modules/rosetta/default.nix
index f86715ff507c..78eaf6a01b71 100644
--- a/pkgs/development/ocaml-modules/rosetta/default.nix
+++ b/pkgs/development/ocaml-modules/rosetta/default.nix
@@ -7,12 +7,12 @@
   uuuu,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "rosetta";
   version = "0.3.0";
 
   src = fetchzip {
-    url = "https://github.com/mirage/rosetta/releases/download/v${version}/rosetta-v${version}.tbz";
+    url = "https://github.com/mirage/rosetta/releases/download/v${finalAttrs.version}/rosetta-v${finalAttrs.version}.tbz";
     sha256 = "1gzp3fbk8qd207cm25dgj9kj7b44ldqpjs63pl6xqvi9hx60m3ij";
   };
 
@@ -32,4 +32,4 @@ buildDunePackage rec {
     homepage = "https://github.com/mirage/rosetta";
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/routes/default.nix b/pkgs/development/ocaml-modules/routes/default.nix
index 04ef6c1e94f1..cae997141db1 100644
--- a/pkgs/development/ocaml-modules/routes/default.nix
+++ b/pkgs/development/ocaml-modules/routes/default.nix
@@ -4,7 +4,7 @@
   buildDunePackage,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "routes";
   version = "2.0.0";
 
@@ -12,7 +12,7 @@ buildDunePackage rec {
   minimalOCamlVersion = "4.05";
 
   src = fetchurl {
-    url = "https://github.com/anuragsoni/routes/releases/download/${version}/routes-${version}.tbz";
+    url = "https://github.com/anuragsoni/routes/releases/download/${finalAttrs.version}/routes-${finalAttrs.version}.tbz";
     hash = "sha256-O2KdaYwrAOUEwTtM14NUgGNxnc8BWAycP1EEuB6w1og=";
   };
 
@@ -25,4 +25,4 @@ buildDunePackage rec {
       anmonteiro
     ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/rpclib/default.nix b/pkgs/development/ocaml-modules/rpclib/default.nix
index d65d94e97f30..d1578b7951d2 100644
--- a/pkgs/development/ocaml-modules/rpclib/default.nix
+++ b/pkgs/development/ocaml-modules/rpclib/default.nix
@@ -10,7 +10,7 @@
   yojson,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "rpclib";
   version = "9.0.0";
 
@@ -18,7 +18,7 @@ buildDunePackage rec {
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/mirage/ocaml-rpc/releases/download/${version}/rpclib-${version}.tbz";
+    url = "https://github.com/mirage/ocaml-rpc/releases/download/${finalAttrs.version}/rpclib-${finalAttrs.version}.tbz";
     hash = "sha256-ziPrdWwCjZN0vRmCMpa923wjfT8FVFLTDRz30VIW6WM=";
   };
 
@@ -41,4 +41,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.vyorkin ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/rusage/default.nix b/pkgs/development/ocaml-modules/rusage/default.nix
index 8992d60368ca..14baa1f34aae 100644
--- a/pkgs/development/ocaml-modules/rusage/default.nix
+++ b/pkgs/development/ocaml-modules/rusage/default.nix
@@ -4,14 +4,14 @@
   buildDunePackage,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "rusage";
   version = "1.0.0";
 
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/CraigFe/ocaml-rusage/releases/download/${version}/rusage-${version}.tbz";
+    url = "https://github.com/CraigFe/ocaml-rusage/releases/download/${finalAttrs.version}/rusage-${finalAttrs.version}.tbz";
     hash = "sha256-OgYA2Fe1goqoaOS45Z6FBJNNYN/uq+KQoUwG8KSo6Fk=";
   };
 
@@ -21,4 +21,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/saturn/lockfree.nix b/pkgs/development/ocaml-modules/saturn/lockfree.nix
index 538dfda5e838..bfa91f76f7ea 100644
--- a/pkgs/development/ocaml-modules/saturn/lockfree.nix
+++ b/pkgs/development/ocaml-modules/saturn/lockfree.nix
@@ -6,14 +6,14 @@
   multicore-magic,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "saturn_lockfree";
   version = "0.5.0";
 
   minimalOCamlVersion = "4.13";
 
   src = fetchurl {
-    url = "https://github.com/ocaml-multicore/saturn/releases/download/${version}/saturn-${version}.tbz";
+    url = "https://github.com/ocaml-multicore/saturn/releases/download/${finalAttrs.version}/saturn-${finalAttrs.version}.tbz";
     hash = "sha256-ZmmxwIe5PiPYTTdvOHbOjRbv2b/bb9y0IekByfREPjk=";
   };
 
@@ -28,4 +28,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/scfg/default.nix b/pkgs/development/ocaml-modules/scfg/default.nix
index aa1d39c64fd3..060c367cf0ef 100644
--- a/pkgs/development/ocaml-modules/scfg/default.nix
+++ b/pkgs/development/ocaml-modules/scfg/default.nix
@@ -13,13 +13,13 @@
   writableTmpDirAsHomeHook,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "scfg";
   version = "0.5";
 
   # upstream git repo is misconfigured and cannot be cloned
   src = fetchzip {
-    url = "https://git.zapashcanon.fr/zapashcanon/scfg/archive/${version}.tar.gz";
+    url = "https://git.zapashcanon.fr/zapashcanon/scfg/archive/${finalAttrs.version}.tar.gz";
     hash = "sha256-XyNVmI0W0B1JqR+uuojpHe9L5KKLhyoH8vN8+9i7Xcg=";
   };
 
@@ -50,8 +50,8 @@ buildDunePackage rec {
     description = "Library to work with the scfg configuration file";
     homepage = "https://ocaml.org/p/scfg/";
     downloadPage = "https://git.zapashcanon.fr/zapashcanon/scfg";
-    changelog = "https://git.zapashcanon.fr/zapashcanon/scfg/src/tag/${version}/CHANGES.md";
+    changelog = "https://git.zapashcanon.fr/zapashcanon/scfg/src/tag/${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.ethancedwards8 ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/secp256k1-internal/default.nix b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix
index 5a57a79889e1..077cd46b44b3 100644
--- a/pkgs/development/ocaml-modules/secp256k1-internal/default.nix
+++ b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix
@@ -10,13 +10,13 @@
   hex,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "secp256k1-internal";
   version = "0.4";
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "ocaml-secp256k1-internal";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-amVtp94cE1NxClWJgcJvRmilnQlC7z44mORUaxvPn00=";
   };
 
@@ -45,4 +45,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.ulrikstrid ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix
index 084a5d32b1c5..6b95fde03bf5 100644
--- a/pkgs/development/ocaml-modules/sedlex/default.nix
+++ b/pkgs/development/ocaml-modules/sedlex/default.nix
@@ -41,7 +41,7 @@ let
   };
   atLeast31 = lib.versionAtLeast param.version "3.1";
 in
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "sedlex";
   inherit (param) version;
 
@@ -50,7 +50,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "ocaml-community";
     repo = "sedlex";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     inherit (param) sha256;
   };
 
@@ -79,9 +79,9 @@ buildDunePackage rec {
 
   meta = {
     homepage = "https://github.com/ocaml-community/sedlex";
-    changelog = "https://github.com/ocaml-community/sedlex/raw/v${version}/CHANGES";
+    changelog = "https://github.com/ocaml-community/sedlex/raw/v${finalAttrs.version}/CHANGES";
     description = "OCaml lexer generator for Unicode";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/sel/default.nix b/pkgs/development/ocaml-modules/sel/default.nix
index 506e8bb89e04..85c456bb6173 100644
--- a/pkgs/development/ocaml-modules/sel/default.nix
+++ b/pkgs/development/ocaml-modules/sel/default.nix
@@ -6,14 +6,14 @@
   buildDunePackage,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "sel";
   version = "0.8.0";
 
   minimalOCamlVersion = "4.07";
 
   src = fetchurl {
-    url = "https://github.com/gares/sel/releases/download/v${version}/sel-${version}.tbz";
+    url = "https://github.com/gares/sel/releases/download/v${finalAttrs.version}/sel-${finalAttrs.version}.tbz";
     hash = "sha256-jTAjWdaoioR5+G96qoOY+JXrJY00eF7y7WhGSiFwfqg=";
   };
 
@@ -31,4 +31,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/semver/default.nix b/pkgs/development/ocaml-modules/semver/default.nix
index 3529f481c33f..2079462ed15d 100644
--- a/pkgs/development/ocaml-modules/semver/default.nix
+++ b/pkgs/development/ocaml-modules/semver/default.nix
@@ -6,11 +6,11 @@
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "semver";
   version = "0.2.1";
   src = fetchurl {
-    url = "https://github.com/rgrinberg/ocaml-semver/releases/download/${version}/semver-${version}.tbz";
+    url = "https://github.com/rgrinberg/ocaml-semver/releases/download/${finalAttrs.version}/semver-${finalAttrs.version}.tbz";
     hash = "sha256-CjzDUtoe5Hvt6zImb+EqVIulRUUUQd9MmuJ4BH/2mLg=";
   };
 
@@ -23,4 +23,4 @@ buildDunePackage rec {
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.ulrikstrid ];
   };
-}
+})