From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 23 00:06:52 2023 Received: (at submit) by debbugs.gnu.org; 23 Feb 2023 05:06:52 +0000 Received: from localhost ([127.0.0.1]:60887 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pV3oi-000367-0x for submit@debbugs.gnu.org; Thu, 23 Feb 2023 00:06:52 -0500 Received: from lists.gnu.org ([209.51.188.17]:49844) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pV3og-00035z-97 for submit@debbugs.gnu.org; Thu, 23 Feb 2023 00:06:50 -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 1pV3of-0001on-VO for guix-patches@gnu.org; Thu, 23 Feb 2023 00:06:50 -0500 Received: from mx1.dismail.de ([78.46.223.134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pV3od-0002nH-F1 for guix-patches@gnu.org; Thu, 23 Feb 2023 00:06:49 -0500 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id a474da8c; Thu, 23 Feb 2023 06:06:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h= mime-version:date:content-type:content-transfer-encoding:from :message-id:subject:to:cc; s=20190914; bh=onMatXYCOT4UJ/S/5yUQSh uhXGUuQ7adhq7fFRlzg24=; b=ZrY8FV3wC10y5DuWmVj8qZn1HBq8rY8ikZA/Bz CKfbFmaBInKFTwBGKZGLkMt+PWKXPc9p6aX8VgxiDOSTCwNj6HzT3M3zoB7ByFby SfhI2NhnW/bc9IBjtlfXoPXS3YSdSFXKeKSM/ZNRCD1X9k6Px5iSgMua2ZeXPf8C mfvQ4ES+0VH3eoJTIrPDgPqE4+ivYUknRk3NlqlrD86cZvmoDZgklPoa8PCWeq8E 177ROXmZi/XNNNN2ZMD3uWHXeeg5X1fIE0PE4R2iT5ikVACxhc7XCVyaw6jd/O4u CL2EqUJQlejMAx2IhG2zrw4uesJyb+4hOOdjBGsM8ZTgtVyQ== Received: from smtp1.dismail.de ( [10.240.26.11]) by mx1.dismail.de (OpenSMTPD) with ESMTP id c1a1fa31; Thu, 23 Feb 2023 06:06:41 +0100 (CET) Received: from smtp1.dismail.de (localhost [127.0.0.1]) by smtp1.dismail.de (OpenSMTPD) with ESMTP id 83e89db8; Thu, 23 Feb 2023 06:06:41 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id ced7fbf5 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 23 Feb 2023 06:06:41 +0100 (CET) MIME-Version: 1.0 Date: Thu, 23 Feb 2023 05:06:40 +0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Mailer: RainLoop/1.16.0a From: "jgart" Message-ID: Subject: [PATCH 1/3] gnu: Add nlohmann-json. To: guix-patches@gnu.org Received-SPF: pass client-ip=78.46.223.134; envelope-from=jgart@dismail.de; helo=mx1.dismail.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Hi, This patch series deprecates json-modern-cxx and refactors existing packa= ges to use the new nlohmann-json package and variable. all best, jgart From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 23 00:12:48 2023 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) From: jgart To: 61724@debbugs.gnu.org. Subject: [PATCH 1/3] gnu: Add nlohmann-json. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 61724 Cc: jgart X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 23 00:12:50 2023 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) From: jgart To: 61724@debbugs.gnu.org. Subject: [PATCH 2/3] gnu: json-modern-cxx: Remove deprecated package. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 61724 Cc: jgart X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 23 00:12:54 2023 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) From: jgart To: 61724@debbugs.gnu.org. Subject: [PATCH 3/3] gnu: Refactor packages to use new nlohmann-json variable. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 61724 Cc: jgart X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 23 12:57:25 2023 Received: (at 61724) by debbugs.gnu.org; 23 Feb 2023 17:57:25 +0000 Received: from localhost ([127.0.0.1]:35233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVFqP-0004L0-51 for submit@debbugs.gnu.org; Thu, 23 Feb 2023 12:57:25 -0500 Received: from mail-ed1-f66.google.com ([209.85.208.66]:41573) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVFqM-0004Kc-Re; Thu, 23 Feb 2023 12:57:24 -0500 Received: by mail-ed1-f66.google.com with SMTP id ec43so44652896edb.8; Thu, 23 Feb 2023 09:57:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=Cl7Es8gQ6povWuQSImqvjlLYlcjxT9ujZ9RQRhVxwXw=; b=VuxILRFKreC9elI8/EmYRrBqy57kQFrLQroLVZVQ78qg/L7jfCK/S8h/1I1AbLZr8s f3KyOKvOhNeHd8ePihDfW6u0yGhT2qMPLFERyUZuflnthycv60T92zILuvYUjzbsb5NJ E9SItOJN3dKkwntnrusKyla1+WVRyiE1JemuLj1K+DocTfAq5fxijrC0yioVnTJJy3Ch DhtHCDMYvE7dflEIz9cnbYBXHzsP2XaDI0yLEiwPIkcwTQOOMnkIWhawv1eLE8paztC2 mOu9On/tT9OBa1JexyD2MpzZbECzHEldL2VIayyjhApNiPGS1Nk6+NqGvxeihAA1gpT9 QdIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Cl7Es8gQ6povWuQSImqvjlLYlcjxT9ujZ9RQRhVxwXw=; b=DF5zOCfZ1jtr3KPfIJOj+2YNNp6NnjI3TaLTMUN1pZ5kUqvoKVjEcnETZgybrWvEhS 6DLAyhKjzTEej3BJeK3yOYy0MKrcoIEHgOsTxYAdvBeqDrqK5PLibnr0HFCKobOHD9FR cM53568bh/gBq6K7s/PPq5Hnta4H8ax3GgjEAfg+URis71/q1tpZ/kgVpudJQXnAdx0+ tJ4L1Dzcyf9DBvoHo5bPSWjfgr1EceHE6C/V7QWAbf6eEslcz4v3mxNWZtwfJMiXY2Ju 4OLkNxwhIXZrr7uKlxsKyWKMdc1p7Pa1hGyEPbIvmEDoyos9pn0q/ZlkZpBU790pE5A9 iWmg== X-Gm-Message-State: AO0yUKXj+XYXvGvIoauqI5aWhKMRoIe5x1Go98N7TGSySPnEvAOswO2h 00H1gaVknto/zqZbKmgJLro= X-Google-Smtp-Source: AK7set+7GEEVXDoJ02DxkKR18jJ6dox1SM1oF6tvRWny0cigtpVaD+1VvEHVADvuxg8MDpRPnH8FDA== X-Received: by 2002:a17:906:71c2:b0:88d:2a41:2a4b with SMTP id i2-20020a17090671c200b0088d2a412a4bmr18921451ejk.60.1677175036766; Thu, 23 Feb 2023 09:57:16 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id se11-20020a170906ce4b00b008cecb8f374asm5794471ejb.0.2023.02.23.09.57.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 09:57:16 -0800 (PST) Message-ID: <3fe4ac9696ec9c962e4a120ca1292ab4fc0e7b70.camel@gmail.com> Subject: Re: [PATCH 1/3] gnu: Add nlohmann-json. From: Liliana Marie Prikler To: jgart , 61724@debbugs.gnu.org Date: Thu, 23 Feb 2023 18:57:14 +0100 In-Reply-To: <20230223051201.17541-1-jgart@dismail.de> References: <20230223051201.17541-1-jgart@dismail.de> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61724 Cc: control@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) merge 61672 61724 thanks Hi jgart, Am Donnerstag, dem 23.02.2023 um 06:11 +0100 schrieb jgart: > * gnu/packages/cpp.scm (nlohmann-json): New variable. > --- > =C2=A0gnu/packages/cpp.scm | 98 +++++++++++++++++------------------------= - > -- > =C2=A01 file changed, 37 insertions(+), 61 deletions(-) >=20 > 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 @@ > =C2=A0;;; Copyright =C2=A9 2021 Nicol=C3=B2 Balzarotti > =C2=A0;;; Copyright =C2=A9 2021 Guillaume Le Vaillant > =C2=A0;;; Copyright =C2=A9 2021 Nikolay Korotkiy > -;;; Copyright =C2=A9 2021 jgart > +;;; Copyright =C2=A9 2021, 2023 jgart > =C2=A0;;; Copyright =C2=A9 2021 Julien Lepiller > =C2=A0;;; Copyright =C2=A9 2021 Disseminate Dissent > > =C2=A0;;; Copyright =C2=A9 2022 Efraim Flashner > @@ -595,74 +595,50 @@ (define-public json-dto > =C2=A0data transfer object.") > =C2=A0=C2=A0=C2=A0=C2=A0 (license license:bsd-3))) > =C2=A0 > -(define-public json-modern-cxx > +(define-public nlohmann-json > =C2=A0=C2=A0 (package > -=C2=A0=C2=A0=C2=A0 (name "json-modern-cxx") > -=C2=A0=C2=A0=C2=A0 (version "3.10.5") > -=C2=A0=C2=A0=C2=A0 (home-page "https://github.com/nlohmann/json") > +=C2=A0=C2=A0=C2=A0 (name "nlohmann-json") > +=C2=A0=C2=A0=C2=A0 (version "3.11.2") Perform one logical change at a time: 1. Updating is a logical change. 2. Renaming and adjusting dependant packages is a logical change. When adding a deprecated alias, it should be done in the same commit as the rename (2). The order of commits between (1) and (2) doesn't matter. Cheers From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 23 15:43:03 2023 Received: (at 61724) by debbugs.gnu.org; 23 Feb 2023 20:43:03 +0000 Received: from localhost ([127.0.0.1]:35448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVIQg-0002jQ-2X for submit@debbugs.gnu.org; Thu, 23 Feb 2023 15:43:03 -0500 Received: from mx2.dismail.de ([159.69.191.136]:5411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVIQe-0002j5-37 for 61724@debbugs.gnu.org; Thu, 23 Feb 2023 15:43:01 -0500 Received: from mx2.dismail.de (localhost [127.0.0.1]) by mx2.dismail.de (OpenSMTPD) with ESMTP id a059b362; Thu, 23 Feb 2023 21:42:52 +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=ucLEhKd1G1GWroF6N1AU6 KD3lQpgYvzg/XFKs9rRBMo=; b=FcC7urOurRTwcVvHsfAVMINqXELxpm7FqF+rL QZc43dorolv7epRxaHh4YQSqeD98ZB2p3eLAIbDHpxDwGPCs+IavmwB6jMgOJyYD 2GRLHhMbd9yMw9jT67LQTzR5zv7H6Cfyy/85ZJMTK1x5a/N2mW+untCt5Rg941sp USkBJaul+20vePMacsHqk1SE0NRUA4YcVm0p1svOMDfT4lqiTMFcXxEW7cxhuhR3 fPy1qj2AmBIw0fk/e/NGsznS0Gwmz6M7lcUTbxXFo3rCwdQon19dTCefNZvfX3W+ 8pv2Vu2PxB89gN8sp95/YtMfDG9t+riKt1C8V6MfMh5+6sZvA== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx2.dismail.de (OpenSMTPD) with ESMTP id 3f68a59d; Thu, 23 Feb 2023 21:42:51 +0100 (CET) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 16419195; Thu, 23 Feb 2023 21:42:51 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 8c7814b1 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 23 Feb 2023 21:42:45 +0100 (CET) From: jgart To: 61724@debbugs.gnu.org. Subject: [PATCH v2 1/2] gnu: Add nlohmann-json. Date: Thu, 23 Feb 2023 21:17:24 +0100 Message-Id: <20230223201724.28695-1-jgart@dismail.de> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 61724 Cc: jgart , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/cpp.scm (nlohmann-json): New variable. --- hi lilyp, thanks for the review and tips! wdyt of v2 all best, jgart 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 -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 23 15:43:07 2023 Received: (at 61724) by debbugs.gnu.org; 23 Feb 2023 20:43:07 +0000 Received: from localhost ([127.0.0.1]:35450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVIQl-0002js-3K for submit@debbugs.gnu.org; Thu, 23 Feb 2023 15:43:07 -0500 Received: from mx2.dismail.de ([159.69.191.136]:5411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVIQf-0002j5-HX for 61724@debbugs.gnu.org; Thu, 23 Feb 2023 15:43:03 -0500 Received: from mx2.dismail.de (localhost [127.0.0.1]) by mx2.dismail.de (OpenSMTPD) with ESMTP id ef7c0c53 for <61724@debbugs.gnu.org>; Thu, 23 Feb 2023 21:42:54 +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=2vWTSmC04XroMk7zZCUuW yISxunMeh5FZcs+HR7C0aw=; b=GVqZCFL8Ua5EswaDyCwiniJvsokaI8jrVZ7ue jA4SnNtJZwao47kac9td3X8pUeuHzhjulSUIlJL4j7q2/wgzl+ubFcctEMYovxbw WEtqNwmAtVq9657/oi/Ob4EhYtHMc9wfzjzI5JPP+2IXStMYL0x2/Iy3tzWhgR4P VgptA1rgoGSq7+xaR9Lb6EByv8kF+85vJ8Q9/1P6fCzVkfJbex+JzbZXgBvRARj/ N5TRCyufk6SQKwGfcK285qSc+og0PszyypnFOS0MAWoj3gDmXsxLBXv9gswv4ZMb NAhMUJEkkKv/lK9YddXzejPOQm3b0FsVMMVZhkJizlQsHz4yQ== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx2.dismail.de (OpenSMTPD) with ESMTP id 8e296ecf for <61724@debbugs.gnu.org>; Thu, 23 Feb 2023 21:42:53 +0100 (CET) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id fab0efd4 for <61724@debbugs.gnu.org>; Thu, 23 Feb 2023 21:42:52 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 30496258 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 23 Feb 2023 21:42:46 +0100 (CET) From: jgart To: 61724@debbugs.gnu.org. Subject: [PATCH v2 2/2] gnu: Refactor packages to use new nlohmann-json variable. Date: Thu, 23 Feb 2023 21:17:25 +0100 Message-Id: <20230223201724.28695-2-jgart@dismail.de> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230223201724.28695-1-jgart@dismail.de> References: <20230223201724.28695-1-jgart@dismail.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 61724 Cc: jgart X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/cpp.scm (json-modern-cxx): Delete 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/build-tools.scm (bear): 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 | 7 +++++-- 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, 19 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 7091459d97..d365c2ba74 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") @@ -656,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") @@ -1805,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") -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 23 15:59:17 2023 Received: (at 61724) by debbugs.gnu.org; 23 Feb 2023 20:59:17 +0000 Received: from localhost ([127.0.0.1]:35472 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVIgP-0003CZ-2s for submit@debbugs.gnu.org; Thu, 23 Feb 2023 15:59:17 -0500 Received: from mail-ed1-f68.google.com ([209.85.208.68]:45657) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pVIgO-0003CN-3y for 61724@debbugs.gnu.org; Thu, 23 Feb 2023 15:59:16 -0500 Received: by mail-ed1-f68.google.com with SMTP id eg37so43251494edb.12 for <61724@debbugs.gnu.org>; Thu, 23 Feb 2023 12:59:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=C29m0i5f5vZWsDjJ6FyXiEUpYgSIeNdAIsGHysgPcQI=; b=bPTHgJjLMiI3AXn8/eERE9KWw7tqAXDLbKnIOtq3kdYctV9wIy03mKXEcQVlTF9xCm M370dQ5t4MqiHfksafw/ig+eYf5eserchqduMkwaAFT+PiigK+gn4ucwCy2qwXuO0WfP hhoh+779SlMZr4RBYWpB22MxNyRs5Pf+aBGZUAGlEaG7tQd2Gfaw83AckRuqL2Iyxlhl BvFXAKHy4O/JbHMiOLD20IOrw8hBxB5J0mKomANhidKcBmMH+vBVZHl10LZ8ojOLCI4H cTahWyt8lkfXmhYUVm1a9Hugprp7U05iGl3APvuOe4Lu4HgHd2FpOj7jWwVJ8mrbPDXS xKcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=C29m0i5f5vZWsDjJ6FyXiEUpYgSIeNdAIsGHysgPcQI=; b=e27rPpoEMEgQwF6pkFNqCLi5AaoZ/dHv1bNzTe/2n2IBG7AVoipSWFriqpFdiwerZQ VwzFZ3/qdorn9qNsGlcs16JjSzzsW3IfIZzXyKvuKsnI2ABIRAdx3WeCi2IZQwbeBwaX MQeIFU1njIGzd7hcEXYzPBC47/5Qn3oi4shAJkvuTL1nTtV460ItL8Qv4T/+rtzzSd/r iwPVuvnybnpujxbJPpu9/TjeB2fuoqLRRbV2d7uDvpxLh/VlzVZ1v55YUk3W1wO9z4U/ IUutMY05EI2CMpwRUIyNi8F5lSMoRSSbTvWOlPHVU/zEWypgMg1uhSQAEWIt7IFXWK7y ebCg== X-Gm-Message-State: AO0yUKXLUSgc3IvSe27CTWznGaiJSe7yxLMyed5JQb94Ffk1l42qHIEl Rx6pAnGMEFqnos8cF7JzW1Y= X-Google-Smtp-Source: AK7set9fAe3GaauEopbl6jiuwtir36Crfvku3YLOSCz2OGIXPaSJ/ispTrri68+GubDQRpaih85Zow== X-Received: by 2002:a17:907:c310:b0:8e5:2a12:8ec0 with SMTP id tl16-20020a170907c31000b008e52a128ec0mr9999212ejc.31.1677185950130; Thu, 23 Feb 2023 12:59:10 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id o15-20020a17090608cf00b008d398a4e687sm5464750eje.158.2023.02.23.12.59.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Feb 2023 12:59:09 -0800 (PST) Message-ID: Subject: Re: [PATCH v2 1/2] gnu: Add nlohmann-json. From: Liliana Marie Prikler To: jgart , 61724@debbugs.gnu.org Date: Thu, 23 Feb 2023 21:59:08 +0100 In-Reply-To: <20230223201724.28695-1-jgart@dismail.de> References: <20230223201724.28695-1-jgart@dismail.de> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61724 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 23.02.2023 um 21:17 +0100 schrieb jgart: > wdyt of v2 Am Donnerstag, dem 23.02.2023 um 18:57 +0100 schrieb Liliana Marie Prikler: > Perform one logical change at a time: > 1. Updating is a logical change. > 2. Renaming and adjusting dependant packages is a logical change. > When adding a deprecated alias, it should be done in the same commit > as the rename (2). Cheers From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 09 20:59:00 2023 Received: (at 61724) by debbugs.gnu.org; 10 Mar 2023 01:59:01 +0000 Received: from localhost ([127.0.0.1]:53372 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paS28-0004eI-Nr for submit@debbugs.gnu.org; Thu, 09 Mar 2023 20:59:00 -0500 Received: from mx1.dismail.de ([78.46.223.134]:24910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paS26-0004e3-LX for 61724@debbugs.gnu.org; Thu, 09 Mar 2023 20:58:59 -0500 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id ec2aea96; Fri, 10 Mar 2023 02:58:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h= mime-version:date:content-type:content-transfer-encoding:from :message-id:subject:to:in-reply-to:references; s=20190914; bh=dw T9VCFrIxcRz2C2GtAQSE7+4HdIPzqOcJ8o/gRxDm8=; b=JyXrUNMheEiinFaibN IwK6LFaaWnt8C+B234Oj6Jzvnss53yB4LAQhegveWgag3Rn1+F1dUeVv5T5V4Gx2 jttV2t8SAgX/cKNdtNv3Y+F+Gi7mWyucAQ79LoxHobomTKuJgTq0ZNlqWThkXeJf iH2YD0J2KQx2lJsm7xoFkGntOgKA2WuocRZe7PIPWQpLib0zrDZ9G5gpqSBw35qx MTUwVcdhAt7138xbOyj8dGI6FZUpwe1EHs7TIkApuDRa7gDZthuBbQGSlYl1gfB9 St/q38rEknJXOp6UEpN/gpRvj89+sSH0QOY2XvDPZfQxBaBeGAnUo/UPQQBoGxcI XRsQ== Received: from smtp1.dismail.de ( [10.240.26.11]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 87150c42; Fri, 10 Mar 2023 02:58:50 +0100 (CET) Received: from smtp1.dismail.de (localhost [127.0.0.1]) by smtp1.dismail.de (OpenSMTPD) with ESMTP id e73735e5; Fri, 10 Mar 2023 02:58:50 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id d2f1b03d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 10 Mar 2023 02:58:50 +0100 (CET) MIME-Version: 1.0 Date: Fri, 10 Mar 2023 01:58:49 +0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Mailer: RainLoop/1.16.0a From: "jgart" Message-ID: <93c2e217aa44ea79264fafa7aa8c7f5c@dismail.de> Subject: Re: [PATCH v2 1/2] gnu: Add nlohmann-json. To: "Liliana Marie Prikler" , 61724@debbugs.gnu.org In-Reply-To: References: <20230223201724.28695-1-jgart@dismail.de> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61724 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi lilyp, Is there anything else I need to do on my end for this patch before it ge= ts pushed? Any need for revision or ready? all the best, jgart From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 10 00:18:18 2023 Received: (at 61724) by debbugs.gnu.org; 10 Mar 2023 05:18:18 +0000 Received: from localhost ([127.0.0.1]:53462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paV90-0002QJ-0a for submit@debbugs.gnu.org; Fri, 10 Mar 2023 00:18:18 -0500 Received: from mail-ed1-f66.google.com ([209.85.208.66]:37825) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paV8y-0002Q7-Ht for 61724@debbugs.gnu.org; Fri, 10 Mar 2023 00:18:17 -0500 Received: by mail-ed1-f66.google.com with SMTP id j11so15920218edq.4 for <61724@debbugs.gnu.org>; Thu, 09 Mar 2023 21:18:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678425490; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=0a+6v3tpJJXaiznsejg/Io2/+e8q9peJVUt0jBCGPGE=; b=gvsIzZrhjb2RBxv6mU+jYlEKe0LTREv82aXyo6U8v34skVNaeNziSmMH3jIMJwmuzj uFhAWZg5UWzhJqSfkFuHXkCBZ/dWVee71/x5cZLIqEmvspGO7TpwqChLoTUbO1UEXwHe qPq1X875Quv63ZPE/hHzxaoixyUwoNSv9LgxmOwgokV5C8dpTUR23vua2YxKS4MJ8oeF NkhHn09vSCT9/yhR9Od/lWd7BGbvJGjhHK6zEZGJN2L5vqLHWZI9cSqofH3tcCXdQf/Y 2C5I4XbMr0yfHRKhNHvwOxKu/Qo1UGvnh77wMQvSpbTR0oYxG2CuMyBdiuhMS3RfIMlh xJHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678425490; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=0a+6v3tpJJXaiznsejg/Io2/+e8q9peJVUt0jBCGPGE=; b=hbwFSKFGZSvX+DCEnvUwJ36aHq3ubR9ScmPpRQMaQ4upomkanTx6xTZOwoqJKFIBGn wiej9qyDxpRmM2kCLoZmKg4blYojKlgiNJNYwn968ov/tp4tdSlA1rFwnxgvw8AI4ZF2 cFJ0jbCoLZfAOfJxe8mh5EslkC520TNxV425VHUe80DYR5iakgtsmueZWTz6b27sVXXy uRAkgP0NjFYAvTq9PTKWXxqGS45j/fpGFRpOtwcRiC4crGm9brHfd16Wo/wQfp/ajTk/ DC7HbbZGkv/DOrxq+sdl/WdHkVfu26oDBjFQLjCLzgOlVr1BrizJHQwQRpIEe0kHsacc nheQ== X-Gm-Message-State: AO0yUKUIqCtspQ/iP9SrIqt+iCD0IY4/GsMyp73G53/yuOxih6TbkEpI Weog2GasxnFdm8mMrLJm98U= X-Google-Smtp-Source: AK7set/+dXM4cS1sLrQUvgWWRIFKfhuLOHhWxR2RWNe+RlN+lydkpwn0ZIFAw1YyOGebRjkTN8cgXg== X-Received: by 2002:a17:906:164e:b0:878:481c:c49b with SMTP id n14-20020a170906164e00b00878481cc49bmr23603747ejd.1.1678425490394; Thu, 09 Mar 2023 21:18:10 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id w7-20020a17090633c700b008f702684c51sm453230eja.161.2023.03.09.21.18.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 21:18:09 -0800 (PST) Message-ID: Subject: Re: [PATCH v2 1/2] gnu: Add nlohmann-json. From: Liliana Marie Prikler To: jgart , 61724@debbugs.gnu.org Date: Fri, 10 Mar 2023 06:18:08 +0100 In-Reply-To: <93c2e217aa44ea79264fafa7aa8c7f5c@dismail.de> References: <20230223201724.28695-1-jgart@dismail.de> <93c2e217aa44ea79264fafa7aa8c7f5c@dismail.de> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61724 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Freitag, dem 10.03.2023 um 01:58 +0000 schrieb jgart: > Hi lilyp, >=20 > Is there anything else I need to do on my end for this patch before > it gets pushed? >=20 > Any need for revision or ready? v2 1/2 mixes functional and stylistic changes in a rather unconventional manner (reverting to old-style inputs). Is there nothing you can do about this to make the patch look nicer? Cheers From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 28 17:26:27 2023 Received: (at 61724) by debbugs.gnu.org; 28 Apr 2023 21:26:27 +0000 Received: from localhost ([127.0.0.1]:34655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psVbm-0001dS-L4 for submit@debbugs.gnu.org; Fri, 28 Apr 2023 17:26:27 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:54490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psVbk-0001d8-Hk for 61724@debbugs.gnu.org; Fri, 28 Apr 2023 17:26:25 -0400 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-94f3cd32799so54879066b.0 for <61724@debbugs.gnu.org>; Fri, 28 Apr 2023 14:26:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682717178; x=1685309178; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=q4B9nw0D/UBJGOoBfc5VGhyurIRSnogEp2eX+sIJgk0=; b=bOJlbnf6CUdB7rVzkv7imfxWf1+B+YMArFKJC+WWDDnD+/aI38isASOvkRDEvmLqKl GoIU451oBAspJLu1FtEJ4+TTcBlXLuc3DTprneCVaAsuJjJpJvwbOLEeS1qW4R9bC6y/ F824CVAU5XDwj99RBbc2CxlQOA6AlkPYaTCySlVOofqwMCDHG2Tbl9AhBADUDFkXx4zg Z8LFPIvkG1N79kqCBojukPD+BHH3F7NIv5g6rUbxpakhjcZ2x9IvX8zAiYhhJzAc9G0r yaBQfVB3W/wWEect5UpBgzqXAEEqGIMhNUnLQ7FL2e/1+gEXAudc7wiVytPguHttyFBP /dLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682717178; x=1685309178; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=q4B9nw0D/UBJGOoBfc5VGhyurIRSnogEp2eX+sIJgk0=; b=gtUnbkKgNUXYZWMFg4b47xcfAOdkyRz8iSTyCnBJFMBSRF55k4nHWEZOaPijCk2rHu kS+HuIets96DDSY5F7bdtWDiHZA1Za0n6+PrZfkdGIBXbzQ4oPG6hCXR+5HymaWiL8Bp FD0GBIOTk+FBevzB8zlJl+k+54G3Y8hI7wQELOE2vFiGFqOVoHheeGS7rdLLDIwPZmrR xyfPf8bhHW4XuT4/RmQ5vp5EitDAG8dK0lj1rx5/n11OAeNgXvhBRh3CkMGdNQKGoCE7 Nrw+pDhynVR6M8RI50OTIKGJ/X2uv4/7vr7FJNHU2fPXGF3X6PA+3nUXUNM63AAZoFrm 665Q== X-Gm-Message-State: AC+VfDyUoz1O+8y7pgkjOP5b7oSHc8QnPENynYGukAwMNVXUss4q43Yp gVoThvRnqXcsPhE6RN2JkZwPNnU8JWHfFg== X-Google-Smtp-Source: ACHHUZ63NIDc0NYbP3geGBNRBhdFwyn3CT+HnD03h4D23xNiOYZH289WuTuYkHUaGEUQGR1ATdF1dQ== X-Received: by 2002:a17:907:3e1a:b0:94f:19b5:bafd with SMTP id hp26-20020a1709073e1a00b0094f19b5bafdmr7266162ejc.42.1682717178343; Fri, 28 Apr 2023 14:26:18 -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 ku15-20020a170907788f00b009571293d6acsm10631004ejc.59.2023.04.28.14.26.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Apr 2023 14:26:18 -0700 (PDT) From: Liliana Marie Prikler Date: Fri, 28 Apr 2023 21:55:13 +0200 Subject: [PATCH v3 3/3] gnu: nlohmann-json: Improve package style. to: 61724@debbugs.gnu.org Message-ID: <89cb6548f34a6a4b3e83441d5dfdeacd12b44a17.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/package/cpp.scm (nlohmann-json)[source]: Fit to 80 chars width. Use G-Expressions. [arguments]: Use G-Expressions. --- gnu/packages/cpp.scm | 72 +++++++++++++++++++++++ [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL, https://senderscore.org/blocklistlookup/ [209.85.218.66 listed in bl.score.senderscore.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.66 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.66 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 61724 Cc: jgart X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) * gnu/package/cpp.scm (nlohmann-json)[source]: Fit to 80 chars width. Use G-Expressions. [arguments]: Use G-Expressions. --- gnu/packages/cpp.scm | 72 +++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 34 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 05208422ec..3a8c9fe1bf 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -610,42 +610,46 @@ (define-public nlohmann-json (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 "))))))))) + #~(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 "))))))))) (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 + #: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~%"))))))) (native-inputs (list amalgamate (let ((version "3.0.0")) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 28 17:26:31 2023 Received: (at 61724) by debbugs.gnu.org; 28 Apr 2023 21:26:31 +0000 Received: from localhost ([127.0.0.1]:34657 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psVbr-0001do-6H for submit@debbugs.gnu.org; Fri, 28 Apr 2023 17:26:31 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:45105) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psVbk-0001d6-Gz for 61724@debbugs.gnu.org; Fri, 28 Apr 2023 17:26:27 -0400 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-94f1a6e66c9so49444166b.2 for <61724@debbugs.gnu.org>; Fri, 28 Apr 2023 14:26:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682717178; x=1685309178; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=bQDxsppgsdo7mLaZZcltuhldi/sqbqe18kJAi6dO9aE=; b=a0y12a6sDGwxmstZUqtzpAn0x+5KMmTgLn7HbCLZXoPBG8cjh4QVeiktm25jijrw4d 84uvY0AXEcPH5ufISkeDeGxvIUSg/5Np2kulKE1PpI811FsxNGZne9QmLx7GLV9lWgY5 AmmDHPJjg1J6JDOnmwFTevo/D3W2xFesOYGmm/pJaFH+x9Kq8MzyxZzvUimfX233aIAn PmhQVB8nQloeFEgn2eNF0lm/H++YGaFKlupUE/Ole/l489PrjnfO3pYo/HxYyr4210Ss hn3h4i7/7HNSCvQUhX9BCMphUSVuvsXa/XHD3qw5UGA+QtMKxOw+wd7zFT5Rfq9WY8Hz sjxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682717178; x=1685309178; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=bQDxsppgsdo7mLaZZcltuhldi/sqbqe18kJAi6dO9aE=; b=hDtZz4g5GwQPdfjHbVYbrV/Jay7TRWrEIOAOAyRLiuDKS3QY5fSaK9P7w6OMojtkoL 56C7ZJ91hIP1Fb022xk4jL3r2F/1W569Y4Ax9xF9h7tid6nD3ZhoINyn5Ze/DCJZc2Kz FU5HGqdPJaG4pLtctomK7ARXaqYP7nwxS2h2tIUMykWh5kkOJ822mz9DCJRdSOiGL6Ml 4IbURr/UhrTDh7RT3yVxCzzqCxtGbH6Bx9bGhr0Hq9f0DTpUgBTQAJh3bMKw2JQhmHKB WS85XAfCZifQHF2XL8uuIpOyRV3YED+FGc91KEvvhp++TeDnkuBauWuIx3cuahHFevRE vyTg== X-Gm-Message-State: AC+VfDyZHRudMZFLLoqnMO+FnfgXvs73cp3SIG/BM7VzoHI4H3sori+i 9DzIdK7OoOY46IyCcHpRT6I0NU1T5D5LRw== X-Google-Smtp-Source: ACHHUZ77nFMuDCZK9CASDVrPvAhQOYqevNL6hI3CP1zBlzByN/PgMVc90qV/Plv7gPE95hQ68Gyujg== X-Received: by 2002:a17:907:2d07:b0:950:e44:47ae with SMTP id gs7-20020a1709072d0700b009500e4447aemr6979919ejc.40.1682717177757; Fri, 28 Apr 2023 14:26:17 -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 ku15-20020a170907788f00b009571293d6acsm10631004ejc.59.2023.04.28.14.26.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Apr 2023 14:26:17 -0700 (PDT) From: Liliana Marie Prikler Date: Fri, 28 Apr 2023 21:50:32 +0200 Subject: [PATCH v3 2/3] gnu: nlohmann-json: Update to 3.11.2. to: 61724@debbugs.gnu.org Message-ID: <65c99f52c66ada297a6570a2fefea8769087be1f.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61724 Cc: jgart X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/cpp.scm (nlohmann-json): Update to 3.11.2. --- gnu/packages/cpp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 556a1aca39..05208422ec 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,7 +606,7 @@ (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 -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 28 17:26:32 2023 Received: (at 61724) by debbugs.gnu.org; 28 Apr 2023 21:26:32 +0000 Received: from localhost ([127.0.0.1]:34659 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psVbr-0001dq-Ft for submit@debbugs.gnu.org; Fri, 28 Apr 2023 17:26:32 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:58610) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psVbk-0001d5-QF for 61724@debbugs.gnu.org; Fri, 28 Apr 2023 17:26:28 -0400 Received: by mail-ed1-f65.google.com with SMTP id 4fb4d7f45d1cf-50685f1b6e0so341739a12.0 for <61724@debbugs.gnu.org>; Fri, 28 Apr 2023 14:26:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682717177; x=1685309177; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=igsc0tybthyqy0C5eygyodZVjUr2drDjojyAXzdwdDs=; b=W3ZS3UMBD7epBwxGr+J5AajCtH/AFmyrMNp3oqCCNWAXU3ayo2h8S3/EzstDEta5kW 3JFDdyb0EFDIWgN74XlT8RV5V7hMwAELgdbb81zt03ZlL9x45n4piewz5BTw8xtnYr2x 3UHsFZ/66Azkegt/tGt75ggjz7Cef1QAY3WFBcp3M+iFhEwEF4rqyLTPMKbcf/dLyva0 vr/bwoejIyI17wwCKZ9lpMOJZj3K5YuU1vDfYvb0YcnA5odzo2doC58kSJRymnXVv36l xk1tl0CkzsMVf+aw/vI97sPo1KutCskcEX/XIU/gxRm4UmwqMFo7HLIkXc7FsVagWYAM ST4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682717177; x=1685309177; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=igsc0tybthyqy0C5eygyodZVjUr2drDjojyAXzdwdDs=; b=eRrKO9qb6wWDZpTiNfPfJqzY9gNir1Ns4voi/Kh2OM8O1zjCmGbTHjBg7hD4tEROoE 9fRtsweW4W2GqSViZhbVdZvbA3rtozfhq2pshGzdoXivfDJwGd4vJKzDxENchR1gZi4t IaGqHHOqY/uam1/LG5c9sp7RnbwCo7sCthBYUaeXfFMIElqdyntR/OSzRNdCRKA9k6dv pBvHvnpzkaa/SAOV8N3wIXnxf5o2ZAeS4h4cbWHslBuIQK0vSsILUCvOBh6DJcdUbZke jokZ7DzOxv2nRLqMRhQJeKHGB+jkDdB7eijUCQ1sPrpSA3ceYdmftVLMYU0XmTn4Kveu HRww== X-Gm-Message-State: AC+VfDyHpJAUtW1UYiTvtirxgxt8HV/SwmZrjXf41ti4jEpEcFmkTg+S NypcdYlpUJWRyegxRiRZvhQrtyfQLsjAGA== X-Google-Smtp-Source: ACHHUZ7YbOEzkTjtw4DlYIe0FKNTIknC+EZD9qZV7ZPVywKivPHjbmAx1euhWm77Qdzx5S04sm3blw== X-Received: by 2002:a17:906:9b87:b0:889:5686:486a with SMTP id dd7-20020a1709069b8700b008895686486amr7371694ejc.30.1682717177176; Fri, 28 Apr 2023 14:26:17 -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 ku15-20020a170907788f00b009571293d6acsm10631004ejc.59.2023.04.28.14.26.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Apr 2023 14:26:16 -0700 (PDT) From: Liliana Marie Prikler Date: Thu, 27 Apr 2023 20:57:58 +0200 Subject: [PATCH v3 1/3] gnu: Rename json-modern-cxx to nlohmann-json. to: 61724@debbugs.gnu.org Message-ID: MIME-Version: 1.0 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 61724 Cc: jgart X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * gnu/packages/cpp.scm (nlohmann-json): New variable. (json-modern-cxx): Mark as deprecated alias. (xtl, jsonnet)[inputs]: Use nlohmann-json. * gnu/packages/build-tools.scm (bear)[inputs]: Likewise. * gnu/packages/cybersecurity.scm (blacksmith)[inputs]: Likewise. * gnu/packages/databases.scm (sqlitebrowser)[inputs]: Adjust comment. * gnu/packages/games.scm (openrct2)[inputs]: Use nlohmann-json. * gnu/packages/graphics.scm (f3d)[native-inputs]: Likewise. * gnu/packages/hardware.scm (openrgb)[inputs]: Likewise. [arguments]: Adjust accordingly. * gnu/packages/image-processing.scm (paraview)[inputs]: Adjust comment. * gnu/packages/irods.scm (irods, irods-client-icommands)[inputs]: Use nlohmann-json. * gnu/packages/jupyter.scm (xeus)[inputs]: Likewise. * gnu/packages/messaging.scm (mtxclient, nheko)[inputs]: Likewise. * gnu/packages/text-editors.scm (jucipp)[inputs]: Likewise. * gnu/packages/video.scm (mktoolnix)[inputs]: Likewise. * gnu/packages/xdisorg.scm (nwg-launchers)[inputs]: Likewise. --- gnu/packages/build-tools.scm | 2 +- gnu/packages/cpp.scm | 13 ++++++++----- gnu/packages/cybersecurity.scm | 2 +- gnu/packages/databases.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/graphics.scm | 2 +- gnu/packages/hardware.scm | 4 ++-- gnu/packages/image-processing.scm | 2 +- 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 +- 14 files changed, 24 insertions(+), 21 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index bcca229466..573ea675c0 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -148,7 +148,7 @@ (define-public bear `(("c-ares" ,c-ares) ("fmt" ,fmt-8) ("grpc" ,grpc) - ("json-modern-cxx" ,json-modern-cxx) + ("nlohmann-json" ,json-modern-cxx) ("protobuf" ,protobuf) ("python" ,python-wrapper) ("re2" ,re2) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index bb1f216e2a..556a1aca39 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -595,9 +595,9 @@ (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") + (name "nlohmann-json") (version "3.10.5") (home-page "https://github.com/nlohmann/json") (source @@ -661,10 +661,13 @@ (define-public json-modern-cxx (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 + (description "@code{nlohmann::json} is a C++ JSON library that provides intuitive syntax and trivial integration.") (license license:expat))) +(define json-modern-cxx + (deprecated-package "json-modern-cxx" nlohmann-json)) + (define-public xtl (package (name "xtl") @@ -680,7 +683,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") @@ -1867,7 +1870,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/databases.scm b/gnu/packages/databases.scm index 4cd0d61da8..ae06fd3599 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -5023,7 +5023,7 @@ (define-public sqlitebrowser (build-system qt-build-system) (arguments (list #:configure-flags - ;; TODO: Unbundle json (json-modern-cxx). + ;; TODO: Unbundle json (nlohmann-json). #~(list (string-append "-DQSCINTILLA_INCLUDE_DIR=" #$(this-package-input "qscintilla") "/include/Qsci") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 3391c141e4..72dee4b50b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4897,7 +4897,7 @@ (define-public openrct2 ("freetype" ,freetype) ("icu4c" ,icu4c) ("jansson" ,jansson) - ("json-modern-cxx" ,json-modern-cxx) + ("nlohmann-json" ,json-modern-cxx) ("libpng" ,libpng) ("libzip" ,libzip) ("mesa" ,mesa) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 261fcf9547..0951770b12 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2535,7 +2535,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 5b85ad9b2e..c23299d1db 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -1059,7 +1059,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 @@ -1067,7 +1067,7 @@ (define-public openrgb (inputs (list hidapi hueplusplus - json-modern-cxx + nlohmann-json libusb mbedtls-apache qtbase-5)) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index cc0d5789b3..0aaac00870 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1213,7 +1213,7 @@ (define-public paraview glew gmsh hdf5 - ;;json-modern-cxx ;For ParFlow; build fails + ;;nlohmann-json ;For ParFlow; build fails jsoncpp libjpeg-turbo libogg 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 d0fcc82076..9337197cb2 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -196,7 +196,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 2fa1c45f98..8441e41351 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2325,7 +2325,7 @@ (define-public mtxclient (list boost coeurl curl - json-modern-cxx + nlohmann-json libevent libsodium olm @@ -2408,7 +2408,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 8714940d1c..b23c5ba2be 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -393,7 +393,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 838dfe7aab..0512801ad8 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1027,7 +1027,7 @@ (define-public mkvtoolnix ("gettext" ,gettext-minimal) ("googletest" ,googletest) ("libxslt" ,libxslt) - ("json-modern-cxx" ,json-modern-cxx) + ("nlohmann-json" ,json-modern-cxx) ("perl" ,perl) ("pkg-config" ,pkg-config) ("po4a" ,po4a) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index f4ddd15aaa..3e9d424863 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -3150,7 +3150,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") -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 28 20:15:33 2023 Received: (at 61724) by debbugs.gnu.org; 29 Apr 2023 00:15:33 +0000 Received: from localhost ([127.0.0.1]:34728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psYFQ-0006wp-Tv for submit@debbugs.gnu.org; Fri, 28 Apr 2023 20:15:33 -0400 Received: from mx1.dismail.de ([78.46.223.134]:37634) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psYFN-0006wb-Fk for 61724@debbugs.gnu.org; Fri, 28 Apr 2023 20:15:31 -0400 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id cca49951; Sat, 29 Apr 2023 02:15:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h= mime-version:date:content-type:content-transfer-encoding:from :message-id:subject:to:in-reply-to:references; s=20190914; bh=PK PkQP98VVQ2AqIL2SAlQafYh2DQhmXcw6XIZcz0ZKU=; b=lyE2osyA2KU78d8LSx vXFy3VDXr6sDBqSkzYfFzDuDqLTHutBQhja8bxvaTtrvh73lM7PgSF0d1lPBgAqA pyWQSfsKm3mXUEN+3ve4y6wCtIAKVtHCVs4HbpH/TT5R1WqsACqb2r8HFlfnd6tS aRy+vwXYQHGYRfJLM2GrMW30uRgLP6kFr3GmQ8DXjkQrV3gF4lRLrlBJ9BSkYHaI 7NWAK6KyNpm84MGBlkzRoolUOy3FazROjo+kWxoJgA8+ml8tkP1cBtZR2Bx3pF0u roBzeOaw8gKClDMIwtJXriHAO16CnLsUrJTlj7fHuFbvLFr8SJa2gqLKxXNrJF1g 8puA== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx1.dismail.de (OpenSMTPD) with ESMTP id a551ac6b; Sat, 29 Apr 2023 02:15:22 +0200 (CEST) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 39108a1c; Sat, 29 Apr 2023 02:15:22 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 788e9e38 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 29 Apr 2023 02:15:22 +0200 (CEST) MIME-Version: 1.0 Date: Sat, 29 Apr 2023 00:15:21 +0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Mailer: RainLoop/1.17.0 From: "jgart" Message-ID: <921f4a827bc29e0fee6e627d57bab80f@dismail.de> Subject: Re: [PATCH v3 2/3] gnu: nlohmann-json: Update to 3.11.2. To: "Liliana Marie Prikler" , 61724@debbugs.gnu.org In-Reply-To: <65c99f52c66ada297a6570a2fefea8769087be1f.camel@gmail.com> References: <65c99f52c66ada297a6570a2fefea8769087be1f.camel@gmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 61724 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Cool, feel free to work on this package if you're interested. I don't thi= nk I'll find the time to hack on it for a while. I was mostly interested in updating it in order to update the nix package= manager since we have a pretty old version. all best, jgart From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 12:06:50 2023 Received: (at 61724) by debbugs.gnu.org; 7 May 2023 16:06:50 +0000 Received: from localhost ([127.0.0.1]:38258 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvguP-0004AP-4Y for submit@debbugs.gnu.org; Sun, 07 May 2023 12:06:50 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:57680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvguM-0004A2-Ea for 61724@debbugs.gnu.org; Sun, 07 May 2023 12:06:47 -0400 Received: by mail-ed1-f68.google.com with SMTP id 4fb4d7f45d1cf-50bc2feb320so5754986a12.3 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=1683475600; x=1686067600; h=mime-version:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=DINl1FX2eQ3qp9bSAocDa0gxGtYcNsrIXZJEjQt/ENE=; b=k02y8QhAM18nfl4APuaeSwBuUjKRM74rc76w69XdDw/OBiNJbPAkAcn/JcNvrW0AH4 J1mg12KtAdmJ1i8UQ8exmNLwg2wwrNDd+Mg76H0JnLeSli0wnaTk31giTXZQ7ZFM8+5W dwrJIs7nR0WUHZGznOo1n35reVq/D2VtHtDTniOYv0OjCbFEBWoh5oIYRROTKmtT0H1L Fa/Gtz3rBdyPINA6jEBxLxIsafOfVXNIovf4nMn6RfwNCkj9edaposlL7ef17WlIz/GK DaBTJeiRypYNkURhU4DJTZGewt5etiM1BHBmSMvHaNPBoer8kgEgYxFUmwF3TtrZde4q wPpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683475600; x=1686067600; h=mime-version:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=DINl1FX2eQ3qp9bSAocDa0gxGtYcNsrIXZJEjQt/ENE=; b=IaevcLo/BLygtM/6kyqYS/NGZcuaNv5I415G+HP/A6ZyBxk5xci4SPL3QCkDE+1gAw oWCIPmtgNxnNSBrp1t6EKrYFhJI/kofHKmuE40yuTmlcrXjcHo1owgFozdjNMGAETOXT RK5UjHwlHnfhOdNZSCgKkqdliQ0MAKum38KYimaItFJG8CuJm5bvLkEtpjxFeaIcKcwq aVsIiqQIQjZ1jgB0y8/YnkFFAf0SnG7T31kFWPtYdA+J6J4o0Q7a+YTmukaBalk+CnlA j5gutBEXsPOW4dW9eaTPVGUBtTm+iMoJdxAUssO3qaoRP7jPrFNlF9cmB9agLpNh6z/h D7rg== X-Gm-Message-State: AC+VfDwePUCRkhbkEDPh8xkAbs/xsX7DISMoH9p/BGXvjeKxgCkywKj+ YZA+TTQeF4zT5QAaBjP75RqVmzqC1GkBzQ== X-Google-Smtp-Source: ACHHUZ6Xk5UUme9gxATdDRNw9X5CkZsgbNzVTvpnTubB3bdeoaUGw4nsCkenZ9nmBdpu7HsjG/2HzQ== X-Received: by 2002:a17:906:6a16:b0:966:eb8:2f12 with SMTP id qw22-20020a1709066a1600b009660eb82f12mr4828274ejc.11.1683475600504; 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.39 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: <7429efc0ff6e48ddd1169a5353abbe6226edaaeb.1683475550.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Thu, 27 Apr 2023 20:57:58 +0200 Subject: [PATCH v4 1/7] gnu: Rename json-modern-cxx to nlohmann-json. to: 61724@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/cpp.scm (nlohmann-json): New variable. (json-modern-cxx): Mark as deprecated alias. (xtl, jsonnet)[inputs]: Use nlohmann-json. * gnu/packages/build-tools.scm (bear)[inputs]: Likewise. * [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.68 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.68 listed in wl.mailspike.net] X-Debbugs-Envelope-To: 61724 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/cpp.scm (nlohmann-json): New variable. (json-modern-cxx): Mark as deprecated alias. (xtl, jsonnet)[inputs]: Use nlohmann-json. * gnu/packages/build-tools.scm (bear)[inputs]: Likewise. * [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.68 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.68 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/cpp.scm (nlohmann-json): New variable. (json-modern-cxx): Mark as deprecated alias. (xtl, jsonnet)[inputs]: Use nlohmann-json. * gnu/packages/build-tools.scm (bear)[inputs]: Likewise. * gnu/packages/cybersecurity.scm (blacksmith)[inputs]: Likewise. * gnu/packages/databases.scm (sqlitebrowser)[inputs]: Adjust comment. * gnu/packages/games.scm (openrct2)[inputs]: Use nlohmann-json. * gnu/packages/graphics.scm (f3d)[native-inputs]: Likewise. * gnu/packages/hardware.scm (openrgb)[inputs]: Likewise. [arguments]: Adjust accordingly. * gnu/packages/image-processing.scm (paraview)[inputs]: Adjust comment. * gnu/packages/irods.scm (irods, irods-client-icommands)[inputs]: Use nlohmann-json. * gnu/packages/jupyter.scm (xeus)[inputs]: Likewise. * gnu/packages/messaging.scm (mtxclient, nheko)[inputs]: Likewise. * gnu/packages/text-editors.scm (jucipp)[inputs]: Likewise. * gnu/packages/video.scm (mktoolnix)[inputs]: Likewise. * gnu/packages/xdisorg.scm (nwg-launchers)[inputs]: Likewise. --- gnu/packages/build-tools.scm | 2 +- gnu/packages/cpp.scm | 13 ++++++++----- gnu/packages/cybersecurity.scm | 2 +- gnu/packages/databases.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/graphics.scm | 2 +- gnu/packages/hardware.scm | 4 ++-- gnu/packages/image-processing.scm | 2 +- 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 +- 14 files changed, 24 insertions(+), 21 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 33d91e6043..fb2deaa384 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -148,7 +148,7 @@ (define-public bear `(("c-ares" ,c-ares) ("fmt" ,fmt-8) ("grpc" ,grpc) - ("json-modern-cxx" ,json-modern-cxx) + ("nlohmann-json" ,json-modern-cxx) ("protobuf" ,protobuf) ("python" ,python-wrapper) ("re2" ,re2) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 023d1c0337..a041b4a3bb 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -595,9 +595,9 @@ (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") + (name "nlohmann-json") (version "3.10.5") (home-page "https://github.com/nlohmann/json") (source @@ -661,10 +661,13 @@ (define-public json-modern-cxx (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 + (description "@code{nlohmann::json} is a C++ JSON library that provides intuitive syntax and trivial integration.") (license license:expat))) +(define-public json-modern-cxx + (deprecated-package "json-modern-cxx" nlohmann-json)) + (define-public xtl (package (name "xtl") @@ -680,7 +683,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") @@ -1859,7 +1862,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/databases.scm b/gnu/packages/databases.scm index 4cd0d61da8..ae06fd3599 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -5023,7 +5023,7 @@ (define-public sqlitebrowser (build-system qt-build-system) (arguments (list #:configure-flags - ;; TODO: Unbundle json (json-modern-cxx). + ;; TODO: Unbundle json (nlohmann-json). #~(list (string-append "-DQSCINTILLA_INCLUDE_DIR=" #$(this-package-input "qscintilla") "/include/Qsci") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4fb9775e8d..f7140fdadc 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4890,7 +4890,7 @@ (define-public openrct2 ("freetype" ,freetype) ("icu4c" ,icu4c) ("jansson" ,jansson) - ("json-modern-cxx" ,json-modern-cxx) + ("nlohmann-json" ,json-modern-cxx) ("libpng" ,libpng) ("libzip" ,libzip) ("mesa" ,mesa) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 261fcf9547..0951770b12 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2535,7 +2535,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 5b85ad9b2e..c23299d1db 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -1059,7 +1059,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 @@ -1067,7 +1067,7 @@ (define-public openrgb (inputs (list hidapi hueplusplus - json-modern-cxx + nlohmann-json libusb mbedtls-apache qtbase-5)) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index cc0d5789b3..0aaac00870 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1213,7 +1213,7 @@ (define-public paraview glew gmsh hdf5 - ;;json-modern-cxx ;For ParFlow; build fails + ;;nlohmann-json ;For ParFlow; build fails jsoncpp libjpeg-turbo libogg 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 d0fcc82076..9337197cb2 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -196,7 +196,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 2fa1c45f98..8441e41351 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2325,7 +2325,7 @@ (define-public mtxclient (list boost coeurl curl - json-modern-cxx + nlohmann-json libevent libsodium olm @@ -2408,7 +2408,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 8714940d1c..b23c5ba2be 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -393,7 +393,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 65fd92ea48..5fc23b777c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1027,7 +1027,7 @@ (define-public mkvtoolnix ("gettext" ,gettext-minimal) ("googletest" ,googletest) ("libxslt" ,libxslt) - ("json-modern-cxx" ,json-modern-cxx) + ("nlohmann-json" ,json-modern-cxx) ("perl" ,perl) ("pkg-config" ,pkg-config) ("po4a" ,po4a) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index bee9711a74..3d66ddc862 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -3149,7 +3149,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") base-commit: 4c3532d7ab81a20e21d23bcf25e06999fcee2571 -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 12:06:50 2023 Received: (at 61724) by debbugs.gnu.org; 7 May 2023 16:06:50 +0000 Received: from localhost ([127.0.0.1]:38260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvguQ-0004AZ-C9 for submit@debbugs.gnu.org; Sun, 07 May 2023 12:06:50 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:54430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvguN-0004A5-9Y for 61724@debbugs.gnu.org; Sun, 07 May 2023 12:06:47 -0400 Received: by mail-ed1-f65.google.com with SMTP id 4fb4d7f45d1cf-50bcae898b2so6670710a12.0 for <61724@debbugs.gnu.org>; Sun, 07 May 2023 09:06:47 -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=9CIlwiRGxdWexmVZfBZBcOFjyE9tfBgU+SAPIaAsbB8=; b=cdK+9GUDLRl/gPNgQvbknghGqJ6FuMc2aC4Eg2/xlrHkLexcCnSte4v1XF9DMdWlaU PXEHy0MblHjTKHgNQ15E0bbrPzc1vqt3f2UHiUpaKeBzOwxUUNIF7GtTifUQ0kZEvyNb g/Hz2i+Q1EnhOD382tDy1NJO6APGL2mfo/dRCmCwuKKK0l9yA7cSK+VGRaRoq3VmT92R 9fk/fF7WHaa8AndED4yEpcm60l/N5QDuZbG4i/81nmx8OcFDYeH3VE23r1IF8Lai/BN7 bLAvvOiLhbAlgNIWgx3u8nvXJyXrkLdJ3kSR7/PCt3i78wCUuHE+io+3t/35TVtg8sx+ YwNg== 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=9CIlwiRGxdWexmVZfBZBcOFjyE9tfBgU+SAPIaAsbB8=; b=I5DPu7Et5kdexkF6p5u+UWO3fKLnhR0ScHhmxfodCI7LE2M6wzLEpr+N/dhEukcadq M4eL7wsOyzJ3fo1jYMaLpmh2Hn6jjd/9NzHe6xO80HyQTnDnDplw6rdbcb+O9tH0rUAj 5sFg0dleqY2kPTPnzH9Ti6XSt87T92Jt3uaqbNWF5GPuJlaCf2IpVhHtqiCxoEhK+OMw T/BcjGr/5f96nyhXOMhYOEmiJRYCXXbxK7uQzQ2SsZ5Wez8XQsfme69yt7VoSL5VSu59 4svAn7mAvsVPIK1y5eI4BEeQFBPeIMJzsFLdnM52bst1P7ytpQ9nKM7/+uumqSUA6hVp AEMg== X-Gm-Message-State: AC+VfDzriisVMqVmkexLBrTRKPGDg/Y7tmbKQRhR7FjM7m3q8F+Gln+F kgH05SY2OWIHU7V92o9umGvHvr1XWCxQjw== X-Google-Smtp-Source: ACHHUZ6b9nXlOA4e3Gv58c+mzSH2r7pu3Wgmv+ZQ8mXZO2BquMLGLjRZ/1lmZ7CdbhRNsdiqRlppZw== X-Received: by 2002:a17:907:9686:b0:966:65ee:beb7 with SMTP id hd6-20020a170907968600b0096665eebeb7mr675451ejc.71.1683475601477; Sun, 07 May 2023 09:06:41 -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.41 for <61724@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 May 2023 09:06:41 -0700 (PDT) Message-Id: <911d4ae047d69888fe33fde18c832fc536837677.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:55:13 +0200 Subject: [PATCH v4 3/7] gnu: nlohmann-json: Improve package style. to: 61724@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 3.4 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/package/cpp.scm (nlohmann-json)[source]: Fit to 80 chars width. Use G-Expressions. [arguments]: Use G-Expressions. --- gnu/packages/cpp.scm | 70 +++++++++++++++++++++++ [...] Content analysis details: (3.4 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL, https://senderscore.org/blocklistlookup/ [209.85.208.65 listed in bl.score.senderscore.com] 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.65 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.65 listed in wl.mailspike.net] X-Debbugs-Envelope-To: 61724 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.4 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/package/cpp.scm (nlohmann-json)[source]: Fit to 80 chars width. Use G-Expressions. [arguments]: Use G-Expressions. --- gnu/packages/cpp.scm | 70 +++++++++++++++++++++++ [...] Content analysis details: (2.4 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.65 listed in wl.mailspike.net] 1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL, https://senderscore.org/blocklistlookup/ [209.85.208.65 listed in bl.score.senderscore.com] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.65 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/package/cpp.scm (nlohmann-json)[source]: Fit to 80 chars width. Use G-Expressions. [arguments]: Use G-Expressions. --- gnu/packages/cpp.scm | 70 +++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 5c2e6d2425..e797020124 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -610,41 +610,45 @@ (define-public nlohmann-json (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 "./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* (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) - (string-append - "#include "))))))))) + #~(begin + ;; Delete bundled software. Preserve doctest_compatibility.h, which + ;; is a wrapper library added by this package. + (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* (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) + (string-append + "#include "))))))))) (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 + #: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~%"))))))) (native-inputs (list amalgamate (let ((version "3.1.0")) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 12:07:00 2023 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 Subject: [PATCH v4 2/7] gnu: nlohmann-json: Update to 3.11.2. to: 61724@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 +++++++++++ [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.68 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.68 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 61724 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * 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 +++++++++++ [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.68 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.68 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * 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++") -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Sun May 07 12:50:14 2023 Received: (at 61724) by debbugs.gnu.org; 7 May 2023 16:50:14 +0000 Received: from localhost ([127.0.0.1]:38314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvhaQ-0005Pg-1E for submit@debbugs.gnu.org; Sun, 07 May 2023 12:50:14 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:48171) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvhaO-0005PR-DD for 61724@debbugs.gnu.org; Sun, 07 May 2023 12:50:12 -0400 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-966287b0f72so197316966b.0 for <61724@debbugs.gnu.org>; Sun, 07 May 2023 09:50:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683478206; x=1686070206; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=Z2nVVI+plhLsBe1edIMMOBJW5wjMZeNWed1duXBw3rM=; b=pkd9gus9Orzl5ZseVDWYuM3MP5NBjSTb3URLSEIY3DKpKZLJdk2gRsIA5aiy9hO+cz NFE5xBLM5MVN6It2HhzNC0XcmTDOn3/nbLQn1AOrvLHK/hyoXffsvk99tweZ4H00wNmi XZGmkCAolF6G8cnsRlkAQe3a4tk1Sg0Lo4GVsWLYZ86ZGNZVKO/fzxU/6w1zcwbybU0z w+zyZq5L0d7Tfx5SFSsmwNN2qZwNX80WmE7mhDYgJpscDH7OujsQNI1e61yUx+ESBfyn o92nFNIDZL2DVLHp+/PMvR6bGaDCq28FpVSu9Yr4TEZaf+fO8beAyyCz0dYLwER5V4ng jO1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683478206; x=1686070206; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Z2nVVI+plhLsBe1edIMMOBJW5wjMZeNWed1duXBw3rM=; b=iSxDXwfgzitfr3SkweLI6OGquq4XX5oMX88X/msJsYFGTn35zNz+Zeiin8T91ORajz /0jnMEjXbE4TIq4BNlRFOIGbAdQxnzc8PS+rDOMRUCJheA6boO6guW2+9JiIChmEkgsf uO78b9GiFKsexpU+oGEFZuylOMCX53EVZnRcloK3ypnZXjRi7Tlnq7CreuU8VHiJaQ0+ 7SmUyFUHlTtOIpSCxb6D6zR2SQQwZl+CUtB6lutT1rZ0qlgR9A3I/xwsktVGdL+PXkYl RQexhiyGYD1ePzLIBfKLV50aozZ5+CN4BW72Xh3L5Wxa3cT59YZfJQyUqj+/ojVnlgvm 5K9A== X-Gm-Message-State: AC+VfDzAoZL0e6gEN9kb9m/CpjpmSVX/2KfvE8pvc8a1eRCkdlDvsJNt eGXDo1gQUByDjWlB7QRes+Z4Tmyr0N6TYw== X-Google-Smtp-Source: ACHHUZ5zTEvc0mpWQVvL7ghxPax68TOdmRn1do65dZk/kmvQK3lRyD/TcYevCtPMhrfqkK8X7uU/8g== X-Received: by 2002:a17:906:9756:b0:94e:d43a:58d5 with SMTP id o22-20020a170906975600b0094ed43a58d5mr6124812ejy.15.1683478206621; Sun, 07 May 2023 09:50:06 -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 jz19-20020a17090775f300b00965c6c63ea3sm3823265ejc.35.2023.05.07.09.50.06 for <61724@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 May 2023 09:50:06 -0700 (PDT) Message-ID: <9f155fbe5ec48e744544103bae59d1587f2c2e80.camel@gmail.com> Subject: Re: [PATCH v4 3/3] gnu: nlohmann-json: Improve package style. (was [PATCH v4 3/7] gnu: nlohmann-json: Improve package style.) From: Liliana Marie Prikler To: 61724@debbugs.gnu.org Date: Sun, 07 May 2023 18:50:05 +0200 In-Reply-To: <911d4ae047d69888fe33fde18c832fc536837677.1683475550.git.liliana.prikler@gmail.com> References: <7429efc0ff6e48ddd1169a5353abbe6226edaaeb.1683475550.git.liliana.prikler@gmail.com> <911d4ae047d69888fe33fde18c832fc536837677.1683475550.git.liliana.prikler@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61724 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Freitag, dem 28.04.2023 um 21:55 +0200 schrieb Liliana Marie Prikler: > * gnu/package/cpp.scm (nlohmann-json)[source]: Fit to 80 > chars width. > Use G-Expressions. > [arguments]: Use G-Expressions. There are no 4..7/7 =E2=80=93 those four extra commits come from the functi= onal C++ packages I also plan to apply next week. Cheers From debbugs-submit-bounces@debbugs.gnu.org Thu May 11 14:29:41 2023 Received: (at 61724) by debbugs.gnu.org; 11 May 2023 18:29:42 +0000 Received: from localhost ([127.0.0.1]:53332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxB2r-0001JL-FV for submit@debbugs.gnu.org; Thu, 11 May 2023 14:29:41 -0400 Received: from mail-wr1-f44.google.com ([209.85.221.44]:39336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxB2n-0001Ig-M6 for 61724@debbugs.gnu.org; Thu, 11 May 2023 14:29:38 -0400 Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-3063d724cb9so1010302f8f.1 for <61724@debbugs.gnu.org>; Thu, 11 May 2023 11:29:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683829772; x=1686421772; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=je7bQNiAMzBEKt1HGAsf8QuDNhjurT30mimrFxI6FZk=; b=FNNrb10aFnhTua8sd06wecUR+Legwm/BzZgiuM+Z8qPUh4w3NTs5PVSlxHSEWZcW1S xZqbe0wNsoCWycBvgN2kXRHNuS1dREUwJiJneCumMVb7fOFqBU7XE/sCVyXttuNhrQJY HghlZoGSqzEXRE+H95ku/kB25O3EnvpQZW7Xjo8B1kFTSvmMAFlQiNdReQm60i1N01qB cy/L4UI9NJYAA4J2+Y+KaFgdbnV1r/9zJ4hA/ZRfXEJ+8d/+83zXMR/2a21gr0KWP6+Y y+ndoy2bwETxg+3YE1qz5BHj5df0ua5RFVmOmTqWDP5YEUSynJXw/55vSIldIPeLeA2n L/fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683829772; x=1686421772; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=je7bQNiAMzBEKt1HGAsf8QuDNhjurT30mimrFxI6FZk=; b=Wg4qofRTjnZ2MRcv1KhYCR3kd1Cdj0KjtP/kIoaLZ8OKPyfOanXeC7MJH97O+mRiKR wuxvqu4/1dhsyiHa0xKS1bFjndBgZYOSwQboqni/PRwnvlTXzBwexq8DGT/h3egQ2gqL 73wsAQHsw/Rlke0EYwrH2j+xVTEO2aSHDQXdXMkqx9J7fek6lZMax2Tawenl0aSKaBb4 d7TmjntarldpAWM5vIFVxZn68Gmva6P7dRjDEnz/aEuFBmgXi+rpHeK5SQ4esKmKaS9Z 4wfoX7vigmGU/p/uts0mTqTraTFmCYtr7kjwrFQt/jW9GCCMz92uM4OJfcfo7c2yuc1Z /IUg== X-Gm-Message-State: AC+VfDwvUOOMdsWlbwmdIGzKal99LqCClP/bBfDIcly8LlqCWv1hnRfG Kf2OQCskM5dt6CcGzt2SPMJ4sXv63II= X-Google-Smtp-Source: ACHHUZ7YD7mu8ATkE+Z93JCauLQ/wzWyuoc17nc3s/NvnL8/zJeQERuFmzscGvkOHk8DZHBjN4hkRw== X-Received: by 2002:a5d:67c6:0:b0:2e4:aa42:7872 with SMTP id n6-20020a5d67c6000000b002e4aa427872mr13277682wrw.4.1683829771590; Thu, 11 May 2023 11:29:31 -0700 (PDT) Received: from pfiuh07 ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id w14-20020a5d680e000000b003079693eff2sm13164938wru.41.2023.05.11.11.29.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 11:29:31 -0700 (PDT) From: Simon Tournier To: Liliana Marie Prikler , 61724@debbugs.gnu.org Subject: Re: [bug#61724] [PATCH v4 1/7] gnu: Rename json-modern-cxx to nlohmann-json. In-Reply-To: <7429efc0ff6e48ddd1169a5353abbe6226edaaeb.1683475550.git.liliana.prikler@gmail.com> References: <7429efc0ff6e48ddd1169a5353abbe6226edaaeb.1683475550.git.liliana.prikler@gmail.com> Date: Thu, 11 May 2023 14:53:13 +0200 Message-ID: <87mt2b3u86.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, On jeu., 27 avril 2023 at 20:57, Liliana Marie Prikler wrote: > diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm > index 33d91e6043..fb2deaa384 100644 > --- a/gnu/packages/build-tools.scm > +++ b/gnu/packages/build-tools.scm > @@ -148,7 + [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zimon.toutoune[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 1.1 DATE_IN_PAST_03_06 Date: is 3 to 6 hours before Received: date -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.221.44 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.221.44 listed in list.dnswl.org] X-Debbugs-Envelope-To: 61724 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) Hi, On jeu., 27 avril 2023 at 20:57, Liliana Marie Prikler wrote: > diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm > index 33d91e6043..fb2deaa384 100644 > --- a/gnu/packages/build-tools.scm > +++ b/gnu/packages/build-tools.scm > @@ -148,7 +148,7 @@ (define-public bear > `(("c-ares" ,c-ares) > ("fmt" ,fmt-8) > ("grpc" ,grpc) > - ("json-modern-cxx" ,json-modern-cxx) > + ("nlohmann-json" ,json-modern-cxx) Typo, I guess. Instead, + ("nlohmann-json" ,nlohmann-json) > diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm > index 4fb9775e8d..f7140fdadc 100644 > --- a/gnu/packages/games.scm > +++ b/gnu/packages/games.scm > @@ -4890,7 +4890,7 @@ (define-public openrct2 > ("freetype" ,freetype) > ("icu4c" ,icu4c) > ("jansson" ,jansson) > - ("json-modern-cxx" ,json-modern-cxx) > + ("nlohmann-json" ,json-modern-cxx) Idem. [...] > diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm > index 65fd92ea48..5fc23b777c 100644 > --- a/gnu/packages/video.scm > +++ b/gnu/packages/video.scm > @@ -1027,7 +1027,7 @@ (define-public mkvtoolnix > ("gettext" ,gettext-minimal) > ("googletest" ,googletest) > ("libxslt" ,libxslt) > - ("json-modern-cxx" ,json-modern-cxx) > + ("nlohmann-json" ,json-modern-cxx) Idem. Cheers, simon From debbugs-submit-bounces@debbugs.gnu.org Thu May 11 14:48:36 2023 Received: (at 61724) by debbugs.gnu.org; 11 May 2023 18:48:36 +0000 Received: from localhost ([127.0.0.1]:53362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxBL6-0001vK-O8 for submit@debbugs.gnu.org; Thu, 11 May 2023 14:48:35 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:44204) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxBL5-0001up-If for 61724@debbugs.gnu.org; Thu, 11 May 2023 14:48:31 -0400 Received: by mail-ej1-f65.google.com with SMTP id a640c23a62f3a-94a342f7c4cso1605589966b.0 for <61724@debbugs.gnu.org>; Thu, 11 May 2023 11:48:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683830904; x=1686422904; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=kHAAydakLMKQ6wsF5BAJ/To7hGAG1yIXNw9tHu4yUAI=; b=EKb5SaS1bhvGdmQel0+TU4DnOijpv8C1Zgi2g0lo/cssNBeJvVYccNNAFeVYH5lco9 7CCmfkQbmQoeCHNurxUjKKJzT+bWc6gMlNMLR72K9A68/vuVPouVHUUNS62+sOrAJyvM MRCwjHQN40nVYiJhH1mHn7kWXBTmYIaEG2PQ+mtdRv/khlBCCY1WuUItSzNYyaYkwwis E3Y1FZjmrOO/9I0ir8guh9ph/hZ/ISY/kKE04ATi9srJUJKIH6a7RW+wQRygYxTaPXj+ BxZUjK+NNifwU3bKLVuJ58ygcgyn5YfxVnB3I2I4bwQdWR1E9F/hNHzO3z5Z/v07ULdB hM3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683830904; x=1686422904; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=kHAAydakLMKQ6wsF5BAJ/To7hGAG1yIXNw9tHu4yUAI=; b=AkfbN63mUe2qruHcn5Kt+gecv3ZsCTP5vJWIkVZUSe+4L/6/DCHMC9W9ohEAN0+AgB quG2g7GULY6yUFcMdzxV4y9mdhiylVO5lzFZRHAM/Yy0GaYXTNEKbFvTT8h6ahMOPt1b PiRp4SfYr+hMzHpJxMzsH/hW+MAnP2eRSpqh+hlQjIBJ0Pgd9achqMabXBuJEWMFe9xW 1vUNJftPzxzxXoSGR0rjRsynrFeQgZiPWqYZL+CT1KK/EA5/DkxjGHWER6xmIizmw5vx nFaBdKahZPxyBobtZ5Md922Gogvly4rv+79qGDJs/mXxyl5TeIL8cmNKOwFBJfB9+cK+ +vkA== X-Gm-Message-State: AC+VfDxkFczzXWvzZyb48oq07GkTKDQSYSpoY/dnq0W9Ms8u3YAs6sdF 4dUDGANl6My7naWDd0zgvMg= X-Google-Smtp-Source: ACHHUZ4EPJ/fE9CKTxAKWeCwrFn/bMix3/lQ2PTD0/z1zUuBRW2qlvfRjflTPpVzPr/Yc617xQts6Q== X-Received: by 2002:a17:907:ea1:b0:96a:7cc9:d038 with SMTP id ho33-20020a1709070ea100b0096a7cc9d038mr2444234ejc.37.1683830904378; Thu, 11 May 2023 11:48:24 -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 my11-20020a1709065a4b00b0096650f46004sm4340355ejc.56.2023.05.11.11.48.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 11:48:24 -0700 (PDT) Message-ID: <3fa2a30c3f4f900a8fd2be39e692312d22cdd955.camel@gmail.com> Subject: Re: [bug#61724] [PATCH v4 1/7] gnu: Rename json-modern-cxx to nlohmann-json. From: Liliana Marie Prikler To: Simon Tournier , 61724@debbugs.gnu.org Date: Thu, 11 May 2023 20:48:23 +0200 In-Reply-To: <87mt2b3u86.fsf@gmail.com> References: <7429efc0ff6e48ddd1169a5353abbe6226edaaeb.1683475550.git.liliana.prikler@gmail.com> <87mt2b3u86.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61724 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 11.05.2023 um 14:53 +0200 schrieb Simon Tournier: > Hi, >=20 > On jeu., 27 avril 2023 at 20:57, Liliana Marie Prikler > wrote: >=20 > > diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build- > > tools.scm > > index 33d91e6043..fb2deaa384 100644 > > --- a/gnu/packages/build-tools.scm > > +++ b/gnu/packages/build-tools.scm > > @@ -148,7 +148,7 @@ (define-public bear > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 `(("c-ares" ,c-ares) > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ("fmt" ,fmt-8) > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ("grpc" ,grpc) > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ("json-modern-cxx" ,json-modern-c= xx) > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ("nlohmann-json" ,json-modern-cxx= ) >=20 > Typo, I guess.=C2=A0 Instead, >=20 > =C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ("nlohmann-json" ,nlohmann-js= on) Indeed, I missed the /g in my sed. Will fix. >=20 Cheers From debbugs-submit-bounces@debbugs.gnu.org Sun May 14 06:24:53 2023 Received: (at 61724-done) by debbugs.gnu.org; 14 May 2023 10:24:53 +0000 Received: from localhost ([127.0.0.1]:40359 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1py8uL-0003RY-Dv for submit@debbugs.gnu.org; Sun, 14 May 2023 06:24:53 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:62727) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1py8uI-0003RK-Sm for 61724-done@debbugs.gnu.org; Sun, 14 May 2023 06:24:52 -0400 Received: by mail-ed1-f67.google.com with SMTP id 4fb4d7f45d1cf-50bd2d7ba74so102759627a12.1 for <61724-done@debbugs.gnu.org>; Sun, 14 May 2023 03:24:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684059885; x=1686651885; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=eZnOWg22vX/VIGTd/Fvsr4I8fDfSGvdlisH7ayhtUJg=; b=R1nvPxKAPTF5lTo4gy5Uv6nwPs+vLqlgDUpRItNtFYvswu5dFpY67/Jn5Z730Bzukj DDVAGhxcW9SBRx9lMtp3qpSW+4tDfQihyRzMY9fsEiMKzMPsbq8dvX2TUxFttbD8ePuY QWSjW+E0k9NpMf9s9X8TfrpY+9TZoj2EyZBUcHtmvFwT/o8dqlLW7zoUAby3rcmMRvmK cCq+Loe4Ie9bGyrZ5CSNP8W4wQpJ72lBUaqz8sVTmQ9Tgl3japyppvy4jP3gteCunLzK MJRbwy7OQUShvX/Cc+NanV8NEOtzPHWCTxckll74Ukhq4ZWLhvlBipq1XvK/B5D8ebki z4KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684059885; x=1686651885; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=eZnOWg22vX/VIGTd/Fvsr4I8fDfSGvdlisH7ayhtUJg=; b=GQWBaimavP1s82blC0ZQZ1w60RvsOeH4rLUxJuZwzkCjv677e6Dlt3xaUbJ04BWJH0 a4I0C+XAF1W6DydkYDQ3tESAdarZNB+WU680VR90EKwq5PHerQfnhXLHMAHo4Nee9hLr jjdz+NsGw410QLG/JR41XLqNi3KkeHzBnVTelDgn+7FhHsM/xIXvX1RX+oAlP1ERwV9n Q2xj/dHDN4TpI9y7/seG2pdNitVC8lxD8J36GNOgdwhZokozpVi4dNcp4T3WUw2QT1RQ UtcLFTAQ1xjCSyRrjBZFWVCFUqdmJP1VAcTY+6Dq7PZsKffnI61bq6pwkmuZEqlpHnTn OfQQ== X-Gm-Message-State: AC+VfDx59uwRcdYqyIwOCemcrsXJOpzb+qbCSsGc4dSuvrL6Tw4sMYFe 1foKmub5GdVPfGnveS4k5CI= X-Google-Smtp-Source: ACHHUZ4RKC/msexFRTYoHqZ7viBsBWyJO4x+CTQVVvSShsbCd3POr573hThlShaa8D2DDCJ8AW/fHA== X-Received: by 2002:a17:907:6d22:b0:965:d7c7:24db with SMTP id sa34-20020a1709076d2200b00965d7c724dbmr27409505ejc.32.1684059884677; Sun, 14 May 2023 03:24:44 -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 n12-20020a1709065dac00b009663cf5dc2fsm7996892ejv.66.2023.05.14.03.24.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 May 2023 03:24:44 -0700 (PDT) Message-ID: <86ddd780cfada40b0a6fe478b4fe1e24a0f6c401.camel@gmail.com> Subject: Re: [bug#61724] [PATCH v4 1/7] gnu: Rename json-modern-cxx to nlohmann-json. From: Liliana Marie Prikler To: Simon Tournier , 61724-done@debbugs.gnu.org Date: Sun, 14 May 2023 12:24:43 +0200 In-Reply-To: <3fa2a30c3f4f900a8fd2be39e692312d22cdd955.camel@gmail.com> References: <7429efc0ff6e48ddd1169a5353abbe6226edaaeb.1683475550.git.liliana.prikler@gmail.com> <87mt2b3u86.fsf@gmail.com> <3fa2a30c3f4f900a8fd2be39e692312d22cdd955.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 61724-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Donnerstag, dem 11.05.2023 um 20:48 +0200 schrieb Liliana Marie Prikler: > Am Donnerstag, dem 11.05.2023 um 14:53 +0200 schrieb Simon Tournier: > > Hi, > >=20 > > On jeu., 27 avril 2023 at 20:57, Liliana Marie Prikler > > wrote: > >=20 > > > diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build- > > > tools.scm > > > index 33d91e6043..fb2deaa384 100644 > > > --- a/gnu/packages/build-tools.scm > > > +++ b/gnu/packages/build-tools.scm > > > @@ -148,7 +148,7 @@ (define-public bear > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 `(("c-ares" ,c-ares) > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ("fmt" ,fmt-8) > > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ("grpc" ,grpc) > > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ("json-modern-cxx" ,json-modern= -cxx) > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ("nlohmann-json" ,json-modern-c= xx) > >=20 > > Typo, I guess.=C2=A0 Instead, > >=20 > > =C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ("nlohmann-json" ,nlohmann-= json) > Indeed, I missed the /g in my sed.=C2=A0 Will fix. And pushed with said fix. Thanks From unknown Sat Jun 21 10:45:13 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 11 Jun 2023 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator