[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
Conversation
This file contains 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
numinit
force-pushed
the
backport-327052-to-release-24.11
branch
from
f8cca0c to
0bbf8a1
Compare
|
Didn't need the Haskell commit in the backport, so you're strictly optional @sternenseemann :-) |
|
Bumping for a merge @emilytrau :-) |
|
Instead of adding a separate commit to reverse the default version change, could you amend this to the commit that did the bump? This will give a clean history, and no matter which commit you'll end up checking out in the future - there will be no temporary version bump here. This will cause the cherry-pick job to fail, but that's fine - the CI output of that job will let us know exactly how you deviated from the cherry-pick to confirm. |
|
Sure thing. |
(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
force-pushed
the
backport-327052-to-release-24.11
branch
from
0bbf8a1 to
c9fada0
Compare
|
Thanks for the tip - I feel like this happens with long-running PR series more often. Should be good now! |
|
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.
Backport of PR #327052 for NixOS 24.11 that doesn't change the default Z3 version.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.