From 1dee60f5a01ebd7ff7da830360e889d22ea48799 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:36 -0600
Subject: [PATCH 01/82] ocamlPackages.genspio: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/genspio/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/genspio/default.nix b/pkgs/development/ocaml-modules/genspio/default.nix
index 22b93c11ed49..80ceb2e643f0 100644
--- a/pkgs/development/ocaml-modules/genspio/default.nix
+++ b/pkgs/development/ocaml-modules/genspio/default.nix
@@ -6,7 +6,7 @@
   fmt,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "genspio";
   version = "0.0.3";
 
@@ -14,8 +14,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "hammerlab";
-    repo = pname;
-    rev = "${pname}.${version}";
+    repo = "genspio";
+    rev = "genspio.${finalAttrs.version}";
     sha256 = "sha256:1788cnn10idp5i1hggg4pys7k0w8m3h2p4xa42jipfg4cpj7shaf";
   };
 
@@ -35,4 +35,4 @@ buildDunePackage rec {
     license = lib.licenses.asl20;
     maintainers = [ ];
   };
-}
+})

From 46b7a34334f6bd0d97ab517c2eee074517d83077 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:40 -0600
Subject: [PATCH 02/82] ocamlPackages.get-activity: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/get-activity/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/get-activity/default.nix b/pkgs/development/ocaml-modules/get-activity/default.nix
index 5157b640aa09..10ccdbab9d0e 100644
--- a/pkgs/development/ocaml-modules/get-activity/default.nix
+++ b/pkgs/development/ocaml-modules/get-activity/default.nix
@@ -11,7 +11,7 @@
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "get-activity";
   inherit (get-activity-lib) version src;
 
@@ -42,7 +42,7 @@ buildDunePackage rec {
     homepage = "https://github.com/tarides/get-activity";
     description = "Collect activity and format as markdown for a journal";
     license = lib.licenses.mit;
-    changelog = "https://github.com/tarides/get-activity/releases/tag/${version}";
+    changelog = "https://github.com/tarides/get-activity/releases/tag/${finalAttrs.version}";
     maintainers = with lib.maintainers; [ zazedd ];
   };
-}
+})

From 5f45dcfdb9ba1116eced0f1b259274c7c757090e Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:41 -0600
Subject: [PATCH 03/82] ocamlPackages.get-activity-lib: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/get-activity/lib.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/get-activity/lib.nix b/pkgs/development/ocaml-modules/get-activity/lib.nix
index 352b75d27f4f..2cd2eea8a744 100644
--- a/pkgs/development/ocaml-modules/get-activity/lib.nix
+++ b/pkgs/development/ocaml-modules/get-activity/lib.nix
@@ -13,14 +13,14 @@
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "get-activity-lib";
   version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "tarides";
     repo = "get-activity";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-QU/LPIxcem5nFvSxcNApOuBu6UHqLHIXVSOJ2UT0eKA=";
   };
 
@@ -48,7 +48,7 @@ buildDunePackage rec {
     homepage = "https://github.com/tarides/get-activity";
     description = "Collect activity and format as markdown for a journal (lib)";
     license = lib.licenses.mit;
-    changelog = "https://github.com/tarides/get-activity/releases/tag/${version}";
+    changelog = "https://github.com/tarides/get-activity/releases/tag/${finalAttrs.version}";
     maintainers = with lib.maintainers; [ zazedd ];
   };
-}
+})

From 38be5fb1c76b2970217551ec322735f45c2a4824 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:41 -0600
Subject: [PATCH 04/82] ocamlPackages.getopt: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/getopt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/getopt/default.nix b/pkgs/development/ocaml-modules/getopt/default.nix
index 9de42e3d8bae..ad409c008a54 100644
--- a/pkgs/development/ocaml-modules/getopt/default.nix
+++ b/pkgs/development/ocaml-modules/getopt/default.nix
@@ -4,7 +4,7 @@
   buildDunePackage,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "getopt";
   version = "20230213";
 
@@ -13,7 +13,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "scemama";
     repo = "ocaml-getopt";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-oYDm945LgjIW+8x7UrO4FlbHywnu8480aiEVvnjBxc8=";
   };
 
@@ -25,4 +25,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.ulrikstrid ];
   };
-}
+})

From 2ff654292a93a30fdf7f1606c8c9e31ced9820ea Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:42 -0600
Subject: [PATCH 05/82] ocamlPackages.git: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/git/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix
index 16580b8208bf..d6119aedfb76 100644
--- a/pkgs/development/ocaml-modules/git/default.nix
+++ b/pkgs/development/ocaml-modules/git/default.nix
@@ -37,14 +37,14 @@
   cmdliner,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "git";
   version = "3.18.0";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
-    url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
+    url = "https://github.com/mirage/ocaml-git/releases/download/${finalAttrs.version}/git-${finalAttrs.version}.tbz";
     hash = "sha256-kleVYn5tquC0vRaqUGh53xHLIB5l/v446BN48Y1RfUs=";
   };
 
@@ -99,4 +99,4 @@ buildDunePackage rec {
     ];
     homepage = "https://github.com/mirage/ocaml-git";
   };
-}
+})

From 878f36db8e82d962569c0cd56a3264511c50c2e0 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:42 -0600
Subject: [PATCH 06/82] ocamlPackages.github: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/github/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/github/default.nix b/pkgs/development/ocaml-modules/github/default.nix
index 28a5de55978c..102ee8fa1e63 100644
--- a/pkgs/development/ocaml-modules/github/default.nix
+++ b/pkgs/development/ocaml-modules/github/default.nix
@@ -11,14 +11,14 @@
   stringext,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "github";
   version = "4.5.1";
 
   src = fetchFromGitHub {
     owner = "mirage";
     repo = "ocaml-github";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "sha256-nxHXOdZAvFe5/lKNw7tTJmY86xzfdFT+fW+lnKioyPM=";
   };
 
@@ -40,4 +40,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ niols ];
   };
-}
+})

From d37761e92d2c08b48036120966af8d682e1286ac Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:43 -0600
Subject: [PATCH 07/82] ocamlPackages.gitlab: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/gitlab/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/gitlab/default.nix b/pkgs/development/ocaml-modules/gitlab/default.nix
index 3f0255d29ec0..c2f57e351a67 100644
--- a/pkgs/development/ocaml-modules/gitlab/default.nix
+++ b/pkgs/development/ocaml-modules/gitlab/default.nix
@@ -11,14 +11,14 @@
   stringext,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "gitlab";
   version = "0.1.8";
 
   src = fetchFromGitHub {
     owner = "tmcgilchrist";
     repo = "ocaml-gitlab";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-7pUpH1SoP4eW8ild5j+Tcy+aTXq0+eSkhKUOXJ6Z30k=";
   };
 
@@ -46,7 +46,7 @@ buildDunePackage rec {
     homepage = "https://github.com/tmcgilchrist/ocaml-gitlab";
     description = "Native OCaml bindings to Gitlab REST API v4";
     license = lib.licenses.bsd3;
-    changelog = "https://github.com/tmcgilchrist/ocaml-gitlab/releases/tag/${version}";
+    changelog = "https://github.com/tmcgilchrist/ocaml-gitlab/releases/tag/${finalAttrs.version}";
     maintainers = with lib.maintainers; [ zazedd ];
   };
-}
+})

From a1e2a3b104157e6b5a2fca82c20202d31356119f Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:44 -0600
Subject: [PATCH 08/82] ocamlPackages.gluon: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/gluon/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/gluon/default.nix b/pkgs/development/ocaml-modules/gluon/default.nix
index 9bc4408c28ab..49daf0af5034 100644
--- a/pkgs/development/ocaml-modules/gluon/default.nix
+++ b/pkgs/development/ocaml-modules/gluon/default.nix
@@ -10,14 +10,14 @@
   uri,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "gluon";
   version = "0.0.9";
 
   minimalOCamlVersion = "5.1";
 
   src = fetchurl {
-    url = "https://github.com/riot-ml/gluon/releases/download/${version}/gluon-${version}.tbz";
+    url = "https://github.com/riot-ml/gluon/releases/download/${finalAttrs.version}/gluon-${finalAttrs.version}.tbz";
     hash = "sha256-YWJCPokY1A7TGqCGoxJl14oKDVeMNybEEB7KiK92WSo=";
   };
 
@@ -40,8 +40,8 @@ buildDunePackage rec {
   meta = {
     description = "Minimal, portable, and fast API on top of the operating-system's evented I/O API";
     homepage = "https://github.com/riot-ml/gluon";
-    changelog = "https://github.com/riot-ml/gluon/blob/${version}/CHANGES.md";
+    changelog = "https://github.com/riot-ml/gluon/blob/${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

From a06da2fa62082accad29a7c0cba424e942ac055d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:44 -0600
Subject: [PATCH 09/82] ocamlPackages.gluten: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/gluten/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/gluten/default.nix b/pkgs/development/ocaml-modules/gluten/default.nix
index 689c7a05f659..17f5e2d12c5f 100644
--- a/pkgs/development/ocaml-modules/gluten/default.nix
+++ b/pkgs/development/ocaml-modules/gluten/default.nix
@@ -6,12 +6,12 @@
   lib,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "gluten";
   version = "0.5.2";
 
   src = fetchurl {
-    url = "https://github.com/anmonteiro/gluten/releases/download/${version}/gluten-${version}.tbz";
+    url = "https://github.com/anmonteiro/gluten/releases/download/${finalAttrs.version}/gluten-${finalAttrs.version}.tbz";
     hash = "sha256-se7Yn59ggLtL0onMjSUsa88B8D05Vybmb6YGcgfnAV8=";
   };
 
@@ -30,4 +30,4 @@ buildDunePackage rec {
     homepage = "https://github.com/anmonteiro/gluten";
     maintainers = with lib.maintainers; [ anmonteiro ];
   };
-}
+})

From 9240dde9c0e7b63f30f3964f9e31d23246222d1f Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:45 -0600
Subject: [PATCH 10/82] ocamlPackages.gmap: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/gmap/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/gmap/default.nix b/pkgs/development/ocaml-modules/gmap/default.nix
index 5b5fc7ecafff..23a9294185d5 100644
--- a/pkgs/development/ocaml-modules/gmap/default.nix
+++ b/pkgs/development/ocaml-modules/gmap/default.nix
@@ -7,14 +7,14 @@
   fmt,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "gmap";
   version = "0.3.0";
 
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/hannesm/gmap/releases/download/${version}/gmap-${version}.tbz";
+    url = "https://github.com/hannesm/gmap/releases/download/${finalAttrs.version}/gmap-${finalAttrs.version}.tbz";
     sha256 = "073wa0lrb0jj706j87cwzf1a8d1ff14100mnrjs8z3xc4ri9xp84";
   };
 
@@ -33,4 +33,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})

