From patchwork Wed Jun 18 14:27:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43140 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 E8BA627BC4B; Wed, 18 Jun 2025 15:33:38 +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 63EDA27BC49 for ; Wed, 18 Jun 2025 15:33:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRtpu-0007WI-Tu; Wed, 18 Jun 2025 10:32:22 -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 1uRtpg-0007FG-Gt for guix-patches@gnu.org; Wed, 18 Jun 2025 10:32:08 -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 1uRtpg-0004be-27 for guix-patches@gnu.org; Wed, 18 Jun 2025 10:32:08 -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=epGghvpRkDooewl2wMJuc0hI0DtW98kSpQRo+GdKQZg=; b=dDjprHwi7WMZrFZ/Yfa/VQVrSbRRv4uOFHWlJKVt3LBXyqqdmq14JKHPW5DqLHVAu+TPbvF88wXgdhUOYNS29QSIo+GsgpfTYD/9ALVxtzkupbuHHdlkqqiU0GG6lut+bqk5p6CGtUN6teZBFvBhQGOsfzEQlsp9ucTBlXs60ga53BHRBtZEZ5Q2oJrTnzKQSYDM4Ovhg0WAEP9HqrGadDbnI4ESvF/MxvA/nNQrM+8TOoxieNoPvWjjaFOB6l1pQEChtlkTVhu7x3mXlu3UGYaDsUeCerYObjs+I9AiZVo7DozjdYaMRg+hwNxVmkERLH1KKxWmmFGSgtPqn+3ytg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uRtpf-0007Re-Pf for guix-patches@gnu.org; Wed, 18 Jun 2025 10:32:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78826] [PATCH 68/88] gnu: ruby-hydra: Fix build with Ruby@3.3. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 Jun 2025 14:32:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78826 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78826@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78826-submit@debbugs.gnu.org id=B78826.175025709528388 (code B ref 78826); Wed, 18 Jun 2025 14:32:07 +0000 Received: (at 78826) by debbugs.gnu.org; 18 Jun 2025 14:31:35 +0000 Received: from localhost ([127.0.0.1]:51760 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uRtp8-0007Nl-NG for submit@debbugs.gnu.org; Wed, 18 Jun 2025 10:31:35 -0400 Received: from 4.mo562.mail-out.ovh.net ([46.105.38.146]:52379) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uRtn6-0006rN-NG for 78826@debbugs.gnu.org; Wed, 18 Jun 2025 10:29:30 -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 4bMmMq56Bpz1byM; Wed, 18 Jun 2025 14:29:27 +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 <78826@debbugs.gnu.org>; Wed, 18 Jun 2025 14:29:27 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.108.25.53]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4bMmMq35gBz5wGT; Wed, 18 Jun 2025 14:29:27 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.5]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 08B3DC3C96; Wed, 18 Jun 2025 14:29:26 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-107S0015e2869ba-966d-4511-9750-514039fab778, 6FDBBA6AF074F8A8A1368D92F187C7EF72285467) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Wed, 18 Jun 2025 16:27:55 +0200 Message-ID: <20250618142822.27945-68-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250618142822.27945-1-ngraves@ngraves.fr> References: <20250618142822.27945-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 14791791503307104994 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtddvgddvkeekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgepudeknecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeekkedvieesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=epGghvpRkDooewl2wMJuc0hI0DtW98kSpQRo+GdKQZg=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1750256967; v=1; b=XnizqimsS2XHjgp9Y01jo4c/vGcQBCC7mvfRTydkNTCmUcXllpn4RuRN7nzrzKfFIHJ86lRB 8X1IuYumkaiAvDNafvK4Srh+G0ubcD2ZE1DrQLbSejUYjMuIB0FxpZVsNQIOq2WGJnmfqoCLKuR gdkyO+VRGrUU2IxFngd0fSeAZAHL/4wqudCvyzYYR/MsNkkgLTuAzVIPLPaK3xdEHEolWc0sntr /Inq59WaD9hASMMnAC9o3bdz9jXiO8s2Ml4xkeQvmDXsQcEKklXTwMw6Ff7+fLhWhCg2Q7J+S9s TxD9VUzYjmnYgirhdys+ZIvqXJyw68Rc0vAw4H8VQOHCA== 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-xyz.scm (ruby-hydra-minimal)[arguments]{phases}: Add phase 'fix-ruby-3.3-build. (ruby-hydra)[arguments]: Inherit from ruby-hydra-minimal phases. (ruby-hydra-minimal/pinned)[arguments]: Rewrite to avoid derivation change, stop inheriting from ruby-hydra-minimal phases. --- gnu/packages/ruby-xyz.scm | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/gnu/packages/ruby-xyz.scm b/gnu/packages/ruby-xyz.scm index c844a26f77..2ad8d10574 100644 --- a/gnu/packages/ruby-xyz.scm +++ b/gnu/packages/ruby-xyz.scm @@ -3511,8 +3511,15 @@ (define-public ruby-hydra-minimal "1swzab7i4cqk1bck7p5m3bh526jh0v6m9qq720r3270zbjc8x8z3")))) (build-system ruby-build-system) (arguments - ;; Avoid rspec dependency. - '(#:tests? #f)) + (list + #:tests? #f ; Avoid rspec dependency. + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-ruby-3.3-build + (lambda _ + (substitute* "lib/hydra.rb" + (("exists\\?") + "exist?"))))))) (synopsis "Ruby hyphenation patterns") (description "ruby-hydra-minimal is a Ruby library for working with hyphenation patterns. @@ -3525,24 +3532,27 @@ (define-public ruby-hydra-minimal/pinned (package (inherit ruby-hydra-minimal) (arguments - (cons* #:ruby ruby-2.7 - (package-arguments ruby-hydra-minimal)))))) + (list + #:tests? #f + #:ruby ruby-2.7))))) (define-public ruby-hydra (package (inherit ruby-hydra-minimal) (name "ruby-hydra") (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'make-files-writable - (lambda _ - (for-each make-file-writable (find-files ".")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "rspec"))))))) + (substitute-keyword-arguments (package-arguments ruby-hydra-minimal) + ((#:tests? tests? #t) + #t) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'make-files-writable + (lambda _ + (for-each make-file-writable (find-files ".")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec")))))))) (native-inputs (list ruby-rspec)) (description