From patchwork Mon Mar 20 17:22:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48373 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 8507D16F34; Mon, 20 Mar 2023 17:31:40 +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 5B0CF16F1D for ; Mon, 20 Mar 2023 17:31:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJLc-0002Sb-95; Mon, 20 Mar 2023 13:31:04 -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 1peJLa-0002Pr-0u for guix-patches@gnu.org; Mon, 20 Mar 2023 13:31: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 1peJLZ-0007xj-OI for guix-patches@gnu.org; Mon, 20 Mar 2023 13:31:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJLZ-0004r4-KO for guix-patches@gnu.org; Mon, 20 Mar 2023 13:31:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 169/223] gnu: ruby-rails: 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:31: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.167933344718594 (code B ref 62196); Mon, 20 Mar 2023 17:31:01 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:30:47 +0000 Received: from localhost ([127.0.0.1]:56420 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJLK-0004po-Pf for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:30:47 -0400 Received: from mail-qv1-f51.google.com ([209.85.219.51]:36369) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJL9-0004pG-42 for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:30:35 -0400 Received: by mail-qv1-f51.google.com with SMTP id cu4so8092785qvb.3 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:30:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333429; 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=Fsnz8n6eAQAKjkn6rKowPWNmTFx5aSR/4unvTeDPv+8=; b=HqvazclRL6pJ/q1RPPD6Hsb8VwF9eCnt+QE44t5SM24lSoV7owBHPzHX/yyJuqD5gz y3YvIRhZVSPSRg8VAaosQzYtMTliSvPdA8AT/ElDrRJK/Qw3gnL0kdAwWIeMybpB0ovE za+/HbB9gHY3fDcJuyw6SggWkhcOEFxOH+Zvnm9B1N9SgSLAjjigPQDNUD4tnf/Zk4F/ Sourz0hQxwkZoG/tsv5sbLpf6zdL5Wm4PJ7TEdPBHOfrf2XLViA5aOfMqYg3FCs2R8ts AJ3f0VeiguIfxfw1NZ37Rudb3KX9bPUEnjmUPFtJ6RM/r6SRDuXaa/YysJ8RGj3hewt6 b9Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333429; 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=Fsnz8n6eAQAKjkn6rKowPWNmTFx5aSR/4unvTeDPv+8=; b=BErVA3VhB3TuaT37rFLt/CP4hc+45Ch8hh9m5EBCvzUx/W8q1f0rgepqsVqEFle1Ay xXa2mcqsWZYYAWdw/VwenoeK1fjA++iZM+b1YicZHeWiqBHOLN4LS6Ler33692AiHbrp IXQ1FwC5DLkwlySOuCb0IUldpUBUzrcWCnjMTcU6ZdycBcDXU+3wZxmM1bILSv60GFgO tOgxtyCc4FKOFMIs6rqhtkWtmCIh91KiRmYKd679Ha1yea2OXli6KK5qg/0fVuytUcUU e+hTRzuJiz4qLk65DXmXzfMavU40NBcQRW0MNttWPJrNIGCN6Jo9a/hi+uXmpLuI4wcz fDTQ== X-Gm-Message-State: AO0yUKVHpZbjf1DMJiCbnbT+CT+eP8QmoJqtZ7gKlsgZS0cCnwf8VZJR wQUtiF2JWcbSCVNDiRwq/vlivQ+9LkY= X-Google-Smtp-Source: AK7set+FG+7WVnb79hoyLlKApVPVm76va2Vz/HsUjnPxF20yzPwaYsYluVMwARoBGdw29OckKrsBeQ== X-Received: by 2002:a05:622a:154:b0:3bf:aa76:f4e1 with SMTP id v20-20020a05622a015400b003bfaa76f4e1mr27996277qtw.40.1679333099750; Mon, 20 Mar 2023 10:24:59 -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.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:24:59 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:22:55 -0400 Message-Id: <20230320172349.12752-68-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-rails): Update to 7.0.4.3. [source]: use ruby-rails-monorepo. [arguments]: Add delete-extraneous-gemspec-files phase. Delete trailing #t. --- gnu/packages/rails.scm | 102 +++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 04aa2d3f89..ddb27a1d77 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -1342,57 +1342,59 @@ (define-public ruby-with-advisory-lock (home-page "https://closuretree.github.io/with_advisory_lock/") (license license:expat))) +;;; This is a meta-package which propagates all the individual Rails +;;; components. (define-public ruby-rails (package - (name "ruby-rails") - (version "6.1.3") - (source - (origin - (method url-fetch) - (uri (rubygems-uri "rails" version)) - (sha256 - (base32 - "0hdancysa617lzyy5gmrcmnpgyb1mz1lawy0l34ycz2wary7y2bz")))) - (build-system ruby-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - ;; This gem acts as glue between the gems that actually make up - ;; Rails. The important thing to check is that the gemspec matches up - ;; with the Guix packages and Rubygems can successfully activate the - ;; Rails gem. - ;; - ;; The following check phase tests this. - (delete 'check) - (add-after 'install 'check - (lambda* (#:key tests? outputs #:allow-other-keys) - (setenv "GEM_PATH" - (string-append - (getenv "GEM_PATH") - ":" - (assoc-ref outputs "out") "/lib/ruby/vendor_ruby")) - (when tests? - (invoke "ruby" "-e" "gem 'rails'")) - #t))))) - (propagated-inputs - (list ruby-actioncable - ruby-actionmailbox - ruby-actionmailer - ruby-actionpack - ruby-actiontext - ruby-actionview - ruby-activejob - ruby-activemodel - ruby-activerecord - ruby-activestorage - ruby-activesupport - bundler - ruby-railties - ruby-sprockets-rails)) - (synopsis "Full-stack web framework optimized for programmer happiness") - (description - "Ruby on Rails is a full-stack web framework optimized for programmer + (name "ruby-rails") + (version %ruby-rails-version) + (source ruby-rails-monorepo) + (build-system ruby-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'delete-extraneous-gemspec-files + (lambda _ + ;; They would otherwise be picked up instead of rails.gemspec at + ;; the root of the repository. + (for-each (lambda (f) + (unless (string-suffix? "rails.gemspec" f) + (delete-file f))) + (find-files "." "\\.gemspec")))) + ;; This gem acts as glue between the gems that actually make up + ;; Rails. The important thing to check is that the gemspec matches + ;; up with the Guix packages and Rubygems can successfully activate + ;; the Rails gem. + ;; + ;; The following check phase tests this. + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? outputs #:allow-other-keys) + (when tests? + (setenv "GEM_PATH" + (string-append (getenv "GEM_PATH") ":" #$output + "/lib/ruby/vendor_ruby")) + (invoke "ruby" "-e" "gem 'rails'"))))))) + (propagated-inputs + (list bundler + ruby-actioncable + ruby-actionmailbox + ruby-actionmailer + ruby-actionpack + ruby-actiontext + ruby-actionview + ruby-activejob + ruby-activemodel + ruby-activerecord + ruby-activestorage + ruby-activesupport + ruby-railties + ruby-sprockets-rails)) + (synopsis "Full-stack web framework optimized for programmer happiness") + (description + "Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.") - (home-page "https://rubyonrails.org/") - (license license:expat))) + (home-page "https://rubyonrails.org/") + (license license:expat)))