X-Loop: help-debbugs@HIDDEN Subject: [bug#78589] [PATCH] gnu: Add catch2@HIDDEN Resent-From: nomike <nomike@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sun, 25 May 2025 17:05:02 +0000 Resent-Message-ID: <handler.78589.B.174819270011620 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 78589 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78589 <at> debbugs.gnu.org Cc: nomike <nomike@HIDDEN> X-Debbugs-Original-To: guix-patches@HIDDEN Received: via spool by submit <at> debbugs.gnu.org id=B.174819270011620 (code B ref -1); Sun, 25 May 2025 17:05:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 May 2025 17:05:00 +0000 Received: from localhost ([127.0.0.1]:47805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uJEmR-00031F-MJ for submit <at> debbugs.gnu.org; Sun, 25 May 2025 13:05:00 -0400 Received: from lists.gnu.org ([2001:470:142::17]:37464) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <nomike@HIDDEN>) id 1uJEmQ-00030c-10 for submit <at> debbugs.gnu.org; Sun, 25 May 2025 13:04:58 -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 <nomike@HIDDEN>) id 1uJEmK-0006rn-Jf for guix-patches@HIDDEN; Sun, 25 May 2025 13:04:52 -0400 Received: from shrimp.cherry.relay.mailchannels.net ([23.83.223.164]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <nomike@HIDDEN>) id 1uJEmI-0000tH-LW for guix-patches@HIDDEN; Sun, 25 May 2025 13:04:52 -0400 X-Sender-Id: dreamhost|x-authsender|nomike@HIDDEN Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id EE99518221B; Sun, 25 May 2025 17:04:48 +0000 (UTC) Received: from pdx1-sub0-mail-a312.dreamhost.com (100-117-153-64.trex-nlb.outbound.svc.cluster.local [100.117.153.64]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 6B2AC1820C7; Sun, 25 May 2025 17:04:48 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1748192688; a=rsa-sha256; cv=none; b=mD5jN2BE1DbymZudu7Mb+McaH4Pl1a78DxS6R8R1v1QYiUvkYJoWH2CVYntaTEgP78hpi5 tgqZdRHTT1IaVT4xmAxC0LVWLZSErcern9N+PbBx/WmT3Nz6J9IcLAYbqXjRYlV9o8dW/9 gsqnRtH35EeyneT2pBrW1gFOTWOrIpNeJVkPbDgnNmS1JoLXlRiPZYYqQkMu7tqCzAwisq q2W7srpN5PTLZvi4PUD1ncQekQJzviq2L915e4O273L462mkKLRXTVPo/LKvWWtmtt03uP aTl8cNMRCp42VKoeZj/3zkgz2SMJyWtEf7doWjJ//eIS/W8Y4qBygfefqAf2jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1748192688; h=from:from: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:dkim-signature; bh=s2VfJw8aiHu1bG37j5qAV5/qAZWDolqUgkNQmCdoEi8=; b=kVeDFSeDUGiFrsuZcC0kifoUcVZFZ8XnStfZ1DhTguWuzdqag3LwHui8A7CJnnOJtm12iZ sALT2X4If4nm8Orp1eiwTpzH5iKCsZuSJW/spYWE6j/HWUNkO3yh/BisWD6mM71hm++3uT RqN9Aqqu7G7ccgN0N6soKqbvbOpoWQbDWloxP79g2HFewwCY9cvowhTI7D34znaEq8DOXo NtYKbAz1BVQWSf95cHHeZuT6w/DJ2JW3oX7EY1CLoQGjKB69JchjRtfC7ZcgM/1fGqTHUy wdHZLANmKTOEirMEVQqcPVlWAQlv6tmbNtUNVmuam1PaEl5ikrW3NgVSAuakIw== ARC-Authentication-Results: i=1; rspamd-5b49d78d5-9d2m6; auth=pass smtp.auth=dreamhost smtp.mailfrom=nomike@HIDDEN X-Sender-Id: dreamhost|x-authsender|nomike@HIDDEN X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|nomike@HIDDEN X-MailChannels-Auth-Id: dreamhost X-Keen-Cold: 46930b9501d0f10a_1748192688673_436856874 X-MC-Loop-Signature: 1748192688673:2580204304 X-MC-Ingress-Time: 1748192688672 Received: from pdx1-sub0-mail-a312.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.117.153.64 (trex/7.0.3); Sun, 25 May 2025 17:04:48 +0000 Received: from localhost (84-112-221-106.cable.dynamic.surfer.at [84.112.221.106]) (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) (Authenticated sender: nomike@HIDDEN) by pdx1-sub0-mail-a312.dreamhost.com (Postfix) with ESMTPSA id 4b54y76SF0z76; Sun, 25 May 2025 10:04:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nomike.com; s=dreamhost; t=1748192688; bh=s2VfJw8aiHu1bG37j5qAV5/qAZWDolqUgkNQmCdoEi8=; h=From:To:Cc:Subject:Date:Content-Type:Content-Transfer-Encoding; b=CxR7pJh9rIbp6KVxY9FZ1wdz2jtoc1664yw6RcFeTHTp0Dn1m6PScprw0zMw+IcXO dkj5+rrkAmG5gWaWzVg+bQBq10L9D/y4gCjzX8nlKcwZrQabp6TLaNgLQ2YwMNk8G5 e4FRbNoZzDL5BK/uvnrsnJ6uALcRfEi9YCgwOdY7THOlTlb8OFOVIG8rwLcTtxYda9 wMLJEsz+87Tk5CqqSPwciMXAMZ7oK+f2LIreapn7S8uqY2jDMh6/bJpKpHT+HimDpd 228AdYjqRZC74gj8XBgBpoF9+43oxrXYykXoWVwtdBvYTfZ12Rm5sFeaeYh1BvO8SJ zsJUX/c2CS2cQ== From: nomike <nomike@HIDDEN> Date: Sun, 25 May 2025 19:01:21 +0200 Message-ID: <20250525170443.2906689-1-nomike@HIDDEN> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Type: text/plain; charset=yes Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=23.83.223.164; envelope-from=nomike@HIDDEN; helo=shrimp.cherry.relay.mailchannels.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.1 (/) This adds a package for catch2 at version 3.8.1. As a lot of packages depend on catch2 v. 3.5.3 this version is left as the default. As this is likely to change in the future, version 3.8.1 is the base package and version 3.5.3 inherits from it. * gnu/packages/check.scm (catch2-3.8.1): New variable, renamed from catch2-3, updated to v. 3.8.1 (catch2-3): New variable, inherit from catch2-3.8.1 Change-Id: If66aa68039137e32fc760d209fdaa1f34b04f39e --- I have previously raised #77772, but just updating catch2 to the new version would trigger way too many rebuilds. I thus file this new patch, which will update catch2 to 3.8.1, but under a new variable name. The old variable will be used for a derivative of the new package with the old version. This way no rebuild should be necessary and the new package can be slowly transitioned to. Maybe someone with more experience in guix can decide which one is the better way forward and can close the other ticket. gnu/packages/check.scm | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 0092668ca7..5e94b738f9 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -55,6 +55,7 @@ ;;; Copyright © 2024, 2025 gemmaro <gemmaro.dev@HIDDEN> ;;; Copyright © 2024 Ashvith Shetty <ashvithshetty10@HIDDEN> ;;; Copyright © 2025 Jordan Moore <lockbox@HIDDEN> +;;; Copyright © 2025 nomike Postmann <nomike@HIDDEN> ;;; ;;; This file is part of GNU Guix. ;;; @@ -763,10 +764,10 @@ (define-public cbehave pattern.") (license license:apsl2)))) -(define-public catch2-3 +(define-public catch2-3.8.1 (package (name "catch2") - (version "3.5.3") + (version "3.8.1") (home-page "https://github.com/catchorg/Catch2") (source (origin (method git-fetch) @@ -776,7 +777,7 @@ (define-public catch2-3 (file-name (git-file-name name version)) (sha256 (base32 - "11yla93vm2896fzhm3fz8lk3y3iz5iy7vd6wa7wnwvhsfd2dbfq3")))) + "0v1k14n02aiw4rv5sxhc5612cjhkdj59cjpm50qfxhapsdv54n3f")))) (build-system cmake-build-system) (arguments (list @@ -790,6 +791,23 @@ (define-public catch2-3 a multi-paradigm automated test framework for C++ and Objective-C.") (license license:boost1.0))) + +(define-public catch2-3 + (package + (inherit catch2-3.8.1) + (name "catch2") + (version "3.5.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/catchorg/Catch2") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11yla93vm2896fzhm3fz8lk3y3iz5iy7vd6wa7wnwvhsfd2dbfq3")))))) + + (define-public cmdtest (package (name "cmdtest") -- 2.49.0
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: nomike <nomike@HIDDEN> Subject: bug#78589: Acknowledgement ([PATCH] gnu: Add catch2@HIDDEN) Message-ID: <handler.78589.B.174819270011620.ack <at> debbugs.gnu.org> References: <20250525170443.2906689-1-nomike@HIDDEN> X-Gnu-PR-Message: ack 78589 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 78589 <at> debbugs.gnu.org Date: Sun, 25 May 2025 17:05:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 78589 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 78589: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D78589 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN Subject: [bug#78589] [PATCH] gnu: Add catch2@HIDDEN Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Mon, 26 May 2025 10:57:02 +0000 Resent-Message-ID: <handler.78589.B78589.174825700927183 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 78589 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: nomike <nomike@HIDDEN> Cc: 78589 <at> debbugs.gnu.org Received: via spool by 78589-submit <at> debbugs.gnu.org id=B78589.174825700927183 (code B ref 78589); Mon, 26 May 2025 10:57:02 +0000 Received: (at 78589) by debbugs.gnu.org; 26 May 2025 10:56:49 +0000 Received: from localhost ([127.0.0.1]:55050 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uJVVh-00074M-CX for submit <at> debbugs.gnu.org; Mon, 26 May 2025 06:56:49 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]:56729) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1uJVVf-00073f-0W for 78589 <at> debbugs.gnu.org; Mon, 26 May 2025 06:56:47 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-73bf5aa95e7so1437996b3a.1 for <78589 <at> debbugs.gnu.org>; Mon, 26 May 2025 03:56:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748257000; x=1748861800; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=jppqWxyDOYWTkf2RG8BX9SpKPNitLfr1WzYPHOYp6oM=; b=NUsr+AaP/mTWsAwQZUqh+RMJH9XLSK4FnkMLkhyGHMZMZDNJ36khAXKz8JIsJ2VsAo yr5iqg39++Mixqohql1P2upmuqPkQjViXsjbcyFVoWW6qcv/6oUs2Im23xWFCAN1jWDL AACNo3xbcBOkk/oxgL9zmGb62EMaMEeHwBy3k4Ab70c+tAqrDL5Y5bJq0lljqJi0RBZU Rj35qs4ZoXv/GS1d0EPPMlzuqao5vqfcPEeZgHJSW1bkcE30h877z+XQ/W1ssV1j48vu t7VLRX8f8CyhheETJ1mlIrQbv+WuTn+qYq9UTUgE0iStvKhoX1M3Uf2rdXpdCU0VY8rk 0PIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748257000; x=1748861800; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=jppqWxyDOYWTkf2RG8BX9SpKPNitLfr1WzYPHOYp6oM=; b=etfGidGbmpQF3NAWCYTLVU7UEiwU1mgtTmLi4fMzl8NUFGEPPeMAy3QxlGFnAfZxBW j1BSOg9DdczofS37z3yGFmxfOqor/hO85/YqzZJ2rTxQzwT//mbbQ/OGatI2l/Cnb/Py xBU1tk/3+cECJ27zIXAv/fsz2CIgjmiuIk8NXfD9n8IcQGNTxRm4WVtVDLEkamiiZROa D50UWNSJ/FrpuF+CordRf5Dyg+oyNBoYqGiMlvCI0Ct+f6wS5pXup0yT+J2genultjfq s/edZnYQ4lYcP+cmRRJbPjJ+D+i21cwcGyVNhkWt/zg9yTKDSCe88LPEDTUVpStcTZ1K 7aIw== X-Gm-Message-State: AOJu0YxLnwI5Zfh6kDEaCdiGpf8A3yTAuoY9RqM+4tt8L791b+idPjGO sXWoiNObmbkFFdDLR2uYyhLYp7/ttPyogHeJ4X2uIibbvXW0ME46RX7FQdkNw5o+ X-Gm-Gg: ASbGncsncm+8sqWBbKEN1dkqUwBoHkOTzjGMTDX0VgBu1YYwqmZJZvHXo9pN18QGSfU Y3T0vUiVaPccg4qzerCsHvJxL+qCzB3Ncwg8CmcOX1jWMVNZZKYFa5crl//DNiKDy8DpS1T90Zl H81GiBhmhXZQaAB7HGwCxolutcZ2BVHrYvxQnyLbP5oJTCu85mmgVUOz9kEFCpb6g8PJ6F6rqC7 r/0iwLsSZYYoBfgGIuUC4kvOSAtp9zlLcK6cuIdm0wMLfV60RTjDJawEWDfZl4ABamr/p2iVIQ9 /dAQNdTwwNuAO0cIYeb+s6njb+1dohKJ02uYeuj+PewNpSLWkw== X-Google-Smtp-Source: AGHT+IEmLX5BjImTqGDhoYcSvS1CvTJZ2tupn9DrGk9eozWiB+98rEtI0UkV9okdJ45IqcMo6vRDxw== X-Received: by 2002:a05:6a00:3e20:b0:740:5977:7efd with SMTP id d2e1a72fcca58-745fe01b292mr10781791b3a.13.1748257000383; Mon, 26 May 2025 03:56:40 -0700 (PDT) Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a98a0ca7sm16798184b3a.158.2025.05.26.03.56.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 May 2025 03:56:39 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> In-Reply-To: <20250525170443.2906689-1-nomike@HIDDEN> (nomike@HIDDEN's message of "Sun, 25 May 2025 19:01:21 +0200") References: <20250525170443.2906689-1-nomike@HIDDEN> Date: Mon, 26 May 2025 19:56:37 +0900 Message-ID: <87ecwbiqsa.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hello! nomike <nomike@HIDDEN> writes: > This adds a package for catch2 at version 3.8.1. As a lot of packages depend > on catch2 v. 3.5.3 this version is left as the default. As this is likely to > change in the future, version 3.8.1 is the base package and version 3.5.3 > inherits from it. > > * gnu/packages/check.scm > (catch2-3.8.1): New variable, renamed from catch2-3, updated to v. 3.8.1 > (catch2-3): New variable, inherit from catch2-3.8.1 > > Change-Id: If66aa68039137e32fc760d209fdaa1f34b04f39e > --- > I have previously raised #77772, but just updating catch2 to the new version > would trigger way too many rebuilds. I thus file this new patch, which will > update catch2 to 3.8.1, but under a new variable name. The old variable will > be used for a derivative of the new package with the old version. > > This way no rebuild should be necessary and the new package can be slowly > transitioned to. > > Maybe someone with more experience in guix can decide which one is the better > way forward and can close the other ticket. Personally, I like to crunch the results locally (rebuilding the dependents to get a view of what breaks). Otherwise a feature branch would work well here. I can register at to https://ci.guix.gnu to build this series, and also send the request for merge issue to guix-patches to have QA process it too. Otherwise adding many variants is a bit like shoving snow forward (amassing technical debt) and tends to make things messier down the road. My 2 cents :-). -- Thanks, Maxim
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.