Skip to content

Commit 1bd54cf

Browse files
mkannwischerrod-chapman
authored andcommitted
nix: update to z3 4.15.3
Port of https://github.com/pq-code-package/mlkem-native/pull/1282/files Signed-off-by: Matthias J. Kannwischer <[email protected]>
1 parent 8e74a84 commit 1bd54cf

File tree

2 files changed

+3
-38
lines changed

2 files changed

+3
-38
lines changed

nix/cbmc/default.nix

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,34 +30,13 @@ buildEnv {
3030
litani = callPackage ./litani.nix { }; # 1.29.0
3131
cbmc-viewer = callPackage ./cbmc-viewer.nix { }; # 3.11
3232
z3 = z3.overrideAttrs (old: rec {
33-
version = "4.12.6";
33+
version = "4.15.3";
3434
src = fetchFromGitHub {
3535
owner = "Z3Prover";
3636
repo = "z3";
37-
rev = "z3-4.12.6";
38-
hash = "sha256-X4wfPWVSswENV0zXJp/5u9SQwGJWocLKJ/CNv57Bt+E=";
37+
rev = "z3-4.15.3";
38+
hash = "sha256-Lw037Z0t0ySxkgMXkbjNW5CB4QQLRrrSEBsLJqiomZ4=";
3939
};
40-
41-
static-matrix-patch = fetchpatch {
42-
name = "gcc-15-fixes.patch";
43-
url = "https://github.com/Z3Prover/z3/commit/2ce89e5f491fa817d02d8fdce8c62798beab258b.patch";
44-
hash = "sha256-UvrUL27o/w1/sH/hO7bmvVupg3vbSjEqoIpoZh2BOhg=";
45-
includes = [ "src/math/lp/static_matrix.h" ];
46-
};
47-
48-
static-matrix-def-patch = fetchpatch {
49-
# clang / gcc fixes. fixes typos in some member names
50-
name = "gcc-15-fixes.patch";
51-
url = "https://github.com/Z3Prover/z3/commit/2ce89e5f491fa817d02d8fdce8c62798beab258b.patch";
52-
includes = [ "src/math/lp/static_matrix_def.h" ];
53-
hash = "sha256-rEH+UzylzyhBdtx65uf8QYj5xwuXOyG6bV/4jgKkXGo=";
54-
};
55-
56-
patches = [
57-
./z3-lower-bound-typo.patch
58-
static-matrix-def-patch
59-
static-matrix-patch
60-
];
6140
});
6241

6342
inherit

nix/cbmc/z3-lower-bound-typo.patch

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)