From patchwork Mon Mar 20 17:13:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48450 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 DFA4516F34; Mon, 20 Mar 2023 17:46:22 +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=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 10C7E16EC7 for ; Mon, 20 Mar 2023 17:46:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJaD-0003Qj-Kx; Mon, 20 Mar 2023 13:46:09 -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 1peJa7-0003OG-IE for guix-patches@gnu.org; Mon, 20 Mar 2023 13:46:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peJa6-0007sZ-Rs for guix-patches@gnu.org; Mon, 20 Mar 2023 13:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJa6-0005yW-N4 for guix-patches@gnu.org; Mon, 20 Mar 2023 13:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 025/223] gnu: ruby-rubocop-rspec: Update to 2.19.0 and inverse inheritance relationship. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62196 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62196@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 62196-submit@debbugs.gnu.org id=B62196.167933432822915 (code B ref 62196); Mon, 20 Mar 2023 17:46:02 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:45:28 +0000 Received: from localhost ([127.0.0.1]:56708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJZY-0005xW-6i for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:45:28 -0400 Received: from mail-yw1-f174.google.com ([209.85.128.174]:44612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJZW-0005xH-4H for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:45:26 -0400 Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-5419d4c340aso237362467b3.11 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:45:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679334320; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fpepf5jaE5m1KCzM3VbQ4pDjl+9BYVAm8qA8dC0eZPQ=; b=IehQMwTXcN6FdJRHxYNWAAh+6Zb9XrvN8X1Zq3R2cjtb6n2L86hnWO/QR/JEvJ2T2w cO0LCylySCTBpgxQdFFpH8PPGOAeCZ/7toG9qQAVXYzWl0kBklXXvpRvINBCgrcYoIni TNfzGplJ1qRznfo2gtPedTlzHs8ITopIvTMOI3srHwgyutpKQcXheKR524OsLTxqttrZ 1s2Qksafx8Ht+qRgorCzIjfByXKRWSZgO5taFIaXW5mPYDf1FOKoUMkFSMTjCm5rTd0q T3/kElW6Ruj6pHEvvPq023xBLPMHfMaPSpiEgh8Dpf35SxmMcgDs+8D2pcY2D+DWsMhP 1uIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679334320; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fpepf5jaE5m1KCzM3VbQ4pDjl+9BYVAm8qA8dC0eZPQ=; b=cprWpAQLSol7bQgFA4fOvhSqAB3WoaOiV+e+iFhOVgzItf0vebX+gs7NoHLO8zhC1k TrrkvR7S8w2sYpvoS1t3TPyyGnWDrJNzIFxmZPSCh6ouFaKRz5aPD2HahA5z3/m2ROqQ rhv56qzBqtT2oECAI2S9YgIe2GJRsJQA73I72IC8H8AaJ0qRa8HPOdVbUqi7vXod4gay KFDzRO6osLgQKr5BErmtdlVnNjTRiIVGSEbjluKZd9pptx5W+O6G7poAs0CHXARPFSVR 4TywQpIvQrJmZDAYzBzh3ZPx8ZV+NsRKWougsxDVVlFg00bOyZq649+fJy7uP8WoyOFW AO1w== X-Gm-Message-State: AO0yUKWAf1xO8Pc9qz9zOG61FQnILiAvjZ0eVg3aenCevzG1WDH253yo oUzwSmqkLyIBGp+beB3MVTGdyyeajy8= X-Google-Smtp-Source: AK7set8dDh7QVudYoUoRxSWHBQdHly6CG0ROl46AVC9PVtlECtJ3HqThCJTWkgTUeVp8xDYiIXTaew== X-Received: by 2002:a67:fb58:0:b0:423:dfee:3f51 with SMTP id e24-20020a67fb58000000b00423dfee3f51mr2668135vsr.25.1679332622093; Mon, 20 Mar 2023 10:17:02 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-46.b2b2c.ca. [72.10.128.46]) by smtp.gmail.com with ESMTPSA id p17-20020a374211000000b007428e743508sm7673809qka.70.2023.03.20.10.17.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:17:01 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:13:17 -0400 Message-Id: <20230320171635.11184-25-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230320171635.11184-1-maxim.cournoyer@gmail.com> References: <20230320171635.11184-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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: , 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-rubocop-rspec): Update to 2.18.1. [arguments]: Delete trailing #t. Change TEST-TARGET to "spec". Remove phases. [native-inputs]: Replace ruby-rubocop-performance with ruby-rubocop-performance-minimal. Add ruby-bump and ruby-rubocop-rake-minimal. (ruby-rubocop-rspec-minimal): Reverse inheritance relationship; this package is now the base package. --- gnu/packages/ruby.scm | 62 ++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 44ac7fb538..d2e9854904 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1602,49 +1602,45 @@ (define ruby-rubocop-rake-minimal (home-page "https://github.com/rubocop/rubocop-rake") (license license:expat))) -(define-public ruby-rubocop-rspec +;;; A minimal variant used to build ruby-rubocop itself. +(define ruby-rubocop-rspec-minimal (package (name "ruby-rubocop-rspec") - (version "2.2.0") + (version "2.19.0") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/rubocop-hq/rubocop-rspec") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0gdpjpympb6qc77bang759z7z6lckf14ghkx8v6614agxg8l3g5y")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rubocop-hq/rubocop-rspec") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mgjyrzi8r44v3gb8xscdwspirz9kqkaf7zlsjhhlxr0di0rlj2r")))) (build-system ruby-build-system) - (arguments - '(#:test-target "internal_investigation" - #:phases - (modify-phases %standard-phases - (add-before 'check 'set-HOME - (lambda _ - (setenv "HOME" "/tmp") - #t))))) - (propagated-inputs - (list ruby-rubocop ruby-rubocop-ast)) - (native-inputs - (list ruby-rack ruby-rspec ruby-rubocop-performance ruby-simplecov - ruby-yard)) + (arguments (list #:tests? #f)) ;avoid extra dependencies (synopsis "Code style checking for RSpec files") (description "This package provides a plugin for the RuboCop code style enforcing & linting tool.") (home-page "https://github.com/rubocop-hq/rubocop-rspec") (license license:expat))) -(define-public ruby-rubocop-rspec-minimal - (hidden-package - (package - (inherit ruby-rubocop-rspec) - (arguments - (substitute-keyword-arguments (package-arguments ruby-rubocop-rspec) - ((#:tests? _ #f) #f))) - (propagated-inputs '()) - (native-inputs '())))) +(define-public ruby-rubocop-rspec + (package + (inherit ruby-rubocop-rspec-minimal) + (arguments '(#:test-target "spec")) + (native-inputs + (list ruby-bump + ruby-rack + ruby-rspec + ruby-rubocop-performance-minimal + ruby-rubocop-rake-minimal + ruby-simplecov + ruby-yard)) + (propagated-inputs + (list ruby-rubocop + ruby-rubocop-ast + ruby-rubocop-capybara)))) (define-public ruby-rubocop-performance (package