nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-18 05:39:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

hol_light: 0-unstable-2026-05-19 -> 0-unstable-2026-09-02 (#558986)

Browse Source
This commit is contained in:
Vincent Laporte
2026-09-02 08:52:57 +00:00
committed by GitHub
parent 954478d3c2 bac0471256
commit 3cd47d2b3c
2 changed files with 5 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/by-name/ho/hol_light/0001-pa_j-accept-camlp5-8.05-for-OCaml-5.4.patch
View File

@@ -1,22 +0,0 @@
From: "Matthias J. Kannwischer" <matthias@zerorisc.com>
Date: Sat, 30 May 2026 16:37:44 +0800
Subject: pa_j: accept camlp5 8.05 for OCaml 5.4
Signed-off-by: Matthias J. Kannwischer <matthias@zerorisc.com>
---
pa_j/chooser.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pa_j/chooser.sh b/pa_j/chooser.sh
index 5ec8d00..de5c8c8 100755
--- a/pa_j/chooser.sh
+++ b/pa_j/chooser.sh
@@ -20,7 +20,7 @@ CAMLP5_FULL_VERSION=`camlp5 -v 2>&1 | cut -f3 -d' ' | cut -f1-3 -d'.' | cut -f1
if test ${OCAML_BINARY_VERSION} = "3.0"
then echo "pa_j_${OCAML_VERSION}.ml"
-elif test ${CAMLP5_FULL_VERSION} = "8.04.00"
+elif test ${CAMLP5_BINARY_VERSION} = "8.04" -o ${CAMLP5_BINARY_VERSION} = "8.05"
then
if test ${OCAML_BINARY_VERSION} = "5.4"
then echo "pa_j_5.4_8.04.00.ml"

12
pkgs/by-name/ho/hol_light/package.nix
View File

@@ -4,13 +4,13 @@
fetchFromGitHub,
makeBinaryWrapper,
writeText,
ocaml-ng,
ocamlPackages,
ledit,
bash,
}:
let
inherit (ocaml-ng.ocamlPackages_5_4)
inherit (ocamlPackages)
ocaml
findlib
zarith
@@ -37,18 +37,16 @@ in
stdenv.mkDerivation {
pname = "hol_light";
version = "0-unstable-2026-05-19";
version = "0-unstable-2026-09-02";
src = fetchFromGitHub {
owner = "jrh13";
repo = "hol-light";
rev = "9b510bc76da4cecf6e509be44d327c9236ec273f";
hash = "sha256-QaTDrGHpHvEde2AK/SD7eM+bAC9vN5o+dQqW1oau1Yo=";
rev = "72f2059e632021b940636156925a7500a3f253fd";
hash = "sha256-oLIqXHwukYyJBgbglIWVcY6S5fJoWnefxMQmcwoOpek=";
};
patches = [
# Accept camlp5 8.05 in the pa_j chooser; submitted upstream.
./0001-pa_j-accept-camlp5-8.05-for-OCaml-5.4.patch
# Link findlib into ocaml-hol so `#use "topfind"` works in the sandbox.
./0002-link-findlib-into-ocaml-hol.patch
];