From patchwork Tue Aug 29 10:40:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 53274 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 BAE3127BBE9; Tue, 29 Aug 2023 11:41:16 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 5D01427BBE2 for ; Tue, 29 Aug 2023 11:41:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qaw9Z-0002Uc-IH; Tue, 29 Aug 2023 06:40:57 -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 1qaw9Y-0002UU-2s for guix-patches@gnu.org; Tue, 29 Aug 2023 06:40:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qaw9X-0001jY-QX for guix-patches@gnu.org; Tue, 29 Aug 2023 06:40:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qaw9e-0000Jh-FQ for guix-patches@gnu.org; Tue, 29 Aug 2023 06:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65565] [PATCH v2] gnu: chaiscript: Fix tests. References: In-Reply-To: Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Aug 2023 10:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65565 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65565@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 65565-submit@debbugs.gnu.org id=B65565.16933056171142 (code B ref 65565); Tue, 29 Aug 2023 10:41:02 +0000 Received: (at 65565) by debbugs.gnu.org; 29 Aug 2023 10:40:17 +0000 Received: from localhost ([127.0.0.1]:49610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaw8v-0000IL-Aa for submit@debbugs.gnu.org; Tue, 29 Aug 2023 06:40:17 -0400 Received: from mail.envs.net ([5.199.136.28]:48136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qaw8t-0000IA-HF for 65565@debbugs.gnu.org; Tue, 29 Aug 2023 06:40:16 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 601E138A013B; Tue, 29 Aug 2023 10:40:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1693305607; bh=fHbw3r3LnvzBK/w/iKy1P/0Shkl/LwAoIGoRi8YUfws=; h=From:To:Cc:Subject:Date:From; b=cdc6MUmbmoPjas23HS9k3sp6zu0nrryxuUKr4RdRxluR+J4MexQK6v5Dn7zw4Bj4g xVkuHoPqAF3QFDBmnt3lEabCyWN+CV9E4Mona1lc6Lhi3B9bwwDh2TEp94/SCfIVpC puD6RsusMCb4q2XUvt6eVGvKr+J3l3QKNMWN4Xd33MuQz/0M6Ybzz6jNLzMxMUbCRP 8pdlMGhV4+ojs91lpQwXWnP5JYrhUW2ctuiZwrxGci5GR7l2VCvmiB21jWm9uufgtZ aSVvNp1ie6L2ByW9uo8BayntW+C3+oDtRMF+GIpQPfPeFShXPyiCBr0wPNMTIFvnWd Pod/hmJnCycAscB9a1CvnlwOzxfyL3XLm3MooKhXpwK8F1/9EAkQKnyZGBUfl2oPNa vINZqE3vwfcrLOlKAJXpLa68acxNgp9oeNoHRL840XCBSXigdXP1DZfI1Y8CsDXDyn ArG8hFkapPYRU/XAp/f92QU3EoTlH2W/QzQHpVTFIq4rm49Hnr/EF3CA+bBnQ8YJYo ELQugw7e1qD5e4ioI+13cmRlXSy7X83gDCwSUBRvZ8065q+eFTXann6iZDGG+ECQQY sAuWw/ee6TDCL8v04j6e4cS41nQNVz+OOg/L6X4aaCm3a2DVSBTxjrb61NiDi71Tca A0yb7Piwpe2jTk1P2NQGINlk= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id O1-1P8xTN2t4; Tue, 29 Aug 2023 10:40:03 +0000 (UTC) Received: from localhost (unknown [36.170.44.50]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Tue, 29 Aug 2023 10:40:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 5b5b8524; Tue, 29 Aug 2023 10:40:27 +0000 (UTC) Date: Tue, 29 Aug 2023 18:40:24 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 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: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "ashish.is--- via Guix-patches\" via" 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 From: 宋文武 * gnu/packages/cpp.scm (chaiscript)[source]: Add snippet. [inputs]: Add catch2. --- gnu/packages/cpp.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) base-commit: 715d203b414727be43e405d09e86aa823125a4b3 diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 3b949198c7..2f8cc2ce25 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -509,8 +509,17 @@ (define-public chaiscript (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0i1c88rn1wwz8nf3dpapcdkk4w623m3nksfy5yjai10k9irkzy3c")))) + (base32 "0i1c88rn1wwz8nf3dpapcdkk4w623m3nksfy5yjai10k9irkzy3c")) + (modules '((guix build utils))) + ;; It's bundled catch2 fails to build. + (snippet '(begin + (delete-file "unittests/catch.hpp") + (substitute* "unittests/compiled_tests.cpp" + (("catch[.]hpp") "catch2/catch.hpp")) + (substitute* "unittests/type_info_test.cpp" + (("catch[.]hpp") "catch2/catch.hpp")))))) (build-system cmake-build-system) + (inputs (list catch2)) (home-page "https://chaiscript.com/") (synopsis "Embedded scripting language designed for C++") (description