From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id eMX1IdBn9GOA3gAAbAwnHQ (envelope-from ) for ; Tue, 21 Feb 2023 07:42:24 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id GO7cIdBn9GODUgAAauVa8A (envelope-from ) for ; Tue, 21 Feb 2023 07:42:24 +0100 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 292953E435 for ; Tue, 21 Feb 2023 07:42:24 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pUMLm-0002oF-Ps; Tue, 21 Feb 2023 01:42:06 -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 1pUMLj-0002nr-US for guix-patches@gnu.org; Tue, 21 Feb 2023 01:42:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUMLj-000645-2R for guix-patches@gnu.org; Tue, 21 Feb 2023 01:42:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pUMLi-00054O-KR for guix-patches@gnu.org; Tue, 21 Feb 2023 01:42:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61672] [PATCH] gnu: Add nlohmann-json. Resent-From: jgart Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Feb 2023 06:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61672 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61672@debbugs.gnu.org Cc: jgart X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167696167319403 (code B ref -1); Tue, 21 Feb 2023 06:42:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Feb 2023 06:41:13 +0000 Received: from localhost ([127.0.0.1]:54396 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pUMKs-00052p-1J for submit@debbugs.gnu.org; Tue, 21 Feb 2023 01:41:13 -0500 Received: from lists.gnu.org ([209.51.188.17]:59264) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pUMKn-00052d-P2 for submit@debbugs.gnu.org; Tue, 21 Feb 2023 01:41:09 -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 1pUMKk-0002ju-Jo for guix-patches@gnu.org; Tue, 21 Feb 2023 01:41:03 -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 1pUMKi-0005pP-EN for guix-patches@gnu.org; Tue, 21 Feb 2023 01:41:02 -0500 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 62db2551 for ; Tue, 21 Feb 2023 07:40:54 +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=O+EQBMF71ceujM2woRUAp xp8GFFcoweOjJ51AnRoQ/g=; b=N+vFEl0+3Y5Rw11Y9oxv4Oif2qTQip3M2DYjc Dlv0lJlAzAYa7+Fpgy4+MxeZu5vuGUUK+ByMwlBVS8O6vk82fobAW9X70+5T2DpA E4W0unw5oJVLoFrDS1UgucUSg+mmIFuUqLuo39lQokNPkkuuVMYKR08G+GmAsb6P NwzYWWiGUu3iEG3KSM/XuqcaSWX6AfO69ojt8De9LNE7AOZv64tIyJ0jnB2eKvXZ LRgHYU24uX0a4ZfxrT2lXXFrNvSRpqW+e7X9uBeurLyRxjbtgXdtO8k330uuyZcv LUwiX0OjRo6CnF5aPVgsnRnPa7PhQUgkIMxK3w90HsKTmEg5A== Received: from smtp1.dismail.de ( [10.240.26.11]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 6a030d7d for ; Tue, 21 Feb 2023 07:40:54 +0100 (CET) Received: from smtp1.dismail.de (localhost [127.0.0.1]) by smtp1.dismail.de (OpenSMTPD) with ESMTP id 3104f99a for ; Tue, 21 Feb 2023 07:40:54 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id ad58f11f (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 21 Feb 2023 07:40:48 +0100 (CET) Date: Tue, 21 Feb 2023 07:40:23 +0100 Message-Id: <20230221064023.11660-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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: jgart X-ACL-Warn: , jgart via Guix-patches From: jgart via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1676961744; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=JyPBQdBAIpIN2PhsMqUKys5o2572iz+P/JEO9LNYGBM=; b=nn/dGV1vM2qknAqUvAk/KXm4qng6cQk/B3k0IZMBJ0DaDDRJgO6HtB2lXCRcYDmvlQ8mkg B6dRORPCaTXH3l8aPm+vRuly6e5h+CNoSzZjKZ59qCZoE7Y4Ce/flE2jgSEf8/o161q54K o5MVjuKIONWpUbze5YLydgIxI06Z3MhqFPvLZbBo0G7mx1v9w8QnfjSfuUZOvkgg1Ek/xE NEZlwjhBQbcGwr8mgBkCcmXNE2/Hz85sk1xgWdirC4DHp6dr2jSwX4XOsJxquJsOJ98gBd 7a0XWy6EyhzizaoR9ahgLsUImbYuGN6BWRzaUF6wMuFMtSDlZ82/F4vaeX9E6A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=N+vFEl0+; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676961744; a=rsa-sha256; cv=none; b=pTsn3iivf/5iXZSrevCJxPpz5qCxQxT10WGV9QlVri26n12Mq2VGkeT6KkFi8i1BU7T1Z8 ys6sV/EXtUDimCy3S9WUpZSPoDgdkA+B18VAoFAEnzduQd5cz51PIyAO6rtTAa9/Zgkh3h BvEizC9rVQbIF4NrXOWUfmFUgr83nt90nQblOIMNTMmUGYcgyMi8GGNXQ0QVqi1P6idyOX qljNnFtV/5AbWhmGl2HxE8dDNcaTfaIUlSNjAA38e+1v6rUoUPYsQT8KKqDWQYobLVsYG5 ULYZmS5qxpjMHTwzH7sfjxtW/ppCRwJCoQUQdNdXgWxi0kq9HXVetmoxnpF0zA== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -2.45 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dismail.de header.s=20190914 header.b=N+vFEl0+; 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"; dmarc=pass (policy=none) header.from=gnu.org X-Migadu-Queue-Id: 292953E435 X-Spam-Score: -2.45 X-TUID: l7QkXdah0zgz * gnu/packages/web.scm (nlohmann-json): New variable. --- gnu/packages/web.scm | 48 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 98db004482..e2f9dddf06 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -58,7 +58,7 @@ ;;; Copyright © 2022 cage ;;; Copyright © 2022 Pradana Aumars ;;; Copyright © 2022 Petr Hodina -;;; Copyright © 2022 jgart +;;; Copyright © 2022, 2023 jgart ;;; Copyright © 2023 Paul A. Patience ;;; Copyright © 2022 Bruno Victal ;;; Copyright © 2023 David Thompson @@ -1109,6 +1109,52 @@ (define-public jansson data.") (license license:expat))) +(define-public nlohmann-json + (package + (name "nlohmann-json") + (version "3.11.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nlohmann/json") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0g6rfsbkvrxmacchz4kbr741yybj7mls3r4hgyfdd3pdbqhn2is9")))) + (build-system cmake-build-system) + (arguments + (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 + `(("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 json-c (package (name "json-c") -- 2.39.1