[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/08: gnu: cereal-1.3.0: Update doctest.h.
From: |
guix-commits |
Subject: |
02/08: gnu: cereal-1.3.0: Update doctest.h. |
Date: |
Mon, 24 Apr 2023 13:49:38 -0400 (EDT) |
rekado pushed a commit to branch core-updates
in repository guix.
commit 0bb60ed3ee9184dc635382ddb674071f5e5cc4d2
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Mon Apr 24 18:50:22 2023 +0200
gnu: cereal-1.3.0: Update doctest.h.
* gnu/packages/serialization.scm (cereal-1.3.0)[native-inputs]: Add gcc-10
and
the sources of the cereal package.
[arguments]: Add a phase to replace the included doctest.h with the variant
from the cereal sources; disable -Werror.
[source]: Delete included doctest.h.
---
gnu/packages/serialization.scm | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index dc076909f9..df9e8fd7a9 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -195,17 +195,26 @@ such as compact binary encodings, XML, or JSON.")
(file-name (git-file-name "cereal" version))
(sha256
(base32
- "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p"))))
+ "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p"))
+ (snippet
+ '(delete-file "unittests/doctest.h"))))
(arguments
(substitute-keyword-arguments (package-arguments cereal)
((#:configure-flags flags #~'())
- #~'("-DSKIP_PORTABILITY_TEST=ON"))
+ #~'("-DSKIP_PORTABILITY_TEST=ON" "-DWITH_WERROR=OFF"))
((#:phases phases #~%standard-phases)
#~(modify-phases #$phases
+ (add-after 'unpack 'update-doctest
+ (lambda* (#:key inputs #:allow-other-keys)
+ (install-file (search-input-file inputs "unittests/doctest.h")
+ "unittests/")))
(add-before 'configure 'skip-sandbox
(lambda _
(substitute* "CMakeLists.txt"
- (("add_subdirectory\\(sandbox\\)") ""))))))))))
+ (("add_subdirectory\\(sandbox\\)") ""))))))))
+ (native-inputs
+ (list doxygen gcc-10
+ (package-source cereal)))))
(define-public msgpack
(package
- branch core-updates updated (a0d49a726a -> 09d2976c86), guix-commits, 2023/04/24
- 01/08: gnu: cereal: Use GCC 10., guix-commits, 2023/04/24
- 05/08: gnu: macs: Patch version check for Python., guix-commits, 2023/04/24
- 02/08: gnu: cereal-1.3.0: Update doctest.h.,
guix-commits <=
- 06/08: gnu: Add python-rich-click., guix-commits, 2023/04/24
- 07/08: gnu: multiqc: Update to 1.14., guix-commits, 2023/04/24
- 03/08: gnu: Add htscodecs., guix-commits, 2023/04/24
- 08/08: gnu: python-plotly-2.4.1: Patch for Python 3.10 changes., guix-commits, 2023/04/24
- 04/08: gnu: salmon: Update to 1.10.1., guix-commits, 2023/04/24