From 9494f24765d6f69de6e6bc9a030acebd8195462e Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 12 May 2025 20:37:27 +0200
Subject: [PATCH 1/3] ocamlPackages.systemd: replace `meta.platform` with
 `meta.platforms`

`platform` is not a valid attr in meta an makes check-meta fail
---
 pkgs/development/ocaml-modules/systemd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/systemd/default.nix b/pkgs/development/ocaml-modules/systemd/default.nix
index f729601d3a74..ce6410a282bd 100644
--- a/pkgs/development/ocaml-modules/systemd/default.nix
+++ b/pkgs/development/ocaml-modules/systemd/default.nix
@@ -16,7 +16,7 @@ buildDunePackage {
   minimalOCamlVersion = "4.06";
   propagatedBuildInputs = [ systemdLibs ];
   meta = {
-    platform = lib.platforms.linux;
+    platforms = lib.platforms.linux;
     description = "OCaml module for native access to the systemd facilities";
     license = lib.licenses.lgpl3Only;
     maintainers = [ lib.maintainers.atagen ];

From 6eec03acff37b43a7b4da3bac4dcde5f759a7f66 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 12 May 2025 20:59:49 +0200
Subject: [PATCH 2/3] ocamlPackages.janeStreet: recurseIntoAttrs

---
 pkgs/top-level/ocaml-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 5d74adccdaa9..deee9cbfb844 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -871,7 +871,7 @@ let
           else
             null;
 
-        janeStreet =
+        janeStreet = lib.recurseIntoAttrs (
           if lib.versionOlder "5.1" ocaml.version then
             import ../development/ocaml-modules/janestreet/0.17.nix {
               inherit self;
@@ -928,7 +928,8 @@ let
             }
           else
             import ../development/ocaml-modules/janestreet {
-            };
+            }
+        );
 
         javalib = callPackage ../development/ocaml-modules/javalib { };
 

From ab0b16dd05b55be93a259d16118578257784208a Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 19 Aug 2025 14:41:25 +0200
Subject: [PATCH 3/3] ocamlPackages: move removed packages behind allowAliases

---
 pkgs/top-level/ocaml-packages.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index deee9cbfb844..37c4a51e1878 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -11,7 +11,9 @@ let
   mkOcamlPackages =
     ocaml:
     (lib.makeScope newScope (
-      self: with self; {
+      self:
+      with self;
+      {
         inherit ocaml;
 
         ### A ###
@@ -118,8 +120,6 @@ let
 
         binning = callPackage ../development/ocaml-modules/binning { };
 
-        biocaml = throw "biocaml has been removed"; # 2025-06-04
-
         biotk = callPackage ../development/ocaml-modules/biotk { };
 
         bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { };
@@ -659,7 +659,6 @@ let
 
         gapi-ocaml = callPackage ../development/ocaml-modules/gapi-ocaml { };
 
-        gd4o = throw "ocamlPackages.gd4o is not maintained, use ocamlPackages.gd instead";
         gd = callPackage ../development/ocaml-modules/gd { inherit (pkgs) gd; };
 
         gen = callPackage ../development/ocaml-modules/gen { };
@@ -1427,8 +1426,6 @@ let
 
         ocaml-version = callPackage ../development/ocaml-modules/ocaml-version { };
 
-        ocaml-vdom = throw "2023-10-09: ocamlPackages.ocaml-vdom was renamed to ocamlPackages.vdom";
-
         ocamlbuild =
           if lib.versionOlder "4.03" ocaml.version then
             callPackage ../development/tools/ocaml/ocamlbuild { }
@@ -2224,6 +2221,11 @@ let
         ### End ###
 
       }
+      // lib.optionalAttrs config.allowAliases {
+        biocaml = throw "biocaml has been removed"; # 2025-06-04
+        gd4o = throw "ocamlPackages.gd4o is not maintained, use ocamlPackages.gd instead";
+        ocaml-vdom = throw "2023-10-09: ocamlPackages.ocaml-vdom was renamed to ocamlPackages.vdom";
+      }
     )).overrideScope
       liftJaneStreet;