nix: Use HOL-Light from nixpkgs#1712
Closed
mkannwischer wants to merge 2 commits into
Closed
Conversation
Contributor
CBMC Results (ML-KEM-512)
Full Results (191 proofs)
|
Contributor
CBMC Results (ML-KEM-768)
Full Results (191 proofs)
|
Contributor
CBMC Results (ML-KEM-1024)
Full Results (191 proofs)
|
Update the nixpkgs input from nixos-25.11 to nixos-26.05 and adjust the flake to the new package set: - Default gcc changed from 14.3.0 to 15.2.0 - slothy: use the new pkgs.slothy from nixpkgs instead of the custom build; nix/slothy/default.nix now just re-exports it with a commented override for pinning a specific upstream revision. Drops the python3-for-slothy (unstable ortools) workaround. - hol_light: nixpkgs pins hol_light to the non-default OCaml 5.3 set (5.4.1 is the 26.05 default) and downgrades camlp5 to 8.03.2, which is not in the binary cache. Build against the default 5.4 set with the cached default camlp5 8.05.01 instead, and add patch 0007 so the pa_j chooser accepts camlp5 8.05 (mapped to pa_j_5.4_8.04.00.ml). - python: provide script dependencies (pyparsing, sympy, ...) via python3.withPackages instead of bare python3Packages entries in a symlinkJoin, which no longer reach sys.path. Fixes autogen's "No module named 'pyparsing'". - autogen: use the snake_case pyparsing API (parse_string/parse_all) to silence the deprecation warning from the newer pyparsing. - cbmc: bitwuzla version 0.8.2 -> 0.9.0. - autogen: Reformatted with newer ruff version - platform tests: Increase disk on x86 from 20 GiB to 30 GiB as nix derivation does not fit anymore otherwise. - clang 18: Clang 18 from 26.05 no longer compiles on MacOS - take it from the 24.05 channel instead. Signed-off-by: Matthias J. Kannwischer <matthias@zerorisc.com>
4b396e9 to
3c6a5db
Compare
14 tasks
3c6a5db to
d0e0eb5
Compare
Signed-off-by: Matthias J. Kannwischer <matthias@zerorisc.com>
d0e0eb5 to
e64d34d
Compare
Contributor
Author
|
My upstream changes have been merged and backported to 26.05, so we can include the changes in #1711. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.