mldonkey: migrate to OCaml 4.13

This commit is contained in:
Weijia Wang 2023-01-11 12:22:50 +01:00 committed by Peter Hoeg
parent 16ef918b42
commit 0b9f9e8621
3 changed files with 9 additions and 1 deletions

View File

@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
url = "https://github.com/ygrek/mldonkey/pull/66/commits/20ff84c185396f3d759cf4ef46b9f0bd33a51060.patch";
hash = "sha256-MCqx0jVfOaLkZhhv0b1cTdO6BK2/f6TxTWmx+NZjXME=";
})
# Fixes OCaml 4.12 compat
(fetchpatch {
url = "https://github.com/ygrek/mldonkey/commit/a153f0f7a4826d86d51d4bacedc0330b70fcbc34.patch";
hash = "sha256-/Muk3mPFjQJ48FqaozGa7o8YSPhDLXRz9K1EyfxlzC8=";
})
];
preConfigure = ''

View File

@ -30882,7 +30882,9 @@ with pkgs;
mjpg-streamer = callPackage ../applications/video/mjpg-streamer { };
mldonkey = callPackage ../applications/networking/p2p/mldonkey {
ocamlPackages = ocaml-ng.ocamlPackages_4_08;
ocamlPackages = ocaml-ng.mkOcamlPackages (ocaml-ng.ocamlPackages_4_13.ocaml.override {
unsafeStringSupport = true;
});
};
mlvwm = callPackage ../applications/window-managers/mlvwm { };

View File

@ -1640,6 +1640,7 @@ let
in let inherit (pkgs) callPackage; in rec
{
inherit mkOcamlPackages;
ocamlPackages_4_00_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.00.1.nix { });