diff options
Diffstat (limited to 'pkgs/applications/science/logic/boolector')
-rw-r--r-- | pkgs/applications/science/logic/boolector/cmake-gtest.patch | 16 | ||||
-rw-r--r-- | pkgs/applications/science/logic/boolector/default.nix | 19 |
2 files changed, 8 insertions, 27 deletions
diff --git a/pkgs/applications/science/logic/boolector/cmake-gtest.patch b/pkgs/applications/science/logic/boolector/cmake-gtest.patch deleted file mode 100644 index 61a64d3abbbf..000000000000 --- a/pkgs/applications/science/logic/boolector/cmake-gtest.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/cmake/googletest-download.cmake b/cmake/googletest-download.cmake -index 0ec4d558..d0910313 100644 ---- a/cmake/googletest-download.cmake -+++ b/cmake/googletest-download.cmake -@@ -9,10 +9,7 @@ ExternalProject_Add( - googletest - SOURCE_DIR "@GOOGLETEST_DOWNLOAD_ROOT@/googletest-src" - BINARY_DIR "@GOOGLETEST_DOWNLOAD_ROOT@/googletest-build" -- GIT_REPOSITORY -- https://github.com/google/googletest.git -- GIT_TAG -- release-1.10.0 -+ URL REPLACEME - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 1d7e01c553b6..d23db163aeb6 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -4,34 +4,31 @@ stdenv.mkDerivation rec { pname = "boolector"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "boolector"; repo = "boolector"; rev = version; - sha256 = "1smcy6yp8wvnw2brgnv5bf40v87k4v4fbdbrhi7987vja632k50z"; + hash = "sha256-CdfpXUbU1+yEmrNyl+hvHlJfpzzzx356naim6vRafDg="; }; patches = [ - # present in master - remove after 3.2.2 + # present in master - remove after 3.2.3 (fetchpatch { - name = "fix-parser-getc-char-casts.patch"; - url = "https://github.com/Boolector/boolector/commit/cc3a70918538c1e71ea5e7273fa1ac098da37c1b.patch"; - sha256 = "0pjvagcy74vxa2q75zbshcz8j7rvhl98549xfcf5y8yyxf5h8hyq"; + name = "update-unit-tests-to-cpp-14.patch"; + url = "https://github.com/Boolector/boolector/commit/cc13f371c0c5093d98638ddd213dc835ef3aadf3.patch"; + hash = "sha256-h8DBhAvUu+wXBwmvwRhHnJv3XrbEpBpvX9D1FI/+avc="; }) ]; - postPatch = '' - sed s@REPLACEME@file://${gtest.src}@ ${./cmake-gtest.patch} | patch -p1 - ''; - - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake gtest ]; buildInputs = [ lingeling btor2tools gmp ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DUSE_LINGELING=YES" + "-DBtor2Tools_INCLUDE_DIR=${btor2tools.dev}/include/btor2parser" ] ++ (lib.optional (gmp != null) "-DUSE_GMP=YES"); nativeCheckInputs = [ python3 ]; |