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