From patchwork Thu Apr 27 18:57:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49857 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8D18327BBE9; Sun, 7 May 2023 17:07:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2EF8927BBE2 for ; Sun, 7 May 2023 17:07:38 +0100 (BST) 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (nlohmann-json): New variable. (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(-) base-commit: 4c3532d7ab81a20e21d23bcf25e06999fcee2571 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") From patchwork Fri Apr 28 19:50:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49856 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B018927BBE9; Sun, 7 May 2023 17:07:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 84CE727BBE2 for ; Sun, 7 May 2023 17:07:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pvgui-00032Z-5P; Sun, 07 May 2023 12:07:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pvgug-00031k-Tv for guix-patches@gnu.org; Sun, 07 May 2023 12:07:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pvgud-0006GH-5P for guix-patches@gnu.org; Sun, 07 May 2023 12:07:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pvgud-0004BQ-05 for guix-patches@gnu.org; Sun, 07 May 2023 12:07:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#61724] [PATCH v4 2/7] gnu: nlohmann-json: Update to 3.11.2. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 May 2023 16:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61724 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61724@debbugs.gnu.org Received: via spool by 61724-submit@debbugs.gnu.org id=B61724.168347562016056 (code B ref 61724); Sun, 07 May 2023 16:07:02 +0000 Received: (at 61724) by debbugs.gnu.org; 7 May 2023 16:07:00 +0000 Received: from localhost ([127.0.0.1]:38262 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvguZ-0004At-Qy for submit@debbugs.gnu.org; Sun, 07 May 2023 12:07:00 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:57395) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvguM-0004A4-MJ for 61724@debbugs.gnu.org; Sun, 07 May 2023 12:06:49 -0400 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-965cc5170bdso483325566b.2 for <61724@debbugs.gnu.org>; Sun, 07 May 2023 09:06:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683475601; x=1686067601; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=q5rz85lGSX5a0PXRHnaLbFBTxeehARd0dSjEgWRGQsA=; b=abbILvchWitSqrsUcISYzqjioq7KvsWMtIlnKJRC+gjGipAO3nP0SSR3/jzedO709b oml4LdzKAZ5VV+Rg/uqT9NH0Mh17YTDSCNcyUbhED0BMhfRjHy7ULs5cFf0H0gOp8lha /AjIFG9mA+VSP1cLLT5fqSP8yo05vFaGG3Zn5z4so+zmSFdy8eePY1buv0g0ssAsYISS 4Is3s3ItHhA+Zec0TOiwb/CIR/S5G4MlLo0mvBdeK4RdWAgm4/VfuG178DudktEGTDvu pRRY28G7OmEjjmzxschbcKISWnKntFRXoeo7rn5ibWKsXwGYQedqD1kGNDd7FN+D6EOV j9Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683475601; x=1686067601; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=q5rz85lGSX5a0PXRHnaLbFBTxeehARd0dSjEgWRGQsA=; b=Vy9Z3bfyWuPGtHTJ0cTD4VChZym4xjeFjvDZlwv3vHFi/GJKwsZlhY+6unhr51yenA KZHeszHb9eLitSt0JenCkO69mT3cwhL8pUBG9FSlviOFyj82n0qBNZ4Nx/E51FHRW26G gFFvM0KwZRj37TneOyG6nrSBvq/jHdbJO+5GhbbUPCjnmDgM9vdrMwlFbt4fLRQVIbM5 z2P+oSQyTZdPNn7s7A9O+Mqkk/h3Tr82EEaRAfvYkSW8EEQ3oiNj9UZTUU7an1cg+7xY kS3/PsMQz0HCSTqqnYdpc9i/m6ck/Ni3Mhc7B62u/I5fPppKe4yT9A1Pys89H9mowUL2 XNnw== X-Gm-Message-State: AC+VfDx1ifyZXIs4/Rkiijr09zXb4hkkZEt+Dmh0HuUYDphE1CllDcQx 0Ab8uBZ7ncWGa1w1wX4N2V/qAEkHCB53sw== X-Google-Smtp-Source: ACHHUZ7TRvcCmhwit0jj/q0YbfZQ0+WiHclWYTMJ72JwJjMJcnr2+EX/+ek4HCGVJB6mYo6zUD2YIg== X-Received: by 2002:a17:906:fd88:b0:965:a72a:b2ae with SMTP id xa8-20020a170906fd8800b00965a72ab2aemr5840770ejb.60.1683475600991; Sun, 07 May 2023 09:06:40 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id hy27-20020a1709068a7b00b0094f3d700868sm3766618ejc.80.2023.05.07.09.06.40 for <61724@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 May 2023 09:06:40 -0700 (PDT) Message-Id: <7fff809117a7e9a66267143a00b6e927ac96d5be.1683475550.git.liliana.prikler@gmail.com> In-Reply-To: <7429efc0ff6e48ddd1169a5353abbe6226edaaeb.1683475550.git.liliana.prikler@gmail.com> References: <7429efc0ff6e48ddd1169a5353abbe6226edaaeb.1683475550.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Fri, 28 Apr 2023 21:50:32 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (nlohmann-json): Update to 3.11.2. [source]: Adjust accordingly. [native-inputs]: Update to 3.1.0. --- gnu/packages/cpp.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index a041b4a3bb..5c2e6d2425 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -598,7 +598,7 @@ (define-public json-dto (define-public nlohmann-json (package (name "nlohmann-json") - (version "3.10.5") + (version "3.11.2") (home-page "https://github.com/nlohmann/json") (source (origin @@ -606,23 +606,22 @@ (define-public nlohmann-json (uri (git-reference (url home-page) (commit (string-append "v" version)))) (sha256 - (base32 "1f9mi45ilwjc2w92grjc53sw038840bjpn8yjf6wc6bxs2nijfqd")) + (base32 "0g6rfsbkvrxmacchz4kbr741yybj7mls3r4hgyfdd3pdbqhn2is9")) (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet '(begin ;; Delete bundled software. Preserve doctest_compatibility.h, which ;; is a wrapper library added by this package. - (install-file "./test/thirdparty/doctest/doctest_compatibility.h" "/tmp") - (for-each delete-file-recursively - '("./third_party" "./test/thirdparty")) - (install-file "/tmp/doctest_compatibility.h" "./test/thirdparty/doctest") + (install-file "./tests/thirdparty/doctest/doctest_compatibility.h" "/tmp") + (delete-file-recursively "./tests/thirdparty") + (install-file "/tmp/doctest_compatibility.h" "./tests/thirdparty/doctest") ;; Adjust for the unbundled fifo_map and doctest. - (substitute* "./test/thirdparty/doctest/doctest_compatibility.h" - (("#include \"doctest\\.h\"") - "#include ")) - (with-directory-excursion "test/src" + (substitute* (find-files "./tests/" "\\.h(pp)?") + (("#include \"doctest\\.h\"") "#include ") + (("#include ") "#include ")) + (with-directory-excursion "tests/src" (let ((files (find-files "." "\\.cpp$"))) (substitute* files (("#include ?\"(fifo_map.hpp)\"" all fifo-map-hpp) @@ -648,7 +647,7 @@ (define-public nlohmann-json (format #t "test suite not run~%"))))))) (native-inputs (list amalgamate - (let ((version "3.0.0")) + (let ((version "3.1.0")) (origin (method git-fetch) (uri (git-reference @@ -657,7 +656,7 @@ (define-public nlohmann-json (file-name (git-file-name "json_test_data" version)) (sha256 (base32 - "0nzsjzlvk14dazwh7k2jb1dinb0pv9jbx5jsyn264wvva0y7daiv")))))) + "0nbirc428qx0lpi940p7y24fzdjbwl6xig3h5rdbihyymmdzhvbc")))))) (inputs (list doctest fifo-map)) (synopsis "JSON parser and printer library for C++") From patchwork Fri Apr 28 19:55:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49855 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 173F327BBE2; Sun, 7 May 2023 17:07:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1D72827BBE9 for ; Sun, 7 May 2023 17:07:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pvguh-000329-Tn; Sun, 07 May 2023 12:07:07 -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-00031j-Rv for guix-patches@gnu.org; Sun, 07 May 2023 12:07:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pvgud-0006GE-04 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-0004BJ-I2 for guix-patches@gnu.org; Sun, 07 May 2023 12:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#61724] [PATCH v4 3/7] gnu: nlohmann-json: Improve package style. 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.168347561016038 (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]: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 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/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"))