ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: catch-framework2: Update to 2.13.0.

Browse source 
* 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.
This commit is contained in:
Efraim Flashner 2020-08-04 10:07:47 +03:00
parent a5b44d999f
commit 7f101e7ceb
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/check.scm
View file

@ -7,7 +7,7 @@
;;; Copyright © 2015, 2017 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2015, 2017 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; 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, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a@scratchpost.org> ;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a@scratchpost.org>
@ -286,7 +286,7 @@ (define-public catch-framework2-1
(define-public catch-framework2 (define-public catch-framework2
(package (package
(name "catch2") (name "catch2")
(version "2.1.2") (version "2.13.0")
(home-page "https://github.com/catchorg/Catch2") (home-page "https://github.com/catchorg/Catch2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
@ -296,7 +296,7 @@ (define-public catch-framework2
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"14vcckqmbydjsg40ngi6iv999zimysh2l7fmrqj1d7xl990qz233")))) "0i4w0c9280a5fyi00mvvf13wlnfzyifr487n1iyr30zvvj5s5f1h"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
`(("python" ,python-wrapper))) `(("python" ,python-wrapper)))

2
gnu/packages/engineering.scm
View file

@ -782,7 +782,7 @@ (define-public libfive
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "CPLUS_INCLUDE_PATH" (setenv "CPLUS_INCLUDE_PATH"
(string-append (assoc-ref inputs "catch") (string-append (assoc-ref inputs "catch")
"/include/catch:" "/include/catch2:"
(or (getenv "CPLUS_INCLUDE_PATH") ""))) (or (getenv "CPLUS_INCLUDE_PATH") "")))
#t))))) #t)))))
(native-inputs (native-inputs

7
gnu/packages/xdisorg.scm
View file

@ -11,7 +11,7 @@
;;; Copyright © 2015 Florian Paul Schmidt <mista.tapas@gmx.net> ;;; Copyright © 2015 Florian Paul Schmidt <mista.tapas@gmx.net>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; 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 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016, 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
@ -2470,6 +2470,11 @@ (define-public j4-dmenu-desktop
`(#:configure-flags '("-DWITH_GIT_CATCH=off") `(#:configure-flags '("-DWITH_GIT_CATCH=off")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'find-catch
(lambda _
(substitute* "CMakeLists.txt"
(("PATH_SUFFIXES catch") "PATH_SUFFIXES catch2"))
#t))
(replace 'check (replace 'check
(lambda _ (lambda _
(invoke "./j4-dmenu-tests" "exclude:SearchPath/XDG_DATA_HOME")))))) (invoke "./j4-dmenu-tests" "exclude:SearchPath/XDG_DATA_HOME"))))))