From 6d35a341f85f743b1eff5722b600edcfcc779204 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Wed, 8 May 2024 00:18:12 +0800 Subject: [PATCH] cbmc: 5.91.0 -> 5.95.1 --- .../0001-Do-not-download-sources-in-cmake.patch | 14 +++++++------- pkgs/applications/science/logic/cbmc/default.nix | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch b/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch index 181214093ef8..c209ed059e44 100644 --- a/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch +++ b/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch @@ -1,4 +1,4 @@ -From 206084d2e08198b0b5b67733c407bd3fb74affb1 Mon Sep 17 00:00:00 2001 +From 714f5ebe9ade721abdccf58edfcddba52465cb8d Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Sun, 2 Jul 2023 22:43:27 +0800 Subject: [PATCH] Do not download sources in cmake @@ -8,7 +8,7 @@ Subject: [PATCH] Do not download sources in cmake 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/solvers/CMakeLists.txt b/src/solvers/CMakeLists.txt -index 8bfcf4d13c..6ba858a461 100644 +index daa0853a57..4bcbbdaa47 100644 --- a/src/solvers/CMakeLists.txt +++ b/src/solvers/CMakeLists.txt @@ -123,16 +123,6 @@ foreach(SOLVER ${sat_impl}) @@ -16,11 +16,11 @@ index 8bfcf4d13c..6ba858a461 100644 message(STATUS "Building solvers with cadical") - download_project(PROJ cadical -- URL https://github.com/arminbiere/cadical/archive/rel-1.5.3.tar.gz -- PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/../scripts/cadical-1.5.3-patch +- URL https://github.com/arminbiere/cadical/archive/rel-1.7.2.tar.gz +- PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/../scripts/cadical-1.7.2-patch - COMMAND cmake -E copy ${CBMC_SOURCE_DIR}/../scripts/cadical_CMakeLists.txt CMakeLists.txt - COMMAND ./configure -- URL_MD5 265b1a715000ed3c5b6de36ddd1278a0 +- URL_MD5 be646831a017f81b300664e58deba1b5 - ) - - add_subdirectory(${cadical_SOURCE_DIR} ${cadical_BINARY_DIR}) @@ -32,10 +32,10 @@ index 8bfcf4d13c..6ba858a461 100644 target_include_directories(solvers PUBLIC ${cadical_SOURCE_DIR}/src -+ ${cadical_INCLUDE_DIR} ++ ${cadical_INCLUDE_DIR} ) target_link_libraries(solvers cadical) -- -2.40.1 +2.42.0 diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index 6a878735bb3d..dcf5b5bb37fa 100644 --- a/pkgs/applications/science/logic/cbmc/default.nix +++ b/pkgs/applications/science/logic/cbmc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cbmc"; - version = "5.91.0"; + version = "5.95.1"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-7DzhGEDS9T6WIjGoxOw9Gf/q+tYNFJDPbQUBV3tbn/I="; + sha256 = "sha256-fDLSo5EeHyPTliAqFp+5mfaB0iZXIMXeMyF21fjl5k4="; }; nativeBuildInputs = [ @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { license = licenses.bsdOriginal; maintainers = with maintainers; [ jiegec ]; platforms = platforms.unix; - # https://github.com/diffblue/cbmc/issues/7423 - broken = stdenv.isLinux && stdenv.isAarch64; + # error: no member named 'aligned_alloc' in the global namespace + broken = stdenv.isDarwin && stdenv.isx86_64; }; }