Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-24.11] z3_4_12: 4.12.5 -> 4.12.6; z3_4_13: init at 4.13.4; fix Z3 builds #374875

Open
wants to merge 8 commits into
base: release-24.11
Choose a base branch
from

Conversation

numinit
Copy link
Contributor

@numinit numinit commented Jan 18, 2025

Backport of PR #327052 for NixOS 24.11 that doesn't change the default Z3 version.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

(cherry picked from commit 2cb20cb)
I also maintain KLEE and STP, and use z3.

(cherry picked from commit 5a15eec)
(cherry picked from commit ef1388f)
(cherry picked from commit fc7bc1d)
(cherry picked from commit 2ad2eed)
Original commit message by Reno Dakota (https://github.com/paparodeo),
rebased against latest z3 changes:

z3 contains a bunch of typos in never used functions. The update to
clang-19 now reports the typos -- wrong member function / variable
names.  There is an upstream patch which fixes some of these:

Z3Prover/z3@2ce89e5

And the others we patch or remove as the upstream code has since been
modified.

(cherry picked from commit df99435)
(cherry picked from commit c556717)
@numinit numinit force-pushed the backport-327052-to-release-24.11 branch from f8cca0c to 0bbf8a1 Compare January 18, 2025 19:54
@numinit numinit removed the request for review from sternenseemann January 18, 2025 19:54
@numinit
Copy link
Contributor Author

numinit commented Jan 18, 2025

Didn't need the Haskell commit in the backport, so you're strictly optional @sternenseemann :-)

@numinit numinit requested a review from emilytrau January 18, 2025 21:40
@numinit
Copy link
Contributor Author

numinit commented Feb 1, 2025

Bumping for a merge @emilytrau :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant