From patchwork Mon Mar 20 17:23:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48393 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 3F76F16F34; Mon, 20 Mar 2023 17:34:36 +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,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 7805016F1F for ; Mon, 20 Mar 2023 17:34:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJOV-0005s0-B8; Mon, 20 Mar 2023 13:34:03 -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 1peJOU-0005rq-Nj for guix-patches@gnu.org; Mon, 20 Mar 2023 13:34:02 -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 1peJOU-0001PR-FK for guix-patches@gnu.org; Mon, 20 Mar 2023 13:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJOU-00051m-BT for guix-patches@gnu.org; Mon, 20 Mar 2023 13:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 180/223] gnu: ruby-braintree: Update to 4.10.0. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:34: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.167933358419217 (code B ref 62196); Mon, 20 Mar 2023 17:34:02 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:33:04 +0000 Received: from localhost ([127.0.0.1]:56508 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJNX-0004zn-G0 for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:33:03 -0400 Received: from mail-pj1-f50.google.com ([209.85.216.50]:35427) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJNV-0004yu-HG for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:33:02 -0400 Received: by mail-pj1-f50.google.com with SMTP id gp15-20020a17090adf0f00b0023d1bbd9f9eso17376741pjb.0 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:33:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333576; 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=CtGM3FZCqNFXv6yN+mVjHr6e/4PPHH5oLFTLvQXbKe8=; b=dUk2/v4w0MV1foAYv3bzryb3hS051vMCLLSWhTsWKJsET5GYlwisNrAG0SrUyJHPre wSH0edczMzhTyRuQRdFUGcaHzXhK87H/VA6UXUazkO72SHyYKM+MG/29hfEKk9Bx5JbA +ODIjfYlaQBxU4Ndyif+IIbgdC1y0tcZ+g1WA43Qsn4cl/0R11NFsQ1N91FTFHt1Aygr eLdHYKGuGMyd880cF6oobtmx5KX4jFwmb+w2VIxclqI5dozBmcw9PLBfw7dL+yTE/KAl qXGrKwzrQ+r8lrKE8QPhbFEKPCCKYDN2sg0TODuyoKylW+Ypjx5kY1FElVbWIL4mOsUe mUfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333576; 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=CtGM3FZCqNFXv6yN+mVjHr6e/4PPHH5oLFTLvQXbKe8=; b=SZRwaA5BFr2koRBZEdIkj7skDdy7Lbeql+iAwOK1mrUopuZa49UCdgPrPr0riBhr5c 8PJx8Wp9X0jdMtSXxBMONFPfkpffHXccU2nW/Pb6dT43aIqNoLd+y0bCH/dCBb8T0hPc dbuPaEMt1EgRXkzV1ZodkmV16hVyCvhY3OWvhaK5q8YpTJFssP2/LOH7FCGIo+irPy/O GjNTSOpa4VDJ5mxWKFumqfeMI0ZlwJ8ej57b0UEg8YMtanGRMK9KGdyCXEHHlfkXltQL oF+eQxq6psaPLNRsYPHq3Vi+YJxmJqVnTNyz5C6cjFGhniCG1+4SkrlRTlUULr6WSLfQ 32hw== X-Gm-Message-State: AO0yUKVGxlvSwFOLWiiAcsAxy6S6cAd9soq3SUmrIgPEoOdPBLYvP5sL ZqFEvaiwztke3MoalOgswrcdWPRw3r0= X-Google-Smtp-Source: AK7set+KdDKhOMNwC+w0da4CgFZVZ1XyjiWxbveiiD3c/gnSjCjOvtQFX3r3CQcGrx2kO4EYvUr04w== X-Received: by 2002:a05:622a:1a04:b0:3bf:e034:5f53 with SMTP id f4-20020a05622a1a0400b003bfe0345f53mr29220019qtb.59.1679333108687; Mon, 20 Mar 2023 10:25:08 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-46.b2b2c.ca. [72.10.128.46]) by smtp.gmail.com with ESMTPSA id i7-20020a378607000000b007422eee8058sm7769352qkd.125.2023.03.20.10.25.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:25:08 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:23:06 -0400 Message-Id: <20230320172349.12752-79-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230320172349.12752-1-maxim.cournoyer@gmail.com> References: <20230320172349.12752-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-braintree): Update to 4.10.0. [source]: Streamline comment. [arguments]: Add disable-rubocop phase. Rename the less-strict-dependencies phase to relax-requirements, and update the substitutions. [native-inputs]: Remove ruby-rubocop. --- gnu/packages/ruby.scm | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 08bdcee338..1905ef0b9b 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -15149,42 +15149,45 @@ (define-public ruby-pry-rescue (define-public ruby-braintree (package (name "ruby-braintree") - (version "4.7.0") + (version "4.10.0") (source (origin - (method git-fetch) - ;; Download from GitHub because the rubygems version does not contain - ;; Rakefile. + (method git-fetch) ;for tests (uri (git-reference (url "https://github.com/braintree/braintree_ruby") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1gixqf9vsjsyrk45lf9xcz0ggdydpgsk8ahknd27bbigz1j4pdf6")))) + (base32 "01b5bp8q038ray5wwg3qhg4hj3r5a48vnfzs3gxkdjm5ky6bmn4p")))) (build-system ruby-build-system) (arguments `(#:test-target "test:unit" #:phases (modify-phases %standard-phases - (add-after 'unpack 'less-strict-dependencies + (add-after 'unpack 'disable-rubocop + (lambda _ + (substitute* "Rakefile" + (("sh \"rubocop\"") "")))) + (add-after 'unpack 'relax-requirements (lambda _ (substitute* "Gemfile" - (("gem \"libxml-ruby\", \"3.2.0\"") + (("gem \"libxml-ruby\", \"3.2.0\"") "gem \"libxml-ruby\", \"~> 3.0.0\"") (("gem \"rspec\", \"3.9.0\"") - "gem \"rspec\", \"~> 3.8.0\"") - (("gem \"rubocop\", \"~>1.12.0\"") - "gem \"rubocop\", \"~> 1.10.0\""))))))) + "gem \"rspec\", \">= 3.9.0\"") + (("gem \"webrick\", \"~>1.7.0\"") + "gem \"webrick\", \">=1.7.0\"") + ((".*gem \"rubocop\".*") "") + ((".*gem \"rspec_junit_formatter\".*") ""))))))) (native-inputs (list ruby-libxml - ruby-pry - ruby-rake - ruby-rspec - ruby-rubocop - ruby-webrick)) + ruby-pry + ruby-rake + ruby-rspec + ruby-webrick)) (propagated-inputs (list ruby-builder - ruby-rexml)) + ruby-rexml)) (home-page "https://www.braintreepayments.com/") (synopsis "Integration access to the Braintree Gateway") (description "Braintree provides resources and tools for developers to