diff --git a/pkgs/development/ocaml-modules/ocaml-r/default.nix b/pkgs/development/ocaml-modules/ocaml-r/default.nix index 9dc2aa7505be..4399befb2314 100644 --- a/pkgs/development/ocaml-modules/ocaml-r/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-r/default.nix @@ -1,6 +1,6 @@ { lib, - fetchFromGitHub, + fetchurl, fetchpatch, buildDunePackage, pkg-config, @@ -12,24 +12,22 @@ buildDunePackage (finalAttrs: { pname = "ocaml-r"; - version = "0.6.0"; + version = "0.7.0"; - duneVersion = "3"; - - minimalOCamlVersion = "4.08"; - - src = fetchFromGitHub { - owner = "pveber"; - repo = "ocaml-r"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-jPyVMxjeh9+xu0dD1gelAxcOhxouKczyvzVoKZ5oSrs="; + src = fetchurl { + url = "https://github.com/pveber/ocaml-r/releases/download/v${finalAttrs.version}/ocaml-r-${finalAttrs.version}.tbz"; + hash = "sha256-nbO36z/bSMb2vQjW5A9O2hjuF2RVzefFN53l/u3KF+o="; }; - # Finds R and Rmathlib separately + # Compatibility with R 4.6 patches = [ (fetchpatch { - url = "https://github.com/pveber/ocaml-r/commit/aa96dc5.patch"; - sha256 = "sha256-xW33W2ciesyUkDKEH08yfOXv0wP0V6X80or2/n2Nrb4="; + url = "https://github.com/pveber/ocaml-r/commit/c70704dd9ff1ed6b4035beef3316dc95275aaf4f.patch"; + hash = "sha256-I3SX+6gVo9l7epeFhtae8Ji4q51mr53sv7MPxvRBdJg="; + }) + (fetchpatch { + url = "https://github.com/pveber/ocaml-r/commit/c90ce656bd55236e74907f2ef5bc70ff11a0cedc.patch"; + hash = "sha256-ACU4d8Npq1IXR3hysk6npHHU8ZRcAgRkHg/c+Sb8dkM="; }) ]; @@ -48,7 +46,7 @@ buildDunePackage (finalAttrs: { meta = { description = "OCaml bindings for the R interpreter"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/pveber/ocaml-r/"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.bcdarwin ]; };