15 files changed, 19 insertions(+), 19 deletions(-)

M gnu/packages/audio.scm
M gnu/packages/bioinformatics.scm
M gnu/packages/check.scm
M gnu/packages/chemistry.scm
M gnu/packages/cpp.scm
M gnu/packages/enchant.scm
M gnu/packages/engineering.scm
M gnu/packages/geo.scm
M gnu/packages/irods.scm
M gnu/packages/networking.scm
M gnu/packages/python-xyz.scm
M gnu/packages/security-token.scm
M gnu/packages/simulation.scm
M gnu/packages/telegram.scm
M gnu/packages/xdisorg.scm

@@ 3615,7 3615,7 @@ stretching and pitch scaling of audio.  This package contains the library.")
         (base32 "0nvhdzy0m3bchk3dpnspv2f518p2v9fjcrv36z1sva1pv9a2g35w"))))
     (build-system cmake-build-system)
     (native-inputs
-     (list catch-framework2))
+     (list catch2))
     (inputs
      (list fftw))
     (home-page "https://mixxxdj.github.io/libkeyfinder/")

@@ 3792,7 3792,7 @@ comment or quality sections.")
     (inputs
      (list gsl openblas zlib))
     (native-inputs
-     `(("catch" ,catch-framework2-1)
+     `(("catch" ,catch2-1)
        ("perl" ,perl)
        ("shunit2" ,shunit2)
        ("which" ,which)))

@@ 440,7 440,7 @@ PyUnit and others.")
 multi-paradigm automated test framework for C++ and Objective-C.")
     (license license:boost1.0)))
 
-(define-public catch-framework2-1
+(define-public catch2-1
   (package
     (name "catch2")
     (version "1.12.2")


@@ 469,7 469,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 catch-framework2
+(define-public catch2
   (package
     (name "catch2")
     (version "2.13.8")

@@ 559,7 559,7 @@ symmetries written in C.  Spglib can be used to:
            glm
            netcdf))
     (native-inputs
-     (list catch-framework2 python-setuptools))
+     (list catch2 python-setuptools))
     (home-page "https://pymol.org")
     (synopsis "Molecular visualization system")
     (description "PyMOL is a capable molecular viewer and renderer.  It can be

@@ 531,7 531,7 @@ functions, class methods, and stl containers.
               (modules '((guix build utils)))
               (snippet '(delete-file-recursively "./test/thirdparty"))))
     (inputs
-     (list catch-framework2-1))
+     (list catch2-1))
     (build-system cmake-build-system)
     (arguments
      '(#:phases


@@ 1264,7 1264,7 @@ services including database, analytic, and machine learning technologies.")
            (lambda _
              (invoke "./tests"))))))
     (native-inputs
-     (list catch-framework2))
+     (list catch2))
     (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

@@ 58,7 58,7 @@
         (base32 "0wbb6dwmzlsyy224y0liis0azgzwbjdvcyzc31pw1aw6vbp36na6"))))
     (build-system cmake-build-system)
     (native-inputs
-     (list catch-framework2
+     (list catch2
            git-minimal
            perl
            ;;FIX-ME: Building with ronn fails.

@@ 3218,7 3218,7 @@ perform various useful functions such as:
     ;;      with all of these.
     (inputs
      `(("boost" ,boost)
-       ("catch2" ,catch-framework2)
+       ("catch2" ,catch2)
        ("cgal" ,cgal)
        ("eigen" ,eigen)
        ("embree" ,embree)

@@ 820,7 820,7 @@ street bearings/orientations, and speed/travel time.")
                   (("TEST_CASE\\(\"ogr\"" all)
                    (string-append all ", \"[!shouldfail]\""))))))))
       (native-inputs
-       (list catch-framework2
+       (list catch2
              pkg-config
              postgresql))
       (inputs

@@ 154,7 154,7 @@
        ("unixodbc" ,unixodbc)
        ("zeromq" ,zeromq)))
     (native-inputs
-     `(("catch2" ,catch-framework2)
+     `(("catch2" ,catch2)
        ("clang" ,clang-toolchain-6)
        ("clang-runtime" ,clang-runtime-6)
        ("libcxx+libcxxabi" ,libcxx+libcxxabi-6)))

@@ 1378,7 1378,7 @@ between different versions of ØMQ.")
     (native-inputs
      (list pkg-config))
     (inputs
-     (list catch-framework2 zeromq))
+     (list catch2 zeromq))
     (home-page "https://zeromq.org")
     (synopsis "C++ bindings for the ØMQ messaging library")
     (description


@@ 3603,7 3603,7 @@ communication over HTTP.")
     (build-system cmake-build-system)
     (inputs                             ; TODO: Need to force-keep references on some inputs, e.g. boost.
      (list zlib
-           catch-framework2
+           catch2
            openssl
            boost
            pcre

@@ 22305,7 22305,7 @@ user-space file systems in Python.")
 
        ;; The following dependencies are used for tests.
        ("python-pytest" ,python-pytest)
-       ("catch" ,catch-framework2-1)
+       ("catch" ,catch2-1)
        ("eigen" ,eigen)))
     (arguments
      `(#:configure-flags

@@ 739,7 739,7 @@ an unprivileged user.")
     (arguments
      ;; These tests do not require any device to be connected
      '(#:configure-flags (list "-DCOMPILE_OFFLINE_TESTS=ON")))
-    (native-inputs (list catch-framework2 doxygen graphviz pkg-config))
+    (native-inputs (list catch2 doxygen graphviz pkg-config))
     (inputs (list hidapi libusb))
     (home-page "https://github.com/Nitrokey/libnitrokey")
     (synopsis "Communication library for Nitrokey")


@@ 763,7 763,7 @@ an unprivileged user.")
     (arguments
      '(#:configure-flags (list "-DBUILD_TESTING=on")))
     (native-inputs (list pkg-config qttools-5))
-    (inputs (list catch-framework2))
+    (inputs (list catch2))
     (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,

@@ 465,7 465,7 @@ FFC is part of the FEniCS Project.")
        ("sundials" ,sundials-openmpi)
        ("zlib" ,zlib)))
     (native-inputs
-     `(("catch" ,catch-framework2-1)
+     `(("catch" ,catch2-1)
        ("pkg-config" ,pkg-config)))
     (propagated-inputs
      `(("ffc" ,python-fenics-ffc)

@@ 387,7 387,7 @@ Telegram project, for its use in telegram desktop client.")
     (inputs
      `(("alsa" ,alsa-lib)
        ("c++-gsl" ,c++-gsl)
-       ("catch" ,catch-framework2)
+       ("catch" ,catch2)
        ("codegen-source"
         ,(origin
            (method git-fetch)

@@ 2893,7 2893,7 @@ create layout indicator widgets.")
                 "1gxpgifzy0hnpd0ymw3r32amzr32z3bgb90ldjzl438p6h1q0i26"))))
     (build-system cmake-build-system)
     (native-inputs
-     (list catch-framework2))
+     (list catch2))
     (arguments
      `(#:configure-flags '("-DWITH_GIT_CATCH=off")
        #:phases