diff --git a/pkgs/by-name/bi/bitwuzla/package.nix b/pkgs/by-name/bi/bitwuzla/package.nix index d85d0eed9f47a..62a0a657d3ec3 100644 --- a/pkgs/by-name/bi/bitwuzla/package.nix +++ b/pkgs/by-name/bi/bitwuzla/package.nix @@ -11,6 +11,7 @@ gtest, gmp, cadical, + cadical' ? cadical.override { version = "2.1.3"; }, cryptominisat, kissat, zlib, @@ -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 @@ -41,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - cadical + cadical' cryptominisat btor2tools symfpu diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 734fce6033640..0ef406d50b150 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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)