From patchwork Sat Jul 12 01:21:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 43242 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 149F127BC4B; Sat, 12 Jul 2025 02:24:58 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,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 811BE27BC49 for ; Sat, 12 Jul 2025 02:24:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uaOyx-0007HI-5w; Fri, 11 Jul 2025 21:24:51 -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 1uaOyB-0006gH-Sy for guix-patches@gnu.org; Fri, 11 Jul 2025 21:24:04 -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 1uaOyB-0005pi-DA for guix-patches@gnu.org; Fri, 11 Jul 2025 21:24:03 -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=6yu6TRX3CBlMKwjqur7bR/gkGmWf7d1saeVjx+GIxcE=; b=DrfEaRmlocEmbtZni3SaSogtM8JApP5ysZ514OSmcGI8auu8mWvZXo8+tZvf8PmXVIXUKSFrq+pMXCsvXmsb6bFuldOa1Ecs6pnPBDVxhBlM4SZPSa0K3X91ocRgUQfAXghWAkqap3OR0VMgqUZgjoF50/doV3xUMlxOrKMllBXaJNE6M4Glj7Lzm2LjrocSrKOGjTaAOVLl0abLxxB1LPHfZrDgIDzOd4u4PJwSCE95MxePAEqv+SfoHLJeKPjsfvyflL8ZEx4bAaoqhIuXdLnazSw/I/kr0352wKqGGQBW+mx354aKn3i3koAdxHQAiaBHMhbBkNB8C4ZPVK9Tkg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uaOyB-0001MB-7i; Fri, 11 Jul 2025 21:24:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72009] [PATCH v2 2/2] gnu: ruby-braintree: Disable Bundler for testing. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: gemmaro.dev@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 12 Jul 2025 01:24:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72009 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72009@debbugs.gnu.org Cc: Andreas Enge , mail@cbaines.net, gemmaro , gemmaro X-Debbugs-Original-Xcc: gemmaro Received: via spool by 72009-submit@debbugs.gnu.org id=B72009.17522834295153 (code B ref 72009); Sat, 12 Jul 2025 01:24:03 +0000 Received: (at 72009) by debbugs.gnu.org; 12 Jul 2025 01:23:49 +0000 Received: from localhost ([127.0.0.1]:41693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uaOxx-0001L2-Hx for submit@debbugs.gnu.org; Fri, 11 Jul 2025 21:23:49 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]:42017) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uaOxt-0001K0-Le for 72009@debbugs.gnu.org; Fri, 11 Jul 2025 21:23:46 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-747fba9f962so2340245b3a.0 for <72009@debbugs.gnu.org>; Fri, 11 Jul 2025 18:23:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752283419; x=1752888219; darn=debbugs.gnu.org; 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=6yu6TRX3CBlMKwjqur7bR/gkGmWf7d1saeVjx+GIxcE=; b=Q1NDKb2SMWYUxYvAOthyao2AP2iGjXm/IGZztD/2opplxWDmBlR54KmH11BT1aJma0 +4y3a5o0N54bCQe1K4To4iY6n8k5jBVVoKKffJhD8OrpKj0zToS3rlb8ea620a7ZjYnX wbwPL70NB2XYRHfSGURhg5e0AThx0+64tqTyW5dr0mcEBPIW1xmb6p4vEIAvUdB9lU+I ux9iO4PUZb1xU9zox2rKkzKIChvLMhJccZdIqLjOeIcDuFe36miiuqvKPeLHOFIpl74U WgEXrusWMiljPHG4Mc6h1Ii33jyBrJCTeHmOLiudo+T+WNcfHJWRUR0OjaTkvmvvKMQk Ns4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752283419; x=1752888219; 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=6yu6TRX3CBlMKwjqur7bR/gkGmWf7d1saeVjx+GIxcE=; b=Kr1/IwEZ3OKjmGottKredWW+dm4yv06rHQJFWLrZqklBj8IN5XtpqaKbEhFX5uGPsZ 1z8+fkjElFgaOlGfkJGIqt1S7LfPB5CzUceznyFhYPo0vgSJXiqjp8ctLFQzABTOmhUg lVeuunbBrV5NIQSL13pmAxL/TvF+N1g7ReNfs+scb4GqhPFuaOnjbZGD+OxBv3Wm/0Tm K34G6MuMMkUELL/WS6Muikt5B3Ue6PzF2wflgp2+rVwI9TVffe4Z9EMo8GUQNOHfA2X1 zce5M2lPPPhv0hnV5ZI3oeT+TgLnrdlCX1QmrvPiC/pI3YvDGaUDQ3yLl1TzOJPaTFb1 eo/Q== X-Gm-Message-State: AOJu0Yx2dpF1x36CU72N12U5npKKk2I+xClvbh7jiYoVQZQ1V6d9Fgx6 kPGRuD4PzjxkeU21Om+tIMBA3YIojvRSfy7JMJU64fHmEo9eiE0UBGHG64T6nw== X-Gm-Gg: ASbGnctbivyfh5FBCr57fsGTDxtvChlvBwZn1dKxMqiUwJT8psheOmKBViwu4EAPyYa 65CJQJ0Zbz4K+wvAUk6ztqr2KsueCKtYPmjspQyco+o/XnXv1P0eAwX/ZLXyI9sN1VarmcoVQH9 uMJ/n7DcryudnAjhvTLZJQPRD17pvOmOkntmv3PerFEvxdyF1X6fXQm7cpncWlcuxvl2T/VLD7w o/baD0xeKWn+OA43WVGuMMdt9NKIHxifZZdmITlFwq2eNpIMnCYJTl6IcbsiAaxeyh1a3HW7j4p e0VqMEmmFLkJ6jVv2PkB/v3K7P87JUa4X/Xtq2LwlSXckC5+5loyYxXQavfFrfzWPViVODl5mN/ BoHVwDD3od8V/BPmMcy7nyvE5xXxeNPu8abjKotqP71kZo0Zu40g= X-Google-Smtp-Source: AGHT+IEy0jnDRhadPzFH47D8b3L9K8eECzYaiMwPdg1vRQFhaRq4qKd8N1nWU4RE5T7Rhk9PyXkWgw== X-Received: by 2002:a05:6a00:3c88:b0:736:9f2e:1357 with SMTP id d2e1a72fcca58-74ed1b3f0e3mr7678390b3a.12.1752283419495; Fri, 11 Jul 2025 18:23:39 -0700 (PDT) Received: from gemwin (ONI-202-70-254-104.oninet.ne.jp. [202.70.254.104]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74fd6c1023asm1171534b3a.61.2025.07.11.18.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jul 2025 18:23:38 -0700 (PDT) From: gemmaro Date: Sat, 12 Jul 2025 10:21:49 +0900 Message-ID: <879784a54eb608af0c5a449743403ef2256492e1.1752282873.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: 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-xyz.scm (ruby-braintree)[arguments]: Replace relax-requirements phase with disable-bundler. If a Gemfile is present, RSpec uses Bundler to resolve dependencies, which can lead to troubles. Removing the Gemfile allows RSpec to use the gems provided by Guix. Change-Id: I0aaeec9fa071b60bc2a8acd7382070779eece1f1 --- gnu/packages/ruby-xyz.scm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/gnu/packages/ruby-xyz.scm b/gnu/packages/ruby-xyz.scm index 511a0b1a0f..d8fb4dc677 100644 --- a/gnu/packages/ruby-xyz.scm +++ b/gnu/packages/ruby-xyz.scm @@ -16045,19 +16045,9 @@ (define-public ruby-braintree (lambda _ (substitute* "Rakefile" (("sh \"rubocop\"") "")))) - (add-after 'unpack 'relax-requirements + (add-after 'unpack 'disable-bundler (lambda _ - (substitute* "Gemfile" - (("gem \"pry\".*") "gem 'pry'\n") - (("gem \"rake\".*") "gem 'rake'\n") - (("gem \"libxml-ruby\", \"3.2.0\"") - "gem \"libxml-ruby\", \"~> 3.0.0\"") - (("gem \"rspec\", \"3.9.0\"") - "gem \"rspec\", \">= 3.9.0\"") - (("gem \"webrick\", \"~>1.7.0\"") - "gem \"webrick\", \">=1.7.0\"") - ((".*gem \"rubocop\".*") "") - ((".*gem \"rspec_junit_formatter\".*") ""))))))) + (delete-file "Gemfile")))))) (native-inputs (list ruby-libxml ruby-pry