Commit 41cf466
committed
nix: repair flake for Nix 2.35 / macOS 26, take provers from nixpkgs
The flake had rotted against current toolchains:
- `nixpkgs` declared both a URL and a `follows`; Nix >= 2.25 rejects
the ambiguity (the `follows` was what the lock resolved all along).
- The opam `conf-git` check had no git in its build environment; give
it one via the overlay, like the existing `conf-pkg-config` fix.
- opam-nix (2025-01) referenced `darwin.apple_sdk`, removed from
nixpkgs, and its pinned nixpkgs shipped binaries that macOS 26's
dyld rejects (duplicate LC_RPATH). Update opam-nix to 2026-06,
re-pinning opam-repository to the previous revision so the OCaml
package set (4.14.2, why3 1.8.0) is unchanged.
- The pinned provers (z3 4.12.6, cvc4 1.8, cvc5 1.0.9) no longer
compile with the clang 19 that comes with the newer nixpkgs. Take
z3 (4.15.1) and cvc5 (1.3.0) directly from nixpkgs and drop cvc4
(archived upstream), removing the source pins and the
mkProverPackage machinery.
- ci: bump install-nix-action to v31 so CI exercises a current Nix
(v26's would not have caught the input conflict), cachix-action
to v17.1 parent 0096d84 commit 41cf466
3 files changed
Lines changed: 94 additions & 101 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
94 | 94 | | |
95 | 95 | | |
96 | 96 | | |
97 | | - | |
| 97 | + | |
98 | 98 | | |
99 | 99 | | |
100 | 100 | | |
101 | | - | |
| 101 | + | |
102 | 102 | | |
103 | 103 | | |
104 | 104 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
8 | 7 | | |
9 | 8 | | |
10 | 9 | | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | 10 | | |
26 | 11 | | |
27 | 12 | | |
| |||
57 | 42 | | |
58 | 43 | | |
59 | 44 | | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
60 | 48 | | |
61 | 49 | | |
62 | 50 | | |
| |||
71 | 59 | | |
72 | 60 | | |
73 | 61 | | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | 62 | | |
82 | 63 | | |
83 | 64 | | |
84 | 65 | | |
85 | 66 | | |
86 | 67 | | |
87 | | - | |
88 | | - | |
89 | | - | |
| 68 | + | |
| 69 | + | |
90 | 70 | | |
91 | 71 | | |
92 | 72 | | |
93 | 73 | | |
94 | | - | |
| 74 | + | |
95 | 75 | | |
96 | 76 | | |
97 | 77 | | |
| |||
0 commit comments