Skip to content

Commit a1db342

Browse files
committed
ocamlPackages: remove broken packages
Remove ocaml-freestanding and torch packages which have been marked broken since NixOS 24.05 and remain unfixed. - ocaml-freestanding: Not compatible with solo5 >= 0.7 - torch: Not compatible with libtorch >= 2.3.0 Per RFC 180, packages broken for a full release cycle are subject to removal. NixOS/rfcs#180
1 parent 1590e21 commit a1db342

8 files changed

Lines changed: 2 additions & 281 deletions

File tree

pkgs/development/ocaml-modules/mirage-crypto/default.nix

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
ounit2,
77
dune-configurator,
88
eqaf,
9-
withFreestanding ? false,
10-
ocaml-freestanding,
119
}:
1210

1311
buildDunePackage (finalAttrs: {
@@ -30,9 +28,6 @@ buildDunePackage (finalAttrs: {
3028
buildInputs = [ dune-configurator ];
3129
propagatedBuildInputs = [
3230
eqaf
33-
]
34-
++ lib.optionals withFreestanding [
35-
ocaml-freestanding
3631
];
3732

3833
meta = {

pkgs/development/ocaml-modules/mirage-crypto/ec.nix

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
lib,
32
buildDunePackage,
43
mirage-crypto,
54
dune-configurator,
@@ -12,8 +11,6 @@
1211
ppx_deriving_yojson,
1312
ppx_deriving,
1413
yojson,
15-
withFreestanding ? false,
16-
ocaml-freestanding,
1714
}:
1815

1916
buildDunePackage {
@@ -31,9 +28,6 @@ buildDunePackage {
3128
propagatedBuildInputs = [
3229
mirage-crypto
3330
mirage-crypto-rng
34-
]
35-
++ lib.optionals withFreestanding [
36-
ocaml-freestanding
3731
];
3832

3933
doCheck = true;

pkgs/development/ocaml-modules/ocaml-freestanding/configurable-binding.patch

Lines changed: 0 additions & 49 deletions
This file was deleted.

pkgs/development/ocaml-modules/ocaml-freestanding/default.nix

Lines changed: 0 additions & 93 deletions
This file was deleted.

pkgs/development/ocaml-modules/ocaml-freestanding/no-opam.patch

Lines changed: 0 additions & 47 deletions
This file was deleted.

pkgs/development/ocaml-modules/tcpip/default.nix

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
ipaddr-cstruct,
2727
lru,
2828
metrics,
29-
withFreestanding ? false,
30-
ocaml-freestanding,
3129
}:
3230

3331
buildDunePackage rec {
@@ -64,9 +62,6 @@ buildDunePackage rec {
6462
metrics
6563
arp
6664
mirage-flow
67-
]
68-
++ lib.optionals withFreestanding [
69-
ocaml-freestanding
7065
];
7166

7267
doCheck = true;

pkgs/development/ocaml-modules/torch/default.nix

Lines changed: 0 additions & 70 deletions
This file was deleted.

pkgs/top-level/ocaml-packages.nix

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,8 +1439,6 @@ let
14391439

14401440
ocaml_expat = callPackage ../development/ocaml-modules/expat { };
14411441

1442-
ocaml-freestanding = callPackage ../development/ocaml-modules/ocaml-freestanding { };
1443-
14441442
ocaml_gettext = callPackage ../development/ocaml-modules/ocaml-gettext { };
14451443

14461444
ocaml_libvirt = callPackage ../development/ocaml-modules/ocaml-libvirt { };
@@ -2113,10 +2111,6 @@ let
21132111

21142112
topkg = callPackage ../development/ocaml-modules/topkg { };
21152113

2116-
torch = callPackage ../development/ocaml-modules/torch {
2117-
torch = pkgs.libtorch-bin;
2118-
};
2119-
21202114
trace = callPackage ../development/ocaml-modules/trace { };
21212115

21222116
trace-tef = callPackage ../development/ocaml-modules/trace/tef.nix { };
@@ -2320,8 +2314,10 @@ let
23202314
dune_2 = pkgs.dune_2; # Added 2025-12-08
23212315
dune_3 = pkgs.dune_3; # Added 2025-12-08
23222316
gd4o = throw "ocamlPackages.gd4o is not maintained, use ocamlPackages.gd instead";
2317+
ocaml-freestanding = throw "ocamlPackages.ocaml-freestanding has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05
23232318
ocaml-vdom = throw "2023-10-09: ocamlPackages.ocaml-vdom was renamed to ocamlPackages.vdom";
23242319
ocaml_lwt = throw "ocamlPackages.ocaml_lwt has been renamed to ocamlPackages.lwt"; # Added 2025-12-05
2320+
torch = throw "ocamlPackages.torch has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05
23252321
}
23262322
)).overrideScope
23272323
liftJaneStreet;

0 commit comments

Comments
 (0)