From 894230db30a963d073c1e8332f2f250a60aec757 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:45 -0600
Subject: [PATCH 11/82] ocamlPackages.graphql-cohttp: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/graphql/cohttp.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/graphql/cohttp.nix b/pkgs/development/ocaml-modules/graphql/cohttp.nix
index c60745b23cd3..cd326bdde201 100644
--- a/pkgs/development/ocaml-modules/graphql/cohttp.nix
+++ b/pkgs/development/ocaml-modules/graphql/cohttp.nix
@@ -12,7 +12,7 @@
   graphql-lwt,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "graphql-cohttp";
 
   inherit (graphql) version src;
@@ -28,7 +28,7 @@ buildDunePackage rec {
     ocplib-endian
   ];
 
-  checkInputs = lib.optionals doCheck [
+  checkInputs = lib.optionals finalAttrs.doCheck [
     alcotest
     cohttp-lwt-unix
     graphql-lwt
@@ -45,4 +45,4 @@ buildDunePackage rec {
     description = "Run GraphQL servers with “cohttp”";
   };
 
-}
+})

From dfa9e59dd366bba6655e18713c1d5c8ca19d7a1e Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:46 -0600
Subject: [PATCH 12/82] ocamlPackages.graphql: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/graphql/parser.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/graphql/parser.nix b/pkgs/development/ocaml-modules/graphql/parser.nix
index 23fbd366f955..477c84004655 100644
--- a/pkgs/development/ocaml-modules/graphql/parser.nix
+++ b/pkgs/development/ocaml-modules/graphql/parser.nix
@@ -8,7 +8,7 @@
   re,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "graphql_parser";
   version = "0.14.0";
 
@@ -16,7 +16,7 @@ buildDunePackage rec {
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/andreas/ocaml-graphql-server/releases/download/${version}/graphql-${version}.tbz";
+    url = "https://github.com/andreas/ocaml-graphql-server/releases/download/${finalAttrs.version}/graphql-${finalAttrs.version}.tbz";
     sha256 = "sha256-v4v1ueF+NV7LvYIVinaf4rE450Z1P9OiMAito6/NHAY=";
   };
 
@@ -37,4 +37,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.vbgl ];
   };
 
-}
+})

From af0617c7b9aacee57050399bd6d258fed535bd72 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:46 -0600
Subject: [PATCH 13/82] ocamlPackages.gsl: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/gsl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/gsl/default.nix b/pkgs/development/ocaml-modules/gsl/default.nix
index 5f30483439c6..c471a7680a7d 100644
--- a/pkgs/development/ocaml-modules/gsl/default.nix
+++ b/pkgs/development/ocaml-modules/gsl/default.nix
@@ -7,7 +7,7 @@
   dune-configurator,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "gsl";
   version = "1.25.1";
 
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "mmottl";
     repo = "gsl-ocaml";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-h1jO2RheBBzxiBgig2yEPk4YyBaZxStt5f+KNZqHdBo=";
   };
 
@@ -32,4 +32,4 @@ buildDunePackage rec {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ vbgl ];
   };
-}
+})

From b363f01605540603d4a4279ec5ec83bb9372ee50 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:47 -0600
Subject: [PATCH 14/82] ocamlPackages.gstreamer: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/gstreamer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/gstreamer/default.nix b/pkgs/development/ocaml-modules/gstreamer/default.nix
index 14bf90552b7f..7f732905b60f 100644
--- a/pkgs/development/ocaml-modules/gstreamer/default.nix
+++ b/pkgs/development/ocaml-modules/gstreamer/default.nix
@@ -8,14 +8,14 @@
   gst_all_1,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "gstreamer";
   version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-gstreamer";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "0y8xi1q0ld4hrk96bn6jfh9slyjrxmnlhm662ynacp3yzalp8jji";
   };
 
@@ -40,4 +40,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl21Only;
     maintainers = with lib.maintainers; [ dandellion ];
   };
-}
+})

From df88aab50e416a764d21c55f81d7a89289cbe651 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:48 -0600
Subject: [PATCH 15/82] ocamlPackages.hack_parallel: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/hack_parallel/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/hack_parallel/default.nix b/pkgs/development/ocaml-modules/hack_parallel/default.nix
index f7fb5ace45bc..34ca7bff9d31 100644
--- a/pkgs/development/ocaml-modules/hack_parallel/default.nix
+++ b/pkgs/development/ocaml-modules/hack_parallel/default.nix
@@ -7,7 +7,7 @@
   pkg-config,
   sqlite,
 }:
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "hack_parallel";
   version = "1.0.1";
   minimalOCamlVersion = "4.08";
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "rvantonder";
     repo = "hack_parallel";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "0qjlkw35r4q2cm0n2x0i73zvx1xgrp6axaia2nm8zxpm49mid629";
   };
 
@@ -51,4 +51,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     homepage = "https://github.com/rvantonder/hack_parallel";
   };
-}
+})

From 2b27ea54eabe640c3a25958febf121d6ae6f9f44 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:48 -0600
Subject: [PATCH 16/82] ocamlPackages.happy-eyeballs: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/happy-eyeballs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix
index 43df0a1cec74..e0686ed37fe3 100644
--- a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix
+++ b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix
@@ -9,14 +9,14 @@
   logs,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "happy-eyeballs";
   version = "2.0.1";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
-    url = "https://github.com/roburio/happy-eyeballs/releases/download/v${version}/happy-eyeballs-${version}.tbz";
+    url = "https://github.com/roburio/happy-eyeballs/releases/download/v${finalAttrs.version}/happy-eyeballs-${finalAttrs.version}.tbz";
     hash = "sha256-slVFiDApMbqF4Yhh5hCjraeCNJbU1JoZXpU1VsNR0mk=";
   };
 
@@ -37,4 +37,4 @@ buildDunePackage rec {
       ulrikstrid
     ];
   };
-}
+})

From 4ec3c9ed2058e7835354f3cdb29a4005ed2ee6ab Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:49 -0600
Subject: [PATCH 17/82] ocamlPackages.hc: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/hc/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/hc/default.nix b/pkgs/development/ocaml-modules/hc/default.nix
index 93c8e18ff2f7..32a578e505c7 100644
--- a/pkgs/development/ocaml-modules/hc/default.nix
+++ b/pkgs/development/ocaml-modules/hc/default.nix
@@ -4,7 +4,7 @@
   fetchzip,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "hc";
   version = "0.5";
 
@@ -12,7 +12,7 @@ buildDunePackage rec {
 
   # upstream git server is misconfigured and cannot be cloned
   src = fetchzip {
-    url = "https://git.zapashcanon.fr/zapashcanon/hc/archive/${version}.tar.gz";
+    url = "https://git.zapashcanon.fr/zapashcanon/hc/archive/${finalAttrs.version}.tar.gz";
     hash = "sha256-oTomFi+e9aCgVpZ9EkxQ/dZz18cW2UcaV0ZIokeBoU0=";
   };
 
@@ -22,8 +22,8 @@ buildDunePackage rec {
     description = "Library for hash consing";
     homepage = "https://ocaml.org/p/hc/";
     downloadPage = "https://git.zapashcanon.fr/zapashcanon/hc";
-    changelog = "https://git.zapashcanon.fr/zapashcanon/hc/src/tag/${version}/CHANGES.md";
+    changelog = "https://git.zapashcanon.fr/zapashcanon/hc/src/tag/${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.ethancedwards8 ];
   };
-}
+})

From 8ff305985bdd4a0da5aca9bccbbc7d4dbf5b17cf Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:49 -0600
Subject: [PATCH 18/82] ocamlPackages.hex: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/hex/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix
index 1d7850b96b03..b6cc694d578c 100644
--- a/pkgs/development/ocaml-modules/hex/default.nix
+++ b/pkgs/development/ocaml-modules/hex/default.nix
@@ -5,7 +5,7 @@
   cstruct,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "hex";
   version = "1.5.0";
 
@@ -13,7 +13,7 @@ buildDunePackage rec {
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
-    url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/hex-${version}.tbz";
+    url = "https://github.com/mirage/ocaml-hex/releases/download/v${finalAttrs.version}/hex-${finalAttrs.version}.tbz";
     hash = "sha256-LmfuyhsDBJMHowgxtc1pS8stPn8qa0+1l/vbZHNRtNw=";
   };
 
@@ -26,4 +26,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ vbgl ];
   };
-}
+})

From f65e7c62d7e65f9aa4a22f8a1ca107fba22fdbcc Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:50 -0600
Subject: [PATCH 19/82] ocamlPackages.hidapi: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/hidapi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/hidapi/default.nix b/pkgs/development/ocaml-modules/hidapi/default.nix
index 38e6d503b866..206ecaa86239 100644
--- a/pkgs/development/ocaml-modules/hidapi/default.nix
+++ b/pkgs/development/ocaml-modules/hidapi/default.nix
@@ -8,7 +8,7 @@
   bigstring,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "hidapi";
   version = "1.2.1";
 
@@ -17,7 +17,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "vbmithr";
     repo = "ocaml-hidapi";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-upygm5G46C65lxaiI6kBOzLrWxzW9qWb6efN/t58SRg=";
   };
 
@@ -39,4 +39,4 @@ buildDunePackage rec {
     maintainers = [ ];
     mainProgram = "ocaml-hid-enumerate";
   };
-}
+})

From 272b19374df98c932c31d0d5c464b1b78dca0ecb Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:51 -0600
Subject: [PATCH 20/82] ocamlPackages.higlo: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/higlo/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix
index f806dbb0be22..167cdf6ac5a1 100644
--- a/pkgs/development/ocaml-modules/higlo/default.nix
+++ b/pkgs/development/ocaml-modules/higlo/default.nix
@@ -6,7 +6,7 @@
   xtmpl,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "higlo";
   version = "0.10.0";
 
@@ -14,7 +14,7 @@ buildDunePackage rec {
     domain = "framagit.org";
     owner = "zoggy";
     repo = "higlo";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-A5Su4+eBOq/WNdY/3EBQ3KqrRQuaCI1x25cEuoZp4Mo=";
   };
 
@@ -25,8 +25,8 @@ buildDunePackage rec {
 
   meta = {
     description = "OCaml library for syntax highlighting";
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     license = lib.licenses.lgpl3;
     maintainers = with lib.maintainers; [ regnat ];
   };
-}
+})

From d40c18f3116f2860be927812cc6acc332f5651fc Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:51 -0600
Subject: [PATCH 21/82] ocamlPackages.hkdf: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/hkdf/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/hkdf/default.nix b/pkgs/development/ocaml-modules/hkdf/default.nix
index 095b88d91af3..57374d290587 100644
--- a/pkgs/development/ocaml-modules/hkdf/default.nix
+++ b/pkgs/development/ocaml-modules/hkdf/default.nix
@@ -7,14 +7,14 @@
   ohex,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "hkdf";
   version = "2.0.0";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
-    url = "https://github.com/hannesm/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
+    url = "https://github.com/hannesm/ocaml-hkdf/releases/download/v${finalAttrs.version}/hkdf-${finalAttrs.version}.tbz";
     hash = "sha256-VLBxJ5viTTn1nK0QNIAGq/8961x0/RGHZN/C/7ITWNM=";
   };
 
