From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 6BpYCSOeGGSwPwAASxT56A (envelope-from ) for ; Mon, 20 Mar 2023 18:55:47 +0100 Received: from aspmx2.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id uP5jCCOeGGTNWwAAG6o9tA (envelope-from ) for ; Mon, 20 Mar 2023 18:55:47 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx2.migadu.com (Postfix) with ESMTPS id B95E436C20 for ; Mon, 20 Mar 2023 18:55:46 +0100 (CET) Authentication-Results: aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=gFn8sVZs; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx2.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679334946; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=QSdjIxl4jxZOlAbN8ZPGNmVxzRXe8iHsugzOdDasLRw=; b=nMkVj07GLxn3D2vDVTNyHc/G9jPMtl64JCgxwQHxlBP3gUrPjMJsy4dujz3HgVOHi/4OCX /CDt+tA9h2eW2HRHTQwEiHcey+S8Jd+QBDR5sZUCXvJpBq8eNH7eV7GW3SUlEG/V/GXnG3 aMhARSjzBLUJVNNvdFY96kAYtvRh3pYdt+uTIioUkAc25vzsZmlX0T2GsRIS8xfZq1z9/9 BTw2GNfGFSY4eATUPDTggsE9S8F0eM/YBcLeX7hFHqnCSBX+KGH+GFxlKndzhoWBZVNpTt GaMVBRbfl0//BP2KnXcBhjZISlTEmuoEVdjB9Ft1P9EWUJy+BE8j3QxqRnYXlA== ARC-Authentication-Results: i=1; aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=gFn8sVZs; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx2.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679334946; a=rsa-sha256; cv=none; b=lb2S5cNUCKyU7Xja8h4Jpd8D31FzJsnPep3Ml7SY2GxLl8VQTTbK+BWy6I6QuFquyJraMV 3E5ECEVTvRB8KOtXSaFe96DbFQeDmYfkh2WIcVKJuwEZ/qoj9zPWm4J5mWFqV9dV04oq44 83mIDtxXg3RZ3D7Mk+jyK+/8jNWVaaHovxvyg3WwtFTr9LCa3mPHyAAfvBtk4i8jj7RC6r eCpmzn/ajROXCBVmafeM3tWU0wO/N4TN1rTXkohUANbErDOIikVe56AsS6pynz7YONjhmY o2GLLgB6Z0zDbCwHxsv3le3k/GXQLlxOSlOPqtxbmyoDUg+ovI7OR6XNFlVX8A== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJNZ-0005QY-Se; Mon, 20 Mar 2023 13:33:05 -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 1peJNY-0005P8-Ew for guix-patches@gnu.org; Mon, 20 Mar 2023 13:33:04 -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 1peJNY-0000wf-6H for guix-patches@gnu.org; Mon, 20 Mar 2023 13:33:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJNX-0004zp-UY for guix-patches@gnu.org; Mon, 20 Mar 2023 13:33:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 193/223] gnu: ruby-shoulda: Update to 4.0.0. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:33:03 +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.167933357119145 (code B ref 62196); Mon, 20 Mar 2023 17:33:03 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:32:51 +0000 Received: from localhost ([127.0.0.1]:56500 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJNL-0004yj-35 for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:32:51 -0400 Received: from mail-yw1-f176.google.com ([209.85.128.176]:43546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJNJ-0004yV-Tn for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:32:50 -0400 Received: by mail-yw1-f176.google.com with SMTP id 00721157ae682-53d277c1834so236599697b3.10 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:32:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333564; 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=QSdjIxl4jxZOlAbN8ZPGNmVxzRXe8iHsugzOdDasLRw=; b=gFn8sVZsW5UDKqDoZC5eGiUXtUi4aIqUkJ1eh7gHFwDHmrWKx2PaCFi0npDXCCWb27 G6KSBOT65YQSDrizfRwPjfEXHD36ZbxWDqtvmEtyA2qyd6MT549E6DYw2cyaOiB7OR4H hwLocrXG4IM+B33w8GAiBPvfGDJMmlVCgkhFs0NgrHDbGHq8bbpUdro3BzII0LOtH1Kw h6ZPtWCzpyqlh6YK5RJ/t75zC10GQI1BRyIG5z5Iz+N4neXRqLoAki2bCtaABV5kH14O 4QX6ur7hIWlUocl4LTIE46T+a/8egxmPIoo/E0C1dmKZPupsXsgVnE1Z+Bgs9mYO9GuA 4NmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333564; 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=QSdjIxl4jxZOlAbN8ZPGNmVxzRXe8iHsugzOdDasLRw=; b=K8zl484BDRU47Rq9Leg0djDQ5N5r3i9AtH0Y4kYhbRSllGnxibnwpf2XUz0/wAVhd0 qpThL5TU1bzRdu7A0cotwvJ7t9jLb2em9xYaRybke96ml6KOGYT9RvDxamiP64r2Cmxu EqHjmsMCbyNO69KiQN9tfsPU/i0TNUMTt6tPjqyfFHWNYHy9yONW9bQ/xUzn4f+g9blY 8m1zzorFp1dnaczfVRhQzLYr1aYJpY+qQ4+6ULPEkyXvUHv1e6Fe8DB2vxs+Qxtvh6Yo iydQpk2HdFNfTx8BLnGVJvpn4khnlCMugpmAWpaZ6Wbjv/2DNgd0IqFnwpRqPw3AzJcB DvKQ== X-Gm-Message-State: AO0yUKVvORE9vJjjvBJqHnHrBMUN3VGdeWASzuKICTUhlt8OCrzLcKWD doCLXhUrmahonCDKnScUNvaDxR0DiKI= X-Google-Smtp-Source: AK7set/BIXuEHGMHUsD4ID7RAadTvHAGZq8R5oK5SAWMNeZlk6g+kr228Le0v63TVDwPc2JWoqNFRQ== X-Received: by 2002:ac8:7d8e:0:b0:3e2:e280:c4a1 with SMTP id c14-20020ac87d8e000000b003e2e280c4a1mr2963871qtd.52.1679333119910; Mon, 20 Mar 2023 10:25:19 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:25:19 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:23:19 -0400 Message-Id: <20230320172349.12752-92-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 Content-Transfer-Encoding: 8bit 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: X-Migadu-Queue-Id: B95E436C20 X-Spam-Score: -2.15 X-Migadu-Spam-Score: -2.15 X-Migadu-Scanner: scn0.migadu.com List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-TUID: OGMDmcMJYfBW * gnu/packages/ruby.scm (ruby-shoulda): Update to 4.0.0. [arguments]: Add relax-requirements phase. [propagated-inputs]: Replace ruby-shoulda-matchers-2 with ruby-shoulda-matchers. (ruby-shoulda-matchers-2): Delete variable. --- gnu/packages/ruby.scm | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ceec6fe291..ad4ca4b926 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -10136,28 +10136,17 @@ (define-public ruby-shoulda-matchers (home-page "https://github.com/thoughtbot/shoulda-matchers") (license license:expat))) -(define-public ruby-shoulda-matchers-2 - (package - (inherit ruby-shoulda-matchers) - (version "2.8.0") - (source (origin - (method url-fetch) - (uri (rubygems-uri "shoulda-matchers" version)) - (sha256 - (base32 - "0d3ryqcsk1n9y35bx5wxnqbgw4m8b3c79isazdjnnbg8crdp72d0")))))) - (define-public ruby-shoulda (package (name "ruby-shoulda") - (version "3.5.0") + (version "4.0.0") (source (origin (method url-fetch) (uri (rubygems-uri "shoulda" version)) (sha256 (base32 - "0csmf15a7mcinfq54lfa4arp0f4b2jmwva55m0p94hdf3pxnjymy")))) + "02lww34kn1g6lidp4rx4rs6bqvirrzxlfw1y2wm11aif8f622xz6")))) (build-system ruby-build-system) (arguments `(#:phases @@ -10165,9 +10154,17 @@ (define-public ruby-shoulda (replace 'check ;; Don't run tests to avoid circular dependence with rails. Instead ;; just import the library to test. - (lambda _ (invoke "ruby" "-Ilib" "-r" "shoulda")))))) - (propagated-inputs - (list ruby-shoulda-context ruby-shoulda-matchers-2)) + (lambda _ (invoke "ruby" "-Ilib" "-r" "shoulda"))) + (add-after 'extract-gemspec 'relax-requirements + (lambda _ + (substitute* "shoulda.gemspec" + ;; An older version of shoulda-matchers (4.0) is used, out of + ;; little maintenance rather than because of an real + ;; incompatibility (see: + ;; https://github.com/thoughtbot/shoulda/issues/275). + ((", \\[\"~> 4.0\"]") ""))))))) + (propagated-inputs + (list ruby-shoulda-context ruby-shoulda-matchers)) (synopsis "Context framework and matchers for testing") (description "@code{shoulda} is a meta-package combining @code{shoulda-context} and -- 2.39.1