Vendor in Nix derivation for bitwuzla-0.3.0
#7
Conversation
bitwuzla/default.nix
Outdated
| , stdenv ? pkgs.stdenv | ||
| , fetchFromGitHub ? pkgs.fetchFromGitHub | ||
| , lib ? pkgs.lib | ||
| , python3 ? pkgs.python3 | ||
| , meson ? pkgs.meson | ||
| , ninja ? pkgs.ninja | ||
| , git ? pkgs.git | ||
| , gmp ? pkgs.gmp | ||
| , gtest ? pkgs.gtest | ||
| , cadical ? pkgs.cadical | ||
| , symfpu ? pkgs.symfpu | ||
| , kissat ? pkgs.kissat | ||
| , cryptominisat ? pkgs.cryptominisat | ||
| , pkg-config ? pkgs.pkg-config | ||
| , writeTextDir ? pkgs.writeTextDir |
There was a problem hiding this comment.
This part was cargo-culted from NixOS/nixpkgs#246779. There's a lot of duplication here, so perhaps I ought to simply remove these as arguments to the derivation?
flake.nix
Outdated
| @@ -12,7 +12,7 @@ | |||
| # $ nix run github:GaloisInc/flakes#z3.v4_8_14 -- -version | |||
|
|
|||
| inputs = { | |||
| nixpkgs.url = "github:nixos/nixpkgs/22.05"; | |||
| nixpkgs.url = "github:nixos/nixpkgs/23.05"; | |||
There was a problem hiding this comment.
I needed to make this change to gain access to meson >= 0.64, which bitwuzla requires.
flake.nix
Outdated
| bitwuzla_unstable_2021_07_01 = { | ||
| url = "github:bitwuzla/bitwuzla/58d720598e359b1fdfec4a469c76f1d1f24db51a"; | ||
| flake = false; | ||
| }; |
There was a problem hiding this comment.
I removed this as an input, since I don't think we want to keep the unstable version around any more. That being said, I'm unclear if we should replace it with a bitwuzla-0.3.0–specific input of some kind.
|
Made various updates including adding newer versions of cvc5 and fixing boolector linkage with CaDiCaL. All solver versions now build successfully. |
|
Take a look and let me know if you have comments or concerns, @RyanGlScott ... github will not let me add you as a reviewer. |
|
I approve. (It's my own PR, so GitHub won't let me explicitly mark it for approval, but I approve nonetheless.) Let's land this! |
This was removed from the `flakes` repo in GaloisInc/flakes#7. The rationale is that odd Yices version numbers are development versions, and we only want to test release versions. `what4`'s CI was testing 2.6.1 (a development version), so let's just remove it.
This was removed from the `flakes` repo in GaloisInc/flakes#7. The rationale is that odd Yices version numbers are development versions, and we only want to test release versions. `what4`'s CI was testing 2.6.1 (a development version), so let's just remove it.
|
|
Fixes #6.