From patchwork Wed Jun 4 20:49: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: 43011 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 0FE4327BC4A; Wed, 4 Jun 2025 21:51:52 +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 3936B27BC49 for ; Wed, 4 Jun 2025 21:51:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uMv4k-0005cU-7v; Wed, 04 Jun 2025 16:51:06 -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 1uMv4i-0005au-E1 for guix-patches@gnu.org; Wed, 04 Jun 2025 16:51:04 -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 1uMv4i-0004ax-5R for guix-patches@gnu.org; Wed, 04 Jun 2025 16:51: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=rQfc8DhM63E2P+G+xyNGvzRzN3pmOHqkQGNE84kImel+IBfFhlU2vczBKxVn5emv/ejhcNsCApn4fl4LR5rE7p6rYB5QYjRQYwz115c9/oXA8sKRUVJtkWsQuMxRL0msQd1NR1tjiM/UDE7oY/6YMglU/HtT5uPVwN0PShyUdiOY6mqmMGiIX6qgtpIwmSImpwZMl4DUAU1LMKDWdvUtV1WnQUyJ9CRjV2jlQcqKInIXKmlEOkB4s9Orb2EtMQLXeUqrW2DXJ/0hmyZloNu/OXd34ffeR4G74/khzwPuoAS9RKC4j0UUDt74dTjsmulVOP0M3GdhdjhoefkpQYXyDg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uMv4i-0001Sl-1H for guix-patches@gnu.org; Wed, 04 Jun 2025 16:51:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78683] [PATCH 3/7] gnu: ruby: Add ruby/pinned. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 04 Jun 2025 20:51: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.17490702525520 (code B ref 78683); Wed, 04 Jun 2025 20:51:03 +0000 Received: (at 78683) by debbugs.gnu.org; 4 Jun 2025 20:50:52 +0000 Received: from localhost ([127.0.0.1]:53509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uMv4W-0001Qt-1k for submit@debbugs.gnu.org; Wed, 04 Jun 2025 16:50:52 -0400 Received: from 9.mo562.mail-out.ovh.net ([46.105.72.114]:50441) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uMv4O-0001PF-Gc for 78683@debbugs.gnu.org; Wed, 04 Jun 2025 16:50:46 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4bCKVC0QHNz1gd5; Wed, 4 Jun 2025 20:50: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>; Wed, 4 Jun 2025 20:50:42 +0000 (UTC) Received: from mta3.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.108.17.28]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bCKVB4q6cz5xP6; Wed, 4 Jun 2025 20:50:42 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.2]) by mta3.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id EF3DF3A4111; Wed, 4 Jun 2025 20:50:41 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-109S0033563685b-cb5e-4b7c-9e86-1b6a7f8a15a7, 55D8CD9FCCBE2A40DC556E1A8E1799EDAA20BDE9) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Wed, 4 Jun 2025 22:49:31 +0200 Message-ID: <20250604205034.10251-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250604205034.10251-1-ngraves@ngraves.fr> References: <20250604205034.10251-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 12799793091015729890 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtddugddvieeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkeeikeefseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=Lqb1MlY/Exs2QWz4t/wvk3crLVRR0zz09oKGTLhQTPo=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1749070243; v=1; b=VGrBwwDCFCJngeDnknYLpXsoEl2uZi2MyKIE8SWgp0hwsCWqhByjvIwVBV2HNuHTUatwmckf uI5oqbBHN2KB/F1h6YF8LA3TaVkSdVBkUt2TKa7UOD/BBeY+FTP3dSXkW12chu9bASP32KdXsuX 9nIif5MNfaQrKXfGChkX5+X9qGMQcsexOp07rv2R1xQpGyj8KhkfEaiyYgV4NnFAvmiiEYQ4yUH KBTPIJ4JVZYP5pVKVukbD/FQ04EqY5yULfrkwfTULZ3WBZ8ovF622lon46U9dzwjEjli9Aux2xl UlJRfP6B2b0Esvi22m19BkO44GSgmtZq7Dh14PRE4Qi+g== 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))