From patchwork Fri Jan 31 08:20:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 37968 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 8394327BBEA; Fri, 31 Jan 2025 08:23:44 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 45FD727BBE2 for ; Fri, 31 Jan 2025 08:23:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tdmJG-0000H0-H5; Fri, 31 Jan 2025 03:23:30 -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 1tdmIB-0007qc-J3 for guix-patches@gnu.org; Fri, 31 Jan 2025 03:22:37 -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 1tdmIB-0002RW-AA for guix-patches@gnu.org; Fri, 31 Jan 2025 03:22:23 -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=rfQs3EGXnXur0Mfwj50zf8lPsA+YXHzLPMY1GCgYmYQ=; b=Jbs+WQCSit5rD1viDNEOrptzC8S/lf796r9s4hM7B5DV2kFy3qXwbbcl8HJirSEcxVu0wUDzf9NCZwe5UnVZm8aKIPIed2mSF9VVOGwpKxS+r1mjXYPG+cngKH7saJHU26KxOLj9ji6std4pFNspCG/9Y+8CJXoyuMi3Gf62j3K0v7SnhDrgDkZuKoXDtnvfiPoLd7Ep6CyvgkNfFlAVjsig95wYymDzkpXTitMcVFzxjPDzOyeJq9j0zQmFeB1cMygwX0IBi7kaH4+U6CzpWblNDcTaJ6EJoJ/jfJKTLMKAyudA/Y2pZ6mmWBvT+IFUeePsBPb3+r9CZIY9MeGwLA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tdmIB-0003VF-4z for guix-patches@gnu.org; Fri, 31 Jan 2025 03:22:23 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75737] [PATCH v3 52/52] gnu: ruby-rspec-rails: Support ruby-sqlite3. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 Jan 2025 08:22:23 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75737 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75737@debbugs.gnu.org Cc: Nicolas Graves , sharlatanus@gmail.com Received: via spool by 75737-submit@debbugs.gnu.org id=B75737.173831172313139 (code B ref 75737); Fri, 31 Jan 2025 08:22:23 +0000 Received: (at 75737) by debbugs.gnu.org; 31 Jan 2025 08:22:03 +0000 Received: from localhost ([127.0.0.1]:49773 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tdmHq-0003Pl-G1 for submit@debbugs.gnu.org; Fri, 31 Jan 2025 03:22:02 -0500 Received: from 8.mo582.mail-out.ovh.net ([178.33.42.204]:39515) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tdmHP-0003Ld-VD for 75737@debbugs.gnu.org; Fri, 31 Jan 2025 03:21:37 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.109.176.202]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4Ykpl23TR2z1WBt for <75737@debbugs.gnu.org>; Fri, 31 Jan 2025 08:21:34 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-8kgmd (unknown [10.110.118.120]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 29F9B1FEEF; Fri, 31 Jan 2025 08:21:34 +0000 (UTC) Received: from ngraves.fr ([37.59.142.113]) by ghost-submission-5b5ff79f4f-8kgmd with ESMTPSA id NeEkOA2InGehewwAZQJ0zg (envelope-from ); Fri, 31 Jan 2025 08:21:34 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-113S0076f2c5f4a-7a0e-4b8b-89f6-55d19b0382a5, 6210C27661D5E5767C478A00054AC6B17F916FEA) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 82.210.73.18 Date: Fri, 31 Jan 2025 09:20:20 +0100 Message-ID: <20250131082029.26291-52-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250131082029.26291-1-ngraves@ngraves.fr> References: <20250131082029.26291-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 9803773443054101218 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdekvdehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehleeiffehtedvlefhffffjeefgfduhfetkeevheeiteduiedugfekuedtheejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpkedvrddvuddtrdejfedrudekpdefjedrheelrddugedvrdduudefnecuvehluhhsthgvrhfuihiivgepfeenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejheejfeejseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=rfQs3EGXnXur0Mfwj50zf8lPsA+YXHzLPMY1GCgYmYQ=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1738311694; v=1; b=vaKo2OOH/QkQZrqrqjki+z1dKxgO9cOax1I3TkUjW99PNpZapCLgG0AABFt69iW1CwqXTsLJ 2wFVIWQ2kx4bMgfTplSB8FRTGcziFSqTu0sPGTx74Dy6S62vyH4uUInFptU3SV9nsjtmkDx/nVP Rvl09Mtwyhhfzt1WNh+aPr3LZdOFVQ81CdDUyQ28Z4JMFQd6/vsznHccyKyCox41xIJEuo9zgtm bdJVkUAgxSObQRc8HYcnAHKMJzNsMZCZGN7gEEMS7Ou7+PQ1Ik6Lp7TcMBjwgcgYiDTtM9TrqCc nfSfc07qpSK2j0/FGFc7S3FLORAK6UuN0Xl6bcYQCeacQ== 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/rails.scm (ruby-rspec-rails): [arguments]<#:phases>: Patch sqlite3 versions in phase 'relax-requirements. --- gnu/packages/rails.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 13d2541164..8fd80d33bb 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -372,8 +372,7 @@ (define-public ruby-rspec-rails (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1ixm9h2sdd8varnkyxccxhp9dyr8fxk6q5ibrkrk2c83v2xa7bjc")))) + (base32 "1ixm9h2sdd8varnkyxccxhp9dyr8fxk6q5ibrkrk2c83v2xa7bjc")))) (build-system ruby-build-system) (arguments (list @@ -396,6 +395,13 @@ (define-public ruby-rspec-rails ((", :git => \"https://github.com/rspec.*") "\n")) (setenv "RAILS_VERSION" #$%ruby-rails-version) + (substitute* '("Gemfile-rails-dependencies" + "example_app_generator/generate_app.rb") + (("'sqlite3', .*") + (string-append + "'sqlite3', '~> " + #$(package-version + (this-package-native-input "ruby-sqlite3")) "'"))) (substitute* "rspec-rails.gemspec" (("'aruba', '~> 0.14.12'") "'aruba', '>= 0.14.12'")