@@ -31,4 +31,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sternenseemann ];
   };
-}
+})

From 22633701792fe54749ad658a7649d4d07fab8611 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:52 -0600
Subject: [PATCH 22/82] ocamlPackages.hpack: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/hpack/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/hpack/default.nix b/pkgs/development/ocaml-modules/hpack/default.nix
index 8a865415e338..ed0863275241 100644
--- a/pkgs/development/ocaml-modules/hpack/default.nix
+++ b/pkgs/development/ocaml-modules/hpack/default.nix
@@ -6,12 +6,12 @@
   faraday,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "hpack";
   version = "0.13.0";
 
   src = fetchurl {
-    url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${version}/h2-${version}.tbz";
+    url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${finalAttrs.version}/h2-${finalAttrs.version}.tbz";
     hash = "sha256-DYm28XgXUpTnogciO+gdW4P8Mbl1Sb7DTwQyo7KoBw8=";
   };
 
@@ -34,4 +34,4 @@ buildDunePackage rec {
       anmonteiro
     ];
   };
-}
+})

From 208141a6f1d985767c099b070abbe08dfdadc875 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:52 -0600
Subject: [PATCH 23/82] ocamlPackages.httpaf: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/httpaf/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/pkgs/development/ocaml-modules/httpaf/default.nix
index ec39fd662995..c42cc1c36178 100644
--- a/pkgs/development/ocaml-modules/httpaf/default.nix
+++ b/pkgs/development/ocaml-modules/httpaf/default.nix
@@ -8,7 +8,7 @@
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "httpaf";
   version = "0.7.1";
 
@@ -16,8 +16,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "inhabitedtype";
-    repo = pname;
-    rev = version;
+    repo = "httpaf";
+    rev = finalAttrs.version;
     sha256 = "0zk78af3qyvf6w66mg8sxygr6ndayzqw5s3zfxibvn121xwni26z";
   };
 
@@ -33,6 +33,6 @@ buildDunePackage rec {
     description = "High-performance, memory-efficient, and scalable web server for OCaml";
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.vbgl ];
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
   };
-}
+})

From a29f846146f5ca7caf280fadb0c74cd0f53311d1 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:53 -0600
Subject: [PATCH 24/82] ocamlPackages.httpun-ws: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/httpun-ws/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/httpun-ws/default.nix b/pkgs/development/ocaml-modules/httpun-ws/default.nix
index 0e199d7168e7..7cea73e84fb8 100644
--- a/pkgs/development/ocaml-modules/httpun-ws/default.nix
+++ b/pkgs/development/ocaml-modules/httpun-ws/default.nix
@@ -11,12 +11,12 @@
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "httpun-ws";
   version = "0.2.0";
 
   src = fetchurl {
-    url = "https://github.com/anmonteiro/httpun-ws/releases/download/${version}/httpun-ws-${version}.tbz";
+    url = "https://github.com/anmonteiro/httpun-ws/releases/download/${finalAttrs.version}/httpun-ws-${finalAttrs.version}.tbz";
     hash = "sha256-6uDNLg61tPyctthitxFqbw/IUDsuQ5BGvw5vTLLCl/0=";
   };
 
@@ -38,4 +38,4 @@ buildDunePackage rec {
     homepage = "https://github.com/anmonteiro/httpun-ws";
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})

From 45883af4e880b16297d4dcef6eae8c88accced79 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:54 -0600
Subject: [PATCH 25/82] ocamlPackages.httpun: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/httpun/types.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/httpun/types.nix b/pkgs/development/ocaml-modules/httpun/types.nix
index 260903504967..3d3584e92da9 100644
--- a/pkgs/development/ocaml-modules/httpun/types.nix
+++ b/pkgs/development/ocaml-modules/httpun/types.nix
@@ -5,12 +5,12 @@
   faraday,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "httpun-types";
   version = "0.2.0";
 
   src = fetchurl {
-    url = "https://github.com/anmonteiro/httpun/releases/download/${version}/httpun-${version}.tbz";
+    url = "https://github.com/anmonteiro/httpun/releases/download/${finalAttrs.version}/httpun-${finalAttrs.version}.tbz";
     hash = "sha256-os4n70yFro4cEAjR49Xok9ayEbk0WGod0pQvfbaHvSw=";
   };
 
@@ -22,4 +22,4 @@ buildDunePackage rec {
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})

From 118bd50e6e655a210c66f5d59d0548dea5538dde Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:54 -0600
Subject: [PATCH 26/82] ocamlPackages.hxd: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/hxd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/hxd/default.nix b/pkgs/development/ocaml-modules/hxd/default.nix
index 343c757db5cc..9d965c50a226 100644
--- a/pkgs/development/ocaml-modules/hxd/default.nix
+++ b/pkgs/development/ocaml-modules/hxd/default.nix
@@ -8,14 +8,14 @@
   withLwt ? true,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "hxd";
   version = "0.4.0";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
-    url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-${version}.tbz";
+    url = "https://github.com/dinosaure/hxd/releases/download/v${finalAttrs.version}/hxd-${finalAttrs.version}.tbz";
     sha256 = "sha256-EAMLciahdQRHGAmtWvwMIAchJkxcbdPVldJIBApxgFg=";
   };
 
@@ -39,4 +39,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.sternenseemann ];
     mainProgram = "hxd.xxd";
   };
-}
+})

From 607371604eeaae450c4f721f162be94e0903145d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:55 -0600
Subject: [PATCH 27/82] ocamlPackages.imagelib: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/imagelib/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/pkgs/development/ocaml-modules/imagelib/default.nix
index d63ea0cd4dc5..7d7f7dec3b51 100644
--- a/pkgs/development/ocaml-modules/imagelib/default.nix
+++ b/pkgs/development/ocaml-modules/imagelib/default.nix
@@ -7,7 +7,7 @@
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   minimalOCamlVersion = "4.08";
   version = "20221222";
   pname = "imagelib";
@@ -15,7 +15,7 @@ buildDunePackage rec {
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/rlepigre/ocaml-imagelib/releases/download/${version}/imagelib-${version}.tbz";
+    url = "https://github.com/rlepigre/ocaml-imagelib/releases/download/${finalAttrs.version}/imagelib-${finalAttrs.version}.tbz";
     hash = "sha256-BQ2TVxGlpc6temteK84TKXpx0MtHZSykL/TjKN9xGP0=";
   };
 
@@ -34,4 +34,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.vbgl ];
     mainProgram = "imagetool";
   };
-}
+})

From 744484752681a0382a3f7e22f481676518d447bb Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:55 -0600
Subject: [PATCH 28/82] ocamlPackages.index: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/index/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix
index 6fcf7bcf639f..0425601f4bbf 100644
--- a/pkgs/development/ocaml-modules/index/default.nix
+++ b/pkgs/development/ocaml-modules/index/default.nix
@@ -19,12 +19,12 @@
   lru,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "index";
   version = "1.6.2";
 
   src = fetchurl {
-    url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz";
+    url = "https://github.com/mirage/index/releases/download/${finalAttrs.version}/index-${finalAttrs.version}.tbz";
     hash = "sha256-k4iDUJik7UTuztBw7YaFXASd8SqYMR1JgLm3JOyriGA=";
   };
 
@@ -73,4 +73,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ vbgl ];
   };
-}
+})

From 5710219cbc63e897e1a23abb158d3529df44767d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:56 -0600
Subject: [PATCH 29/82] ocamlPackages.inotify: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/inotify/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix
index 900f60e7c774..d8d01a0614f1 100644
--- a/pkgs/development/ocaml-modules/inotify/default.nix
+++ b/pkgs/development/ocaml-modules/inotify/default.nix
@@ -7,14 +7,14 @@
   fileutils, # only for tests
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   version = "2.6";
   pname = "inotify";
 
   src = fetchFromGitHub {
     owner = "whitequark";
     repo = "ocaml-inotify";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-Vg9uVIx6/OMS1WoJIHwZbSt5ZyFy+Xgw5167FJWGslg=";
   };
 
@@ -31,7 +31,7 @@ buildDunePackage rec {
     description = "Bindings for Linux’s filesystem monitoring interface, inotify";
     license = lib.licenses.lgpl21;
     maintainers = [ lib.maintainers.vbgl ];
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     platforms = lib.platforms.linux;
   };
-}
+})

From dc3698d7e2bb3d0c1c09f69e5b081cd456d3f558 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:57 -0600
Subject: [PATCH 30/82] ocamlPackages.integers: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/integers/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix
index 104438eeab50..ffcbd6fb3130 100644
--- a/pkgs/development/ocaml-modules/integers/default.nix
+++ b/pkgs/development/ocaml-modules/integers/default.nix
@@ -5,14 +5,14 @@
   stdlib-shims,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "integers";
   version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "ocamllabs";
     repo = "ocaml-integers";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "sha256-zuUgP1jOiVT0q6GisGpkqx7nybWbARgnAcU8NYqvCzA=";
   };
 
@@ -22,7 +22,7 @@ buildDunePackage rec {
     description = "Various signed and unsigned integer types for OCaml";
     license = lib.licenses.mit;
     homepage = "https://github.com/ocamllabs/ocaml-integers";
-    changelog = "https://github.com/ocamllabs/ocaml-integers/raw/${version}/CHANGES.md";
+    changelog = "https://github.com/ocamllabs/ocaml-integers/raw/${finalAttrs.version}/CHANGES.md";
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})

From 4637d8eafa4d0410a4c9573ada3a1c2271a7bf63 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:57 -0600
Subject: [PATCH 31/82] ocamlPackages.integers_stubs_js: migrate to finalAttrs

---
 .../ocaml-modules/integers_stubs_js/default.nix        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/integers_stubs_js/default.nix b/pkgs/development/ocaml-modules/integers_stubs_js/default.nix
index 1ab3dbb25407..6456e37ec3b7 100644
--- a/pkgs/development/ocaml-modules/integers_stubs_js/default.nix
+++ b/pkgs/development/ocaml-modules/integers_stubs_js/default.nix
@@ -5,7 +5,7 @@
   zarith_stubs_js ? null,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "integers_stubs_js";
   version = "1.0";
 
@@ -14,8 +14,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "o1-labs";
-    repo = pname;
-    rev = version;
+    repo = "integers_stubs_js";
+    rev = finalAttrs.version;
     sha256 = "sha256-lg5cX9/LQlVmR42XcI17b6KaatnFO2L9A9ZXfID8mTY=";
   };
 
@@ -26,6 +26,6 @@ buildDunePackage rec {
     description = "Javascript stubs for the integers library in js_of_ocaml";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ bezmuth ];
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
   };
-}
+})

From 755e3b65d04e30b6aa95f98dc5084037461dfdae Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:58 -0600
Subject: [PATCH 32/82] ocamlPackages.io-page: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/io-page/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix
index 7860ecd68154..4da13c8470ce 100644
--- a/pkgs/development/ocaml-modules/io-page/default.nix
+++ b/pkgs/development/ocaml-modules/io-page/default.nix
@@ -8,7 +8,7 @@
   ounit,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "io-page";
   version = "3.0.0";
 
