[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/11: gnu: nlohmann-json-cpp: Update to 3.7.0.
From: |
guix-commits |
Subject: |
03/11: gnu: nlohmann-json-cpp: Update to 3.7.0. |
Date: |
Wed, 18 Sep 2019 17:10:37 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit af632c6b70feaf83c534fa282904b5fdf6f6f919
Author: Ludovic Courtès <address@hidden>
Date: Wed Sep 18 21:44:15 2019 +0200
gnu: nlohmann-json-cpp: Update to 3.7.0.
* gnu/packages/serialization.scm (nlohmann-json-cpp): Update to 3.7.0.
[source]: Use 'git-fetch'.
[native-inputs, arguments]: New fields.
---
gnu/packages/serialization.scm | 33 +++++++++++++++++++++++----------
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index f0ae0d2..9fefa5a 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -42,6 +42,7 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages databases)
#:use-module (gnu packages documentation)
+ #:use-module (gnu packages gcc)
#:use-module (gnu packages lua)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
@@ -394,17 +395,29 @@ it is comparable to protobuf.")
(define-public nlohmann-json-cpp
(package
(name "nlohmann-json-cpp")
- (version "2.1.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://github.com/nlohmann/json/"
- "archive/v" version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "0lrh6cjd643c7kmvmwafbgq7dqj3b778483gjhjbvp6rc6z5xf2r"))))
+ (version "3.7.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nlohmann/json.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0v7xih4zjixxxfvkfbs7a8j9qcvpwlsv4vrkbyns3hc7b44nb8ap"))))
(build-system cmake-build-system)
+ (native-inputs
+ ;; Integer overflow tests like those from
+ ;; <https://github.com/nlohmann/json/issues/1447> fail when building with
+ ;; gcc@5. Thus, build with a newer GCC.
+ `(("gcc" ,gcc-9)))
+ (arguments
+ '(#:phases (modify-phases %standard-phases
+ (add-before 'build 'unset-path-variables
+ (lambda _
+ (unsetenv "C_INCLUDE_PATH")
+ (unsetenv "CPLUS_INCLUDE_PATH")
+ #t)))))
(home-page "https://nlohmann.github.io/json/")
(synopsis "JSON library for C++")
(description
- branch master updated (cf48ea9 -> da55110), guix-commits, 2019/09/18
- 04/11: gnu: Add python-jupyter-protocol., guix-commits, 2019/09/18
- 06/11: gnu: Add python-jupyter-kernel-test., guix-commits, 2019/09/18
- 01/11: guix package: "guix package -f FILE" ensures FILE returns a package., guix-commits, 2019/09/18
- 02/11: linux-container: 'eval/container' correctly passes -L and -C flags., guix-commits, 2019/09/18
- 05/11: gnu: Add python-jupyter-kernel-mgmt., guix-commits, 2019/09/18
- 08/11: doc: Mention the "repository name" for 'guix pack -f docker'., guix-commits, 2019/09/18
- 07/11: gnu: Add Xeus., guix-commits, 2019/09/18
- 03/11: gnu: nlohmann-json-cpp: Update to 3.7.0.,
guix-commits <=
- 09/11: import: pypi: Refresher recognizes pythonhosted.org source URLs., guix-commits, 2019/09/18
- 11/11: scripts: pull: Add options for generation management, guix-commits, 2019/09/18
- 10/11: pull: Work around Ubuntu's 'sudo'., guix-commits, 2019/09/18