diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 4aecf9f766d..f76f89f91ed 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2133,7 +2133,7 @@ point and then, after each tween step, plugging back the result.") (("check_target\\(gtest_main\\)") "") (("check_target\\(gmock\\)") ""))))))) (native-inputs - (list googletest)) + (list googletest-1.12)) (home-page "https://abseil.io") (synopsis "Augmented C++ standard library") (description "Abseil is a collection of C++ library code designed to @@ -2146,7 +2146,7 @@ Google's C++ code base.") (package (inherit base) (name "abseil-cpp") - (version "20250127.1") + (version "20250814.1") (source (origin (method git-fetch) (uri (git-reference @@ -2155,7 +2155,7 @@ Google's C++ code base.") (file-name (git-file-name name version)) (sha256 (base32 - "0r2j360csym12jlgmcy92rgwdmng63shchxvfmln3j5402lv0g21")) + "1wm2271hwy2pnfv9b5iy0y9xvbhiwffdf9i6s3dn89k630wh6928")) (patches (search-patches "abseil-cpp-20220623.1-no-kepsilon-i686.patch")))) (arguments @@ -2179,7 +2179,28 @@ Google's C++ code base.") (setenv "CTEST_OUTPUT_ON_FAILURE" "1") (invoke "ctest" "-E" "absl_symbolize_test|absl_log_format_test"))))) - #~())))))))) + #~()))))) + (native-inputs + (modify-inputs (package-native-inputs base) + (replace "googletest" googletest)))))) + +(define-public abseil-cpp-20250127 + (let ((base abseil-cpp)) + (package + (inherit base) + (name "abseil-cpp") + (version "20250127.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/abseil/abseil-cpp") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0r2j360csym12jlgmcy92rgwdmng63shchxvfmln3j5402lv0g21")) + (patches + (search-patches "abseil-cpp-20220623.1-no-kepsilon-i686.patch"))))))) (define (abseil-cpp-for-c++-standard base version) (hidden-package diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 819f248bd16..50e2efe8962 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1904,7 +1904,7 @@ with a single function call.") #:outputs `(("out" . ,#$output:python))))))))) (outputs (list "out" "python")) (inputs - (list abseil-cpp + (list abseil-cpp-20250127 boost cpuinfo dlpack diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 9643990f95d..f8341dba55b 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -441,7 +441,7 @@ MPD servers, search and multimedia key support.") (define-public ashuffle (package (name "ashuffle") - (version "3.13.4") + (version "3.14.9") (source (origin (method git-fetch) (uri (git-reference @@ -450,7 +450,7 @@ MPD servers, search and multimedia key support.") (file-name (git-file-name name version)) (sha256 (base32 - "09dvar0aglyy2h9y115ymgryd8l6npc2y2ccdzij0b70f47ncqmf")))) + "06n0mk8cxsw5ycmzxmvwykz7pf6k67qj5g1l8jjwckn7289ll3ba")))) (native-inputs (list pkg-config)) (inputs (list abseil-cpp-cxxstd17 @@ -463,7 +463,13 @@ MPD servers, search and multimedia key support.") #~'("-Dtests=enabled" "-Dunsupported_use_system_absl=true" "-Dunsupported_use_system_gtest=true" - "-Dunsupported_use_system_yamlcpp=true"))) + "-Dunsupported_use_system_yamlcpp=true") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-dependencies + (lambda _ + (substitute* "meson.build" + (("'absl_low_level_hash',") ""))))))) (home-page "https://github.com/joshkunz/ashuffle") (synopsis "Automatic library-wide shuffle for mpd") (description "ashuffle is an application for automatically shuffling your