From patchwork Thu Feb 23 05:11:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: jgart X-Patchwork-Id: 47222 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 A7EDF16BBC; Thu, 23 Feb 2023 05:13:39 +0000 (GMT) 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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 4441F16B9D for ; Thu, 23 Feb 2023 05:13:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pV3uj-0002Ow-J5; Thu, 23 Feb 2023 00:13:05 -0500 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 1pV3uh-0002Nt-Bw for guix-patches@gnu.org; Thu, 23 Feb 2023 00:13:03 -0500 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 1pV3ug-0004BN-Pi for guix-patches@gnu.org; Thu, 23 Feb 2023 00:13:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pV3ug-0003If-KN for guix-patches@gnu.org; Thu, 23 Feb 2023 00:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61724] [PATCH 1/3] gnu: Add nlohmann-json. References: In-Reply-To: Resent-From: jgart Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Feb 2023 05:13: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 Cc: jgart Received: via spool by 61724-submit@debbugs.gnu.org id=B61724.167712916812636 (code B ref 61724); Thu, 23 Feb 2023 05:13:02 +0000 Received: (at 61724) by debbugs.gnu.org; 23 Feb 2023 05:12:48 +0000 Received: from localhost ([127.0.0.1]:60912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pV3uS-0003Hj-4n for submit@debbugs.gnu.org; Thu, 23 Feb 2023 00:12:48 -0500 Received: from mx2.dismail.de ([159.69.191.136]:33312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pV3uP-0003H3-2m for 61724@debbugs.gnu.org; Thu, 23 Feb 2023 00:12:45 -0500 Received: from mx2.dismail.de (localhost [127.0.0.1]) by mx2.dismail.de (OpenSMTPD) with ESMTP id fe5f1821 for <61724@debbugs.gnu.org>; Thu, 23 Feb 2023 06:12:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20190914; bh=UnGyV8bsS+MJrdbl8i0GT LcFbgkWJcPAZXUERCAfrzQ=; b=vIFCrmC6zwfWBwNiukAzRsOaJQFWFWpNqEh7D gi1NGgsv3JNykpA4n00NM0g7EvSe6++A4Yx38eLlH6r6Qtt40KEqEnXUEAlJf20S qSnbpfgoYxvYipLfJxZy8n5mtEnezvxFaG/6/493v3glcaCpL6ZM7ioAmkG4CTrN quuk7BxYakr9WnHRBgDm+4zahxoo1qSeri81WDCE8zUqGKrE5N0wv8ZssDjgEB5K 2f3/gm8T+RF/hUnSYsLEzt2cqYol0XYfleNzb2zoS6D93T9PWekN9rwHaNL/jBCS JBpSMZSf0v2OnoQIr48njkzr2Jq2bedVGmQ2FtrEsq8CuBYSQ== Received: from smtp1.dismail.de ( [10.240.26.11]) by mx2.dismail.de (OpenSMTPD) with ESMTP id 3974e433 for <61724@debbugs.gnu.org>; Thu, 23 Feb 2023 06:12:37 +0100 (CET) Received: from smtp1.dismail.de (localhost [127.0.0.1]) by smtp1.dismail.de (OpenSMTPD) with ESMTP id 2184049b for <61724@debbugs.gnu.org>; Thu, 23 Feb 2023 06:12:37 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 92925a1d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 23 Feb 2023 06:12:36 +0100 (CET) Date: Thu, 23 Feb 2023 06:11:59 +0100 Message-Id: <20230223051201.17541-1-jgart@dismail.de> X-Mailer: git-send-email 2.39.1 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: , Reply-to: jgart X-ACL-Warn: , jgart via Guix-patches X-Patchwork-Original-From: jgart via Guix-patches via From: jgart 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): New variable. --- gnu/packages/cpp.scm | 98 +++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 61 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index ed6ae69198..7091459d97 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -22,7 +22,7 @@ ;;; Copyright © 2021 Nicolò Balzarotti ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Nikolay Korotkiy -;;; Copyright © 2021 jgart +;;; Copyright © 2021, 2023 jgart ;;; Copyright © 2021 Julien Lepiller ;;; Copyright © 2021 Disseminate Dissent ;;; Copyright © 2022 Efraim Flashner @@ -595,74 +595,50 @@ (define-public json-dto data transfer object.") (license license:bsd-3))) -(define-public json-modern-cxx +(define-public nlohmann-json (package - (name "json-modern-cxx") - (version "3.10.5") - (home-page "https://github.com/nlohmann/json") + (name "nlohmann-json") + (version "3.11.2") (source (origin (method git-fetch) - (uri (git-reference (url home-page) - (commit (string-append "v" version)))) - (sha256 - (base32 "1f9mi45ilwjc2w92grjc53sw038840bjpn8yjf6wc6bxs2nijfqd")) + (uri (git-reference + (url "https://github.com/nlohmann/json") + (commit (string-append "v" version)))) (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") - - ;; Adjust for the unbundled fifo_map and doctest. - (substitute* "./test/thirdparty/doctest/doctest_compatibility.h" - (("#include \"doctest\\.h\"") - "#include ")) - (with-directory-excursion "test/src" - (let ((files (find-files "." "\\.cpp$"))) - (substitute* files - (("#include ?\"(fifo_map.hpp)\"" all fifo-map-hpp) - (string-append - "#include "))))))))) + (sha256 + (base32 "0g6rfsbkvrxmacchz4kbr741yybj7mls3r4hgyfdd3pdbqhn2is9")))) (build-system cmake-build-system) (arguments - '(#:configure-flags - (list "-DJSON_MultipleHeaders=ON" ; For json_fwd.hpp. - (string-append "-DJSON_TestDataDirectory=" - (dirname - (search-input-directory %build-inputs - "json_nlohmann_tests")))) - #:phases (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? parallel-tests? #:allow-other-keys) - (if tests? - ;; Some tests need git and a full checkout, skip those. - (invoke "ctest" "-LE" "git_required" - "-j" (if parallel-tests? - (number->string (parallel-job-count)) - "1")) - (format #t "test suite not run~%"))))))) + (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 - (list amalgamate - (let ((version "3.0.0")) - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/nlohmann/json_test_data") - (commit (string-append "v" version)))) - (file-name (git-file-name "json_test_data" version)) - (sha256 - (base32 - "0nzsjzlvk14dazwh7k2jb1dinb0pv9jbx5jsyn264wvva0y7daiv")))))) - (inputs - (list doctest fifo-map)) - (synopsis "JSON parser and printer library for C++") - (description "JSON for Modern C++ is a C++ JSON library that provides -intuitive syntax and trivial integration.") + `(("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 xtl From patchwork Thu Feb 23 05:12:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jgart X-Patchwork-Id: 47221 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 D1D9B16BA9; Thu, 23 Feb 2023 05:13:36 +0000 (GMT) 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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED 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 D8CE916B9D for ; Thu, 23 Feb 2023 05:13:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pV3uj-0002Os-69; Thu, 23 Feb 2023 00:13:05 -0500 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 1pV3uh-0002Nv-Fh for guix-patches@gnu.org; Thu, 23 Feb 2023 00:13:03 -0500 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 1pV3uh-0004BU-7E for guix-patches@gnu.org; Thu, 23 Feb 2023 00:13:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pV3uh-0003Io-1y for guix-patches@gnu.org; Thu, 23 Feb 2023 00:13:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61724] [PATCH 2/3] gnu: json-modern-cxx: Remove deprecated package. Resent-From: jgart Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Feb 2023 05:13:03 +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 Cc: jgart Received: via spool by 61724-submit@debbugs.gnu.org id=B61724.167712917012644 (code B ref 61724); Thu, 23 Feb 2023 05:13:03 +0000 Received: (at 61724) by debbugs.gnu.org; 23 Feb 2023 05:12:50 +0000 Received: from localhost ([127.0.0.1]:60914 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pV3uS-0003Hl-O9 for submit@debbugs.gnu.org; Thu, 23 Feb 2023 00:12:50 -0500 Received: from mx2.dismail.de ([159.69.191.136]:33312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pV3uQ-0003H3-Ak for 61724@debbugs.gnu.org; Thu, 23 Feb 2023 00:12:46 -0500 Received: from mx2.dismail.de (localhost [127.0.0.1]) by mx2.dismail.de (OpenSMTPD) with ESMTP id d4aed78a for <61724@debbugs.gnu.org>; Thu, 23 Feb 2023 06:12:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20190914; bh=B8VlAEepNLbC1lG/+FPVq V7qfakrhHrXmZzTycCnnNE=; b=pLbVNgBtQQWbGvukH/FPd62wPXp3frRrThBSr 6ER4hWqitZKiVf9vRgKUTgVdg4QJUE6c6D7LtuTMT7CD14ktDjiN2ZAb2FgOYok4 vk92Ek/Vm/a2TwBTrH+GcFmxlzSH/aKolAZfnsjcYx5LIaCfgNCCSIxVrr3P2PcL C6xVF/O6gIH1E+HGa3m5ThzOqqOAUewzWeqjX8j7aRY2st/MAg2b8rQHZj94crOl x5bYlipvWBOwLoeLx/rcmcPHvGY4Ol5SrAF8tQDBIscrxDEfz56CL0Te2G1Nl1V3 fYxiifnKvtiq/xkzMKxEuSfczccTKJ6UPqYsI47vzdyfdWMlQ== Received: from smtp1.dismail.de ( [10.240.26.11]) by mx2.dismail.de (OpenSMTPD) with ESMTP id 6670a093 for <61724@debbugs.gnu.org>; Thu, 23 Feb 2023 06:12:38 +0100 (CET) Received: from smtp1.dismail.de (localhost [127.0.0.1]) by smtp1.dismail.de (OpenSMTPD) with ESMTP id 0b8f1913 for <61724@debbugs.gnu.org>; Thu, 23 Feb 2023 06:12:38 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id c74749a2 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 23 Feb 2023 06:12:37 +0100 (CET) Date: Thu, 23 Feb 2023 06:12:00 +0100 Message-Id: <20230223051201.17541-2-jgart@dismail.de> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223051201.17541-1-jgart@dismail.de> References: <20230223051201.17541-1-jgart@dismail.de> 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: , Reply-to: jgart X-ACL-Warn: , jgart via Guix-patches X-Patchwork-Original-From: jgart via Guix-patches via From: jgart 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 (json-modern-cxx): Delete variable. --- gnu/packages/cpp.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 7091459d97..d4d4173675 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -595,6 +595,9 @@ (define-public json-dto data transfer object.") (license license:bsd-3))) +(define-public json-modern-cxx + (deprecated-package "json-modern-cxx" nlohmann-json)) + (define-public nlohmann-json (package (name "nlohmann-json") From patchwork Thu Feb 23 05:12:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jgart X-Patchwork-Id: 47223 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 2C96C16BBC; Thu, 23 Feb 2023 05:13:43 +0000 (GMT) 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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 2EF2516B9D for ; Thu, 23 Feb 2023 05:13:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pV3uj-0002Ou-F9; Thu, 23 Feb 2023 00:13:05 -0500 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 1pV3uh-0002OM-Vz for guix-patches@gnu.org; Thu, 23 Feb 2023 00:13:04 -0500 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 1pV3uh-0004Bg-MQ for guix-patches@gnu.org; Thu, 23 Feb 2023 00:13:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pV3uh-0003Iw-Gb for guix-patches@gnu.org; Thu, 23 Feb 2023 00:13:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61724] [PATCH 3/3] gnu: Refactor packages to use new nlohmann-json variable. Resent-From: jgart Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Feb 2023 05:13:03 +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 Cc: jgart Received: via spool by 61724-submit@debbugs.gnu.org id=B61724.167712917412661 (code B ref 61724); Thu, 23 Feb 2023 05:13:03 +0000 Received: (at 61724) by debbugs.gnu.org; 23 Feb 2023 05:12:54 +0000 Received: from localhost ([127.0.0.1]:60916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pV3uX-0003I8-OP for submit@debbugs.gnu.org; Thu, 23 Feb 2023 00:12:54 -0500 Received: from mx2.dismail.de ([159.69.191.136]:33312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pV3uR-0003H3-1z for 61724@debbugs.gnu.org; Thu, 23 Feb 2023 00:12:48 -0500 Received: from mx2.dismail.de (localhost [127.0.0.1]) by mx2.dismail.de (OpenSMTPD) with ESMTP id 91fecfa0 for <61724@debbugs.gnu.org>; Thu, 23 Feb 2023 06:12:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20190914; bh=KHGT6GhAl+macVy0zCOvN IH2PUHu8gpytTK++J+bgxY=; b=Wi4gIXZsdnkf/VgC38u3BpLSONqECXVj5m+/8 gyX5nDxRQoGjL4E8y5HbTlsEFDUoyLv1+BhTCtDN8FcIOzNGbFO7CDKZOIQ+ftWw VQhFhrJe8NgN4f3psMVGnFFkMDt++Qep3y/HPlg2p7wdDUz1EXCSUFjNyMG6dBJa cObrUeMqNa49LqiqFszb0og8UuYr4c2u5bs6t/jrzllZnq/crqXU/NEuC6ioQ3zH /Janf1sgeESr4dQaHV+XcWwoDfrtqpD6ANsnZ4VxoVa3yTK2dlWCCt4PEZoCAMxC tVdooonT4zqRZgCfnelLb8RItCopyg8VgEE/kn9GH+E/ataPg== Received: from smtp1.dismail.de ( [10.240.26.11]) by mx2.dismail.de (OpenSMTPD) with ESMTP id 51a945ea for <61724@debbugs.gnu.org>; Thu, 23 Feb 2023 06:12:40 +0100 (CET) Received: from smtp1.dismail.de (localhost [127.0.0.1]) by smtp1.dismail.de (OpenSMTPD) with ESMTP id 83c0e434 for <61724@debbugs.gnu.org>; Thu, 23 Feb 2023 06:12:39 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 82be671f (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 23 Feb 2023 06:12:38 +0100 (CET) Date: Thu, 23 Feb 2023 06:12:01 +0100 Message-Id: <20230223051201.17541-3-jgart@dismail.de> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223051201.17541-1-jgart@dismail.de> References: <20230223051201.17541-1-jgart@dismail.de> 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: , Reply-to: jgart X-ACL-Warn: , jgart via Guix-patches X-Patchwork-Original-From: jgart via Guix-patches via From: jgart 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/build-tools.scm (bear): Use new variable. [inputs]: Use variable. * gnu/packages/cpp.scm (xtl): Use new variable. [inputs]: Use variable. * gnu/packages/cpp.scm (jsonnet): Use new variable. [inputs]: Use variable. * gnu/packages/cybersecurity.scm (blacksmith): Use new variable. [inputs]: Use variable. * gnu/packages/games.scm (openrct2): Use new variable. [inputs]: Use variable. * gnu/packages/graphics.scm (f3d): Use new variable. [native-inputs]: Use variable. * gnu/packages/hardware.scm (openrgb): Use new variable. [arguments]: Use variable. [inputs]: Use variable. * gnu/packages/irods.scm (irods): Use new variable. [inputs]: Use variable. * gnu/packages/jupyter.scm (xeus): Use new variable. [inputs]: Use variable. * gnu/packages/messaging.scm (mtxclient): Use new variable. [inputs]: Use variable. * gnu/packages/text-editors.scm (jucipp): Use new variable. [inputs]: Use variable. * gnu/packages/video.scm (mkvtoolnix): Use new variable. [inputs]: Use variable. * gnu/packages/xdisorg.scm (nwg-launchers): Use new variable. [native-inputs]: Use variable. --- gnu/packages/build-tools.scm | 2 +- gnu/packages/cpp.scm | 4 ++-- gnu/packages/cybersecurity.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/graphics.scm | 2 +- gnu/packages/hardware.scm | 4 ++-- gnu/packages/irods.scm | 4 ++-- gnu/packages/jupyter.scm | 2 +- gnu/packages/messaging.scm | 4 ++-- gnu/packages/text-editors.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/xdisorg.scm | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 3d03c37a2c..0e043b5cf6 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -147,7 +147,7 @@ (define-public bear `(("c-ares" ,c-ares) ("fmt" ,fmt-8) ("grpc" ,grpc) - ("json-modern-cxx" ,json-modern-cxx) + ("nlohmann-json" ,nlohmann-json) ("protobuf" ,protobuf) ("python" ,python-wrapper) ("re2" ,re2) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index d4d4173675..d365c2ba74 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -659,7 +659,7 @@ (define-public xtl "134pgvmf9cx5dxs0m0m3qhp3m3r1gl86ic3xax21zc4sdj8sdq46")) (file-name (git-file-name name version)))) (native-inputs - (list doctest googletest json-modern-cxx)) + (list doctest googletest nlohmann-json)) (arguments '(#:configure-flags '("-DBUILD_TESTS=ON") @@ -1808,7 +1808,7 @@ (define-public jsonnet (native-inputs (list googletest pkg-config)) (inputs - (list json-modern-cxx)) + (list nlohmann-json)) (home-page "https://jsonnet.org/") (synopsis "Data templating language") (description "Jsonnet is a templating language extending JSON diff --git a/gnu/packages/cybersecurity.scm b/gnu/packages/cybersecurity.scm index 7bca251d06..cb03cbd5aa 100644 --- a/gnu/packages/cybersecurity.scm +++ b/gnu/packages/cybersecurity.scm @@ -89,7 +89,7 @@ (define-public blacksmith (native-inputs (list pkg-config)) (inputs - (list argagg asmjit json-modern-cxx)) + (list argagg asmjit nlohmann-json)) (home-page "https://comsec.ethz.ch/research/dram/blacksmith") (synopsis "Rowhammer fuzzer with non-uniform and frequency-based patterns") (description diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index e1639a8c64..10a22fe031 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4763,7 +4763,7 @@ (define-public openrct2 ("freetype" ,freetype) ("icu4c" ,icu4c) ("jansson" ,jansson) - ("json-modern-cxx" ,json-modern-cxx) + ("nlohmann-json" ,nlohmann-json) ("libpng" ,libpng) ("libzip" ,libzip) ("mesa" ,mesa) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 94b93970b1..cc3ae9909f 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2556,7 +2556,7 @@ (define-public f3d (native-inputs (list cxxopts help2man - json-modern-cxx)) + nlohmann-json)) (inputs (list alembic assimp diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index c00a6e2d91..9fb896a36a 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -1070,7 +1070,7 @@ (define-public openrgb (string-append #$(this-package-input "hueplusplus") "/include/hueplusplus")) (("dependencies/json") - (string-append #$(this-package-input "json-modern-cxx") + (string-append #$(this-package-input "nlohmann-json") "/include/nlohmann"))))) ;; Call qmake instead of configure to create a Makefile. (replace 'configure @@ -1078,7 +1078,7 @@ (define-public openrgb (inputs (list hidapi hueplusplus - json-modern-cxx + nlohmann-json libusb mbedtls-apache qtbase-5)) diff --git a/gnu/packages/irods.scm b/gnu/packages/irods.scm index 5c9b66000c..a14ac87aa2 100644 --- a/gnu/packages/irods.scm +++ b/gnu/packages/irods.scm @@ -143,7 +143,7 @@ (define-public irods ("boost" ,boost-for-irods) ("cppzmq" ,cppzmq) ("fmt" ,fmt-6) - ("json" ,json-modern-cxx) + ("json" ,nlohmann-json) ("libarchive" ,libarchive) ("libcxxabi" ,libcxxabi-6) ; we need this for linking with -lc++abi ("linux-pam" ,linux-pam) @@ -247,7 +247,7 @@ (define-public irods-client-icommands ("cppzmq" ,cppzmq) ("fmt" ,fmt-6) ("irods" ,irods) - ("json" ,json-modern-cxx) + ("json" ,nlohmann-json) ("libarchive" ,libarchive) ("libcxxabi" ,libcxxabi-6) ; we need this for linking with -lc++abi ("mit-krb5" ,mit-krb5) diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index 20c72a7437..cfc7ff0451 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -195,7 +195,7 @@ (define-public xeus python-jupyter-client)) (inputs (list xtl - json-modern-cxx + nlohmann-json cppzmq zeromq openssl diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index d540309a8f..f3456f7eaf 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2331,7 +2331,7 @@ (define-public mtxclient (list boost coeurl curl - json-modern-cxx + nlohmann-json libevent libsodium olm @@ -2414,7 +2414,7 @@ (define-public nheko gst-plugins-base gst-plugins-bad ; sdp & webrtc for voip gst-plugins-good-qt ; rtpmanager for voip - json-modern-cxx + nlohmann-json libevent libnice ; for voip olm diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 16400481b0..56da6139f9 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -390,7 +390,7 @@ (define-public jucipp clang-11 ;XXX: must be the same version as Mesas LLVM gtkmm-3 gtksourceviewmm - json-modern-cxx + nlohmann-json libgit2 universal-ctags)) (synopsis "Lightweight C++ IDE") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index fcbafdb846..7638412227 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1049,7 +1049,7 @@ (define-public mkvtoolnix ("gettext" ,gettext-minimal) ("googletest" ,googletest) ("libxslt" ,libxslt) - ("json-modern-cxx" ,json-modern-cxx) + ("nlohmann-json" ,nlohmann-json) ("perl" ,perl) ("pkg-config" ,pkg-config) ("po4a" ,po4a) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index ddb70bd817..574a28cdaa 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -3114,7 +3114,7 @@ (define-public nwg-launchers (base32 "0hq2qiqxvrw3g515ywcb676ljc8mdw3pyslgxr3vahizfljah1pv")))) (build-system meson-build-system) - (native-inputs (list json-modern-cxx pkg-config)) + (native-inputs (list nlohmann-json pkg-config)) (inputs (list gtk-layer-shell gtkmm-3 librsvg)) (home-page "https://github.com/nwg-piotr/nwg-launchers") (synopsis "Application launchers for wlroots")