@@ -16,7 +16,7 @@ buildDunePackage rec {
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz";
+    url = "https://github.com/mirage/io-page/releases/download/v${finalAttrs.version}/io-page-${finalAttrs.version}.tbz";
     hash = "sha256-DjbKdNkFa6YQgJDLmLsuvyrweb4/TNvqAiggcj/3hu4=";
   };
 
@@ -34,4 +34,4 @@ buildDunePackage rec {
     description = "IO memory page library for Mirage backends";
     maintainers = with lib.maintainers; [ vbgl ];
   };
-}
+})

From 5669c1de399d6bdc23dfea5a505fad40668e8f69 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:58 -0600
Subject: [PATCH 33/82] ocamlPackages.iomux: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/iomux/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/iomux/default.nix b/pkgs/development/ocaml-modules/iomux/default.nix
index 25b7c07ddad8..6f4535e3ec7f 100644
--- a/pkgs/development/ocaml-modules/iomux/default.nix
+++ b/pkgs/development/ocaml-modules/iomux/default.nix
@@ -6,14 +6,14 @@
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "iomux";
   version = "0.4";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
-    url = "https://github.com/haesbaert/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
+    url = "https://github.com/haesbaert/ocaml-iomux/releases/download/v${finalAttrs.version}/iomux-${finalAttrs.version}.tbz";
     hash = "sha256-Hjk/rlWUdoSMXHBSUHaxEHDoBqVJ7rrghLBGqXcrqzU=";
   };
 
@@ -26,9 +26,9 @@ buildDunePackage rec {
   ];
 
   meta = {
-    homepage = "https://github.com/haesbaert/ocaml-${pname}";
+    homepage = "https://github.com/haesbaert/ocaml-iomux";
     description = "IO Multiplexers for OCaml";
     license = with lib.licenses; [ isc ];
     maintainers = with lib.maintainers; [ toastal ];
   };
-}
+})

From a29c8d9f73fecaed36df0f9c40ff1a30ac33aac1 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:59 -0600
Subject: [PATCH 34/82] ocamlPackages.iri: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/iri/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/iri/default.nix b/pkgs/development/ocaml-modules/iri/default.nix
index 106e62e630b0..49dfc5d5b2b5 100644
--- a/pkgs/development/ocaml-modules/iri/default.nix
+++ b/pkgs/development/ocaml-modules/iri/default.nix
@@ -7,7 +7,7 @@
   uutf,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "iri";
   version = "1.1.0";
 
@@ -17,7 +17,7 @@ buildDunePackage rec {
     domain = "framagit.org";
     owner = "zoggy";
     repo = "ocaml-iri";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-fh5+0CWplDdGXCotZL2UzjOGil2LR4NppttaquO/ndE=";
   };
 
@@ -31,6 +31,6 @@ buildDunePackage rec {
     description = "IRI (RFC3987) native OCaml implementation";
     license = lib.licenses.lgpl3;
     maintainers = [ lib.maintainers.vbgl ];
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
   };
-}
+})

From dc23a702312837eacb08566649f4a5750e46ece1 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:13:59 -0600
Subject: [PATCH 35/82] ocamlPackages.irmin: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/irmin/ppx.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix
index 49c6033695be..7e602b2408dd 100644
--- a/pkgs/development/ocaml-modules/irmin/ppx.nix
+++ b/pkgs/development/ocaml-modules/irmin/ppx.nix
@@ -7,12 +7,12 @@
   logs,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ppx_irmin";
   version = "3.11.0";
 
   src = fetchurl {
-    url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz";
+    url = "https://github.com/mirage/irmin/releases/download/${finalAttrs.version}/irmin-${finalAttrs.version}.tbz";
     hash = "sha256-CZlvvMLEPhF6m9jpAoxjXoHMyyZNXgLUJauLBrus29s=";
   };
 
@@ -33,4 +33,4 @@ buildDunePackage rec {
       sternenseemann
     ];
   };
-}
+})

From 856d04eef953da7405623b259248fd092e8d599d Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:00 -0600
Subject: [PATCH 36/82] ocamlPackages.iter: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/iter/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/iter/default.nix b/pkgs/development/ocaml-modules/iter/default.nix
index 5ad0a1e1e32d..ed1f44a3b0fc 100644
--- a/pkgs/development/ocaml-modules/iter/default.nix
+++ b/pkgs/development/ocaml-modules/iter/default.nix
@@ -7,14 +7,14 @@
   qcheck-core,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "iter";
   version = "1.9";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
-    url = "https://github.com/c-cube/iter/releases/download/v${version}/iter-${version}.tbz";
+    url = "https://github.com/c-cube/iter/releases/download/v${finalAttrs.version}/iter-${finalAttrs.version}.tbz";
     hash = "sha256-26nluxUuDQ2wBUw2sqlHZ0eihKdzjxXxGVo+IDXH6Wg=";
   };
 
@@ -36,4 +36,4 @@ buildDunePackage rec {
     '';
     license = lib.licenses.bsd2;
   };
-}
+})

From 1b2516b9229a24fead168b275f3a43c56d54086b Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:01 -0600
Subject: [PATCH 37/82] ocamlPackages.jose: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/jose/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/jose/default.nix b/pkgs/development/ocaml-modules/jose/default.nix
index 6e6a59e0dbe5..a32201228299 100644
--- a/pkgs/development/ocaml-modules/jose/default.nix
+++ b/pkgs/development/ocaml-modules/jose/default.nix
@@ -11,12 +11,12 @@
   zarith,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "jose";
   version = "0.10.0";
 
   src = fetchurl {
-    url = "https://github.com/ulrikstrid/ocaml-jose/releases/download/v${version}/${pname}-${version}.tbz";
+    url = "https://github.com/ulrikstrid/ocaml-jose/releases/download/v${finalAttrs.version}/jose-${finalAttrs.version}.tbz";
     hash = "sha256-F6Odq5JXTkAxdqV3HQusoF+9rvt4BZytslKnsIjJLI8=";
   };
 
@@ -44,4 +44,4 @@ buildDunePackage rec {
       marijanp
     ];
   };
-}
+})

From ffdb7651ed420a29c3027ff18c816c76b79d2964 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:02 -0600
Subject: [PATCH 38/82] ocamlPackages.json-data-encoding: migrate to finalAttrs

---
 .../ocaml-modules/json-data-encoding/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/json-data-encoding/default.nix b/pkgs/development/ocaml-modules/json-data-encoding/default.nix
index 3c21d451d81b..7540cca08982 100644
--- a/pkgs/development/ocaml-modules/json-data-encoding/default.nix
+++ b/pkgs/development/ocaml-modules/json-data-encoding/default.nix
@@ -6,14 +6,14 @@
   uri,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "json-data-encoding";
   version = "1.0.1";
   minimalOCamlVersion = "4.10";
   src = fetchFromGitLab {
     owner = "nomadic-labs";
     repo = "data-encoding";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-KoA4xX4tNyi6bX5kso/Wof1LA7431EXJ34eD5X4jnd8=";
   };
 
@@ -28,4 +28,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl3;
     maintainers = [ lib.maintainers.ulrikstrid ];
   };
-}
+})

From b8e16f46e5838a4d9c929d3909101953fc6d525c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:02 -0600
Subject: [PATCH 39/82] ocamlPackages.junit: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/junit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/junit/default.nix b/pkgs/development/ocaml-modules/junit/default.nix
index 59a6404ecac9..aaae36cf8d10 100644
--- a/pkgs/development/ocaml-modules/junit/default.nix
+++ b/pkgs/development/ocaml-modules/junit/default.nix
@@ -6,12 +6,12 @@
   tyxml,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "junit";
   version = "2.3.0";
 
   src = fetchurl {
-    url = "https://github.com/Khady/ocaml-junit/releases/download/${version}/junit-${version}.tbz";
+    url = "https://github.com/Khady/ocaml-junit/releases/download/${finalAttrs.version}/junit-${finalAttrs.version}.tbz";
     hash = "sha256-j+4lfuQEWq8z8ik/zfA5phWqv8km+tGEzqG/63cbhTM=";
   };
 
@@ -28,4 +28,4 @@ buildDunePackage rec {
     maintainers = [ ];
     homepage = "https://github.com/Khady/ocaml-junit";
   };
-}
+})

From 07d10aee7878624ea6eb9198d5ca557e8797c7b3 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:03 -0600
Subject: [PATCH 40/82] ocamlPackages.jwto: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/jwto/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/jwto/default.nix b/pkgs/development/ocaml-modules/jwto/default.nix
index 6c73b06213ac..5645ff5e8369 100644
--- a/pkgs/development/ocaml-modules/jwto/default.nix
+++ b/pkgs/development/ocaml-modules/jwto/default.nix
@@ -12,7 +12,7 @@
   ppx_deriving,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "jwto";
   version = "0.4.0";
 
@@ -23,7 +23,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "sporto";
     repo = "jwto";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-TOWwNyrOqboCm8Y4mM6GgtmxGO3NmyDdAX7m8CifA7Y=";
   };
 
@@ -51,4 +51,4 @@ buildDunePackage rec {
       jtcoolen
     ];
   };
-}
+})

From c273b87d0d23cfefdc406d4b9e31543291242a02 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:04 -0600
Subject: [PATCH 41/82] ocamlPackages.kafka: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/kafka/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/kafka/default.nix b/pkgs/development/ocaml-modules/kafka/default.nix
index eb39fcba38e4..d855161cd59e 100644
--- a/pkgs/development/ocaml-modules/kafka/default.nix
+++ b/pkgs/development/ocaml-modules/kafka/default.nix
@@ -7,12 +7,12 @@
   zlib,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "kafka";
   version = "0.5";
 
   src = fetchurl {
-    url = "https://github.com/didier-wenzek/ocaml-kafka/releases/download/${version}/kafka-${version}.tbz";
+    url = "https://github.com/didier-wenzek/ocaml-kafka/releases/download/${finalAttrs.version}/kafka-${finalAttrs.version}.tbz";
     sha256 = "0m9212yap0a00hd0f61i4y4fna3141p77qj3mm7jl1h4q60jdhvy";
   };
 
@@ -28,4 +28,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.vbgl ];
     broken = lib.versionAtLeast ocaml.version "5.0";
   };
-}
+})

From b998e69227c75e5895a3b86880d84dad4f690266 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:04 -0600
Subject: [PATCH 42/82] ocamlPackages.kcas: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/kcas/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/kcas/default.nix b/pkgs/development/ocaml-modules/kcas/default.nix
index 35a54b7a0cb3..c2e01340021f 100644
--- a/pkgs/development/ocaml-modules/kcas/default.nix
+++ b/pkgs/development/ocaml-modules/kcas/default.nix
@@ -12,12 +12,12 @@
   mdx,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "kcas";
   version = "0.7.0";
 
   src = fetchurl {
-    url = "https://github.com/ocaml-multicore/kcas/releases/download/${version}/kcas-${version}.tbz";
+    url = "https://github.com/ocaml-multicore/kcas/releases/download/${finalAttrs.version}/kcas-${finalAttrs.version}.tbz";
     hash = "sha256-mo/otnkB79QdyVgLw1sZFfkR/Z/l15cRVfEYPPd6H5E=";
   };
 
