From patchwork Mon Mar 20 17:13:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48292 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 9FF2616F34; Mon, 20 Mar 2023 17:28:41 +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 D254616F32 for ; Mon, 20 Mar 2023 17:28:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJHl-0005EF-EN; Mon, 20 Mar 2023 13:27: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 1peJHi-0005AO-Qo for guix-patches@gnu.org; Mon, 20 Mar 2023 13:27:02 -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 1peJHi-0005gK-Hf for guix-patches@gnu.org; Mon, 20 Mar 2023 13:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJHi-00049W-Dn for guix-patches@gnu.org; Mon, 20 Mar 2023 13:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 067/223] gnu: ruby-activejob: 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:27:02 +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.167933321215942 (code B ref 62196); Mon, 20 Mar 2023 17:27:02 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:26:52 +0000 Received: from localhost ([127.0.0.1]:56330 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJHY-000493-7a for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:26:52 -0400 Received: from mail-qt1-f173.google.com ([209.85.160.173]:40840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJGn-0003va-39 for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:26:05 -0400 Received: by mail-qt1-f173.google.com with SMTP id x1so13969306qtr.7 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:26:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333159; 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=1UWiHdoGJKTVHj9tBHeIwW3iO2baJ28CZmD4wF5q2ik=; b=SvKMNT/azQ8fdKckFhOiKlBFe3RSxGio0lZGl3j2ke2Md0DChrdAn18RO4L179z3jw nt0b/iHdxo1Um7OFT5o92EhsfPr6HW4EmykCx3z11L8QboELi21A7EoeQwrxVyUT2uON L8B0FCSoR1N237olbwtQcfn12BOAsuHRnZUKBywHw4iH2MUzLOKaRL+KCkRabGohnWZ8 Yn28QZIHFgfhmNcWMY1Ff7bZ4Z9MMz6+D6BG47/HKmlBUFVh4GCeBPecQkqoNOWk1UCn CofxCRJMP1kN9+kV5uKwJG2L8B7mQMHc8rtq28KBPCTUH+mW/BOLShwQr3nZD2p3bt9G m7iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333159; 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=1UWiHdoGJKTVHj9tBHeIwW3iO2baJ28CZmD4wF5q2ik=; b=yC8K4AKaENP3Hsqga23CUl/xdzBqlOlE2ageR7DET1lphOhVCgGhXzqsU8BQZ/bil/ 03yMWLFCLikc2rzdD6Mp6/TtafGan+PAw4f2hfe0y2mOwk5R0yvGf4cDpBpwqY/3okW0 VG0vJJGAWOgc2HJ46rU6lbv00bcYCXtX55gUdRybOKQ9S6UXumrv/HZ2DAHw1zqqDjP5 lyEIFb9SdzAgom9Zn0oqogiWgf0WkABQUz68BUCuVJZTq+9+AXcy/V7dhTcWz57wcnnf 66MXLcHsc6ntxR6IbgKzcQ5egwkxxg3bK+CoEJzqClPkVnOuYGg/W8IeEykLeGE4Dztj weVA== X-Gm-Message-State: AO0yUKXpUBroT0beTlN47CXqogEQOFEzHZRXXyX/wYjNFyuvKP/+Rzc0 S+1oWs5GVpIhAgU1q8UPOMahQu7e0vk= X-Google-Smtp-Source: AK7set/AiRV/cLBOqsjgTrpvgk6iPwqTnySnF/LGab61lZTyaz2vrzG0V5ouGWwcHqSGPtId7HuWoQ== X-Received: by 2002:ad4:5f46:0:b0:5bf:59a4:c117 with SMTP id p6-20020ad45f46000000b005bf59a4c117mr18539001qvg.5.1679332660467; Mon, 20 Mar 2023 10:17:40 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:17:40 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:13:59 -0400 Message-Id: <20230320171635.11184-67-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-activejob): Update to 7.0.4.3. [source]: Use ruby-rails-monorepo. [arguments]: Remove #:tests? argument. Add #:phases argument. [native-inputs]: New field. --- gnu/packages/rails.scm | 57 ++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 338c92ddaa..bff4e09264 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -522,27 +522,42 @@ (define-public ruby-actioncable (define-public ruby-activejob (package - (name "ruby-activejob") - (version "6.1.3") - (source - (origin - (method url-fetch) - (uri (rubygems-uri "activejob" version)) - (sha256 - (base32 - "175d8q0achdlsxjsvq0w9znvfqfkgbj75kbmdrvg4fb277wwplmf")))) - (build-system ruby-build-system) - (arguments - '(;; No included tests - #:tests? #f)) - (propagated-inputs - (list ruby-activesupport ruby-globalid)) - (synopsis "Declare job classes for multiple backends") - (description - "ActiveJob allows declaring job classes in a common way across Rails -applications.") - (home-page "https://rubyonrails.org/") - (license license:expat))) + (name "ruby-activejob") + (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 "activejob"))) + (add-after 'chdir 'delete-problematic-tests + (lambda _ + (substitute* "Rakefile" + ;; Remove the adapters that aren't yet packaged or would + ;; introduce cyclic dependencies. + (("backburner ") "") + (("resque ") "") + (("sidekiq ") "") + (("sneakers ") "") + (("sucker_punch ") "")) + (substitute* "test/cases/exceptions_test.rb" + (("ActiveJob::QueueAdapters::SneakersAdapter") ""))))))) + (native-inputs + (list ruby-queue-classic + ruby-delayed-job + ruby-que + ruby-zeitwerk)) + (propagated-inputs + (list ruby-activesupport + ruby-globalid)) + (synopsis "Declare job classes for multiple backends") + (description "ActiveJob allows declaring job classes in a common way +across Rails applications.") + (home-page "https://rubyonrails.org/") + (license license:expat))) (define-public ruby-activestorage (package