From patchwork Mon Mar 20 17:22:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48378 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 D749016F3D; Mon, 20 Mar 2023 17:32:12 +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 1A1AA16F1D for ; Mon, 20 Mar 2023 17:32:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJMb-00040X-6G; Mon, 20 Mar 2023 13:32: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 1peJMa-0003zj-16 for guix-patches@gnu.org; Mon, 20 Mar 2023 13:32: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 1peJMZ-00008l-GA for guix-patches@gnu.org; Mon, 20 Mar 2023 13:32:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJMZ-0004vs-Ag for guix-patches@gnu.org; Mon, 20 Mar 2023 13:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 148/223] gnu: ruby-activestorage: Update to 7.0.4.3. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:32: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.167933349818839 (code B ref 62196); Mon, 20 Mar 2023 17:32:03 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:31:38 +0000 Received: from localhost ([127.0.0.1]:56458 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJMA-0004ti-1r for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:31:38 -0400 Received: from mail-ua1-f45.google.com ([209.85.222.45]:40726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJM9-0004tT-6S for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:31:37 -0400 Received: by mail-ua1-f45.google.com with SMTP id g23so8442132uak.7 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:31:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333491; 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=2OnBOLNzuHpZa9xPh+NJNDwaldH9hqIM9fwcEXNTDL4=; b=fYD8X0xFMWBm1GFL407rjD7T6CqTz57oINiNYB8bwQl4IlvdXKUWIM9yc8zZ4owBIy A3eAv+dicDK20a/D00ANJR49B6+wgLO4LrTBIYzpLddXdEvrD41ZF3jOwUCWpeeUu1sV njVx2+Xhk2BVgLW3bYunv6Nc6ap1DcHHtgBGjSdk9+VFCPdWbpLizPT5aGBVvXG9Es0n IT9CbKhQJeuuMNSE55gs2oFrloky43XQf3R+wOGT7KHx0JoWnwJ/lpom9kmJj/Wpe0lJ DXeW3DlILHYgyVCTlhJ2r+aRYtXuUbUYXsEt6zBtYw2NyspdnpfcmRcsIDrjg9sTgZpA ippg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333491; 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=2OnBOLNzuHpZa9xPh+NJNDwaldH9hqIM9fwcEXNTDL4=; b=c69nkyBVRMKZGcxaRxdxrwm269FMR0E6qnvaa2PFa/J1ckrI/sn6QFPAIoTytepUcW WW1ci2MjcBCmU8QcS5AQ5uHujKEVI1yvwiQDbsGOwM1UvRAiOR9IwGCqUwEyLm5sFDtJ RdUcdnX332MYMVZ9XZxRHv3CJY6hdvjHzuYtxNtrfUrGfkX81upI7hKuUEZssV587FB7 AlKFUX4gVig7RYSCkr6Eia/HEX1ao0OFcFdcSgNUb0fz9fsyeCTFSygapO+5zurB04OD R1CqIijnSA3wtULVdn40tK2PlvrH4xkgjcdYfmFoizol0CFB1tHbZ7yOt+UbWZFy09Bf fsbA== X-Gm-Message-State: AO0yUKXX1OoPxSZXGlsyq0cPtqKyfJEjntG/WXUw106Mfdp2Zj/iTpwL IzvL5OHJfYZ2p/AcOjEpMWmbWsldOek= X-Google-Smtp-Source: AK7set9AkRQuluuGHMjzIga29TQ3PGhhgv5YTTLK2/jATTaDYl2MzksHMk8a5kkLGIdmr5fmJFzGhg== X-Received: by 2002:a05:6214:5099:b0:5ba:8af3:5d59 with SMTP id kk25-20020a056214509900b005ba8af35d59mr436269qvb.15.1679333081586; Mon, 20 Mar 2023 10:24:41 -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.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:24:41 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:22:34 -0400 Message-Id: <20230320172349.12752-47-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/rails.scm (ruby-activestorage): Update to 7.0.4.3. [source]: Use ruby-rail-monorepo. [arguments]: Add #:phases argument. [propagated-inputs]: replace ruby-mimemagic with ruby-mini-mime. --- gnu/packages/rails.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 540c69ec2f..6c41466ac3 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -643,25 +643,26 @@ (define-public ruby-activejob (define-public ruby-activestorage (package (name "ruby-activestorage") - (version "6.1.3") - (source - (origin - (method url-fetch) - (uri (rubygems-uri "activestorage" version)) - (sha256 - (base32 - "0gkxvbi5w8zmdxpiyz3b10kzz8cxqqh9bj81sjl3fp8wa3v2ld4i")))) + (version %ruby-rails-version) + (source ruby-rails-monorepo) (build-system ruby-build-system) (arguments - '(;; No included tests - #:tests? #f)) + (list + ;; The test suite is disabled, because it activestorage requires + ;; 'rails', which would introduce a dependency cycle. + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'extract-gemspec 'chdir + (lambda _ + (chdir "activestorage")))))) (propagated-inputs (list ruby-actionpack ruby-activejob ruby-activerecord ruby-activesupport ruby-marcel - ruby-mimemagic)) + ruby-mini-mime)) (synopsis "Integrate file storage services in to Rails applications") (description "ActiveStorage integrates file storage services with Rails applications,