From 7c7da63790c6707de67ff293fcedd997c466cbfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Sat, 9 Aug 2025 12:00:23 +0700
Subject: [PATCH 1/3] ocamlPackages.logs: ocamlPackages.logs: refactor to use
 buildTopkg

---
 .../ocaml-modules/logs/default.nix            | 63 ++++++++-----------
 1 file changed, 26 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix
index 2befcaa51dcc9..864ec2e970771 100644
--- a/pkgs/development/ocaml-modules/logs/default.nix
+++ b/pkgs/development/ocaml-modules/logs/default.nix
@@ -3,18 +3,17 @@
   stdenv,
   fetchurl,
   ocaml,
-  findlib,
-  ocamlbuild,
   topkg,
-  result,
-  lwt,
+  buildTopkgPackage,
+  cmdlinerSupport ? true,
   cmdliner,
-  fmt,
   fmtSupport ? lib.versionAtLeast ocaml.version "4.08",
-  js_of_ocaml-compiler,
+  fmt,
   jsooSupport ? true,
+  js_of_ocaml-compiler,
   lwtSupport ? true,
-  cmdlinerSupport ? true,
+  lwt,
+  result,
 }:
 let
   pname = "logs";
@@ -49,39 +48,29 @@ let
   optional_buildInputs = map (d: d.pkg) (lib.filter (d: d.enabled) optional_deps);
 in
 
-if lib.versionOlder ocaml.version "4.03" then
-  throw "logs is not available for OCaml ${ocaml.version}"
-else
-
-  stdenv.mkDerivation rec {
-    name = "ocaml${ocaml.version}-${pname}-${version}";
-    version = "0.8.0";
+buildTopkgPackage rec {
+  inherit pname;
+  version = "0.8.0";
 
-    src = fetchurl {
-      url = "${webpage}/releases/${pname}-${version}.tbz";
-      hash = "sha256-mmFRQJX6QvMBIzJiO2yNYF1Ce+qQS2oNF3+OwziCNtg=";
-    };
+  minimalOCamlVersion = "4.03";
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-      topkg
-    ];
-    buildInputs = [ topkg ] ++ optional_buildInputs;
-    propagatedBuildInputs = [ result ];
+  src = fetchurl {
+    url = "${webpage}/releases/${pname}-${version}.tbz";
+    hash = "sha256-mmFRQJX6QvMBIzJiO2yNYF1Ce+qQS2oNF3+OwziCNtg=";
+  };
 
-    strictDeps = true;
+  buildInputs = [ topkg ] ++ optional_buildInputs;
+  propagatedBuildInputs = [ result ];
 
-    buildPhase = "${topkg.run} build ${lib.escapeShellArgs enable_flags}";
+  strictDeps = true;
 
-    inherit (topkg) installPhase;
+  buildPhase = "${topkg.run} build ${lib.escapeShellArgs enable_flags}";
 
-    meta = with lib; {
-      description = "Logging infrastructure for OCaml";
-      homepage = webpage;
-      inherit (ocaml.meta) platforms;
-      maintainers = [ maintainers.sternenseemann ];
-      license = licenses.isc;
-    };
-  }
+  meta = with lib; {
+    description = "Logging infrastructure for OCaml";
+    homepage = webpage;
+    inherit (ocaml.meta) platforms;
+    maintainers = [ maintainers.sternenseemann ];
+    license = licenses.isc;
+  };
+}

From 0580fb2f9c4f940899907d34232d66e7c7a12b51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Tue, 12 Aug 2025 11:03:12 +0700
Subject: [PATCH 2/3] ocamlPackages.logs: remove result

---
 pkgs/development/ocaml-modules/logs/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix
index 864ec2e970771..9542778b53539 100644
--- a/pkgs/development/ocaml-modules/logs/default.nix
+++ b/pkgs/development/ocaml-modules/logs/default.nix
@@ -13,7 +13,6 @@
   js_of_ocaml-compiler,
   lwtSupport ? true,
   lwt,
-  result,
 }:
 let
   pname = "logs";
@@ -60,7 +59,6 @@ buildTopkgPackage rec {
   };
 
   buildInputs = [ topkg ] ++ optional_buildInputs;
-  propagatedBuildInputs = [ result ];
 
   strictDeps = true;
 

From 0d09262e2f921b160bf9fb29906499ee615bf0c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?=
 =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= <toastal@posteo.net>
Date: Sat, 9 Aug 2025 12:02:43 +0700
Subject: [PATCH 3/3] =?UTF-8?q?ocamlPackages.logs:=200.8.0=20=E2=86=92=200?=
 =?UTF-8?q?.9.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/logs/default.nix            | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix
index 9542778b53539..bbe31bcb13a9c 100644
--- a/pkgs/development/ocaml-modules/logs/default.nix
+++ b/pkgs/development/ocaml-modules/logs/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchurl,
   ocaml,
+  version ? if lib.versionAtLeast ocaml.version "4.14" then "0.9.0" else "0.8.0",
   topkg,
   buildTopkgPackage,
   cmdlinerSupport ? true,
@@ -15,6 +16,19 @@
   lwt,
 }:
 let
+  param =
+    {
+      "0.8.0" = {
+        minimalOCamlVersion = "4.03";
+        sha512 = "c34c67b00d6a989a2660204ea70db8521736d6105f15d1ee0ec6287a662798fe5c4d47075c6e7c84f5d5372adb5af5c4c404f79db70d69140af5e0ebbea3b6a5";
+      };
+      "0.9.0" = {
+        minimalOCamlVersion = "4.14";
+        sha512 = "b75fb28e83f33461b06b5c9b60972c4a9a9a1599d637b4a0c7b1e86a87f34fe5361e817cb31f42ad7e7cbb822473b28fab9f58a02870eb189ebe88dae8e045ff";
+      };
+    }
+    .${version};
+
   pname = "logs";
   webpage = "https://erratique.ch/software/${pname}";
 
@@ -46,16 +60,13 @@ let
   ]) optional_deps;
   optional_buildInputs = map (d: d.pkg) (lib.filter (d: d.enabled) optional_deps);
 in
-
-buildTopkgPackage rec {
-  inherit pname;
-  version = "0.8.0";
-
-  minimalOCamlVersion = "4.03";
+buildTopkgPackage {
+  inherit pname version;
+  inherit (param) minimalOCamlVersion;
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    hash = "sha256-mmFRQJX6QvMBIzJiO2yNYF1Ce+qQS2oNF3+OwziCNtg=";
+    inherit (param) sha512;
   };
 
   buildInputs = [ topkg ] ++ optional_buildInputs;