From patchwork Mon Mar 20 17:13:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48407 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 CD10C16F32; Mon, 20 Mar 2023 17:42:43 +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 BE37216EC7 for ; Mon, 20 Mar 2023 17:42:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJVS-0007mV-7p; Mon, 20 Mar 2023 13:41:14 -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 1peJVP-0007jJ-Fx for guix-patches@gnu.org; Mon, 20 Mar 2023 13:41:11 -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 1peJVP-00058c-7W for guix-patches@gnu.org; Mon, 20 Mar 2023 13:41:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJVP-0005MT-3Y for guix-patches@gnu.org; Mon, 20 Mar 2023 13:41:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 041/223] gnu: ruby-cucumber-messages: Update to 21.0.1. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:41:11 +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.167933402220205 (code B ref 62196); Mon, 20 Mar 2023 17:41:11 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:40:22 +0000 Received: from localhost ([127.0.0.1]:56588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJUc-0005Fj-Ah for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:40:22 -0400 Received: from mail-qt1-f178.google.com ([209.85.160.178]:43957) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJ8G-0003Et-De for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:17:16 -0400 Received: by mail-qt1-f178.google.com with SMTP id c10so2743558qtj.10 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:17:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679332636; 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=bpSnJttNaTVm+XZbqaw6MBpQew716/Js37B378XZEAE=; b=Wgeke+YF2j7j0Ar0nObyByRhaqNPFxvDAjFtR37npoXDG6AfbyftxZYURDSRX0rANv Y0kPmd6UdIEjqXtt2m/RbGYF5vh3qMEI5fYRBo3OkSi/UXzEl9o61RnGRbIsG+4HNdx8 oaWqW+TstAaI1dcHb7iBpnB6y6uMw/H9DBEJ6YxCNPtSbS8auTsafr1FZdBk/7Ez3010 FiXYHBmbYVreEV+pgN1OzA6egLoSRnADuHny3MEQ/PFG8uFRnJ54NW3vKG39DCkrMD4Z +/GDYd/5mxqIzPDNGkzSDNHrgmqWaSODrrmpQOawIlFiU7k2pB3Fo3bM2uqU6JJjoWPv 6qtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679332636; 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=bpSnJttNaTVm+XZbqaw6MBpQew716/Js37B378XZEAE=; b=Qu/K8Xpr9F/IACw5GWuBYK0jO1YDk0ULSV8AKS/sVkpHDgk0w47kulH0/wQzMYyq9j YFKBgkSyALgO1yZPC2/dsA+RqlxHreic3KwY/LBM6vob/2S14o8xMT8KnMtY0Qs8zpTk eyLRqE7BPpY6GWxrIKRk7F55QzOMJ0IPuiqU8V+k8lW0IpbmzzdRT/C5478df+Cyaopq iQA+s0+dpyQ/5px/q23HDxKUr5dzG3O+7hW+dAZFos4S3J3FeY3ZM4/0C1i3nH/oXcSZ haMTk1hHkRqQTDhxKq3/4kX00oFYs/6r+M9O3NvfGDHrtY+8ZdYOttPZf4W3ms49yGOz EBNg== X-Gm-Message-State: AO0yUKU7vLqn4GQ7gHbS3pF5d7XiZ+i33FEYfG09nK2bnZXjGinEu+n1 6PZ4cvVSocsMP17xF13v0Qft7pOGfGc= X-Google-Smtp-Source: AK7set+i1SbmUi/Z/zB76e8jUdjNmFqZJnDhAC8gs19nC5gd9atXXPUkR5J3bhBFbUAvBjIj3Xh/iA== X-Received: by 2002:a05:622a:1a04:b0:3bf:c423:c384 with SMTP id f4-20020a05622a1a0400b003bfc423c384mr21430560qtb.15.1679332635960; Mon, 20 Mar 2023 10:17:15 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:17:15 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:13:33 -0400 Message-Id: <20230320171635.11184-41-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-cucumber-messages): Update to 21.0.1. [source]: Adjust to upstream URI change and use url-fetch. [phases]: Delete patch-protobuf.rb and compile phases. Move check phase after install phase, and augment GEM_PATH in check phase. [propagated-inputs]: Delete field. [native-inputs]: Add ruby-cucumber-compatibility-kit-bootstrap. [home-page]: Update URL. --- gnu/packages/ruby.scm | 48 +++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d328fe67b3..df88c6c083 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7992,40 +7992,30 @@ (define ruby-cucumber-compatibility-kit-bootstrap (define-public ruby-cucumber-messages (package (name "ruby-cucumber-messages") - (version "12.2.0") + (version "21.0.1") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/cucumber/messages-ruby") - (commit "12cd07eac87bce7843fd1bb0bf64bc4da09f097c"))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (rubygems-uri "cucumber-messages" version)) (sha256 (base32 - "16wwqfpsq7crvxc3q08lphgyh12cl2d83p1c79p312q4jmy9cn5a")))) + "0482a63y7my0arn2bv208g401dq8525f0gwhnwaa11mhv6ph0q5i")))) (build-system ruby-build-system) (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-protobuf.rb - (lambda _ - (substitute* "rake/protobuf.rb" - (("load 'protobuf/tasks/compile.rake'") - "require 'protobuf/tasks'")) - #t)) - (add-before 'build 'compile - (lambda _ - (substitute* "Makefile" - (("bundle exec ") "") - (("include default.mk.*" all) - (string-append "#" all))) - (invoke "make"))) - (replace 'check - (lambda _ - (invoke "rspec")))))) - (propagated-inputs - `(("ruby-protobuf" ,ruby-protobuf-cucumber))) - (native-inputs - (list ruby-rspec)) - (home-page "https://github.com/cucumber/messages-ruby") + (list #:phases + #~(modify-phases %standard-phases + ;; The test suite requires the gem to be installed, so move it + ;; after the install phase. + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + (setenv "GEM_PATH" (string-append + (getenv "GEM_PATH") ":" + #$output "/lib/ruby/vendor_ruby")) + (when tests? + (invoke "rspec"))))))) + (native-inputs + (list ruby-cucumber-compatibility-kit-bootstrap ruby-rspec)) + (home-page "https://github.com/cucumber/messages/") (synopsis "Cucumber Messages for Ruby (Protocol Buffers)") (description "Cucumber Messages for Ruby is a library which allows serialization and deserialization of the protocol buffer messages used in