@@ -42,8 +42,8 @@ buildDunePackage rec {
     longDescription = ''
       A software transactional memory (STM) implementation based on an atomic lock-free multi-word compare-and-set (MCAS) algorithm enhanced with read-only compare operations and ability to block awaiting for changes.
     '';
-    changelog = "https://raw.githubusercontent.com/ocaml-multicore/kcas/refs/tags/${version}/CHANGES.md";
+    changelog = "https://raw.githubusercontent.com/ocaml-multicore/kcas/refs/tags/${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})

From 49612f26bb1964dbf1bef9a7f0193c070a10e937 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:05 -0600
Subject: [PATCH 43/82] ocamlPackages.kdf: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/kdf/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/kdf/default.nix b/pkgs/development/ocaml-modules/kdf/default.nix
index cb5c091e3d77..6f3f762e7049 100644
--- a/pkgs/development/ocaml-modules/kdf/default.nix
+++ b/pkgs/development/ocaml-modules/kdf/default.nix
@@ -8,12 +8,12 @@
   ohex,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "kdf";
   version = "1.0.0";
 
   src = fetchurl {
-    url = "https://github.com/robur-coop/kdf/releases/download/v${version}/kdf-${version}.tbz";
+    url = "https://github.com/robur-coop/kdf/releases/download/v${finalAttrs.version}/kdf-${finalAttrs.version}.tbz";
     hash = "sha256-0WFYKw7+ZtlY3WuMnCEGjp9kVM4hg3fWz4eCPexi4M4=";
   };
 
@@ -34,4 +34,4 @@ buildDunePackage rec {
     license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})

From f08e44bd8a53c8bd07c18426b49a53078dac7c1c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:05 -0600
Subject: [PATCH 44/82] ocamlPackages.kdl: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/kdl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/kdl/default.nix b/pkgs/development/ocaml-modules/kdl/default.nix
index bd30bc8c8747..cb6c926c21a1 100644
--- a/pkgs/development/ocaml-modules/kdl/default.nix
+++ b/pkgs/development/ocaml-modules/kdl/default.nix
@@ -9,7 +9,7 @@
   zarith,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "kdl";
   version = "0.2.0";
 
@@ -34,7 +34,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "eilvelia";
     repo = "ocaml-kdl";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-0MiJe0XbWAlS2NvGxLplsgVfCNaA/7iCMx4+F+6FAtM=";
   };
 
@@ -44,4 +44,4 @@ buildDunePackage rec {
     maintainers = with lib.maintainers; [ toastal ];
     homepage = "https://github.com/eilvelia/ocaml-kdl";
   };
-}
+})

From edf3c80a1a7dc4cb0ab5158bac0a32a58283c1ea Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:06 -0600
Subject: [PATCH 45/82] ocamlPackages.ke: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/ke/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ke/default.nix b/pkgs/development/ocaml-modules/ke/default.nix
index 14b984f4b811..21a8536afd51 100644
--- a/pkgs/development/ocaml-modules/ke/default.nix
+++ b/pkgs/development/ocaml-modules/ke/default.nix
@@ -7,12 +7,12 @@
   bigstringaf,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ke";
   version = "0.6";
 
   src = fetchurl {
-    url = "https://github.com/mirage/ke/releases/download/v${version}/ke-${version}.tbz";
+    url = "https://github.com/mirage/ke/releases/download/v${finalAttrs.version}/ke-${finalAttrs.version}.tbz";
     sha256 = "sha256-YSFyB+IgCwSxd1lzZhD/kggmmmR/hUy1rnLNrA1nIwU=";
   };
 
@@ -33,4 +33,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})

From 7b869043f446e887adf40f48648014c1d0ddd419 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:07 -0600
Subject: [PATCH 46/82] ocamlPackages.kicadsch: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/kicadsch/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/kicadsch/default.nix b/pkgs/development/ocaml-modules/kicadsch/default.nix
index 92066bf56ed9..79c6cefa5c57 100644
--- a/pkgs/development/ocaml-modules/kicadsch/default.nix
+++ b/pkgs/development/ocaml-modules/kicadsch/default.nix
@@ -4,14 +4,14 @@
   fetchurl,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "kicadsch";
   version = "0.9.0";
 
   minimalOCamlVersion = "4.07";
 
   src = fetchurl {
-    url = "https://github.com/jnavila/plotkicadsch/releases/download/v${version}/plotkicadsch-${version}.tbz";
+    url = "https://github.com/jnavila/plotkicadsch/releases/download/v${finalAttrs.version}/plotkicadsch-${finalAttrs.version}.tbz";
     sha256 = "sha256-B+vnEPyd3SUzviTdNoyvYk0p7Hrg/XTJm8KxsY8A4jQ=";
   };
 
@@ -21,4 +21,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ leungbk ];
   };
-}
+})

From 7cab79975341d4351a52a51daa533a8ad1c3dafa Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:07 -0600
Subject: [PATCH 47/82] ocamlPackages.kqueue: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/kqueue/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/kqueue/default.nix b/pkgs/development/ocaml-modules/kqueue/default.nix
index 07d4921b704c..768e8ae25746 100644
--- a/pkgs/development/ocaml-modules/kqueue/default.nix
+++ b/pkgs/development/ocaml-modules/kqueue/default.nix
@@ -7,14 +7,14 @@
   ppx_optcomp,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "kqueue";
   version = "0.4.0";
 
   minimalOCamlVersion = "4.12";
 
   src = fetchurl {
-    url = "https://github.com/anuragsoni/kqueue-ml/releases/download/${version}/kqueue-${version}.tbz";
+    url = "https://github.com/anuragsoni/kqueue-ml/releases/download/${finalAttrs.version}/kqueue-${finalAttrs.version}.tbz";
     hash = "sha256-fJHhmAp0EFzR9JH93a+EHy1auwSBKZV/XcBQLCedJLc=";
   };
 
@@ -32,8 +32,8 @@ buildDunePackage rec {
   meta = {
     description = "OCaml bindings for kqueue event notification interface";
     homepage = "https://github.com/anuragsoni/kqueue-ml";
-    changelog = "https://github.com/anuragsoni/kqueue-ml/blob/${version}/CHANGES.md";
+    changelog = "https://github.com/anuragsoni/kqueue-ml/blob/${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ sixstring982 ];
   };
-}
+})

From a7eeb65fe023d6d7847a6e65dad43cfcd1e46ad8 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:08 -0600
Subject: [PATCH 48/82] ocamlPackages.lablgtk3: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/lablgtk3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix
index 872da0e0d113..79aa69b65ae6 100644
--- a/pkgs/development/ocaml-modules/lablgtk3/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix
@@ -9,14 +9,14 @@
   camlp-streams,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   version = "3.1.5";
   pname = "lablgtk3";
 
   minimalOCamlVersion = "4.06";
 
   src = fetchurl {
-    url = "https://github.com/garrigue/lablgtk/releases/download/${version}/lablgtk3-${version}.tbz";
+    url = "https://github.com/garrigue/lablgtk/releases/download/${finalAttrs.version}/lablgtk3-${finalAttrs.version}.tbz";
     hash = "sha256-1IIc2+zzrjdPIDF9Y+Q/5YAww7qWV7UaLoPmUhl+jqw=";
   };
 
@@ -36,4 +36,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl21;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})

From df0dd0a0983a19d1defb5a75f6b6a247e356ae0f Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:08 -0600
Subject: [PATCH 49/82] ocamlPackages.lambdapi: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/lambdapi/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lambdapi/default.nix b/pkgs/development/ocaml-modules/lambdapi/default.nix
index 0ec480007239..23d1053d963c 100644
--- a/pkgs/development/ocaml-modules/lambdapi/default.nix
+++ b/pkgs/development/ocaml-modules/lambdapi/default.nix
@@ -18,14 +18,14 @@
   yojson,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "lambdapi";
   version = "3.0.0";
 
   minimalOCamlVersion = "4.14";
 
   src = fetchurl {
-    url = "https://github.com/Deducteam/lambdapi/releases/download/${version}/lambdapi-${version}.tbz";
+    url = "https://github.com/Deducteam/lambdapi/releases/download/${finalAttrs.version}/lambdapi-${finalAttrs.version}.tbz";
     hash = "sha256-EGau0mGP2OakAMUUfb9V6pd86NP+LlGKxnhcZ3WhuL4=";
   };
 
@@ -64,7 +64,7 @@ buildDunePackage rec {
     homepage = "https://github.com/Deducteam/lambdapi";
     description = "Proof assistant based on the λΠ-calculus modulo rewriting";
     license = lib.licenses.cecill21;
-    changelog = "https://github.com/Deducteam/lambdapi/raw/${version}/CHANGES.md";
+    changelog = "https://github.com/Deducteam/lambdapi/raw/${finalAttrs.version}/CHANGES.md";
     maintainers = with lib.maintainers; [ bcdarwin ];
   };
-}
+})

From bccc889a0f09e48a99396088e642e337aeb183dc Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:09 -0600
Subject: [PATCH 50/82] ocamlPackages.lambdasoup: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/lambdasoup/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lambdasoup/default.nix b/pkgs/development/ocaml-modules/lambdasoup/default.nix
index ea4b3512c16d..63c1bf7a9131 100644
--- a/pkgs/development/ocaml-modules/lambdasoup/default.nix
+++ b/pkgs/development/ocaml-modules/lambdasoup/default.nix
@@ -8,7 +8,7 @@
   ounit2,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "lambdasoup";
   version = "1.1.1";
 
@@ -16,8 +16,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "aantron";
-    repo = pname;
-    rev = version;
+    repo = "lambdasoup";
+    rev = finalAttrs.version;
     hash = "sha256-+d1JPU7OyQgt8pDTlwZraqPHH+OBQD1ycsELKpHT95Y=";
   };
 
@@ -36,4 +36,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.vbgl ];
   };
 
-}
+})

From c4c08c9931a20d76c84d01582e2259495f2b13c4 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:10 -0600
Subject: [PATCH 51/82] ocamlPackages.lame: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/lame/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lame/default.nix b/pkgs/development/ocaml-modules/lame/default.nix
index f0db47138606..0e1c15c227f1 100644
--- a/pkgs/development/ocaml-modules/lame/default.nix
+++ b/pkgs/development/ocaml-modules/lame/default.nix
@@ -7,7 +7,7 @@
   lame,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "lame";
   version = "0.3.7";
 
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-lame";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-/ZzoGFQQrBf17TaBPSFDQ1yHaQnva56YLmscOacrKBI=";
   };
 
