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))