cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #219883 from wegank/mldonkey-ocaml

Browse source 
mldonkey: migrate to OCaml 4.14
This commit is contained in:
Weijia Wang 2023-03-06 23:57:29 +02:00 committed by GitHub
commit 87eb883435
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/networking/p2p/mldonkey/default.nix
View file

@ -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 = {

2
pkgs/top-level/all-packages.nix
View file

@ -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;
});
};