all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 61724@debbugs.gnu.org
Subject: [bug#61724] [PATCH v4 2/7] gnu: nlohmann-json: Update to 3.11.2.
Date: Fri, 28 Apr 2023 21:50:32 +0200	[thread overview]
Message-ID: <7fff809117a7e9a66267143a00b6e927ac96d5be.1683475550.git.liliana.prikler@gmail.com> (raw)
In-Reply-To: <7429efc0ff6e48ddd1169a5353abbe6226edaaeb.1683475550.git.liliana.prikler@gmail.com>

* gnu/packages/cpp.scm (nlohmann-json): Update to 3.11.2.
[source]<snippet>: Adjust accordingly.
[native-inputs]<json_test_data>: Update to 3.1.0.
---
 gnu/packages/cpp.scm | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index a041b4a3bb..5c2e6d2425 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -598,7 +598,7 @@ (define-public json-dto
 (define-public nlohmann-json
   (package
     (name "nlohmann-json")
-    (version "3.10.5")
+    (version "3.11.2")
     (home-page "https://github.com/nlohmann/json")
     (source
      (origin
@@ -606,23 +606,22 @@ (define-public nlohmann-json
        (uri (git-reference (url home-page)
                            (commit (string-append "v" version))))
        (sha256
-        (base32 "1f9mi45ilwjc2w92grjc53sw038840bjpn8yjf6wc6bxs2nijfqd"))
+        (base32 "0g6rfsbkvrxmacchz4kbr741yybj7mls3r4hgyfdd3pdbqhn2is9"))
        (file-name (git-file-name name version))
        (modules '((guix build utils)))
        (snippet
         '(begin
            ;; Delete bundled software.  Preserve doctest_compatibility.h, which
            ;; is a wrapper library added by this package.
-           (install-file "./test/thirdparty/doctest/doctest_compatibility.h" "/tmp")
-           (for-each delete-file-recursively
-                     '("./third_party" "./test/thirdparty"))
-           (install-file "/tmp/doctest_compatibility.h" "./test/thirdparty/doctest")
+           (install-file "./tests/thirdparty/doctest/doctest_compatibility.h" "/tmp")
+           (delete-file-recursively "./tests/thirdparty")
+           (install-file "/tmp/doctest_compatibility.h" "./tests/thirdparty/doctest")
 
            ;; Adjust for the unbundled fifo_map and doctest.
-           (substitute* "./test/thirdparty/doctest/doctest_compatibility.h"
-             (("#include \"doctest\\.h\"")
-              "#include <doctest/doctest.h>"))
-           (with-directory-excursion "test/src"
+           (substitute* (find-files "./tests/" "\\.h(pp)?")
+             (("#include \"doctest\\.h\"") "#include <doctest/doctest.h>")
+             (("#include <doctest\\.h>") "#include <doctest/doctest.h>"))
+           (with-directory-excursion "tests/src"
              (let ((files (find-files "." "\\.cpp$")))
                (substitute* files
                  (("#include ?\"(fifo_map.hpp)\"" all fifo-map-hpp)
@@ -648,7 +647,7 @@ (define-public nlohmann-json
                           (format #t "test suite not run~%")))))))
     (native-inputs
      (list amalgamate
-           (let ((version "3.0.0"))
+           (let ((version "3.1.0"))
              (origin
                (method git-fetch)
                (uri (git-reference
@@ -657,7 +656,7 @@ (define-public nlohmann-json
                (file-name (git-file-name "json_test_data" version))
                (sha256
                 (base32
-                 "0nzsjzlvk14dazwh7k2jb1dinb0pv9jbx5jsyn264wvva0y7daiv"))))))
+                 "0nbirc428qx0lpi940p7y24fzdjbwl6xig3h5rdbihyymmdzhvbc"))))))
     (inputs
      (list doctest fifo-map))
     (synopsis "JSON parser and printer library for C++")
-- 
2.39.2





  reply	other threads:[~2023-05-07 16:07 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-23  5:06 [bug#61724] [PATCH 1/3] gnu: Add nlohmann-json jgart via Guix-patches via
2023-02-23  5:11 ` jgart via Guix-patches via
2023-02-23  5:12   ` [bug#61724] [PATCH 2/3] gnu: json-modern-cxx: Remove deprecated package jgart via Guix-patches via
2023-02-23  5:12   ` [bug#61724] [PATCH 3/3] gnu: Refactor packages to use new nlohmann-json variable jgart via Guix-patches via
2023-02-23 17:57   ` [bug#61724] [PATCH 1/3] gnu: Add nlohmann-json Liliana Marie Prikler
2023-02-23 20:17 ` [bug#61724] [PATCH v2 1/2] " jgart via Guix-patches via
2023-02-23 20:17   ` [bug#61724] [PATCH v2 2/2] gnu: Refactor packages to use new nlohmann-json variable jgart via Guix-patches via
2023-02-23 20:59   ` [bug#61724] [PATCH v2 1/2] gnu: Add nlohmann-json Liliana Marie Prikler
2023-03-10  1:58   ` jgart via Guix-patches via
2023-03-10  5:18     ` Liliana Marie Prikler
2023-04-27 18:57 ` [bug#61724] [PATCH v3 1/3] gnu: Rename json-modern-cxx to nlohmann-json Liliana Marie Prikler
2023-04-27 18:57 ` [bug#61724] [PATCH v4 1/7] " Liliana Marie Prikler
2023-04-28 19:50   ` Liliana Marie Prikler [this message]
2023-04-28 19:55   ` [bug#61724] [PATCH v4 3/7] gnu: nlohmann-json: Improve package style Liliana Marie Prikler
2023-05-07 16:50     ` [bug#61724] [PATCH v4 3/3] gnu: nlohmann-json: Improve package style. (was [PATCH v4 3/7] gnu: nlohmann-json: Improve package style.) Liliana Marie Prikler
2023-05-11 12:53   ` [bug#61724] [PATCH v4 1/7] gnu: Rename json-modern-cxx to nlohmann-json Simon Tournier
2023-05-11 18:48     ` Liliana Marie Prikler
2023-05-14 10:24       ` bug#61724: " Liliana Marie Prikler
2023-04-28 19:50 ` [bug#61724] [PATCH v3 2/3] gnu: nlohmann-json: Update to 3.11.2 Liliana Marie Prikler
2023-04-29  0:15   ` jgart via Guix-patches via
2023-04-28 19:55 ` [bug#61724] [PATCH v3 3/3] gnu: nlohmann-json: Improve package style Liliana Marie Prikler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7fff809117a7e9a66267143a00b6e927ac96d5be.1683475550.git.liliana.prikler@gmail.com \
    --to=liliana.prikler@gmail.com \
    --cc=61724@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.