amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Download patch file Download diff file Expand all files Collapse all files

73
gnu/packages/cpp.scm
View file

@ -452,46 +452,43 @@ 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") (package
(revision "0") (name "fifo-map")
(version (git-version "1.1.1" revision commit))) (version "1.0.0")
(package (home-page "https://github.com/nlohmann/fifo_map")
(name "fifo-map") (source (origin
(version version) (method git-fetch)
(home-page "https://github.com/nlohmann/fifo_map") (uri (git-reference
(source (origin (url home-page)
(method git-fetch) (commit (string-append "v" version))))
(uri (git-reference (sha256
(url home-page) (base32
(commit commit))) "0y59fk6ycrgjln9liwcja3l5j1vxpa5i671bynpbsjlyq5f2560q"))
(sha256 (patches (search-patches "fifo-map-remove-catch.hpp.patch"
(base32 "fifo-map-fix-flags-for-gcc.patch"))
"0pi77b75kp0l7z454ihcd14nzpi3nc5m4nyjbsgy5f9bw3676196")) (file-name (git-file-name name version))
(patches (search-patches "fifo-map-remove-catch.hpp.patch" (modules '((guix build utils)))
"fifo-map-fix-flags-for-gcc.patch")) (snippet '(delete-file-recursively "./test/thirdparty"))))
(file-name (git-file-name name version)) (native-inputs
(modules '((guix build utils))) (list catch-framework2-1))
(snippet '(delete-file-recursively "./test/thirdparty")))) (build-system cmake-build-system)
(native-inputs (arguments
(list catch-framework2-1)) '(#:phases
(build-system cmake-build-system) (modify-phases %standard-phases
(arguments (replace 'check
`(#:phases (lambda* (#:key tests? #:allow-other-keys)
(modify-phases %standard-phases (when tests? (invoke "./unit"))))
(replace 'check (replace 'install
(lambda _ (lambda* (#:key outputs #:allow-other-keys)
(invoke "./unit"))) (let* ((out (assoc-ref outputs "out"))
(replace 'install (inc (string-append out "/include/fifo_map")))
(lambda* (#:key outputs #:allow-other-keys) (with-directory-excursion "../source"
(let* ((out (assoc-ref outputs "out")) (install-file "src/fifo_map.hpp" inc))))))))
(inc (string-append out "/include/fifo_map"))) (synopsis "FIFO-ordered associative container for C++")
(with-directory-excursion "../source" (description "Fifo_map is a C++ header only library for associative
(install-file "src/fifo_map.hpp" inc))))))))
(synopsis "FIFO-ordered associative container for C++")
(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