From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id YH+6H0HhsWFZcAAAgWs5BA (envelope-from ) for ; Thu, 09 Dec 2021 11:58:09 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id gKeFG0HhsWEubQAAB5/wlQ (envelope-from ) for ; Thu, 09 Dec 2021 10:58:09 +0000 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 440C32FC1A for ; Thu, 9 Dec 2021 11:58:09 +0100 (CET) Received: from localhost ([::1]:53552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mvH7o-0003La-BK for larch@yhetil.org; Thu, 09 Dec 2021 05:58:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35432) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvH7i-0003LH-BR for guix-patches@gnu.org; Thu, 09 Dec 2021 05:58:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59247) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mvH7i-00087k-3r for guix-patches@gnu.org; Thu, 09 Dec 2021 05:58:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mvH7i-0002ni-2e for guix-patches@gnu.org; Thu, 09 Dec 2021 05:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51885] [PATCH v2 3/4] gnu: Add json. Resent-From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Dec 2021 10:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51885 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51885@debbugs.gnu.org Cc: Raghav Gururajan , jgart X-Debbugs-Original-To: Raghav Gururajan via Guix-patches via , 51885@debbugs.gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163904744910710 (code B ref -1); Thu, 09 Dec 2021 10:58:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Dec 2021 10:57:29 +0000 Received: from localhost ([127.0.0.1]:42558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvH7B-0002mb-6G for submit@debbugs.gnu.org; Thu, 09 Dec 2021 05:57:29 -0500 Received: from lists.gnu.org ([209.51.188.17]:55140) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mvH7A-0002mU-8x for submit@debbugs.gnu.org; Thu, 09 Dec 2021 05:57:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mvH7A-0003Ex-0B for guix-patches@gnu.org; Thu, 09 Dec 2021 05:57:28 -0500 Received: from [2a00:1450:4864:20::535] (port=33482 helo=mail-ed1-x535.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mvH77-000839-Lk for guix-patches@gnu.org; Thu, 09 Dec 2021 05:57:27 -0500 Received: by mail-ed1-x535.google.com with SMTP id t5so18369315edd.0 for ; Thu, 09 Dec 2021 02:57:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=65tDvfcaCe6lvE9YRPFobVLd8BUQjeXDVtfcXSXHGMA=; b=KZUqkW/Jqaq010JEc9KolxmM4sLs5l+fgWzWB6eTKq1II2CkOhu6qESabTGgJTy/fH yRX493hT7AUidSPb7zStzKrvOM7annz/kTPgCTtJWGgPO4j7GEv2/yV9eBlXfMdtj6A8 bbVRY+gCgITwJWmKBc6CgJYyHJc0UzmPESsPKHZyCG5ENM13ypzV+guFqJ6qnj/xXtch 7xwg41P/HU1g/3AKRDqwaarQ2AiNv1O6LxAXIXszQTRY4SWmiWRowoPaDHKuwNXBkY3G DY34wKV0lTkRH2wjZ3DJkiiy8Hls3zp9yiP0/v/0fYG3LDpwMqhUkHEKDs0M7XGMCR0N Tk9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=65tDvfcaCe6lvE9YRPFobVLd8BUQjeXDVtfcXSXHGMA=; b=ALs/dWc9cMCajLZAMzwx4xZlr0mx2QS1HT9Ug+/B2xNPtvKH/m31jO6wTlscUCp+AF 2VPQzWvidkx1/zceM6YAIxRzkzaja+p87FZ3LBdaroMql8dyDvU5LzzmPzJoN3fZE6oD VvIqtjKl2Bgn7FuNTVIbr2oZkCaprvlr2S9WK8oDZ2t9uRyVpKgkbZnD8zyuNSE2uT0b GAxAtU9uYUJe2yuJKWKcDrsQBkS6W/4J0PLdsPqQ+B+J4sGIbc67aaKieegqjGjmoIZh K/95KnsGuNXb8sGaFYVR+i5IpSR5RquMdrD9MoZxN0HalsHwAj5GlaYUw7GEQNAtg7NN QlVQ== X-Gm-Message-State: AOAM533vqJbllFNckDW0jeKTqSbhh48rIV2b93FXEG4E1RjBn0pyBBty KigCKLUCTahn4eOQitVh42mYj1yjbdc= X-Google-Smtp-Source: ABdhPJzNwtHjfrHVX58mEPwiIsXcLtENSTCPzoiQX0uzI+aYmJtr4A0iD70YXGuH9Sn62l89TId0Ng== X-Received: by 2002:a17:907:728c:: with SMTP id dt12mr14153688ejc.375.1639047442321; Thu, 09 Dec 2021 02:57:22 -0800 (PST) Received: from localhost (host-79-54-200-65.retail.telecomitalia.it. [79.54.200.65]) by smtp.gmail.com with ESMTPSA id cs15sm2425611ejc.31.2021.12.09.02.57.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Dec 2021 02:57:21 -0800 (PST) From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti In-Reply-To: <20211209105212.29412-3-rg@raghavgururajan.name> References: <20211209105212.29412-1-rg@raghavgururajan.name> <20211209105212.29412-3-rg@raghavgururajan.name> Date: Thu, 09 Dec 2021 11:57:21 +0100 Message-ID: <87tufikpv2.fsf@guix.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: text/plain X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::535 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=anothersms@gmail.com; helo=mail-ed1-x535.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.00 Authentication-Results: aspmx1.migadu.com; none X-Migadu-Queue-Id: 440C32FC1A X-Spam-Score: -4.00 X-Migadu-Scanner: scn1.migadu.com X-TUID: s7524ypch3xG Hi, is this different from json-modern-cxx (except for the version)? Raghav Gururajan via Guix-patches via writes: > * gnu/packages/cpp.scm (json): New variable. > > Co-authored-by: jgart > --- > gnu/packages/cpp.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 63 insertions(+) > > diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm > index a579c47ad9..28705d5bb6 100644 > --- a/gnu/packages/cpp.scm > +++ b/gnu/packages/cpp.scm > @@ -77,6 +77,69 @@ (define-module (gnu packages cpp) > #:use-module (gnu packages web) > #:use-module (gnu packages xml)) > > +(define-public json > + (package > + (name "json") > + (version "3.10.4") > + (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 "17kxwxl6515s8nb5x7zy69c8qy4gswac66fp15261x1g6sa2jnkx")) > + (modules '((guix build utils) > + (ice-9 ftw) > + (srfi srfi-1))) > + (snippet > + `(begin > + (delete-file-recursively "third_party") > + (let ((keep > + ;; Custom forks which are incompatible with the ones in Guix. > + '("doctest" "fifo_map"))) > + (with-directory-excursion "test/thirdparty" > + (for-each delete-file-recursively > + (lset-difference string=? > + (scandir ".") > + (cons* "." ".." keep))))) > + #t)))) > + (build-system cmake-build-system) > + (arguments > + `(#:configure-flags > + (list > + (string-append "-DJSON_TestDataDirectory=" > + (assoc-ref %build-inputs "json_test_data"))) > + #:phases > + (modify-phases %standard-phases > + (add-after 'unpack 'disable-failing-tests > + (lambda _ > + (substitute* "test/CMakeLists.txt" > + ;; Requires network connection. > + (("add_subdirectory\\(cmake_fetch_content\\)") ""))))))) > + (native-inputs > + `(("json_test_data" > + ,(origin > + (method git-fetch) > + (uri > + (git-reference > + (url "https://github.com/nlohmann/json_test_data") > + (commit "v3.0.0"))) > + (file-name > + (git-file-name "json_test_data" "3.0.0")) > + (sha256 > + (base32 "0nzsjzlvk14dazwh7k2jb1dinb0pv9jbx5jsyn264wvva0y7daiv")))) > + ("python" ,python-wrapper))) > + (home-page "https://json.nlohmann.me/") > + (synopsis "JSON for C++") > + (description "@code{json} is a C++ json library for converting to and from > +C++ data structures. It's design goals emphasize intuitive syntax, trivial > +integration via a single header file, and serious test coverage involving all of > +the codebase.") > + (license license:expat))) > + > (define-public argagg > (let ((commit "79e4adfa2c6e2bfbe63da05cc668eb9ad5596748") > (revision "0")) > -- > 2.34.0