Skip to content

nix: Pin z3 to upstream commit 286b107 #1127

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.

Sign up for GitHub

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

Draft
mkannwischer wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

nix: Pin z3 to upstream commit 286b107 #1127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cfbd62
nix: Pin z3 to upstream commit 286b107
mkannwischer May 22, 2026
1da0e32
CBMC: Switch polyvec_matrix_pointwise_montgomery_row to z3_smt_only
mkannwischer May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
pkgs-unstable = inputs.nixpkgs-unstable.legacyPackages.${system};
pkgs-2405 = inputs.nixpkgs-2405.legacyPackages.${system};
util = pkgs.callPackage ./nix/util.nix {
inherit (pkgs) bitwuzla z3;
inherit (pkgs-unstable) cbmc;
inherit (pkgs) bitwuzla;
inherit (pkgs-unstable) cbmc z3;
# TODO: switch back to stable python3 for slothy once ortools is fixed in 25.11
python3-for-slothy = pkgs-unstable.python3;
};
Expand Down Expand Up @@ -240,8 +240,8 @@
pkgs-unstable = inputs.nixpkgs-unstable.legacyPackages.x86_64-linux;
util = pkgs.callPackage ./nix/util.nix {
inherit pkgs;
inherit (pkgs) bitwuzla z3;
inherit (pkgs-unstable) cbmc;
inherit (pkgs) bitwuzla;
inherit (pkgs-unstable) cbmc z3;
# TODO: switch back to stable python3 for slothy once ortools is fixed in 25.11
python3-for-slothy = pkgs-unstable.python3;
};
Expand Down
6 changes: 3 additions & 3 deletions nix/cbmc/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ buildEnv {
litani = callPackage ./litani.nix { }; # 1.29.0
cbmc-viewer = callPackage ./cbmc-viewer.nix { }; # 3.12
z3 = z3.overrideAttrs (_: {
version = "4.15.3";
version = "4.17.0";
src = fetchFromGitHub {
owner = "Z3Prover";
repo = "z3";
rev = "z3-4.15.3";
hash = "sha256-Lw037Z0t0ySxkgMXkbjNW5CB4QQLRrrSEBsLJqiomZ4=";
rev = "286b107d7da5d357b76d318e8b23eb9aa219d143";
hash = "sha256-Qjb/YK5TxU0WKF3RPJ/pUmxB2qqgPnY3OSRSkKM/s3c=";
};
});

Expand Down
4 changes: 2 additions & 2 deletions proofs/cbmc/polyvec_matrix_pointwise_montgomery_row/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ USE_DYNAMIC_FRAMES=1

# Disable any setting of EXTERNAL_SAT_SOLVER, and choose SMT backend instead
EXTERNAL_SAT_SOLVER=
CBMCFLAGS=--external-smt2-solver $(PROOF_ROOT)/lib/z3_no_bv_extract --z3
CBMCFLAGS=--external-smt2-solver $(PROOF_ROOT)/lib/z3_smt_only --z3

FUNCTION_NAME = polyvec_matrix_pointwise_montgomery_row

Expand All @@ -44,7 +44,7 @@ FUNCTION_NAME = polyvec_matrix_pointwise_montgomery_row
EXPENSIVE = true

# This function is large enough to need...
CBMC_OBJECT_BITS = 11
CBMC_OBJECT_BITS = 8

# If you require access to a file-local ("static") function or object to conduct
# your proof, set the following (and do not include the original source file
Expand Down
Loading