diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-03-06 23:57:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-06 23:57:29 +0200 |
| commit | 87eb883435f47830696ae868fdf861a5d1270b29 (patch) | |
| tree | 9b6e8ffb9598553759f57cd71b0514910d9c414c | |
| parent | 14e9a2a7ef75adfc4703c36e7187ce7645673306 (diff) | |
| parent | d61ab7452c9652b0b6051f1a2a9f7da38d67dceb (diff) | |
Merge pull request #219883 from wegank/mldonkey-ocaml
mldonkey: migrate to OCaml 4.14
| -rw-r--r-- | pkgs/applications/networking/p2p/mldonkey/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 1291caa088ff..7bc5e2f59679 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { url = "https://github.com/ygrek/mldonkey/commit/a153f0f7a4826d86d51d4bacedc0330b70fcbc34.patch"; hash = "sha256-/Muk3mPFjQJ48FqaozGa7o8YSPhDLXRz9K1EyfxlzC8="; }) + # Fixes OCaml 4.14 compat + (fetchpatch { + url = "https://github.com/FabioLolix/AUR-artifacts/raw/6721c2d4ef0be9a99499ecf2787e378e50b915e9/mldonkey-fix-build.patch"; + hash = "sha256-HPW/CKfhywy+Km5/64Iok4tO9LJjAk53jVlsYzIRPfs="; + }) ]; preConfigure = '' @@ -28,7 +33,7 @@ stdenv.mkDerivation rec { ''; strictDeps = true; - nativeBuildInputs = with ocamlPackages; [ ocaml camlp4]; + nativeBuildInputs = with ocamlPackages; [ ocaml camlp4 ]; buildInputs = (with ocamlPackages; [ num ]) ++ [ zlib ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f2ef63b7bb6..5d7fa20a7195 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31564,7 +31564,7 @@ with pkgs; mjpg-streamer = callPackage ../applications/video/mjpg-streamer { }; mldonkey = callPackage ../applications/networking/p2p/mldonkey { - ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_13.ocaml.override { + ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_14.ocaml.override { unsafeStringSupport = true; }); }; |