me/guix
Archived
1
0
Fork 0
Code Activity

gnu: fifo-map: Use a release tag.

Browse source 
* gnu/packages/cpp.scm (fifo-map): Update to 1.0.0, which is
one (inconsequential) commit ahead of our custom "1.1.1" version.
[arguments]: Respect TESTS? in check phase while at it.
This commit is contained in:
Marius Bakke 2022-01-30 17:28:43 +01:00
parent 2b4aeda755
commit f89bf66690
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 35 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/cpp.scm
View file

@ -452,21 +452,18 @@ functions, class methods, and stl containers.
(license license:bsd-3))) (license license:bsd-3)))
(define-public fifo-map (define-public fifo-map
(let* ((commit "0dfbf5dacbb15a32c43f912a7e66a54aae39d0f9")
(revision "0")
(version (git-version "1.1.1" revision commit)))
(package (package
(name "fifo-map") (name "fifo-map")
(version version) (version "1.0.0")
(home-page "https://github.com/nlohmann/fifo_map") (home-page "https://github.com/nlohmann/fifo_map")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url home-page) (url home-page)
(commit commit))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"0pi77b75kp0l7z454ihcd14nzpi3nc5m4nyjbsgy5f9bw3676196")) "0y59fk6ycrgjln9liwcja3l5j1vxpa5i671bynpbsjlyq5f2560q"))
(patches (search-patches "fifo-map-remove-catch.hpp.patch" (patches (search-patches "fifo-map-remove-catch.hpp.patch"
"fifo-map-fix-flags-for-gcc.patch")) "fifo-map-fix-flags-for-gcc.patch"))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
@ -476,11 +473,11 @@ functions, class methods, and stl containers.
(list catch-framework2-1)) (list catch-framework2-1))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'check (replace 'check
(lambda _ (lambda* (#:key tests? #:allow-other-keys)
(invoke "./unit"))) (when tests? (invoke "./unit"))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -491,7 +488,7 @@ functions, class methods, and stl containers.
(description "Fifo_map is a C++ header only library for associative (description "Fifo_map is a C++ header only library for associative
container which uses the order in which keys were inserted to the container container which uses the order in which keys were inserted to the container
as ordering relation.") as ordering relation.")
(license license:expat)))) (license license:expat)))
(define-public json-modern-cxx (define-public json-modern-cxx
(package (package