From patchwork Fri Apr 28 19:50:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49856 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B018927BBE9; Sun, 7 May 2023 17:07:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 84CE727BBE2 for ; Sun, 7 May 2023 17:07:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pvgui-00032Z-5P; Sun, 07 May 2023 12:07:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pvgug-00031k-Tv for guix-patches@gnu.org; Sun, 07 May 2023 12:07:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pvgud-0006GH-5P for guix-patches@gnu.org; Sun, 07 May 2023 12:07:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pvgud-0004BQ-05 for guix-patches@gnu.org; Sun, 07 May 2023 12:07:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#61724] [PATCH v4 2/7] gnu: nlohmann-json: Update to 3.11.2. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 May 2023 16:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61724 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61724@debbugs.gnu.org Received: via spool by 61724-submit@debbugs.gnu.org id=B61724.168347562016056 (code B ref 61724); Sun, 07 May 2023 16:07:02 +0000 Received: (at 61724) by debbugs.gnu.org; 7 May 2023 16:07:00 +0000 Received: from localhost ([127.0.0.1]:38262 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvguZ-0004At-Qy for submit@debbugs.gnu.org; Sun, 07 May 2023 12:07:00 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:57395) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvguM-0004A4-MJ for 61724@debbugs.gnu.org; Sun, 07 May 2023 12:06:49 -0400 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-965cc5170bdso483325566b.2 for <61724@debbugs.gnu.org>; Sun, 07 May 2023 09:06:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683475601; x=1686067601; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=q5rz85lGSX5a0PXRHnaLbFBTxeehARd0dSjEgWRGQsA=; b=abbILvchWitSqrsUcISYzqjioq7KvsWMtIlnKJRC+gjGipAO3nP0SSR3/jzedO709b oml4LdzKAZ5VV+Rg/uqT9NH0Mh17YTDSCNcyUbhED0BMhfRjHy7ULs5cFf0H0gOp8lha /AjIFG9mA+VSP1cLLT5fqSP8yo05vFaGG3Zn5z4so+zmSFdy8eePY1buv0g0ssAsYISS 4Is3s3ItHhA+Zec0TOiwb/CIR/S5G4MlLo0mvBdeK4RdWAgm4/VfuG178DudktEGTDvu pRRY28G7OmEjjmzxschbcKISWnKntFRXoeo7rn5ibWKsXwGYQedqD1kGNDd7FN+D6EOV j9Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683475601; x=1686067601; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=q5rz85lGSX5a0PXRHnaLbFBTxeehARd0dSjEgWRGQsA=; b=Vy9Z3bfyWuPGtHTJ0cTD4VChZym4xjeFjvDZlwv3vHFi/GJKwsZlhY+6unhr51yenA KZHeszHb9eLitSt0JenCkO69mT3cwhL8pUBG9FSlviOFyj82n0qBNZ4Nx/E51FHRW26G gFFvM0KwZRj37TneOyG6nrSBvq/jHdbJO+5GhbbUPCjnmDgM9vdrMwlFbt4fLRQVIbM5 z2P+oSQyTZdPNn7s7A9O+Mqkk/h3Tr82EEaRAfvYkSW8EEQ3oiNj9UZTUU7an1cg+7xY kS3/PsMQz0HCSTqqnYdpc9i/m6ck/Ni3Mhc7B62u/I5fPppKe4yT9A1Pys89H9mowUL2 XNnw== X-Gm-Message-State: AC+VfDx1ifyZXIs4/Rkiijr09zXb4hkkZEt+Dmh0HuUYDphE1CllDcQx 0Ab8uBZ7ncWGa1w1wX4N2V/qAEkHCB53sw== X-Google-Smtp-Source: ACHHUZ7TRvcCmhwit0jj/q0YbfZQ0+WiHclWYTMJ72JwJjMJcnr2+EX/+ek4HCGVJB6mYo6zUD2YIg== X-Received: by 2002:a17:906:fd88:b0:965:a72a:b2ae with SMTP id xa8-20020a170906fd8800b00965a72ab2aemr5840770ejb.60.1683475600991; Sun, 07 May 2023 09:06:40 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id hy27-20020a1709068a7b00b0094f3d700868sm3766618ejc.80.2023.05.07.09.06.40 for <61724@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 May 2023 09:06:40 -0700 (PDT) Message-Id: <7fff809117a7e9a66267143a00b6e927ac96d5be.1683475550.git.liliana.prikler@gmail.com> In-Reply-To: <7429efc0ff6e48ddd1169a5353abbe6226edaaeb.1683475550.git.liliana.prikler@gmail.com> References: <7429efc0ff6e48ddd1169a5353abbe6226edaaeb.1683475550.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Fri, 28 Apr 2023 21:50:32 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (nlohmann-json): Update to 3.11.2. [source]: Adjust accordingly. [native-inputs]: 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 ")) - (with-directory-excursion "test/src" + (substitute* (find-files "./tests/" "\\.h(pp)?") + (("#include \"doctest\\.h\"") "#include ") + (("#include ") "#include ")) + (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++")