guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 88f81d6e12a45e36064d39137a474f81cc61dd2f
Author: Andreas Enge <[email protected]>
AuthorDate: Sat Jun 20 22:43:32 2026 +0200
gnu: catch2-3: Rename to catch2-3.5.
* gnu/packages/check.scm (catch2-3): Rename to and define as deprecated
by...
(catch2-3.5): ...this.
(trompeloeil): Adapt input.
* gnu/packages/chemistry.scm (rdkit),
* gnu/packages/cpp.scm (immer),
* gnu/packages/enchant.scm (nuspell),
* gnu/packages/games.scm (fuzzylite, endless-sky)
* gnu/packages/gnome.scm (gnome-system-monitor),
* gnu/packages/logging.scm (spdlog-1.15),
* gnu/packages/luanti.scm (luanti),
* gnu/packages/maths.scm (highfive),
* gnu/packages/networking.scm (restinio),
* gnu/packages/package-management.scm (libmamba),
* gnu/packages/physics.scm (python-brille),
* gnu/packages/potassco.scm (clingo, clingo-lpx, clingcon),
* gnu/packages/xdisorg.scm (j4-dmenu-desktop): Adapt inputs.
Change-Id: I69fac4ec6d3914a6dc7d86f2454f410db937a83f
---
gnu/packages/check.scm | 7 +++++--
gnu/packages/chemistry.scm | 2 +-
gnu/packages/cpp.scm | 2 +-
gnu/packages/enchant.scm | 2 +-
gnu/packages/games.scm | 4 ++--
gnu/packages/gnome.scm | 2 +-
gnu/packages/logging.scm | 2 +-
gnu/packages/luanti.scm | 2 +-
gnu/packages/maths.scm | 2 +-
gnu/packages/networking.scm | 2 +-
gnu/packages/package-management.scm | 2 +-
gnu/packages/physics.scm | 2 +-
gnu/packages/potassco.scm | 6 +++---
gnu/packages/xdisorg.scm | 2 +-
14 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index cb8fe8548b..533fefe6ad 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -808,7 +808,7 @@ pattern.")
a multi-paradigm automated test framework for C++ and Objective-C.")
(license license:boost1.0)))
-(define-public catch2-3
+(define-public catch2-3.5
(package
(inherit catch2-3.8)
(name "catch2")
@@ -823,6 +823,9 @@ a multi-paradigm automated test framework for C++ and
Objective-C.")
(base32
"11yla93vm2896fzhm3fz8lk3y3iz5iy7vd6wa7wnwvhsfd2dbfq3"))))))
+;; 2026-06-20
+(define-deprecated-package catch2-3 catch2-3.5)
+
(define-public catch2-3.15
(package
(inherit catch2-3.8)
@@ -3289,7 +3292,7 @@ tests. The output format is JSON.")
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "test/self_test"))))))))
- (native-inputs (list catch2-3))
+ (native-inputs (list catch2-3.5))
(home-page "https://github.com/rollbear/trompeloeil";)
(synopsis "Header only C++14 mocking framework")
(description
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index 2905a36bd5..7545638b95 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -1719,7 +1719,7 @@ Tanimoto scoring.")
(native-inputs
(list bison
boost-numpy
- catch2-3
+ catch2-3.5
eigen
flex
freesasa
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index e3cec2025a..8f8ea07b08 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -3005,7 +3005,7 @@ comma separated value (CSV) files.")
#~(modify-phases %standard-phases
(replace 'check (assoc-ref gnu:%standard-phases 'check)))))
(inputs (list boost libgc c-rrb))
- (native-inputs (list catch2-3 doctest fmt pkg-config))
+ (native-inputs (list catch2-3.5 doctest fmt pkg-config))
(home-page "https://sinusoid.es/immer";)
(synopsis "Immutable data structures")
(description "Immer is a library of persistent and immutable data
structures
diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm
index 751db081ba..6a146108eb 100644
--- a/gnu/packages/enchant.scm
+++ b/gnu/packages/enchant.scm
@@ -63,7 +63,7 @@
(if (%current-target-system)
(list #:configure-flags #~(list "-DBUILD_TESTING=OFF"))
'()))
- (native-inputs (list catch2-3 pkg-config))
+ (native-inputs (list catch2-3.5 pkg-config))
(propagated-inputs (list icu4c))
(native-search-paths (list (search-path-specification
(variable "DICPATH")
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 000e1f2007..26eec60304 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4520,7 +4520,7 @@ exec ~a/bin/freedink -refdir ~a/share/dink\n"
(base32
"1ai7x5lfy8c1d11crz33ayy21alry740f78qjjxwzdfr6ph7pkzq"))))
(build-system cmake-build-system)
- (native-inputs (list catch2-3))
+ (native-inputs (list catch2-3.5))
(home-page "https://www.fuzzylite.com/";)
(synopsis "Fuzzy logic control binary")
(description
@@ -10490,7 +10490,7 @@ your score gets higher, you level up and the blocks
fall faster.")
(substitute* "CMakeLists.txt"
(("games\\)") "bin)")))))))
(inputs
- (list catch2-3
+ (list catch2-3.5
flac
glew
libavif
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index adda74db17..63933cb879 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11485,7 +11485,7 @@ Bluefish supports many programming and markup
languages.")
'(#:glib-or-gtk? #t
#:configure-flags '("-Dsystemd=false")))
(native-inputs
- (list catch2-3
+ (list catch2-3.5
cmake
`(,glib "bin") ;for glib-mkenums.
`(,gtk+ "bin") ;gtk-update-icon-cache
diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index ecf50b05e3..b4960681e2 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -294,7 +294,7 @@ output in multiple windows in a terminal.")
" DESTINATION "
#$output:bin "/bin"
")\n"))))))))
- (native-inputs (list catch2-3))
+ (native-inputs (list catch2-3.5))
(inputs (list googlebenchmark))
(propagated-inputs (list fmt-11))
(home-page "https://github.com/gabime/spdlog";)
diff --git a/gnu/packages/luanti.scm b/gnu/packages/luanti.scm
index c47ce0645c..150314517c 100644
--- a/gnu/packages/luanti.scm
+++ b/gnu/packages/luanti.scm
@@ -128,7 +128,7 @@
(search-path-specification
(variable "LUANTI_MOD_PATH")
(files '("share/luanti/mods")))))
- (native-inputs (list catch2-3 pkg-config))
+ (native-inputs (list catch2-3.5 pkg-config))
(inputs (list curl
freetype
gettext-minimal
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 51730de17c..adfe3dba6c 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2375,7 +2375,7 @@ Blosc-compressed datasets.")
"-GNinja")))
(native-inputs
(list boost-1.83
- catch2-3
+ catch2-3.5
ninja))
(inputs
(list hdf5))
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 37283b8d1c..31a08e2283 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -4230,7 +4230,7 @@ communication over HTTP.")
(lambda _
(chdir "dev"))))))
(native-inputs
- (list catch2-3
+ (list catch2-3.5
json-dto))
(inputs
(list openssl
diff --git a/gnu/packages/package-management.scm
b/gnu/packages/package-management.scm
index 48826e4a6f..eae168fe54 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1809,7 +1809,7 @@ endif()
"~Use CA certificate from the root prefix" ; no CA
certs in build env
"~remote_yaml_file"))))))) ; downloads from
raw.githubusercontent.com
(native-inputs
- (list catch2-3 cli11 pkg-config python))
+ (list catch2-3.5 cli11 pkg-config python))
(inputs
(list curl
libarchive
diff --git a/gnu/packages/physics.scm b/gnu/packages/physics.scm
index 1ec11f12a6..236d59005a 100644
--- a/gnu/packages/physics.scm
+++ b/gnu/packages/physics.scm
@@ -329,7 +329,7 @@ Version: ~a
(find-files "../source/brille" "\\.py$")
(find-files "." "^_brille\\..*\\.so$")))))))))
(native-inputs
- (list catch2-3
+ (list catch2-3.5
cmake-minimal
highfive
pybind11-2
diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm
index fb8c164a74..f814bb796a 100644
--- a/gnu/packages/potassco.scm
+++ b/gnu/packages/potassco.scm
@@ -205,7 +205,7 @@ satisfiability checking (SAT).")
(("find_package\\(Clasp") "find_package(clasp"))
(rename-file "cmake/ClingoConfig.cmake.in"
"cmake/clingo-config.cmake.in"))))))
- (inputs (list catch2-3 clasp libpotassco))
+ (inputs (list catch2-3.5 clasp libpotassco))
(native-inputs (list bison re2c
mpark-variant
pkg-config
@@ -271,7 +271,7 @@ over difference logic.")
"find_package(Catch2 3 REQUIRED)")))))))
(home-page "https://github.com/potassco/clingo-lpx";)
(inputs (list clingo flint))
- (native-inputs (list catch2-3))
+ (native-inputs (list catch2-3.5))
(synopsis "Simplex solver")
(description "Clingo-LPX is an extension to Clingo that models constraints
and goals over linear (in)equations.")
@@ -311,7 +311,7 @@ and goals over linear (in)equations.")
(string-append "#" all))))))))
(home-page "https://potassco.org/clingcon";)
(inputs (list clingo wide-integer))
- (native-inputs (list catch2-3))
+ (native-inputs (list catch2-3.5))
(synopsis "Constraint answer set solver")
(description "Clingcon is an answer set solver for constraint logic
It extends Clingo with constraint solving capacities for constraints over
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 6e6cf9ce8f..a89d64ba82 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -3847,7 +3847,7 @@ create layout indicator widgets.")
"15jlb0si77sndnl5annys0dq2gkwwvzn1d2jwjay9i3xdivzmfb2"))))
(build-system meson-build-system)
(native-inputs
- (list catch2-3 pkg-config))
+ (list catch2-3.5 pkg-config))
(inputs (list spdlog-1.15))
(arguments
(list
