* [bug#61672] [PATCH] gnu: Add nlohmann-json.
@ 2023-02-21 6:40 jgart via Guix-patches via
2023-02-21 6:43 ` [bug#61672] [PATCH v2] " jgart via Guix-patches via
0 siblings, 1 reply; 4+ messages in thread
From: jgart via Guix-patches via @ 2023-02-21 6:40 UTC (permalink / raw)
To: 61672; +Cc: jgart
* gnu/packages/web.scm (nlohmann-json): New variable.
---
gnu/packages/web.scm | 48 +++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 47 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 98db004482..e2f9dddf06 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -58,7 +58,7 @@
;;; Copyright © 2022 cage <cage-dev@twistfold.it>
;;; Copyright © 2022 Pradana Aumars <paumars@courrier.dev>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
-;;; Copyright © 2022 jgart <jgart@dismail.de>
+;;; Copyright © 2022, 2023 jgart <jgart@dismail.de>
;;; Copyright © 2023 Paul A. Patience <paul@apatience.com>
;;; Copyright © 2022 Bruno Victal <mirai@makinata.eu>
;;; Copyright © 2023 David Thompson <dthompson2@worcester.edu>
@@ -1109,6 +1109,52 @@ (define-public jansson
data.")
(license license:expat)))
+(define-public nlohmann-json
+ (package
+ (name "nlohmann-json")
+ (version "3.11.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nlohmann/json")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0g6rfsbkvrxmacchz4kbr741yybj7mls3r4hgyfdd3pdbqhn2is9"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:out-of-source? #t
+ #:configure-flags
+ #~(list "-DJSON_FastTests=ON"
+ "-DJSON_MultipleHeaders=ON"
+ "-DJSON_BuildTests=ON"
+ (string-append "-DJSON_TestDataDirectory="
+ #$(this-package-native-input "json-test-data")))
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ ;; Skip tests that require git or modify “installed files”.
+ (when tests?
+ (invoke "make" "ARGS=-LE 'not_reproducible|git_required' --verbose")))))))
+ (native-inputs
+ `(("json-test-data"
+ ,(origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nlohmann/json_test_data")
+ (commit "v3.1.0")))
+ (sha256
+ (base32 "0nbirc428qx0lpi940p7y24fzdjbwl6xig3h5rdbihyymmdzhvbc"))
+ (file-name (git-file-name "vis-test" version))))))
+ (home-page "https://json.nlohmann.me/")
+ (synopsis "JSON for Modern C++")
+ (description "This package provides a JSON implementation with an
+intuitive syntax for C++, a single include header file, and with a
+codebase that has 100% code coverage.")
+ (license license:expat)))
+
(define-public json-c
(package
(name "json-c")
--
2.39.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#61672] [PATCH v2] gnu: Add nlohmann-json.
2023-02-21 6:40 [bug#61672] [PATCH] gnu: Add nlohmann-json jgart via Guix-patches via
@ 2023-02-21 6:43 ` jgart via Guix-patches via
2023-02-21 8:49 ` Liliana Marie Prikler
2023-02-21 13:37 ` jgart via Guix-patches via
0 siblings, 2 replies; 4+ messages in thread
From: jgart via Guix-patches via @ 2023-02-21 6:43 UTC (permalink / raw)
To: 61672; +Cc: jgart
* gnu/packages/web.scm (nlohmann-json): New variable.
v2 just rebases the history
---
gnu/packages/web.scm | 48 +++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 47 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 98db004482..e2f9dddf06 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -58,7 +58,7 @@
;;; Copyright © 2022 cage <cage-dev@twistfold.it>
;;; Copyright © 2022 Pradana Aumars <paumars@courrier.dev>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
-;;; Copyright © 2022 jgart <jgart@dismail.de>
+;;; Copyright © 2022, 2023 jgart <jgart@dismail.de>
;;; Copyright © 2023 Paul A. Patience <paul@apatience.com>
;;; Copyright © 2022 Bruno Victal <mirai@makinata.eu>
;;; Copyright © 2023 David Thompson <dthompson2@worcester.edu>
@@ -1109,6 +1109,52 @@ (define-public jansson
data.")
(license license:expat)))
+(define-public nlohmann-json
+ (package
+ (name "nlohmann-json")
+ (version "3.11.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nlohmann/json")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0g6rfsbkvrxmacchz4kbr741yybj7mls3r4hgyfdd3pdbqhn2is9"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:out-of-source? #t
+ #:configure-flags
+ #~(list "-DJSON_FastTests=ON"
+ "-DJSON_MultipleHeaders=ON"
+ "-DJSON_BuildTests=ON"
+ (string-append "-DJSON_TestDataDirectory="
+ #$(this-package-native-input "json-test-data")))
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ ;; Skip tests that require git or modify “installed files”.
+ (when tests?
+ (invoke "make" "ARGS=-LE 'not_reproducible|git_required' --verbose")))))))
+ (native-inputs
+ `(("json-test-data"
+ ,(origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/nlohmann/json_test_data")
+ (commit "v3.1.0")))
+ (sha256
+ (base32 "0nbirc428qx0lpi940p7y24fzdjbwl6xig3h5rdbihyymmdzhvbc"))
+ (file-name (git-file-name "vis-test" version))))))
+ (home-page "https://json.nlohmann.me/")
+ (synopsis "JSON for Modern C++")
+ (description "This package provides a JSON implementation with an
+intuitive syntax for C++, a single include header file, and with a
+codebase that has 100% code coverage.")
+ (license license:expat)))
+
(define-public json-c
(package
(name "json-c")
--
2.39.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#61672] [PATCH v2] gnu: Add nlohmann-json.
2023-02-21 6:43 ` [bug#61672] [PATCH v2] " jgart via Guix-patches via
@ 2023-02-21 8:49 ` Liliana Marie Prikler
2023-02-21 13:37 ` jgart via Guix-patches via
1 sibling, 0 replies; 4+ messages in thread
From: Liliana Marie Prikler @ 2023-02-21 8:49 UTC (permalink / raw)
To: jgart, 61672
Am Dienstag, dem 21.02.2023 um 07:43 +0100 schrieb jgart:
> * gnu/packages/web.scm (nlohmann-json): New variable.
Note, that json-modern-cxx is already defined in gnu/packages/cpp.scm.
I'd suggest renaming it, deprecating the old name and then updating it.
Cheers
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#61672] [PATCH v2] gnu: Add nlohmann-json.
2023-02-21 6:43 ` [bug#61672] [PATCH v2] " jgart via Guix-patches via
2023-02-21 8:49 ` Liliana Marie Prikler
@ 2023-02-21 13:37 ` jgart via Guix-patches via
1 sibling, 0 replies; 4+ messages in thread
From: jgart via Guix-patches via @ 2023-02-21 13:37 UTC (permalink / raw)
To: liliana.prikler, 61672
hi lilyp,
> Note, that json-modern-cxx is already defined in gnu/packages/cpp.scm.
Oh didn't realize. Thanks! I'll send an update today.
all best,
jgart
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-21 13:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-21 6:40 [bug#61672] [PATCH] gnu: Add nlohmann-json jgart via Guix-patches via
2023-02-21 6:43 ` [bug#61672] [PATCH v2] " jgart via Guix-patches via
2023-02-21 8:49 ` Liliana Marie Prikler
2023-02-21 13:37 ` jgart via Guix-patches via
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).