summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2023-08-21 22:26:10 +0200
committerVincent Laporte <vbgl@users.noreply.github.com>2023-08-22 11:55:34 +0200
commita16f7eb56e88c8985fcc6eb81dabd6cade4e425a (patch)
tree57d90784b92494f76011cdb467c079595997b9ea
parentgitlab-runner: 16.2.1 -> 16.3.0 (diff)
downloadnixpkgs-a16f7eb56e88c8985fcc6eb81dabd6cade4e425a.tar.gz
ocamlPackages.hack_parallel: fix for OCaml 5.0
(cherry picked from commit e55d51881ea16623b1efb799f5c002ee3c78e379)
-rw-r--r--pkgs/development/ocaml-modules/hack_parallel/default.nix18
1 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/development/ocaml-modules/hack_parallel/default.nix b/pkgs/development/ocaml-modules/hack_parallel/default.nix
index 6ce3288f647b..8ed2011b31c8 100644
--- a/pkgs/development/ocaml-modules/hack_parallel/default.nix
+++ b/pkgs/development/ocaml-modules/hack_parallel/default.nix
@@ -3,7 +3,6 @@
buildDunePackage rec {
pname = "hack_parallel";
version = "1.0.1";
- duneVersion = "3";
minimalOCamlVersion = "4.08";
src = fetchFromGitHub {
@@ -15,6 +14,23 @@ buildDunePackage rec {
patches = [ ./hack_parallel.patch ];
+ postPatch = ''
+ substituteInPlace src/third-party/hack_core/hack_caml.ml --replace 'include Pervasives' ""
+ substituteInPlace \
+ src/interface/hack_parallel_intf.mli \
+ src/procs/worker.ml \
+ src/third-party/hack_core/hack_core_list.ml \
+ src/third-party/hack_core/hack_result.ml* \
+ src/utils/collections/myMap.ml \
+ src/utils/daemon.ml* \
+ src/utils/exit_status.ml \
+ src/utils/hack_path.ml \
+ src/utils/measure.ml \
+ src/utils/timeout.ml \
+ --replace Pervasives. Stdlib.
+ substituteInPlace src/utils/sys_utils.ml --replace String.create Bytes.create
+ '';
+
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ core core_unix sqlite ];