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 ]; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5d74adccdaa9..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 { }; @@ -871,7 +870,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 +927,8 @@ let } else import ../development/ocaml-modules/janestreet { - }; + } + ); javalib = callPackage ../development/ocaml-modules/javalib { }; @@ -1426,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 { } @@ -2223,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;