diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2020-08-04 10:07:47 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2020-08-04 10:30:31 +0300 |
| commit | 7f101e7ceb869882b9a959cb7801aea64c26704d (patch) | |
| tree | 4bb946fa8e9b3f7564c8df65c15667fab2e1f04f | |
| parent | a5b44d999f26828932be910f6b8113608b6e266c (diff) | |
gnu: catch-framework2: Update to 2.13.0.
* gnu/packages/check.scm (catch-framework2): Update to 2.13.0.
* gnu/packages/engineering.scm (libfive)[arguments]: Adjust custom
'find-catch phase for updated include path.
* gnu/packages/xdisorg.scm (j4-dmenu-desktop)[arguments]: Add custom
'find-catch phase to search for updated catch2 include directory.
| -rw-r--r-- | gnu/packages/check.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/engineering.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/xdisorg.scm | 7 |
3 files changed, 10 insertions, 5 deletions
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index eb12383887..e9fecff03d 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015, 2017 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> -;;; Copyright © 2015, 2016, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015, 2016, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a@scratchpost.org> @@ -286,7 +286,7 @@ a multi-paradigm automated test framework for C++ and Objective-C.") (define-public catch-framework2 (package (name "catch2") - (version "2.1.2") + (version "2.13.0") (home-page "https://github.com/catchorg/Catch2") (source (origin (method git-fetch) @@ -296,7 +296,7 @@ a multi-paradigm automated test framework for C++ and Objective-C.") (file-name (git-file-name name version)) (sha256 (base32 - "14vcckqmbydjsg40ngi6iv999zimysh2l7fmrqj1d7xl990qz233")))) + "0i4w0c9280a5fyi00mvvf13wlnfzyifr487n1iyr30zvvj5s5f1h")))) (build-system cmake-build-system) (inputs `(("python" ,python-wrapper))) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index b34eb415d5..a227fdbdad 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -782,7 +782,7 @@ fonts to gEDA.") (lambda* (#:key inputs #:allow-other-keys) (setenv "CPLUS_INCLUDE_PATH" (string-append (assoc-ref inputs "catch") - "/include/catch:" + "/include/catch2:" (or (getenv "CPLUS_INCLUDE_PATH") ""))) #t))))) (native-inputs diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 20702c3a4f..3baeea32df 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2015 Florian Paul Schmidt <mista.tapas@gmx.net> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016, 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com> @@ -2470,6 +2470,11 @@ create layout indicator widgets.") `(#:configure-flags '("-DWITH_GIT_CATCH=off") #:phases (modify-phases %standard-phases + (add-after 'unpack 'find-catch + (lambda _ + (substitute* "CMakeLists.txt" + (("PATH_SUFFIXES catch") "PATH_SUFFIXES catch2")) + #t)) (replace 'check (lambda _ (invoke "./j4-dmenu-tests" "exclude:SearchPath/XDG_DATA_HOME")))))) |