diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2024-03-31 20:46:45 -0400 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2024-03-31 20:46:45 -0400 |
| commit | 155f23a52e626e8ac60f818937d5bb1a3ebe3184 (patch) | |
| tree | a19317812471db31ae2a97844d6cf74e45057466 /gnu/packages/logging.scm | |
| parent | d9dee5ea2f564fa6979ae552fd9bd5ac22f86ecc (diff) | |
| parent | 1cba1f8ce6f84c4737650401c0eb0473a45f9ff7 (diff) | |
Merge branch 'master' into mesa-updates
Change-Id: I4cd94a58b62d8c3987e4a60c76b37894ad851e35
Diffstat (limited to 'gnu/packages/logging.scm')
| -rw-r--r-- | gnu/packages/logging.scm | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index c204a013b4..a757c22154 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -26,6 +26,7 @@ (define-module (gnu packages logging) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix download) @@ -213,7 +214,7 @@ output in multiple windows in a terminal.") (define-public spdlog (package (name "spdlog") - (version "1.12.0") + (version "1.13.0") (source (origin (method git-fetch) @@ -221,18 +222,19 @@ output in multiple windows in a terminal.") (url "https://github.com/gabime/spdlog") (commit (string-append "v" version)))) (file-name (git-file-name name version)) - (patches (search-patches "spdlog-fix-tests.patch")) (sha256 - (base32 "0yyncv6wjs5rqm76rkqyxpfbsingk1dq5zfcqhy1a7fpw8xdl53k")))) + (base32 "0zgdmdgnp2y36jrlk85d4fiyjkjd6anly8pambyc3f3v6sg02zyy")))) (build-system cmake-build-system) ;; TODO run benchmark. Currently not possible, as adding ;; (gnu packages benchmark) forms a dependency cycle (arguments - '(#:configure-flags - (list "-DSPDLOG_BUILD_BENCH=OFF" - "-DSPDLOG_BUILD_SHARED=ON" - "-DSPDLOG_BUILD_TESTS=ON"))) - (native-inputs (list catch2-3.3)) + (list #:configure-flags + #~(list "-DSPDLOG_BUILD_BENCH=OFF" + "-DSPDLOG_BUILD_SHARED=ON" + #$@(if (%current-target-system) + '() + '("-DSPDLOG_BUILD_TESTS=ON"))))) + (native-inputs (list catch2-3)) (home-page "https://github.com/gabime/spdlog") (synopsis "Fast C++ logging library") (description "Spdlog is a very fast header-only/compiled C++ logging |