@@ -30,4 +30,4 @@ buildDunePackage rec {
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ dandellion ];
   };
-}
+})

From 5dd15df9873da25a645c57f1a2ebf120e6e79729 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:10 -0600
Subject: [PATCH 52/82] ocamlPackages.landmarks: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/landmarks/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/landmarks/default.nix b/pkgs/development/ocaml-modules/landmarks/default.nix
index 40375794fd0c..757417c82f23 100644
--- a/pkgs/development/ocaml-modules/landmarks/default.nix
+++ b/pkgs/development/ocaml-modules/landmarks/default.nix
@@ -5,7 +5,7 @@
   ocaml,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "landmarks";
   version = "1.5";
   minimalOCamlVersion = "4.08";
@@ -13,14 +13,14 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "LexiFi";
     repo = "landmarks";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-eIq02D19OzDOrMDHE1Ecrgk+T6s9vj2X6B2HY+z+K8Q=";
   };
 
   doCheck = lib.versionAtLeast ocaml.version "4.08" && lib.versionOlder ocaml.version "5.0";
 
   meta = {
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     description = "Simple Profiling Library for OCaml";
     longDescription = ''
       Landmarks is a simple profiling library for OCaml. It provides
@@ -28,8 +28,8 @@ buildDunePackage rec {
       instrumentation of the code may either done by hand, automatically or
       semi-automatically using the ppx pepreprocessor (see landmarks-ppx package).
     '';
-    changelog = "https://raw.githubusercontent.com/LexiFi/landmarks/refs/tags/v${version}/CHANGES.md";
+    changelog = "https://raw.githubusercontent.com/LexiFi/landmarks/refs/tags/v${finalAttrs.version}/CHANGES.md";
     maintainers = with lib.maintainers; [ kenran ];
     license = lib.licenses.mit;
   };
-}
+})

From 811e56f6b3c8a595256533ddbc143f8ebc043657 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:11 -0600
Subject: [PATCH 53/82] ocamlPackages.lastfm: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/lastfm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lastfm/default.nix b/pkgs/development/ocaml-modules/lastfm/default.nix
index 88d23138d571..85d077a31758 100644
--- a/pkgs/development/ocaml-modules/lastfm/default.nix
+++ b/pkgs/development/ocaml-modules/lastfm/default.nix
@@ -6,7 +6,7 @@
   xmlplaylist,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "lastfm";
   version = "0.3.4";
 
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-lastfm";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-1te9B2+sUmkT/i2K5ueswWAWpvJf9rXob0zR4CMOJlg=";
   };
 
@@ -30,4 +30,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl21Only;
     maintainers = with lib.maintainers; [ dandellion ];
   };
-}
+})

From 8cbc1fa865b0e6a4085c29167b73bd14b420e5ad Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:11 -0600
Subject: [PATCH 54/82] ocamlPackages.lens: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/lens/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lens/default.nix b/pkgs/development/ocaml-modules/lens/default.nix
index e0d1a0febd2a..a45e1c3074f4 100644
--- a/pkgs/development/ocaml-modules/lens/default.nix
+++ b/pkgs/development/ocaml-modules/lens/default.nix
@@ -7,7 +7,7 @@
   ounit,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "lens";
   version = "1.2.5";
 
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "pdonadeo";
     repo = "ocaml-lens";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "1k23n7pa945fk6nbaq6nlkag5kg97wsw045ghz4gqp8b9i2im3vn";
   };
 
@@ -37,4 +37,4 @@ buildDunePackage rec {
       kazcw
     ];
   };
-}
+})

From a5c0f24f161c75d802300172f857aa79f38e8af6 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:12 -0600
Subject: [PATCH 55/82] ocamlPackages.letsencrypt: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/letsencrypt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/letsencrypt/default.nix b/pkgs/development/ocaml-modules/letsencrypt/default.nix
index dd61aa9373ff..0966928123fd 100644
--- a/pkgs/development/ocaml-modules/letsencrypt/default.nix
+++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix
@@ -18,12 +18,12 @@
   domain-name,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "letsencrypt";
   version = "1.1.0";
 
   src = fetchurl {
-    url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-${version}.tbz";
+    url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${finalAttrs.version}/letsencrypt-${finalAttrs.version}.tbz";
     hash = "sha256-Iw55GffyG5tWA49hao1z9BX6p4N2+EKuhLIoOwG8EKM=";
   };
 
@@ -57,4 +57,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.sternenseemann ];
     homepage = "https://github.com/mmaker/ocaml-letsencrypt";
   };
-}
+})

From f3b04c66743257afe0839ac55783a2de56bab1c3 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:13 -0600
Subject: [PATCH 56/82] ocamlPackages.libc: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/libc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/libc/default.nix b/pkgs/development/ocaml-modules/libc/default.nix
index cd2501325ab9..0d51c6101b1b 100644
--- a/pkgs/development/ocaml-modules/libc/default.nix
+++ b/pkgs/development/ocaml-modules/libc/default.nix
@@ -5,12 +5,12 @@
   config,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "libc";
   version = "0.0.1";
 
   src = fetchurl {
-    url = "https://github.com/ocaml-sys/libc.ml/releases/download/${version}/libc-${version}.tbz";
+    url = "https://github.com/ocaml-sys/libc.ml/releases/download/${finalAttrs.version}/libc-${finalAttrs.version}.tbz";
     hash = "sha256-e5x5Yae7V6qOpq+aLZaV+6L9ldy9qDqd9Kc8nkAsENg=";
   };
 
@@ -23,4 +23,4 @@ buildDunePackage rec {
     homepage = "https://github.com/ocaml-sys/libc.ml";
     license = lib.licenses.mit;
   };
-}
+})

From fbb1f576d32a9473478dea1332ed2b9e111ddf9f Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:13 -0600
Subject: [PATCH 57/82] ocamlPackages.lilv: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/lilv/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lilv/default.nix b/pkgs/development/ocaml-modules/lilv/default.nix
index dbb2d71c1aa3..8d17d5230bf0 100644
--- a/pkgs/development/ocaml-modules/lilv/default.nix
+++ b/pkgs/development/ocaml-modules/lilv/default.nix
@@ -8,14 +8,14 @@
   lilv,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "lilv";
   version = "0.1.0";
 
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-lilv";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "080ja8c4sxprk5qnldpfzxriag57m9603vny3b4bnwh5xm1id08c";
   };
 
@@ -34,4 +34,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl21Only;
     maintainers = with lib.maintainers; [ dandellion ];
   };
-}
+})

From ddbacd27ed3387438cc2411776b1a22b5ca8a227 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:14 -0600
Subject: [PATCH 58/82] ocamlPackages.linenoise: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/linenoise/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/linenoise/default.nix b/pkgs/development/ocaml-modules/linenoise/default.nix
index 05596866b070..2ee7401e59af 100644
--- a/pkgs/development/ocaml-modules/linenoise/default.nix
+++ b/pkgs/development/ocaml-modules/linenoise/default.nix
@@ -5,7 +5,7 @@
   result,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "linenoise";
   version = "1.5.1";
 
@@ -13,8 +13,8 @@ buildDunePackage rec {
 
   src = fetchFromGitHub {
     owner = "fxfactorial";
-    repo = "ocaml-${pname}";
-    rev = "v${version}";
+    repo = "ocaml-linenoise";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-yWBWMbk1anXaF4hIakTOcRZFCYmxI0xG3bHFFOAyEDA=";
   };
 
@@ -24,6 +24,6 @@ buildDunePackage rec {
     description = "OCaml bindings to linenoise";
     license = lib.licenses.bsd3;
     maintainers = [ lib.maintainers.vbgl ];
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
   };
-}
+})

From 1d9de6ec2096980f8b7fc20112e73ea1dbcadc2e Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:14 -0600
Subject: [PATCH 59/82] ocamlPackages.lo: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/lo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lo/default.nix b/pkgs/development/ocaml-modules/lo/default.nix
index f5ee5cfecc2d..3c5f33194cf8 100644
--- a/pkgs/development/ocaml-modules/lo/default.nix
+++ b/pkgs/development/ocaml-modules/lo/default.nix
@@ -7,7 +7,7 @@
   liblo,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "lo";
   version = "0.2.0";
 
@@ -16,7 +16,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-lo";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "0mi8h6f6syxjkxz493l5c3l270pvxx33pz0k3v5465wqjsnppar2";
   };
 
@@ -36,4 +36,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl21Plus;
     maintainers = with lib.maintainers; [ dandellion ];
   };
-}
+})

From 51bbe94fad853d6ca1764046141a569a1003bac6 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:15 -0600
Subject: [PATCH 60/82] ocamlPackages.lru: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/lru/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lru/default.nix b/pkgs/development/ocaml-modules/lru/default.nix
index 74bb6c07f524..710c855619f2 100644
--- a/pkgs/development/ocaml-modules/lru/default.nix
+++ b/pkgs/development/ocaml-modules/lru/default.nix
@@ -7,14 +7,14 @@
   qcheck-alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "lru";
   version = "0.3.1";
 
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/pqwy/lru/releases/download/v${version}/lru-${version}.tbz";
+    url = "https://github.com/pqwy/lru/releases/download/v${finalAttrs.version}/lru-${finalAttrs.version}.tbz";
     hash = "sha256-bL4j0np9WyRPhpwLiBQNR/cPQTpkYu81wACTJdSyNv0=";
   };
 
@@ -29,4 +29,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.vbgl ];
     license = lib.licenses.isc;
   };
-}
+})

From e05f54e36c241d49269259386a7b664482009422 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:15 -0600
Subject: [PATCH 61/82] ocamlPackages.lua-ml: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/lua-ml/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lua-ml/default.nix b/pkgs/development/ocaml-modules/lua-ml/default.nix
index 45c0637e5de3..d358a7baf44e 100644
--- a/pkgs/development/ocaml-modules/lua-ml/default.nix
+++ b/pkgs/development/ocaml-modules/lua-ml/default.nix
@@ -3,7 +3,7 @@
   fetchFromGitHub,
   buildDunePackage,
 }:
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "lua-ml";
   version = "0.9.4";
 
@@ -12,14 +12,14 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "lindig";
     repo = "lua-ml";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-kMBTHzmlrRWNpWwG321jYcM61rE1J3YQkygSrfnZ6Wc=";
   };
 
   meta = {
     description = "Embeddable Lua 2.5 interpreter implemented in OCaml";
-    inherit (src.meta) homepage;
+    inherit (finalAttrs.src.meta) homepage;
     license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})

