From patchwork Sun May 25 17:01:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "nomike (they/them)" X-Patchwork-Id: 42915 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 4386427BC4C; Sun, 25 May 2025 18:05:27 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 71EE527BC49 for ; Sun, 25 May 2025 18:05:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uJEmX-0006ug-5k; Sun, 25 May 2025 13:05:05 -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 1uJEmU-0006sO-R7 for guix-patches@gnu.org; Sun, 25 May 2025 13:05:02 -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 1uJEmU-0000ul-Id for guix-patches@gnu.org; Sun, 25 May 2025 13:05:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=s2VfJw8aiHu1bG37j5qAV5/qAZWDolqUgkNQmCdoEi8=; b=FIu1HUbQp3B+Mx/i4WIxVI7l0rAfTQN0c+isqML12HAqmJ7aqkyvb0Bhd4T9gMUmuyigYdObdg5HFl3QbQkDQA277cXr2fQZ07u6ghKhZtzTdw+EKSCX758Zb9Ml5/xzET3GzGsS+StfJ4vBgx4sKeBXrWSXS9PvVfxdAFbuO4LI+aDyBQ0atUOtRZfkvDzT/ahr1tGDFd2Zm+j+yMKOpugyIPNZZ6HBIIUu5KncW9iLNk4rGbaSfMAobsD8tkkcnpZcIX7sibUVihVyi9Ob3F5u820VYUhgDIc9quwB0lUyEwVoO/zSZlhnN//b7SLCFSqlnpGFHfeHX08hfUB/fQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uJEmU-00031p-BK for guix-patches@gnu.org; Sun, 25 May 2025 13:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78589] [PATCH] gnu: Add catch2@3.8.1 Resent-From: nomike Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 May 2025 17:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78589 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78589@debbugs.gnu.org Cc: nomike X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@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 ) id 1uJEmR-00031F-MJ for submit@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 ) id 1uJEmQ-00030c-10 for submit@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 ) id 1uJEmK-0006rn-Jf for guix-patches@gnu.org; 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 ) id 1uJEmI-0000tH-LW for guix-patches@gnu.org; Sun, 25 May 2025 13:04:52 -0400 X-Sender-Id: dreamhost|x-authsender|nomike@nomike.com 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@nomike.com X-Sender-Id: dreamhost|x-authsender|nomike@nomike.com X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|nomike@nomike.com 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@nomike.com) 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 Date: Sun, 25 May 2025 19:01:21 +0200 Message-ID: <20250525170443.2906689-1-nomike@nomike.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=23.83.223.164; envelope-from=nomike@nomike.com; 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-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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 ;;; Copyright © 2024 Ashvith Shetty ;;; Copyright © 2025 Jordan Moore +;;; Copyright © 2025 nomike Postmann ;;; ;;; 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")