guix_mirror_bot pushed a commit to branch master
in repository guix.
commit ef878e0e702030b3927d2ef3c067cb79eb546294
Author: Andreas Enge <[email protected]>
AuthorDate: Sat Jun 20 22:27:57 2026 +0200
gnu: catch2: Rename to catch2-2.
* gnu/packages/check.scm (catch2): Rename to...
(catch2-2): ...this.
(rapidcheck): Adapt inputs.
* gnu/packages/animation.scm (pencil2d),
* gnu/packages/audio.scm (libkeyfinder),
* gnu/packages/chemistry.scm (python-pymol),
gnu/packages/cpp.scm (xdgpp, icecream-cpp, span, chaiscript, json-dto,
rapidfuzz-cpp, libexpected, zug, lager, cli11, cpp-mustache,
tl-optional, type-safe),
* gnu/packages/engineering.scm (valeronoi, libigl),
* gnu/packages/geo.scm (mapnik),
* gnu/packages/maths.scm (osqp),
* gnu/packages/networking.scm (cppzmq),
* gnu/packages/python-science.scm (python-openpmd-api),
* gnu/packages/security-token.scm (libnitrokey): Adapt inputs.
Change-Id: Icd92b5aa0491911d5eeb5faf7b1d467e1e85fdc7
---
gnu/packages/animation.scm | 2 +-
gnu/packages/audio.scm | 2 +-
gnu/packages/check.scm | 6 +++---
gnu/packages/chemistry.scm | 2 +-
gnu/packages/cpp.scm | 26 +++++++++++++-------------
gnu/packages/engineering.scm | 4 ++--
gnu/packages/geo.scm | 2 +-
gnu/packages/maths.scm | 2 +-
gnu/packages/networking.scm | 2 +-
gnu/packages/python-science.scm | 2 +-
gnu/packages/security-token.scm | 4 ++--
11 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index 699e73ec5d..4977ed6f54 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -373,7 +373,7 @@ waveform until they line up with the proper sounds.")
(add-after 'unpack 'fix-tests
(lambda _
;; Its bundled catch2-2.5.0 fails to build with glibc-2.35.
- (copy-file #$(file-append catch2 "/include/catch2/catch.hpp")
+ (copy-file #$(file-append catch2-2 "/include/catch2/catch.hpp")
"tests/src/catch.hpp")))
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 8532e12174..96e69c14b5 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -5493,7 +5493,7 @@ stretching and pitch scaling of audio. This package
contains the library.")
(base32 "0nvhdzy0m3bchk3dpnspv2f518p2v9fjcrv36z1sva1pv9a2g35w"))))
(build-system cmake-build-system)
(native-inputs
- (list catch2))
+ (list catch2-2))
(inputs
(list fftw))
(home-page "https://mixxxdj.github.io/libkeyfinder/";)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index c30d4f3125..cb8fe8548b 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -697,7 +697,7 @@ multi-paradigm automated test framework for C++ and
Objective-C.")
a multi-paradigm automated test framework for C++ and Objective-C.")
(license license:boost1.0)))
-(define-public catch2
+(define-public catch2-2
(package
(name "catch2")
(version "2.13.10")
@@ -3547,10 +3547,10 @@ provides a simple way to achieve this.")
"-DRC_ENABLE_TESTS=on")))
(build-system cmake-build-system)
(inputs (list boost
- catch2
+ catch2-2
doctest
googletest))
- (native-inputs (list catch2 googletest))
+ (native-inputs (list catch2-2 googletest))
(home-page "https://github.com/emil-e/rapidcheck";)
(synopsis "Property based testing framework for C++")
(description "Rapidcheck is a property based testing framework for C++.
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index b00057d740..2905a36bd5 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -812,7 +812,7 @@ quantum chemistry (and molecular mechanics) softwares.")
python-pyqt
glm
netcdf))
- (native-inputs (list cmake-minimal catch2 python-pytest python-setuptools))
+ (native-inputs (list cmake-minimal catch2-2 python-pytest
python-setuptools))
(propagated-inputs (list python-numpy-1))
(home-page "https://pymol.org";)
(synopsis "Molecular visualization system")
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 3447773759..e3cec2025a 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -913,7 +913,7 @@ advanced instruction sets including AVX-512, APX, and
AVX10.2.")
(sha256
(base32 "1w8da10whrhc7j82jf90814m3blabkl9s0kg8hv8h2fj5y3ji7hw"))))
(build-system gnu-build-system)
- (native-inputs (list catch2))
+ (native-inputs (list catch2-2))
(arguments
(list
#:test-target "test"
@@ -978,7 +978,7 @@ mathematical functions operating on batches.")
(arguments
(list
#:configure-flags #~(list "-DCMAKE_CXX_STANDARD=17")))
- (native-inputs (list boost catch2))
+ (native-inputs (list boost catch2-2))
(home-page "https://github.com/renatoGarcia/icecream-cpp";)
(synopsis "C++ library for @code{printf} debugging")
(description
@@ -1057,7 +1057,7 @@ distribute with your projects
(install-file "../source/include/tcb/span.hpp"
(string-append #$output "/include")))))))
(native-inputs
- (list catch2))
+ (list catch2-2))
(home-page "https://github.com/tcbrindle/span";)
(synopsis "C++20's @code{std::span} shim for older compilers")
(description "This package provides a single-header implementation of
@@ -1330,7 +1330,7 @@ successor of hyprland-qtutils.")
(substitute* "unittests/type_info_test.cpp"
(("catch[.]hpp") "catch2/catch.hpp"))))))
(build-system cmake-build-system)
- (inputs (list catch2))
+ (inputs (list catch2-2))
(home-page "https://chaiscript.com/";)
(synopsis "Embedded scripting language designed for C++")
(description
@@ -1476,7 +1476,7 @@ and EETF.")
(add-after 'unpack 'change-directory
(lambda _
(chdir "dev"))))))
- (native-inputs (list catch2))
+ (native-inputs (list catch2-2))
(propagated-inputs (list rapidjson)) ;#include'd
(home-page "https://github.com/Stiffstream/json_dto";)
(synopsis "JSON to C++ structures conversion library")
@@ -2084,7 +2084,7 @@ library.")
(arguments
(list
#:configure-flags #~(list "-DRAPIDFUZZ_BUILD_TESTING=ON")))
- (native-inputs (list catch2))
+ (native-inputs (list catch2-2))
(home-page "https://github.com/rapidfuzz/rapidfuzz-cpp";)
(synopsis "Rapid fuzzy string matching using the Levenshtein Distance")
(description
@@ -2944,7 +2944,7 @@ services including database, analytic, and machine
learning technologies.")
(patches (search-patches "libexpected-use-provided-catch2.patch"))))
(build-system cmake-build-system)
(native-inputs
- (list catch2))
+ (list catch2-2))
(synopsis "C++11/14/17 std::expected with functional-style extensions")
(description "@code{std::expected} is proposed as the preferred way to
represent objects which will either have an expected value, or an unexpected
@@ -3036,7 +3036,7 @@ written in C++.")
#:phases
#~(modify-phases %standard-phases
(replace 'check (assoc-ref gnu:%standard-phases 'check)))))
- (native-inputs (list boost catch2))
+ (native-inputs (list boost catch2-2))
(home-page "https://sinusoid.es/zug";)
(synopsis "Higher-order sequence transformers")
(description "Zug is a C++ library providing transducers, that is,
@@ -3067,7 +3067,7 @@ composable sequential transformations.")
(delete-file-recursively "test/event_loop")))
(replace 'check (assoc-ref gnu:%standard-phases
'check)))))
(inputs (list boost-1.83 immer zug))
- (native-inputs (list catch2 cereal))
+ (native-inputs (list catch2-2 cereal))
(home-page "https://sinusoid.es/lager";)
(synopsis "Library for value-oriented design")
(description "Lager is a library for value-oriented design implementing
@@ -3186,7 +3186,7 @@ standards.")
#~(list "-DCLI11_SINGLE_FILE=OFF"
"-DCLI11_BUILD_EXAMPLES=OFF")))
(native-inputs
- (list catch2 doxygen googletest))
+ (list catch2-2 doxygen googletest))
(synopsis "Command line parser for C++11")
(description
"CLI11 is a command line parser for C++11 and beyond that provides a rich
@@ -3835,7 +3835,7 @@ std::function:
(install-file "../source/mustache.hpp"
(string-append (assoc-ref outputs "out")
"/include")))))))
- (native-inputs (list catch2))
+ (native-inputs (list catch2-2))
(home-page "https://github.com/kainjow/Mustache";)
(synopsis "Mustache text templates for modern C++")
(description "@code{cpp-mustache} is a Mustache implementation for C++ 11
@@ -5023,7 +5023,7 @@ on @code{.po} files and doesn't need @code{.mo} files
pre-generated.")
((".*http.*catchorg/Catch2.*") "")
(("FetchContent_MakeAvailable\\(Catch2\\)")
"find_package(Catch2 REQUIRED)")))))))
- (native-inputs (list catch2))
+ (native-inputs (list catch2-2))
(home-page "https://github.com/TartanLlama/optional";)
(synopsis "Implementation of std::optional with extensions for
C++11/14/17")
(description "@code{tl::optional} provides a single-header implementation
of
@@ -5082,7 +5082,7 @@ C++23.")
(string-append prefix " PATHS \""
#$(this-package-input "debug-assert")
"/lib/cmake/debug_assert\")"))))))))
- (native-inputs (list catch2))
+ (native-inputs (list catch2-2))
(inputs (list debug-assert))
(home-page "https://github.com/foonathan/type_safe";)
(synopsis "C++ abstractions for preventing bugs via the type system")
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index cac944dcd9..5fee6b0f72 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -1095,7 +1095,7 @@ with the kernel and various utilities such as per-cpu
counters.")
qtbase
qtsvg
qtwayland))
- (native-inputs (list catch2))
+ (native-inputs (list catch2-2))
(home-page "https://github.com/ccoors/Valeronoi";)
(synopsis "WiFi mapping companion application for Valetudo")
(description
@@ -3874,7 +3874,7 @@ perform various useful functions such as:
"predicates"
"xml"))))))))
- (native-inputs (list catch2))
+ (native-inputs (list catch2-2))
;; XXX: Inputs are currently only used to build tests.
;; We would need to patch the CMake recipe to build a shared library
;; with all of these.
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 2c24607aeb..c1ce559449 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1554,7 +1554,7 @@ content models.")
(("^include.*Catch2_SOURCE_DIR.*contrib/Catch.cmake.*")
"include(Catch)\n")))))))
(native-inputs
- (list catch2
+ (list catch2-2
pkg-config
postgresql))
(inputs
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index e341418e30..51730de17c 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -6487,7 +6487,7 @@ Fresnel integrals, and similar related functions as
well.")
(("GIT_TAG v2.13.6")
"")))))))
(native-inputs
- (list catch2
+ (list catch2-2
python-wrapper ;You need python installed to generate unittests.
python-numpy ;You need numpy ...
python-scipy ;You need scipy ...
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 44b0fc1f32..37283b8d1c 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1641,7 +1641,7 @@ between different versions of ØMQ.")
(native-inputs
(list pkg-config))
(inputs
- (list catch2 zeromq))
+ (list catch2-2 zeromq))
(home-page "https://zeromq.org";)
(synopsis "C++ bindings for the ØMQ messaging library")
(description
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index d208099757..16c963a3b0 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -2565,7 +2565,7 @@ aggregated sum and more.")
#:configure-flags
#~(list "-DopenPMD_SUPERBUILD=OFF")))
(native-inputs
- (list catch2
+ (list catch2-2
python-numpy))
(inputs
(list hdf5
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 4caaded52e..6f604c4acd 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -1006,7 +1006,7 @@ to the @code{python-yubikey-manager} package.")
(arguments
;; These tests do not require any device to be connected
'(#:configure-flags (list "-DCOMPILE_OFFLINE_TESTS=ON")))
- (native-inputs (list catch2 doxygen graphviz pkg-config))
+ (native-inputs (list catch2-2 doxygen graphviz pkg-config))
(inputs (list hidapi libusb))
(home-page "https://github.com/Nitrokey/libnitrokey";)
(synopsis "Communication library for Nitrokey")
@@ -1028,7 +1028,7 @@ to the @code{python-yubikey-manager} package.")
"0z39f8w0zvra874az0f67ck1al9kbpaidpilggbl8jnfs05010ck"))))
(build-system cmake-build-system)
(native-inputs (list pkg-config qttools-5))
- (inputs (list catch2))
+ (inputs (list catch2-2))
(home-page "https://github.com/tplgy/cppcodec";)
(synopsis "Header library to encode/decode base64, base64url, etc.")
(description "This package provides library to encode/decode base64,