From ec5e4a8503a3a13ab0b6c6fff48ba272f68520f2 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:16 -0600
Subject: [PATCH 62/82] ocamlPackages.lun: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/lun/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lun/default.nix b/pkgs/development/ocaml-modules/lun/default.nix
index 4bf1820920b4..7e6c615f1663 100644
--- a/pkgs/development/ocaml-modules/lun/default.nix
+++ b/pkgs/development/ocaml-modules/lun/default.nix
@@ -4,14 +4,14 @@
   fetchurl,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "lun";
   version = "0.0.2";
 
   minimalOCamlVersion = "4.12.0";
 
   src = fetchurl {
-    url = "https://github.com/robur-coop/lun/releases/download/v${version}/lun-${version}.tbz";
+    url = "https://github.com/robur-coop/lun/releases/download/v${finalAttrs.version}/lun-${finalAttrs.version}.tbz";
     hash = "sha256-1oqjTXY+/jJT1uQOV6iiK9qV9DAmERYsL2BtentmB8I=";
   };
 
@@ -21,4 +21,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = [ ];
   };
-}
+})

From 914064d1bcc110f7001e0994f1efd14ed710ad61 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:17 -0600
Subject: [PATCH 63/82] ocamlPackages.lustre-v6: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/lustre-v6/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lustre-v6/default.nix b/pkgs/development/ocaml-modules/lustre-v6/default.nix
index 0ec69ec356a8..1feee8346625 100644
--- a/pkgs/development/ocaml-modules/lustre-v6/default.nix
+++ b/pkgs/development/ocaml-modules/lustre-v6/default.nix
@@ -8,14 +8,14 @@
   yaml,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "lustre-v6";
   version = "6.107.4";
 
   minimalOCamlVersion = "4.12";
 
   src = fetchurl {
-    url = "https://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.v${version}.tgz";
+    url = "https://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.v${finalAttrs.version}.tgz";
     hash = "sha256-baT5ZJtg5oFoJ5eHb3ISsmY6G31UG10KlNXC+ta+M1c=";
   };
 
@@ -36,4 +36,4 @@ buildDunePackage rec {
     ];
     mainProgram = "lv6";
   };
-}
+})

From f7586a37de5512e34560ce55f6c9d143d7dc24ec Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:17 -0600
Subject: [PATCH 64/82] ocamlPackages.lutils: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/lutils/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lutils/default.nix b/pkgs/development/ocaml-modules/lutils/default.nix
index 318d209a91d1..7091ae899f44 100644
--- a/pkgs/development/ocaml-modules/lutils/default.nix
+++ b/pkgs/development/ocaml-modules/lutils/default.nix
@@ -6,14 +6,14 @@
   num,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "lutils";
   version = "1.54.1";
 
   minimalOCamlVersion = "4.02";
 
   src = fetchurl {
-    url = "https://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lutils.v${version}.tgz";
+    url = "https://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lutils.v${finalAttrs.version}.tgz";
     hash = "sha512:d3c3b80286b1aa236ba922d9e18a133721fc80126c8b89520fb811dce9400e217aaa75b5d49e03988be7f6bf5f2e1a391d02ceeaa5ec0a0cd5ce218083a29514";
   };
 
@@ -25,8 +25,8 @@ buildDunePackage rec {
   meta = {
     homepage = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/";
     description = "Tools and libs shared by Verimag/synchronous tools (lustre, lutin, rdbg)";
-    changelog = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/-/releases/v${version}";
+    changelog = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/-/releases/v${finalAttrs.version}";
     license = lib.licenses.cecill21;
     mainProgram = "gnuplot-rif";
   };
-}
+})

From f3281bb0aeb963bd418c19bde7cda27c586af521 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:18 -0600
Subject: [PATCH 65/82] ocamlPackages.luv: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/luv/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/luv/default.nix b/pkgs/development/ocaml-modules/luv/default.nix
index 193edadb4b09..3360f9077a1c 100644
--- a/pkgs/development/ocaml-modules/luv/default.nix
+++ b/pkgs/development/ocaml-modules/luv/default.nix
@@ -14,12 +14,12 @@ let
       version,
       sha256,
     }:
-    buildDunePackage rec {
+    buildDunePackage (finalAttrs: {
       pname = "luv";
       inherit version;
 
       src = fetchurl {
-        url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz";
+        url = "https://github.com/aantron/luv/releases/download/${finalAttrs.version}/luv-${finalAttrs.version}.tar.gz";
         inherit sha256;
       };
 
@@ -52,7 +52,7 @@ let
           sternenseemann
         ];
       };
-    };
+    });
 in
 {
   luv-0-5-12 = generic {

From 3498fdb8b7ef77d7569d664f2638aa6b19aa4287 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:19 -0600
Subject: [PATCH 66/82] ocamlPackages.lwt_eio: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/lwt_eio/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/lwt_eio/default.nix b/pkgs/development/ocaml-modules/lwt_eio/default.nix
index d7bc05f2b648..8372d456cc1b 100644
--- a/pkgs/development/ocaml-modules/lwt_eio/default.nix
+++ b/pkgs/development/ocaml-modules/lwt_eio/default.nix
@@ -5,7 +5,6 @@
   eio,
   lwt,
 }:
-
 buildDunePackage (finalAttrs: {
   pname = "lwt_eio";
   version = if lib.versionAtLeast lwt.version "6.0.0" then "0.6" else "0.5.1";

From 8cffc04b3ecdf7ff30b6b538b3665cd5654e3175 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:20 -0600
Subject: [PATCH 67/82] ocamlPackages.lwt_ssl: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/lwt_ssl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lwt_ssl/default.nix b/pkgs/development/ocaml-modules/lwt_ssl/default.nix
index ec4ea72c53b5..d246011ba61c 100644
--- a/pkgs/development/ocaml-modules/lwt_ssl/default.nix
+++ b/pkgs/development/ocaml-modules/lwt_ssl/default.nix
@@ -6,14 +6,14 @@
   lwt,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "lwt_ssl";
   version = "1.2.0";
 
   duneVersion = "3";
 
   src = fetchurl {
-    url = "https://github.com/ocsigen/lwt_ssl/releases/download/${version}/lwt_ssl-${version}.tbz";
+    url = "https://github.com/ocsigen/lwt_ssl/releases/download/${finalAttrs.version}/lwt_ssl-${finalAttrs.version}.tbz";
     hash = "sha256-swIK0nrs83fhw/J0Cgizbcu6mR+EMGZRE1dBBUiImnc=";
   };
 
@@ -28,4 +28,4 @@ buildDunePackage rec {
     license = lib.licenses.lgpl21;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})

From 8c854899311d11e1d36d92bdff8a29f19a98833c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:21 -0600
Subject: [PATCH 68/82] ocamlPackages.macaddr: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/macaddr/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix
index 7de7d60b912c..aab3c3a79568 100644
--- a/pkgs/development/ocaml-modules/macaddr/default.nix
+++ b/pkgs/development/ocaml-modules/macaddr/default.nix
@@ -7,14 +7,14 @@
   ounit2,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "macaddr";
   version = "5.6.2";
 
   minimalOCamlVersion = "4.04";
 
   src = fetchurl {
-    url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz";
+    url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${finalAttrs.version}/ipaddr-${finalAttrs.version}.tbz";
     hash = "sha256-CKP6bmQRSQtmYeWxAinqnsa4w3OOn2slWFmxPxRb4TY=";
   };
 
@@ -30,4 +30,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = [ ];
   };
-}
+})

From d10ee51bd02d7815cf1b2371ca69e2b1b610883c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:21 -0600
Subject: [PATCH 69/82] ocamlPackages.mad: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/mad/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/mad/default.nix b/pkgs/development/ocaml-modules/mad/default.nix
index 172d10b4452b..a619c84fb9ca 100644
--- a/pkgs/development/ocaml-modules/mad/default.nix
+++ b/pkgs/development/ocaml-modules/mad/default.nix
@@ -6,7 +6,7 @@
   libmad,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mad";
   version = "0.5.3";
 
@@ -15,7 +15,7 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-mad";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-rSFzWyUYTrGL7GvVsY5qKdCXqY/XJQkuBerexG838jc=";
   };
 
@@ -28,4 +28,4 @@ buildDunePackage rec {
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ dandellion ];
   };
-}
+})

From f338dfad733732590e13007a45bf4b41c38bfa01 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:22 -0600
Subject: [PATCH 70/82] ocamlPackages.magic-mime: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/magic-mime/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix
index 9f2af3cea2f1..1ff4253ee077 100644
--- a/pkgs/development/ocaml-modules/magic-mime/default.nix
+++ b/pkgs/development/ocaml-modules/magic-mime/default.nix
@@ -4,12 +4,12 @@
   buildDunePackage,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "magic-mime";
   version = "1.3.1";
 
   src = fetchurl {
-    url = "https://github.com/mirage/ocaml-magic-mime/releases/download/v${version}/magic-mime-${version}.tbz";
+    url = "https://github.com/mirage/ocaml-magic-mime/releases/download/v${finalAttrs.version}/magic-mime-${finalAttrs.version}.tbz";
     hash = "sha256-4CNNA2Jduh76xY5X44dnLXWl6aYh/0ms/g9gnADxOwg=";
   };
 
@@ -21,4 +21,4 @@ buildDunePackage rec {
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ vbgl ];
   };
-}
+})

From cc903b8e2a81d526fda376754176b221a080f822 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:23 -0600
Subject: [PATCH 71/82] ocamlPackages.mccs: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/mccs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/mccs/default.nix b/pkgs/development/ocaml-modules/mccs/default.nix
index 00e27fd13e96..900d63944c58 100644
--- a/pkgs/development/ocaml-modules/mccs/default.nix
+++ b/pkgs/development/ocaml-modules/mccs/default.nix
@@ -5,14 +5,14 @@
   cudf,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mccs";
   version = "1.1+19";
 
   src = fetchFromGitHub {
     owner = "AltGr";
     repo = "ocaml-mccs";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-xvcqPXyzVGXXFYRVdFPaCfieFEguWffWVB04ImEuPvQ=";
   };
 
@@ -32,4 +32,4 @@ buildDunePackage rec {
     ];
     maintainers = [ ];
   };
-}
+})

From cbf5b74112ddad777f7a4a88984f83d3fab7e1a3 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:23 -0600
Subject: [PATCH 72/82] ocamlPackages.mec: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/mec/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/mec/default.nix b/pkgs/development/ocaml-modules/mec/default.nix
index 29ed1fc0e862..5e5f5dab15a9 100644
--- a/pkgs/development/ocaml-modules/mec/default.nix
+++ b/pkgs/development/ocaml-modules/mec/default.nix
@@ -12,11 +12,11 @@
   bisect_ppx,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mec";
   version = "0.1.0";
   src = fetchzip {
-    url = "https://gitlab.com/nomadic-labs/cryptography/ocaml-ec/-/archive/${version}/ocaml-ec-${version}.tar.bz2";
+    url = "https://gitlab.com/nomadic-labs/cryptography/ocaml-ec/-/archive/${finalAttrs.version}/ocaml-ec-${finalAttrs.version}.tar.bz2";
     sha256 = "sha256-uIcGj/exSfuuzsv6C/bnJXpYRu3OY3dcKMW/7+qwi2U=";
   };
 
@@ -48,4 +48,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.ulrikstrid ];
   };
-}
+})

