diff --git a/pkgs/by-name/cb/cbmc/0002-Do-not-download-sources-in-cmake.patch b/pkgs/by-name/cb/cbmc/0002-Do-not-download-sources-in-cmake.patch index c45b65e80f6e..9a5c365285df 100644 --- a/pkgs/by-name/cb/cbmc/0002-Do-not-download-sources-in-cmake.patch +++ b/pkgs/by-name/cb/cbmc/0002-Do-not-download-sources-in-cmake.patch @@ -27,12 +27,12 @@ index ab8d111..d7165e2 100644 message(STATUS "Building solvers with cadical") download_project(PROJ cadical -- URL https://github.com/arminbiere/cadical/archive/rel-2.0.0.tar.gz +- URL https://github.com/arminbiere/cadical/archive/rel-3.0.0.tar.gz + SOURCE_DIR @srccadical@ - PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/scripts/cadical-2.0.0-patch + PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/scripts/cadical-3.0.0-patch COMMAND cmake -E copy ${CBMC_SOURCE_DIR}/scripts/cadical_CMakeLists.txt CMakeLists.txt COMMAND ./configure -- URL_MD5 9fc2a66196b86adceb822a583318cc35 +- URL_HASH SHA256=282b1c9422fde8631cb721b86450ae94df4e8de0545c17a69a301aaa4bf92fcf ) add_subdirectory(${cadical_SOURCE_DIR} ${cadical_BINARY_DIR}) @@ -40,11 +40,11 @@ index ab8d111..d7165e2 100644 message(STATUS "Building with IPASIR solver linking against: CaDiCaL") download_project(PROJ cadical -- URL https://github.com/arminbiere/cadical/archive/rel-2.0.0.tar.gz +- URL https://github.com/arminbiere/cadical/archive/rel-3.0.0.tar.gz + SOURCE_DIR @srccadical@ - PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/scripts/cadical-2.0.0-patch + PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/scripts/cadical-3.0.0-patch COMMAND ./configure -- URL_MD5 9fc2a66196b86adceb822a583318cc35 +- URL_HASH SHA256=282b1c9422fde8631cb721b86450ae94df4e8de0545c17a69a301aaa4bf92fcf ) message(STATUS "Building CaDiCaL") diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix index 77c0d72ce4e7..ca8059681e24 100644 --- a/pkgs/by-name/cb/cbmc/package.nix +++ b/pkgs/by-name/cb/cbmc/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cbmc"; - version = "6.8.0"; + version = "6.9.0"; src = fetchFromGitHub { owner = "diffblue"; repo = "cbmc"; tag = "cbmc-${finalAttrs.version}"; - hash = "sha256-PT6AYiwkplCeyMREZnGZA0BKl4ZESRC02/9ibKg7mYU="; + hash = "sha256-SMJBnzoyTwcwJa9L2X1iX2W4Z/Mwoirf8EXfoyG0dRI="; }; srcglucose = fetchFromGitHub { @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { srccadical = (cadical.override { - version = "2.0.0"; + version = "3.0.0"; }).src; nativeBuildInputs = [