From 69e6f91ed189151671c4922658df66ff81c3e161 Mon Sep 17 00:00:00 2001 From: Mrmaxmeier Date: Tue, 4 Oct 2022 18:10:43 +0000 Subject: [PATCH 1/2] bitwuzla: build with SymFPU --- pkgs/applications/science/logic/bitwuzla/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/applications/science/logic/bitwuzla/default.nix index 82bfbd6dc3fe..467eeb5c8d9b 100644 --- a/pkgs/applications/science/logic/bitwuzla/default.nix +++ b/pkgs/applications/science/logic/bitwuzla/default.nix @@ -5,6 +5,7 @@ , cmake , lingeling , btor2tools +, symfpu , gtest , gmp , cadical @@ -35,12 +36,14 @@ stdenv.mkDerivation rec { picosat minisat btor2tools + symfpu gmp zlib ] ++ lib.optional withLingeling lingeling; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" + "-DUSE_SYMFPU=ON" "-DPicoSAT_INCLUDE_DIR=${lib.getDev picosat}/include/picosat" "-DBtor2Tools_INCLUDE_DIR=${lib.getDev btor2tools}/include/btor2parser" "-DBtor2Tools_LIBRARIES=${lib.getLib btor2tools}/lib/libbtor2parser${stdenv.hostPlatform.extensions.sharedLibrary}" From 18663fd1c1132d659d8f68d101b14a96b5857b2e Mon Sep 17 00:00:00 2001 From: Mrmaxmeier Date: Tue, 4 Oct 2022 18:11:00 +0000 Subject: [PATCH 2/2] bitwuzla: unstable-2022-08-07 -> unstable-2022-10-03 We're dropping -DUSE_SYMFPU because the new Bitwuzla version has a hard requirement on SymFPU. --- pkgs/applications/science/logic/bitwuzla/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/applications/science/logic/bitwuzla/default.nix index 467eeb5c8d9b..cc8651f69cfa 100644 --- a/pkgs/applications/science/logic/bitwuzla/default.nix +++ b/pkgs/applications/science/logic/bitwuzla/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "bitwuzla"; - version = "unstable-2022-08-07"; + version = "unstable-2022-10-03"; src = fetchFromGitHub { owner = "bitwuzla"; repo = "bitwuzla"; - rev = "b6fb61736a5cf70cd0b35ec4aeeadf23971610ce"; - hash = "sha256-T5VnnWrcZ8K1NjFf5eeg0TRpXBLRCxC67v8zWPwYF/Y="; + rev = "3bc0f9f1aca04afabe1aff53dd0937924618b2ad"; + hash = "sha256-UXZERl7Nedwex/oUrcf6/GkDSgOQ537WDYm117RfvWo="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DUSE_SYMFPU=ON" "-DPicoSAT_INCLUDE_DIR=${lib.getDev picosat}/include/picosat" "-DBtor2Tools_INCLUDE_DIR=${lib.getDev btor2tools}/include/btor2parser" "-DBtor2Tools_LIBRARIES=${lib.getLib btor2tools}/lib/libbtor2parser${stdenv.hostPlatform.extensions.sharedLibrary}"