From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id eDXMF8rMV2SgngAASxT56A (envelope-from ) for ; Sun, 07 May 2023 18:07:38 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id UHK8F8rMV2S4ywAA9RJhRA (envelope-from ) for ; Sun, 07 May 2023 18:07:38 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 264A43E5E4 for ; Sun, 7 May 2023 18:07:38 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pvgui-00032c-Bv; Sun, 07 May 2023 12:07:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pvgug-00031i-Qw for guix-patches@gnu.org; Sun, 07 May 2023 12:07:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pvguc-0006GD-Mn for guix-patches@gnu.org; Sun, 07 May 2023 12:07:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pvguc-0004BB-5t for guix-patches@gnu.org; Sun, 07 May 2023 12:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#61724] [PATCH v4 1/7] gnu: Rename json-modern-cxx to nlohmann-json. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 May 2023 16:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61724 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61724@debbugs.gnu.org Received: via spool by 61724-submit@debbugs.gnu.org id=B61724.168347561016032 (code B ref 61724); Sun, 07 May 2023 16:07:02 +0000 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 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1683475658; a=rsa-sha256; cv=none; b=aLE+R2Gt6S6BrVz9MHq0t4n+cOFeqz4TMtaTe8Il8FtDDQIzt5FGfh5c2HmR1s/orL+FnL /5eBtBPAPuk1lSA3iGdblsBFnGDWdiBEhsDYa6pOlru7SM9WJ9rVE27rHMo7RrJEXIjTb3 txPqMHW1kMju0+iapSHs5XxlJ4+m/gp0Okm+JvJVYZJsol4S7Tx9tmXsYhTBDwkuAtakF9 vuYgshMUvi3cRZnyeQk+C+h2l22Y/pl700FywIrxRmqMxz7/Rezy8ZSGPsx6k0c5xh3CzF 7KLPcEf3C/zREi1XgWyBxlOJkHyK8g69+Up301dRKKY0CDV7VSvLjwwXg0/l4A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=k02y8QhA; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1683475658; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=DINl1FX2eQ3qp9bSAocDa0gxGtYcNsrIXZJEjQt/ENE=; b=S+hmFKPPZqiN1zjzM+s8m1U9nRCO49qx8U6f7mYrC3Ul6IS/81H2RNe7Vexf88fiIcRTag m4HD/8onVqJKT0oaquldWjuPCpTM11xPkC38BZQAoRIHmX8VFcEXXBaGYJUCBTE+N4LLvh h6kfY+8Xbe/X73vfoxmBFuQq1lPsjeMVwTc6p4P13oshrl4iNgTwCeuQldvGyi1QrWFjxI pyUCmRBA69fYNDHZOWDILxJ3TJGuDq5RvwVx2GRtRuHvJ1sB9qrvcab5rXVOtxhSPS16GC jl6oyY5YLrxsVA5xWkZZPwpPFJkwGBDsXM15vTKYJmcyAkHvPU9e+AGXoyOw4Q== X-Migadu-Spam: Yes X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=k02y8QhA; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Spam: Yes X-Migadu-Spam-Score: 8.31 X-Spam-Score: 8.31 X-Migadu-Queue-Id: 264A43E5E4 X-TUID: tl6MREGB2a9r * 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