From patchwork Mon Mar 20 17:22:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48382 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 CF41016F32; Mon, 20 Mar 2023 17:32:32 +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=unavailable 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 17B3016F1D for ; Mon, 20 Mar 2023 17:32:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJMZ-0003zO-NL; Mon, 20 Mar 2023 13:32:03 -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 1peJMY-0003zF-5E for guix-patches@gnu.org; Mon, 20 Mar 2023 13:32: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 1peJMX-00008O-PQ for guix-patches@gnu.org; Mon, 20 Mar 2023 13:32:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJMX-0004vO-LS for guix-patches@gnu.org; Mon, 20 Mar 2023 13:32:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 143/223] gnu: ruby-actioncable: 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:32:01 +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.167933347118734 (code B ref 62196); Mon, 20 Mar 2023 17:32:01 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:31:11 +0000 Received: from localhost ([127.0.0.1]:56439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJLi-0004s6-W1 for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:31:11 -0400 Received: from mail-il1-f182.google.com ([209.85.166.182]:35385) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJLh-0004rs-Im for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:31:09 -0400 Received: by mail-il1-f182.google.com with SMTP id u8so158095ilb.2 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:31:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333464; 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=k/oppqX7o7TzC+t4QONOmyNMO500svchlmkto+p4BI4=; b=LAlEpI7I2kZG24Cwol1ouxJABfUet7do6Vjz0poxZpMRNcolSloYZ+4IzxyrJU+WJA iujDkeaR6QWurfg0cjywNyiGOrzgBP+ARi1w0YpzsySMe7F1O5TNWr+Ai2Kx9BlgP37f 17V/h/w6AyYDTGc9Tqhwv1am2gBnLur4Zg5xvXeR42aKAMQEHrKfrZAGTPioUpxtKwI1 T9QDLit8luAq9T9Cy40HDy5fri0tCrzailhX1RQN1iVJJ+ZizFPS+sHmspxpkB21PiVS vNFHJ1Gh/tMLY1HnWP2ow64K6hCF9RdUforlx9ve1d+mBtEzfp/cbSkUFMOUJM61wjvZ x/Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333464; 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=k/oppqX7o7TzC+t4QONOmyNMO500svchlmkto+p4BI4=; b=1YmqwZBeFT4c9aoFOZjvwI5/Pp35fQIHv5CavmmFQcDCz4SWNORlNc9Zd86InqsqW5 k3aw2vNyP8oiWX++dYDnpy0/RLEumrf/BsNHWU6EaZOxWOheeSzsPao5P/Ztijw1boxy tqWzzN1lXmx+a2XL4Sf6IhBH6FllpjQca+DU3HSGYLpLl+lQV9s0CIXuu8E7NoEI2/L8 b5hjY8VZSA0vKtjeZSL5As/5ltZKSv6Un6Lulv5WautXYBlel3+Al5rfkowQR3t+vFIo 0J/vXMesyh8QTLoPRVWzlsUtFxn6BFt9wWpZPUFVGIZYZWb2wEThA0wmub4gW+QZkQY/ 02gg== X-Gm-Message-State: AO0yUKX3BCZm/i/nbE+JIiugN3KYdpafbC6ErzUgDBAnZQWdVz7LEw3I U25QwKF15nF/UGVMr/kx9AgO22gPATg= X-Google-Smtp-Source: AK7set/gE9HyzYio1ELjkNUQ54QKFNFjkhIeah53Jh0CKKgPTWh9cGU2dYTLv25jtu+SgFLJSjXD5A== X-Received: by 2002:a05:6214:509d:b0:5c8:15bc:f630 with SMTP id kk29-20020a056214509d00b005c815bcf630mr9871448qvb.24.1679333074866; Mon, 20 Mar 2023 10:24:34 -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.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:24:34 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:22:29 -0400 Message-Id: <20230320172349.12752-42-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-actioncable): Update to 7.0.4.3. [source]: Use ruby-rail-monorepo. [arguments]: Drop #:tests?. Add #:phases argument. [native-inputs]: New field. --- gnu/packages/rails.scm | 66 ++++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 21 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index d3712a93c9..43db167671 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -553,28 +553,52 @@ (define-public ruby-actionpack (define-public ruby-actioncable (package - (name "ruby-actioncable") - (version "6.1.3") - (source - (origin - (method url-fetch) - (uri (rubygems-uri "actioncable" version)) - (sha256 - (base32 - "1cgb1l0gml1vklxka2djpi5q5b4bgzgm5pahzfjvvgm5vzvrvi9v")))) - (build-system ruby-build-system) - (arguments - '(;; No included tests - #:tests? #f)) - (propagated-inputs - (list ruby-actionpack ruby-activesupport ruby-nio4r - ruby-websocket-driver)) - (synopsis "Integrate integrates WebSockets with Rails applications") - (description - "Action Cable integrates WebSockets with Rails applications. Through + (name "ruby-actioncable") + (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 "actioncable"))) + (delete 'check) ;moved after install phase + (add-after 'install 'check + (assoc-ref %standard-phases 'check)) + (add-before 'check 'set-GEM_PATH + (lambda _ + (setenv "GEM_PATH" (string-append + (getenv "GEM_PATH") ":" + #$output "/lib/ruby/vendor_ruby")))) + (add-before 'check 'disable-problematic-tests + (lambda _ + ;; There are multiple client test failures (see: + ;; https://github.com/rails/rails/issues/47617). + (delete-file "test/client_test.rb"))) + (add-before 'check 'start-redis + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "redis-server" "--daemonize" "yes"))))))) + (native-inputs + (list redis + ruby-activerecord + ruby-pg + ruby-puma + ruby-redis + ruby-websocket-client-simple)) + (propagated-inputs + (list ruby-actionpack + ruby-activesupport + ruby-nio4r + ruby-websocket-driver)) + (synopsis "Integrate integrates WebSockets with Rails applications") + (description + "Action Cable integrates WebSockets with Rails applications. Through WebSockets it allows for real-time features in web applications.") - (home-page "https://rubyonrails.org/") - (license license:expat))) + (home-page "https://rubyonrails.org/") + (license license:expat))) (define-public ruby-activejob (package