From patchwork Sun Feb 16 00:34: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: 38699 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 E0FE127BBE2; Sun, 16 Feb 2025 00:40:33 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 77E9027BBEA for ; Sun, 16 Feb 2025 00:40:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tjShi-00066z-L1; Sat, 15 Feb 2025 19:40:14 -0500 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 1tjShe-00062u-G8 for guix-patches@gnu.org; Sat, 15 Feb 2025 19:40:11 -0500 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 1tjShe-0002ze-55 for guix-patches@gnu.org; Sat, 15 Feb 2025 19:40:10 -0500 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=cO7BiNSfUlha2QoulZYXByJ9DrxXI2MDRiYH+/aFCPw=; b=bY4e/lhjK4CI2AjZLf08sbbu+aSsJA7u6XEGAWnJByrONJtW2Mh5T5Dkd42rrq4iAQiRji+/7RR7fQS+iBoCnQ5qZoyI4ZrHXgs2oDLq6JefUhvPY8Kb9BEyOmTcMTt9/jnCA3W+d8yO6GRwhpP7O6bPr6uvxmMgkPEdzfke+3bKJuB7k4LTwwfCn6H5JAthXRZz2pSTD2BTVU/gVH3mXWCZSXnNyROCl8/tjy+dLAeYUn779iX8i5vpaL/mbXKUDjv5h4HPumHsNElEtZQzjXYpgkVnm+BAqmZ9GkLiRIzKQUrqdr01zOMNaK7MNYKVT6bRA2eFrDZACCys1lnNaQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tjShe-0004MX-09 for guix-patches@gnu.org; Sat, 15 Feb 2025 19:40:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76314] [PATCH ruby-team 64/71] gnu: ruby-standard: Update to 1.37.0. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Feb 2025 00:40:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76314 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76314@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 76314-submit@debbugs.gnu.org id=B76314.173966634816531 (code B ref 76314); Sun, 16 Feb 2025 00:40:09 +0000 Received: (at 76314) by debbugs.gnu.org; 16 Feb 2025 00:39:08 +0000 Received: from localhost ([127.0.0.1]:58937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tjSgd-0004IU-VE for submit@debbugs.gnu.org; Sat, 15 Feb 2025 19:39:08 -0500 Received: from 15.mo582.mail-out.ovh.net ([188.165.39.161]:48401) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tjSex-00048A-Ur for 76314@debbugs.gnu.org; Sat, 15 Feb 2025 19:37:25 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.109.176.161]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4YwRh236Zsz1Q6x for <76314@debbugs.gnu.org>; Sun, 16 Feb 2025 00:37:22 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-hzhzp (unknown [10.110.113.120]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 1AF221FE10; Sun, 16 Feb 2025 00:37:22 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-5b5ff79f4f-hzhzp with ESMTPSA id mAGgOEEzsWfTJi8AcpLeiw (envelope-from ); Sun, 16 Feb 2025 00:37:22 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-102R0044e7e5a2e-166f-4e36-8cef-b4be2a342c2d, 9A8994E2D2D994E918F063C652E1CB4623A3A71F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.137.22 Date: Sun, 16 Feb 2025 01:34:32 +0100 Message-ID: <20250216003503.6348-64-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250216003503.6348-1-ngraves@ngraves.fr> References: <20250216003503.6348-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 3693514648538637026 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdehgedtvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvheelieffheetvdelhfffffejfefgudfhteekveehieetudeiudfgkeeutdehjeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupddujeeirddujeelrddufeejrddvvddpfeejrdehledrudegvddruddtvdenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeeifedugeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=cO7BiNSfUlha2QoulZYXByJ9DrxXI2MDRiYH+/aFCPw=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1739666242; v=1; b=FBgNLQuJQFOwj7DvV+VDT4AIBiqD3XxCxZz1XF/LQ736Xddtfnuq+2ry79pUW+9kMn9epldS Ioia6XmKP9q/0//YEgbA016KYkftMjEo3afRZjV6ySQNdC7Sy/pEi1/3BrYD/AxyuwdwCFEatNl ABvHhSBVNJlINGeyg99maQSm07LDRiAksunkOB2pPB8YBrxEsMzeUJf3UZ4YzGCVi/mhMj5TTn/ jAxCSmEY1aUN80yIcwD2Yc4xJz74wt1wXtbFwtiOmHpmZKtjwy0cGBXgmDYpjNxZ2LpIHbbMcVd E2WCoG7t5AW1+v8KHnzDipiz8Zu1y6+2bJGsM57XSlSAg== 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-standard): Update to 1.37.0. [arguments]<#:phases>: Update phases 'delete-problematic-tests and 'relax-requirements. Use gexp. [native-inputs]: Remove ruby-gimme, ruby-pry. [propagated-inputs]: Add ruby-lint-roller, ruby-standard-custom, ruby-standard-performance. --- gnu/packages/ruby.scm | 66 +++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 95e575f7b7..5dfadb2e72 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2384,7 +2384,7 @@ as defaults in Standard Ruby.") (define-public ruby-standard (package (name "ruby-standard") - (version "1.25.3") + (version "1.37.0") (source (origin (method git-fetch) ;no test suite in distributed gem @@ -2393,39 +2393,49 @@ as defaults in Standard Ruby.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0q42gv7wgrc818a5hm599sy07vjq69hbijzpkpgh6jws6x7wzyh3")))) + (base32 "0gm9fn6fz41aya34xz7kzda8xxs7h98n7cjx66qbcy2w0qhs40wc")))) (build-system ruby-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-HOME - (lambda _ - ;; Some tests fail otherwise. - (setenv "HOME" "/tmp"))) - (add-after 'unpack 'relax-requirements - (lambda _ - (substitute* "standard.gemspec" - (("\"rubocop\", \"1.44.1\"") - "\"rubocop\", \">= 1.44.1\"") - (("\"rubocop-performance\", \"1.15.2\"") - "\"rubocop-performance\", \">= 1.15.2\"")))) - (add-after 'unpack 'delete-problematic-tests - ;; These tests fail for unknown reasons (see: - ;; https://github.com/testdouble/standard/issues/532). - (lambda _ - (for-each - delete-file - '("test/standard_test.rb" - "test/standard/cop/block_single_line_braces_test.rb"))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-HOME + (lambda _ + ;; Some tests fail otherwise. + (setenv "HOME" "/tmp"))) + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "standard.gemspec" + (("\"rubocop\", \".*\"") + (string-append + "\"rubocop\", \"~> " + #$(package-version + (this-package-input "ruby-rubocop")) + "\"")) + (("\"rubocop-performance\", \".*\"") + (string-append + "\"rubocop-performance\", \"~> " + #$(package-version + (this-package-input "ruby-rubocop-performance")) + "\""))))) + (add-after 'unpack 'delete-problematic-tests + ;; These tests fail for unknown reasons (see: + ;; https://github.com/testdouble/standard/issues/532). + (lambda _ + (delete-file "test/standard_test.rb") + (substitute* "test/standard/base_test.rb" + ((".*test_configures_all_rubocop_cops.*" all) + (string-append all + " skip('fails on guix')\n")))))))) (native-inputs - (list ruby-gimme - ruby-pry - ruby-simplecov)) + (list ruby-simplecov)) (propagated-inputs (list ruby-language-server-protocol + ruby-lint-roller ruby-rubocop - ruby-rubocop-performance)) + ruby-rubocop-performance + ruby-standard-custom + ruby-standard-performance)) (synopsis "Ruby Style Guide, with linter & automatic code fixer") (description "Standard is a port of StandardJS. Like StandardJS, it aims to save time in the following ways: