Unverified Commit 87eb8834 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #219883 from wegank/mldonkey-ocaml 

mldonkey: migrate to OCaml 4.14
parents 14e9a2a7 d61ab745

pkgs/applications/networking/p2p/mldonkey/default.nix

+6 −1
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;















    });















  };