From 3e3ca38c835b37b17a845941ef9490988fb3d7fb Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:24 -0600
Subject: [PATCH 73/82] ocamlPackages.melange-json: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/melange-json/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/melange-json/default.nix b/pkgs/development/ocaml-modules/melange-json/default.nix
index aa4df6c9ca33..1f0fc5ef4f2a 100644
--- a/pkgs/development/ocaml-modules/melange-json/default.nix
+++ b/pkgs/development/ocaml-modules/melange-json/default.nix
@@ -7,13 +7,13 @@
   ppxlib,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "melange-json";
   version = "2.0.0";
   src = fetchFromGitHub {
     owner = "melange-community";
     repo = "melange-json";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-vgcvPRc2vEHE1AtHyttvs1T0LcoeTOFfmPUCz95goT0=";
   };
 
@@ -29,4 +29,4 @@ buildDunePackage rec {
       lib.maintainers.vog
     ];
   };
-}
+})

From a4e3a5223be0c13378bf179a42fd053b10fd3c0f Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:24 -0600
Subject: [PATCH 74/82] ocamlPackages.mem_usage: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/mem_usage/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/mem_usage/default.nix b/pkgs/development/ocaml-modules/mem_usage/default.nix
index 613edfe0377f..b85cbff15636 100644
--- a/pkgs/development/ocaml-modules/mem_usage/default.nix
+++ b/pkgs/development/ocaml-modules/mem_usage/default.nix
@@ -4,14 +4,14 @@
   buildDunePackage,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mem_usage";
   version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-mem_usage";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-5tQNsqbiU9oJvKHUjeTo/ST4A0Axc95gdJISLaa9VRM=";
   };
 
@@ -25,4 +25,4 @@ buildDunePackage rec {
     description = "Cross-platform memory usage information";
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})

From 1ca0bf03f4f6680c44ed25c8166a540ba9f767af Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:25 -0600
Subject: [PATCH 75/82] ocamlPackages.memprof-limits: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/memprof-limits/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/memprof-limits/default.nix b/pkgs/development/ocaml-modules/memprof-limits/default.nix
index b250c6be3853..66af6ba1810f 100644
--- a/pkgs/development/ocaml-modules/memprof-limits/default.nix
+++ b/pkgs/development/ocaml-modules/memprof-limits/default.nix
@@ -5,14 +5,14 @@
   ocaml,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "memprof-limits";
   version = "0.2.1";
 
   src = fetchFromGitLab {
     owner = "gadmm";
-    repo = pname;
-    rev = "v${version}";
+    repo = "memprof-limits";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-Pmuln5TihPoPZuehZlqPfERif6lf7O+0454kW9y3aKc=";
   };
 
@@ -25,4 +25,4 @@ buildDunePackage rec {
     maintainers = with lib.maintainers; [ alizter ];
     broken = !(lib.versionOlder ocaml.version "5.0.0");
   };
-}
+})

From 183709c8462acefbff276ad5c1680a8a8279f3f7 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:26 -0600
Subject: [PATCH 76/82] ocamlPackages.memtrace: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/memtrace/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/memtrace/default.nix b/pkgs/development/ocaml-modules/memtrace/default.nix
index 8b50cf0712dd..783da4401b77 100644
--- a/pkgs/development/ocaml-modules/memtrace/default.nix
+++ b/pkgs/development/ocaml-modules/memtrace/default.nix
@@ -4,23 +4,23 @@
   fetchFromGitHub,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "memtrace";
   version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "janestreet";
-    repo = pname;
-    rev = "v${version}";
+    repo = "memtrace";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-dWkTrN8ZgNUz7BW7Aut8mfx8o4n8f6UZaDv/7rbbwNs=";
   };
 
   minimalOCamlVersion = "4.11";
 
   meta = {
-    homepage = "https://github.com/janestreet/${pname}";
+    homepage = "https://github.com/janestreet/memtrace";
     description = "Streaming client for OCaml's Memprof";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ niols ];
   };
-}
+})

From 4dc830660032c118699a71e128fb76da2b3cd6c2 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:26 -0600
Subject: [PATCH 77/82] ocamlPackages.merlin-extend: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/merlin-extend/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/merlin-extend/default.nix b/pkgs/development/ocaml-modules/merlin-extend/default.nix
index 7bc7f39005bf..4e9dd4ca48bf 100644
--- a/pkgs/development/ocaml-modules/merlin-extend/default.nix
+++ b/pkgs/development/ocaml-modules/merlin-extend/default.nix
@@ -5,12 +5,12 @@
   cppo,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "merlin-extend";
   version = "0.6.2";
 
   src = fetchurl {
-    url = "https://github.com/let-def/merlin-extend/releases/download/v${version}/merlin-extend-${version}.tbz";
+    url = "https://github.com/let-def/merlin-extend/releases/download/v${finalAttrs.version}/merlin-extend-${finalAttrs.version}.tbz";
     hash = "sha256-R1WOfzC2RGLyucgvt/eHEzrPoNUTJFK2rXhI4LD013k=";
   };
 
@@ -22,4 +22,4 @@ buildDunePackage rec {
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

From f54d106e6362b7ad9af4740cc88a74e6686dd3a2 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:27 -0600
Subject: [PATCH 78/82] ocamlPackages.metadata: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/metadata/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/metadata/default.nix b/pkgs/development/ocaml-modules/metadata/default.nix
index 1262f54cfafb..12f3d4d52584 100644
--- a/pkgs/development/ocaml-modules/metadata/default.nix
+++ b/pkgs/development/ocaml-modules/metadata/default.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "metadata";
   version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-metadata";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-g76R1ziRv3VDl0IEJOm626m/ywDz+qgHtQg0uPb0MCU=";
   };
 
@@ -23,4 +23,4 @@ buildDunePackage rec {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ dandellion ];
   };
-}
+})

From f8066c3efa1e5f734200c809ffb883350a617fc8 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:27 -0600
Subject: [PATCH 79/82] ocamlPackages.metrics: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/metrics/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/metrics/default.nix b/pkgs/development/ocaml-modules/metrics/default.nix
index 421f7b6e911a..4b9fa941dbea 100644
--- a/pkgs/development/ocaml-modules/metrics/default.nix
+++ b/pkgs/development/ocaml-modules/metrics/default.nix
@@ -6,14 +6,14 @@
   fmt,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "metrics";
   version = "0.5.0";
 
   minimalOCamlVersion = "4.04";
 
   src = fetchurl {
-    url = "https://github.com/mirage/metrics/releases/download/v${version}/metrics-${version}.tbz";
+    url = "https://github.com/mirage/metrics/releases/download/v${finalAttrs.version}/metrics-${finalAttrs.version}.tbz";
     sha256 = "sha256-3zVjgJCdBkYbzQl+9gY8qfPFE2X0dqeXwDZktTwFcV0=";
   };
 
@@ -30,4 +30,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.vbgl ];
   };
 
-}
+})

From a197a460ff8cf5b44191ad3ef3523f0620edd401 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:28 -0600
Subject: [PATCH 80/82] ocamlPackages.middleware: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/middleware/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/middleware/default.nix b/pkgs/development/ocaml-modules/middleware/default.nix
index 13371ab50e30..736b4a6ec0c1 100644
--- a/pkgs/development/ocaml-modules/middleware/default.nix
+++ b/pkgs/development/ocaml-modules/middleware/default.nix
@@ -5,14 +5,14 @@
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "middleware";
   version = "0.0.1";
 
   minimalOCamlVersion = "4.14.0";
 
   src = fetchurl {
-    url = "https://github.com/skolemlabs/middleware/releases/download/${version}/${pname}-${version}.tbz";
+    url = "https://github.com/skolemlabs/middleware/releases/download/${finalAttrs.version}/middleware-${finalAttrs.version}.tbz";
     hash = "sha256-zhLEGvyZiKrdBKWcEbB4PHvYzBlkrp1Ldnon0mP2Ypg=";
   };
 
@@ -25,8 +25,8 @@ buildDunePackage rec {
   meta = {
     description = "Composable stacked functions, which can respond to inner calls";
     homepage = "https://github.com/skolemlabs/middleware";
-    changelog = "https://github.com/skolemlabs/middleware/blob/${version}/CHANGES.md";
+    changelog = "https://github.com/skolemlabs/middleware/blob/${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sixstring982 ];
   };
-}
+})

From cab561198facd36aa0326d6b3ca3ab6eb627d3ef Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:29 -0600
Subject: [PATCH 81/82] ocamlPackages.mimic: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/mimic/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/mimic/default.nix b/pkgs/development/ocaml-modules/mimic/default.nix
index a17efdc45e42..fe351d2ddf94 100644
--- a/pkgs/development/ocaml-modules/mimic/default.nix
+++ b/pkgs/development/ocaml-modules/mimic/default.nix
@@ -12,14 +12,14 @@
   bigstringaf,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "mimic";
   version = "0.0.9";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
-    url = "https://github.com/dinosaure/mimic/releases/download/${version}/mimic-${version}.tbz";
+    url = "https://github.com/dinosaure/mimic/releases/download/${finalAttrs.version}/mimic-${finalAttrs.version}.tbz";
     hash = "sha256-lU3xzrVIqSKnhUQIhaXRamr39zXWw3DtNdM5EUtp4p8=";
   };
 
@@ -44,4 +44,4 @@ buildDunePackage rec {
     homepage = "https://github.com/mirage/ocaml-git";
     maintainers = [ lib.maintainers.sternenseemann ];
   };
-}
+})

From 10bf0cd38b56ac2e2472ecca19777bdfe8469bd8 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 22 Jan 2026 10:14:29 -0600
Subject: [PATCH 82/82] ocamlPackages.minttea: migrate to finalAttrs

---
 pkgs/development/ocaml-modules/minttea/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/minttea/default.nix b/pkgs/development/ocaml-modules/minttea/default.nix
index 3685f2d459b4..0d6bf937993d 100644
--- a/pkgs/development/ocaml-modules/minttea/default.nix
+++ b/pkgs/development/ocaml-modules/minttea/default.nix
@@ -6,14 +6,14 @@
   tty,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "minttea";
   version = "0.0.3";
 
   minimalOCamlVersion = "5.1";
 
   src = fetchurl {
-    url = "https://github.com/leostera/minttea/releases/download/${version}/minttea-${version}.tbz";
+    url = "https://github.com/leostera/minttea/releases/download/${finalAttrs.version}/minttea-${finalAttrs.version}.tbz";
     hash = "sha256-WEaJVCCvsmKcF8+yzovljt8dGWaIv4UmAr74jq6Vo9M=";
   };
 
@@ -25,8 +25,8 @@ buildDunePackage rec {
   meta = {
     description = "Fun, functional, and stateful way to build terminal apps in OCaml heavily inspired by Go's BubbleTea";
     homepage = "https://github.com/leostera/minttea";
-    changelog = "https://github.com/leostera/minttea/blob/${version}/CHANGES.md";
+    changelog = "https://github.com/leostera/minttea/blob/${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ sixstring982 ];
   };
-}
+})