From patchwork Mon Mar 20 17:13:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48274 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 7D3C816F2D; Mon, 20 Mar 2023 17:28:04 +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 407B516F34 for ; Mon, 20 Mar 2023 17:28:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJGt-0004Kw-U7; Mon, 20 Mar 2023 13:26:11 -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 1peJGp-0004HG-C8 for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:10 -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 1peJGp-0005MO-3l for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJGp-0003y2-0S for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 059/223] gnu: ruby-activemodel: Update to 7.0.4.3 and enable tests. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:26:06 +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.167933311814514 (code B ref 62196); Mon, 20 Mar 2023 17:26:06 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:25:18 +0000 Received: from localhost ([127.0.0.1]:56036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJG1-0003lr-SS for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:25:18 -0400 Received: from mail-qt1-f174.google.com ([209.85.160.174]:46823) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJ8c-0003Kk-Dr for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:17:38 -0400 Received: by mail-qt1-f174.google.com with SMTP id c19so13929563qtn.13 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:17:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679332653; 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=tm3i3LL1AxooBaIR3f5ObXVE1uUC0lf/0+GsW+/8QxM=; b=H3KTzDYF60vQ6AmGNP27nonHg6MZqFAF0q2/qzMjejYx0VWRU246jYqyV5xMnFBExc XPB/Cj6bc45negx1HuHbqgx06Z/leEIHgzZiiLHg4FpG5PU40j5H/iaK1YCIayO/UaA7 2H1bxmGcpVbj2BQrrSOLVkzD4YYQAhVEhQZWZXrMhUkssbCHP4GMTgCT/adyiawsVn7e ZbRX4+w8VIZok0cksUGITE2eWAoDZ82e4ppvqzR9jtYrokK7WUVEauc+39gLx7y524yR 8OieBUJVJJlqarkfGN7io6YXoi3PbVCSJAZ8O6jW3cy33GzHOpoe9ysNOH5XhEcTPoMP 5Qhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679332653; 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=tm3i3LL1AxooBaIR3f5ObXVE1uUC0lf/0+GsW+/8QxM=; b=58A5xyHSsZAY+vR3vFiB7e8+PVU6g4lFSu+971oWK08IaOrHDKdee7TkpJw6Vt5tjS wCcIoAtJWyWd4kd7g3US4VaZ7LKdhbZ9nZ+s7YEWKtp7FoU46bJY2vBOQ/MMo+sIKg56 O2Ep9PKUayXZ/0GShOuHoaNIBTTYvMFu87PZ/Ebf0lTDnH4jg8h412qVwIxzerxJuzk7 3uOezT7wcRTG/auoNe8CyWnrtC+GZEhYvyUHyozvKELMW8ye3t9UMTvkOzdDRQucr0sH Unw8aTe8FQ32vM8r/m1qHjQTUz6d3H6gMNVezaK9Y0mqKluyoQSfb6p6IY4b/HKuLVHz VFtg== X-Gm-Message-State: AO0yUKVmE/Yh5VxiJ/cFL5UlhmkhUquRRdwDtWfGvy/wG5cim5d+nWUK w0O6tiPu1bqDgpOlPneVaPAJlKJK/ZQ= X-Google-Smtp-Source: AK7set9ZPpaKTMO0j5h3lBdVLt9pYnvQ3fLvXKhwukZpSAQNIGhfY9codEKsVmW45Vtc0BWiJPxUzA== X-Received: by 2002:a05:622a:181a:b0:3e3:791e:72d0 with SMTP id t26-20020a05622a181a00b003e3791e72d0mr3586452qtc.19.1679332652875; Mon, 20 Mar 2023 10:17:32 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-46.b2b2c.ca. [72.10.128.46]) by smtp.gmail.com with ESMTPSA id p17-20020a374211000000b007428e743508sm7673809qka.70.2023.03.20.10.17.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:17:32 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:13:51 -0400 Message-Id: <20230320171635.11184-59-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230320171635.11184-1-maxim.cournoyer@gmail.com> References: <20230320171635.11184-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-activemodel): Update to 7.0.4.3. Fix indentation. [source]: Use ruby-rails-monorepo. [arguments]: Remove #:tests? argument. Add #:phases argument. [native-inputs]: New field. --- gnu/packages/rails.scm | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 9fa0f23ad8..329bacdaef 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -260,28 +260,30 @@ (define-public ruby-autoprefixer-rails (define-public ruby-activemodel (package - (name "ruby-activemodel") - (version "6.1.3") - (source - (origin - (method url-fetch) - (uri (rubygems-uri "activemodel" version)) - (sha256 - (base32 - "07m85r00cd1dzxg65zr9wjrdqppw51b5ka9c5mrz92vnw18kfb70")))) - (build-system ruby-build-system) - (arguments - '(;; No included tests - #:tests? #f)) - (propagated-inputs - (list ruby-activesupport)) - (synopsis "Toolkit for building modeling frameworks like Active Record") - (description - "This package provides a toolkit for building modeling frameworks like + (name "ruby-activemodel") + (version %ruby-rails-version) + (source ruby-rails-monorepo) + (build-system ruby-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'extract-gemspec 'chdir + (lambda _ + (chdir "activemodel"))) + (add-after 'chdir 'delete-problematic-tests + (lambda _ + ;; We do not want to depend on ruby-railties at this stage. + (delete-file "test/cases/railtie_test.rb")))))) + (native-inputs (list ruby-bcrypt)) + (propagated-inputs (list ruby-activesupport)) + (synopsis "Toolkit for building modeling frameworks like Active Record") + (description + "This package provides a toolkit for building modeling frameworks like Active Record. ActiveSupport handles attributes, callbacks, validations, serialization, internationalization, and testing.") - (home-page "https://rubyonrails.org/") - (license license:expat))) + (home-page "https://rubyonrails.org/") + (license license:expat))) (define-public ruby-activerecord (package