From patchwork Tue Jun 3 21:46:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42988 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 CF5AF27BC4A; Tue, 3 Jun 2025 22:48:28 +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 9E1D427BC49 for ; Tue, 3 Jun 2025 22:48:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uMZTT-0006ZS-Ms; Tue, 03 Jun 2025 17:47:11 -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 1uMZTM-0006HT-Qn for guix-patches@gnu.org; Tue, 03 Jun 2025 17:47:06 -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 1uMZTL-0006DE-3L for guix-patches@gnu.org; Tue, 03 Jun 2025 17:47:04 -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:References:In-Reply-To:Date:From:To:Subject; bh=gqLrhzkOvhndVRHiodvCnXH8ZvGiUYFVZwU32AXLauo=; b=FVzVMZRxODaWjBDPyAJq9Gs3D1vNd8iQWRRrfbAtQxjLSExdOa7iGG7KhOJ1mfskcDy18ZiY7xygFa6nidfoqJ5zmT5aa7lAuqW/6fdIxAg0qMm1XNosEMZxY5dj2kjnDlSFTxSLylmLJ/R+XNsIHusGrAHmGv3Qu8IDj3IBxtqpgD29wp8p0RxygOKWRogwoY+KOQea4y/DZz3itHzwxC+VR54jukvdIeTQEY8nEGwd8RDGKbTBj/2aEJRXsrV06+N6p3ukU1dQUkP2MD4Q+lUlzqz3gqc9dOGa0uGbm85pDRu3dB4t+2YDschlNr49Mm74E1d1IAeBjyMCkiVLtg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uMZTK-0003uN-Im for guix-patches@gnu.org; Tue, 03 Jun 2025 17:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78683] [PATCH 2/5] gnu: ruby-importmap-rails: Downgrade ruby-sqlite3 native-input. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Jun 2025 21:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78683 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78683@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78683-submit@debbugs.gnu.org id=B78683.174898721114957 (code B ref 78683); Tue, 03 Jun 2025 21:47:02 +0000 Received: (at 78683) by debbugs.gnu.org; 3 Jun 2025 21:46:51 +0000 Received: from localhost ([127.0.0.1]:42840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uMZT8-0003t5-Kf for submit@debbugs.gnu.org; Tue, 03 Jun 2025 17:46:50 -0400 Received: from 3.mo563.mail-out.ovh.net ([46.105.40.8]:58447) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uMZT3-0003sT-Uz for 78683@debbugs.gnu.org; Tue, 03 Jun 2025 17:46:47 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bBknH6Zvwz1QcW; Tue, 3 Jun 2025 21:46:43 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78683@debbugs.gnu.org>; Tue, 3 Jun 2025 21:46:43 +0000 (UTC) Received: from mta10.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.113.24]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bBknH3Cbhz5xNc; Tue, 3 Jun 2025 21:46:43 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.0]) by mta10.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 039FEDA3BFA; Tue, 3 Jun 2025 21:46:42 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-95G00142fbee5e-b22c-4b4e-bc3e-ed4d5d5c6668, A5CF9DDD6AE9BD53716D923BBF84B57CA59C6645) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Tue, 3 Jun 2025 23:46:29 +0200 Message-ID: <20250603214640.25126-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250603214640.25126-1-ngraves@ngraves.fr> References: <20250603214640.25126-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 7873136575656551138 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtddugdduudeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkeeikeefseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=gqLrhzkOvhndVRHiodvCnXH8ZvGiUYFVZwU32AXLauo=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1748987204; v=1; b=UuHbQQ3GbksP8Y/SMTxSaNAZQDA8XwV+5o4gxqC4IY+9J7OxAO5tcRMAduecI3OZeSoo1NTJ cN1sZiVo0pbvCFQMW+o8hipoS7trcY5PcKYmjKXcyb1DEI7m2RCOd6GicxPKG8Q9DXowVmXRNX0 hEmtl6KWwitXF8AShozuyDHAvY0kUlL4m9ckuErVx4HWdMXRj1fBpjRIgiCWHNDqLYgI+rN/SLv anuDQjCyb8XJ3rYkrjTUMgtodkaFjQCNhmWMzXaR9OKkOSYars7pBFKRr5nvfMm5LeBF6x99dc0 zr/4G3WMbHjHKvpRq+x3zfacCxRHNJMLL83irgSNRWxtA== 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 * gnu/packages/rails.scm (ruby-importmap-rails): [native-inputs]: Replace ruby-sqlite3 by ruby-sqlite3-1.4. --- gnu/packages/rails.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 6104c2ff15..2045be03f0 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -992,7 +992,7 @@ (define-public ruby-importmap-rails ruby-rails ruby-rexml ruby-selenium-webdriver - ruby-sqlite3 + ruby-sqlite3-1.4 ruby-stimulus-rails ruby-turbo-rails ruby-tzinfo From patchwork Tue Jun 3 21:46:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42991 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 AD68627BC4A; Tue, 3 Jun 2025 22:50:25 +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=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 6DD8927BC49 for ; Tue, 3 Jun 2025 22:50:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uMZTX-0006pn-8l; Tue, 03 Jun 2025 17:47:15 -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 1uMZTM-0006HY-Qv for guix-patches@gnu.org; Tue, 03 Jun 2025 17:47:06 -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 1uMZTL-0006DR-O3 for guix-patches@gnu.org; Tue, 03 Jun 2025 17:47:04 -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:References:In-Reply-To:Date:From:To:Subject; bh=Lqb1MlY/Exs2QWz4t/wvk3crLVRR0zz09oKGTLhQTPo=; b=Lr3QzkYFo9bZ97BFbrBOctt1nz+CfPiLxuTL37ZxaT9Ec/7F2Ky5WdCtM5liAmK94PPOrCWT1R8dq3Imk1jH8CV1CsI5ssnmA+PAXc2SnOMsxbRjoHNFZ5GqqMtSiYZj/2ZO9Oyi+6T+SS3vZ5jw23SJtbPIF3QCP4zBOuX0o8fxgXJI7+OBtU74J7i7La0xaB0yRU1VAB/0bqgOotsJA1Ffj/2le5fupOypuRkgOGno/bgJlk1gh2Sa0Cz1ELZ26+BZl7uO/n3KCxHVN2xkV8LxDyef8sFykiLRYLavAOHITEi2GV8jh0w94ZOdulQi3wyet6NdtGRjVfAjDzw2QA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uMZTL-0003ud-HL for guix-patches@gnu.org; Tue, 03 Jun 2025 17:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78683] [PATCH 3/5] gnu: ruby: Add ruby/pinned. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Jun 2025 21:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78683 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78683@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78683-submit@debbugs.gnu.org id=B78683.174898721214972 (code B ref 78683); Tue, 03 Jun 2025 21:47:03 +0000 Received: (at 78683) by debbugs.gnu.org; 3 Jun 2025 21:46:52 +0000 Received: from localhost ([127.0.0.1]:42844 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uMZT9-0003tL-Cr for submit@debbugs.gnu.org; Tue, 03 Jun 2025 17:46:51 -0400 Received: from 7.mo563.mail-out.ovh.net ([46.105.59.58]:37981) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uMZT4-0003sV-Qf for 78683@debbugs.gnu.org; Tue, 03 Jun 2025 17:46:48 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bBknK0VSSz1S59; Tue, 3 Jun 2025 21:46:45 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78683@debbugs.gnu.org>; Tue, 3 Jun 2025 21:46:44 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.108.9.88]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bBknJ51hnz5xNc; Tue, 3 Jun 2025 21:46:44 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 322063A2890; Tue, 3 Jun 2025 21:46:43 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-102R004522a8726-5169-4921-8951-c2607b552cff, A5CF9DDD6AE9BD53716D923BBF84B57CA59C6645) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Tue, 3 Jun 2025 23:46:30 +0200 Message-ID: <20250603214640.25126-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250603214640.25126-1-ngraves@ngraves.fr> References: <20250603214640.25126-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 7873418049610834658 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtddugdduudeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkeeikeefseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=Lqb1MlY/Exs2QWz4t/wvk3crLVRR0zz09oKGTLhQTPo=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1748987205; v=1; b=mVCdxWFEoekr6JQVEPsGPUAR88Nz/avIa8POWaRqKEkI9k52pxVE1AmLDng5IMqAuk/LwbUX QHHPm79mL1f1NN4JUvJkFZLsI4p4XbBD1ZaPH+ZsMpJwNSDctWaioGEWoHGqSHOzLcBa4hj5Eue kZ37vkHJR1m+XQs3hbQB87VpdBVq1iyoAOE4XtPni6OzWj0ZgYnj6c6PI+tcHAiJ2E8zgvRKuyS /ENi27tMG8YymjofwdiTvWb44GJ96JOC8VPkcO4p3YwYojO+OqeDmOHLL3GYPpSptR791WALJSo CINZBJri1ONbnSsZa9yXxN6xhDePan8vZbZO3wP9OpAJQ== 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 is to help batch update the lagging version of ruby on core-packages. * gnu/packages/ruby.scm (ruby/pinned): Define outdated variant. * gnu/packages/qt.scm (qtbase-5, qtwebengine-5) * gnu/packages/ruby.scm (ruby-hydra-minimal/pinned) * gnu/packages/tex.scm (texlive-hyphen-complete) * gnu/packages/texlive.scm (texlivebin) * gnu/packages/webkit.scm (webkitgtk): [native-inputs]: Replace ruby-2.7 by ruby/pinned. --- gnu/packages/qt.scm | 6 ++---- gnu/packages/ruby.scm | 6 +++++- gnu/packages/tex.scm | 3 +-- gnu/packages/texlive.scm | 3 +-- gnu/packages/webkit.scm | 3 +-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 7995dc74c5..791a176954 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -575,8 +575,7 @@ (define-public qtbase-5 pkg-config python vulkan-headers - ;; TODO Move to ruby@3 on the next rebuild cycle. - ruby-2.7)) + ruby/pinned)) (arguments `(#:disallowed-references ,(list python) #:configure-flags @@ -3345,8 +3344,7 @@ (define-public qtwebengine-5 pkg-config python2-six python-2 - ;; TODO Move to ruby@3 on the next rebuild cycle. - ruby-2.7)) + ruby/pinned)) (inputs (list alsa-lib at-spi2-core diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 4b929b5bcb..72a05fa125 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -288,6 +288,10 @@ (define-public ruby-2.7 (define-public ruby ruby-3.2) +;; Outdated variant, should only be tolerated as a native-input. +;; TODO: Update on the core-packages branch. +(define-public ruby/pinned ruby-2.7) + (define-public mruby (package (name "mruby") @@ -4056,7 +4060,7 @@ (define-public ruby-hydra-minimal/pinned (package (inherit ruby-hydra-minimal) (arguments - (cons* #:ruby ruby-2.7 + (cons* #:ruby ruby/pinned (package-arguments ruby-hydra-minimal)))))) (define-public ruby-hydra diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 8ff396c50e..f03266643c 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -766,8 +766,7 @@ (define-public texlive-hyphen-complete (string-append "File.join(\"" ptex "\""))) (invoke "ruby" "generate-ptex-patterns.rb")))))))) (native-inputs - ;; TODO: Update to ruby@3 on next rebuild-cycle. - (list ruby-2.7 + (list ruby/pinned ruby-hydra-minimal/pinned ;; Build phase requires "docstrip.tex" from TEXLIVE-LATEX. ;; However, adding this package to native inputs would initiate diff --git a/gnu/packages/texlive.scm b/gnu/packages/texlive.scm index 8ba3e1bb4f..c1ce170dda 100644 --- a/gnu/packages/texlive.scm +++ b/gnu/packages/texlive.scm @@ -136,8 +136,7 @@ (define texlivebin ("pixman" ,pixman) ("potrace" ,potrace) ("python" ,python) - ;; TODO Move to ruby@3 on the next rebuild cycle. - ("ruby" ,ruby-2.7) + ("ruby" ,ruby/pinned) ("tcsh" ,tcsh) ("teckit" ,teckit) ("zlib" ,zlib) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 7a2ded69d3..6cd590d2ca 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -242,8 +242,7 @@ (define-public webkitgtk pkg-config python-wrapper gi-docgen - ;; TODO Move to ruby@3 on the next rebuild cycle. - ruby-2.7 + ruby/pinned unifdef)) (propagated-inputs (list gtk libsoup)) From patchwork Tue Jun 3 21:46:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42989 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 A6A4F27BC4A; Tue, 3 Jun 2025 22:49:09 +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=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 7618427BC49 for ; Tue, 3 Jun 2025 22:49:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uMZTU-0006f3-KF; Tue, 03 Jun 2025 17:47:12 -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 1uMZTN-0006HW-57 for guix-patches@gnu.org; Tue, 03 Jun 2025 17:47:07 -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 1uMZTL-0006DM-6C for guix-patches@gnu.org; Tue, 03 Jun 2025 17:47:04 -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:References:In-Reply-To:Date:From:To:Subject; bh=C6pP+WATK7rrWFckz85bB7AZwkjV+dM4G3aPuJ8U0Fs=; b=JONYF51GxgI0n7Q+SJ21mpIzL0FNaV6+j3NcxqGWv83ZNca2hQwP8myE3qpqILCXtS6qJ7U34rbOTjPOLBUnDy0LtPo/RNe0eUiHT9N3VSvSpEEKmBt422Is5LI9il23UbCyGuam//YGH/03XP0DfHEGPfIquEks3lxzkxKIZmP0iowMoCIkl9q81I6pIsoMHA1ReQd6jwGiLJwbv1T+hvkjXbV+L36OF5uef2lnvo61u+GPEmiIahj9dcrYNwGY6/VpGndsMhPAuF3C8PQFWq5084a8v9JI3Fo7G8Jn4/bi2af4Qrb+I+k9RiLyHT+rgCk9yZ2KB/nMGvnCNzV6Bg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uMZTL-0003uU-1H for guix-patches@gnu.org; Tue, 03 Jun 2025 17:47:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78683] [PATCH 4/5] gnu: ruby-safe-yaml: Update ruby input and disable tests. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Jun 2025 21:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78683 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78683@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78683-submit@debbugs.gnu.org id=B78683.174898721114965 (code B ref 78683); Tue, 03 Jun 2025 21:47:02 +0000 Received: (at 78683) by debbugs.gnu.org; 3 Jun 2025 21:46:51 +0000 Received: from localhost ([127.0.0.1]:42842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uMZT9-0003tB-21 for submit@debbugs.gnu.org; Tue, 03 Jun 2025 17:46:51 -0400 Received: from 2.mo563.mail-out.ovh.net ([46.105.33.33]:52915) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uMZT5-0003sW-Gu for 78683@debbugs.gnu.org; Tue, 03 Jun 2025 17:46:48 -0400 Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net [79.137.60.36]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4bBknK6S2Jz1RSr; Tue, 3 Jun 2025 21:46:45 +0000 (UTC) Received: from director2.derp.mail-out.ovh.net (director2.derp.mail-out.ovh.net. [127.0.0.1]) by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78683@debbugs.gnu.org>; Tue, 3 Jun 2025 21:46:45 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.176.82]) by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bBknK5PvMz1xw6; Tue, 3 Jun 2025 21:46:45 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.4]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 52FD7C3B50; Tue, 3 Jun 2025 21:46:45 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-110S0046909cd02-1bd8-4227-9cf9-1826067ed5fa, A5CF9DDD6AE9BD53716D923BBF84B57CA59C6645) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Tue, 3 Jun 2025 23:46:31 +0200 Message-ID: <20250603214640.25126-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250603214640.25126-1-ngraves@ngraves.fr> References: <20250603214640.25126-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 7873699525550269154 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtddugdduudeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkeeikeefseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=C6pP+WATK7rrWFckz85bB7AZwkjV+dM4G3aPuJ8U0Fs=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1748987206; v=1; b=AHU33+X3im0/QZJzjkSpJB+Lz7I7LEftt7Z0ufo6SOq24Mawz9m0OfvTJyWJDO5QOF4iANO9 7khyGPIFt894q8NE7pnJA+WxVP8+oY0dr5cemRVTnhFceZ3coEvSL1eMVb7t+wr9EIBi3qzXguk T+zqs9FbjBoWNum0O3xvDxLMhUtpiqQBTSnOy06k5h9mhQRn5rEiD6kVsZQwAaJEgk6SBwFkNnQ vcVXjy0sw5szX9hFAU3Ca15Ko/UgSJJNfvS0nXHwDyG+S1pHUuu1XA+GX6FG2zwXtkacdm3Qcrr 6lJdhP6OSz/UWZY+V2kmGuv9Dglku81uLeQWn1WH+t0xQ== 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 * gnu/packages/ruby.scm (ruby-safe-yaml)[arguments]: {ruby}: Remove to use canonical ruby. {tests?}: Disable broken tests. --- gnu/packages/ruby.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 72a05fa125..a2f6f8041c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -14538,7 +14538,10 @@ (define-public ruby-safe-yaml (list ruby-rspec ruby-hashie ruby-heredoc-unindent)) (arguments (list - #:ruby ruby-2.7 + ;; Tests are broken since the move to ruby@3. + ;; There's ongoing effort on the Jekyll dependent + ;; to remove this orphan dependency. + #:tests? #f ; broken since move to ruby@3 #:test-target "spec" #:phases #~(modify-phases %standard-phases From patchwork Tue Jun 3 21:46:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42990 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 6756627BC4B; Tue, 3 Jun 2025 22:49:23 +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 075C527BC49 for ; Tue, 3 Jun 2025 22:49:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uMZTW-0006hF-9H; Tue, 03 Jun 2025 17:47:14 -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 1uMZTM-0006HU-RK for guix-patches@gnu.org; Tue, 03 Jun 2025 17:47:06 -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 1uMZTM-0006DY-6U for guix-patches@gnu.org; Tue, 03 Jun 2025 17:47:04 -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:References:In-Reply-To:Date:From:To:Subject; bh=xU8doFICCMMA+a5CXvnGhIOCLHgKxpvWChTvUY43rpA=; b=jWodssB71Rz131dxOqs3+7UewvxUCG4iyaMOlMIkPjakBAe8BVSpUlfclYbfd7H+5oPBAdqIO0DAEsDCpdvSgaNRqEsXxYxznKAG9oShGHL0tzb4v6Mqsk7j1TePsazUplNH14D0nTTgfps26wFunNtQWuxyon33L3WZSz1KtX3T9IpqFn6Rnlt3T7/gFCZ16YE4DGtHQRNlHaas5ye2D9q9M55z42De6EQgIdqHDmT5hAviwvxsg54livWUWcj9G0cIOlV6ETfPiYcCDr94dubmTQbYJG9BuQhpdzOqgNeegKasOPCiE9ea2LFgKT5L5LfEeacOMymZAP4HKNH8BQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uMZTM-0003uk-04 for guix-patches@gnu.org; Tue, 03 Jun 2025 17:47:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78683] [PATCH 5/5] gnu: utf8proc-2.7.0: Update ruby native-input. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Jun 2025 21:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78683 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78683@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78683-submit@debbugs.gnu.org id=B78683.174898721614990 (code B ref 78683); Tue, 03 Jun 2025 21:47:03 +0000 Received: (at 78683) by debbugs.gnu.org; 3 Jun 2025 21:46:56 +0000 Received: from localhost ([127.0.0.1]:42846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uMZTE-0003ti-2a for submit@debbugs.gnu.org; Tue, 03 Jun 2025 17:46:56 -0400 Received: from 6.mo562.mail-out.ovh.net ([46.105.48.43]:57353) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uMZT6-0003sY-AC for 78683@debbugs.gnu.org; Tue, 03 Jun 2025 17:46:53 -0400 Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net [152.228.215.222]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bBknL5Y5Lz1jm2; Tue, 3 Jun 2025 21:46:46 +0000 (UTC) Received: from director3.derp.mail-out.ovh.net (director3.derp.mail-out.ovh.net. [127.0.0.1]) by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <78683@debbugs.gnu.org>; Tue, 3 Jun 2025 21:46:46 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.178.252]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bBknL4PFKz5xJH; Tue, 3 Jun 2025 21:46:46 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.0]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 49BBCBA4121; Tue, 3 Jun 2025 21:46:46 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-104R005414c1bbe-fc58-4f0d-be8a-e9c3fec4f6b4, A5CF9DDD6AE9BD53716D923BBF84B57CA59C6645) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Tue, 3 Jun 2025 23:46:32 +0200 Message-ID: <20250603214640.25126-5-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250603214640.25126-1-ngraves@ngraves.fr> References: <20250603214640.25126-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 7873981000469766882 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtddugdduudeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkeeikeefseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=xU8doFICCMMA+a5CXvnGhIOCLHgKxpvWChTvUY43rpA=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1748987206; v=1; b=PKlnL8Z74UQfqD0iEkVmrU2cRgvVAwK9HCJ3iWi39d1pgmW8fdFgR4XSF8HwyeTcgQ/wnQ4K qHoGNxUW/zPwh20P935k3VEZb9LWG/edA+fyvhjInw895FgpTzIfhLVlkCuT1FQfXgZ4CZi016C tCrnrxsv6Y/eOmWyPwfpE59Dj1db2K1IrD9ePvn237FxDKNB97r7lBPLBoGskR2ySMn6k4YLX6n iz3/V4gunnly5R/yscTIAWpFiB80Vf9iOUfqpP54Y6Fd9R7hfb+XEUWZDqqG9zaBA/fiho47ePy Arbc/hIpRoIR+SG3C/BF7wJpw3wi8pxw+lhvpICCOTnLg== 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 * gnu/packages/textutils.scm (utf8proc-2.7.0)[native-inputs] {ruby}: Update to ruby. --- gnu/packages/textutils.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 41c7890e04..b897e8cb35 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -267,8 +267,7 @@ (define-public utf8proc-2.7.0 (sha256 (base32 "1g77s8g9443dd92f82pbkim7rk51s7xdwa3mxpzb1lcw8ryxvvg3")))) ;; For tests - ;; TODO Move to ruby@3 on the next rebuild cycle. - ("ruby" ,ruby-2.7))))))) + ("ruby" ,ruby))))))) (define-public libconfuse (package