Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 2 deletions pkgs/by-name/bi/bitwuzla/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
gtest,
gmp,
cadical,
cadical' ? cadical.override { version = "2.1.3"; },
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice trick. I usually avoid such ? defaults on callPackage args, however I think we can be confident a ' (prime) suffixed name won't get supplied from the auto-args pkgs.

cryptominisat,
kissat,
zlib,
Expand All @@ -26,11 +27,12 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "bitwuzla";
repo = "bitwuzla";
rev = finalAttrs.version;
tag = finalAttrs.version;
hash = "sha256-v5r+BWXUUbKtkos6qmGMC9MMytS/h759SHY6lsTHU1k=";
};

strictDeps = true;
__structuredAttrs = true;

nativeBuildInputs = [
meson
Expand All @@ -41,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
];

buildInputs = [
cadical
cadical'
cryptominisat
btor2tools
symfpu
Expand Down
4 changes: 0 additions & 4 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12530,10 +12530,6 @@ with pkgs;
ocamlPackages = ocaml-ng.ocamlPackages_4_12;
};

bitwuzla = callPackage ../by-name/bi/bitwuzla/package.nix {
cadical = cadical.override { version = "2.1.3"; };
};

inherit
(callPackage ./rocq-packages.nix {
inherit (ocaml-ng)
Expand Down
Loading