diff options
Diffstat (limited to 'pkgs/applications/science/logic/hol_light/default.nix')
-rw-r--r-- | pkgs/applications/science/logic/hol_light/default.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 9f379252fd529..5f4bc89db397c 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runtimeShell, fetchFromGitHub, fetchpatch, ocaml, num, camlp5 }: +{ lib, stdenv, runtimeShell, fetchFromGitHub, fetchpatch, ocaml, findlib, num, camlp5, camlp-streams }: let load_num = @@ -15,19 +15,23 @@ let exec ${ocaml}/bin/ocaml \ -I \`${camlp5}/bin/camlp5 -where\` \ ${load_num} \ + -I ${camlp-streams}/lib/ocaml/${ocaml.version}/site-lib/camlp-streams camlp_streams.cma -init make.ml ''; in +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "hol_light is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation { pname = "hol_light"; - version = "unstable-2019-10-06"; + version = "unstable-2023-07-21"; src = fetchFromGitHub { owner = "jrh13"; repo = "hol-light"; - rev = "5c91b2ded8a66db571824ecfc18b4536c103b23e"; - sha256 = "0sxsk8z08ba0q5aixdyczcx5l29lb51ba4ip3d2fry7y604kjsx6"; + rev = "29b3e114f5c166584f4fbcfd1e1f9b13a25b7349"; + hash = "sha256-Z5/4dCfLRwLMHBmth3xMdFW1M6NzUT/aPEEwSz1/S2E="; }; patches = [ @@ -39,8 +43,8 @@ stdenv.mkDerivation { strictDeps = true; - nativeBuildInputs = [ ocaml camlp5 ]; - propagatedBuildInputs = [ num ]; + nativeBuildInputs = [ ocaml findlib camlp5 ]; + propagatedBuildInputs = [ camlp-streams num ]; installPhase = '' mkdir -p "$out/lib/hol_light" "$out/bin" |