From patchwork Mon Mar 20 17:22:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48331 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 1C60116F32; Mon, 20 Mar 2023 17:30:24 +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 0E85D16F2D for ; Mon, 20 Mar 2023 17:30:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJHQ-0004ol-DI; Mon, 20 Mar 2023 13:26:44 -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 1peJHG-0004ht-JR for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:35 -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 1peJHG-0005YX-9G for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:34 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJHG-00046O-08 for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:34 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 146/223] gnu: ruby-marcel: Relocate to (gnu packages rails). Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:26:33 +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.167933315815081 (code B ref 62196); Mon, 20 Mar 2023 17:26:33 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:25:58 +0000 Received: from localhost ([127.0.0.1]:56199 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJGg-0003v5-96 for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:25:58 -0400 Received: from mail-qv1-f51.google.com ([209.85.219.51]:43965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJFQ-0003ds-Dv for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:24:40 -0400 Received: by mail-qv1-f51.google.com with SMTP id jl13so8052602qvb.10 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:24:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333080; 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=f0Qh0Wuj4rEHauYwskZkaq3bfHMm3Of+nH2V9XjKIrg=; b=Z3/WlvOMayoL3E3UuhW16Q0xfGQXyeHbX7tQdJUCckIcwcKY6rIaK2uIE6dGfI2PdE +QoaOTv4QTZ00IF4t+akd++PZG/ct48H7Hbf+RPwtUlCtsFY3Sgn8TVLBu1/YavSRpRl MGFOCGmZLwUU7Cj06uIc/9tGCx4KY5+DX11RNA9pnsG9LRXjc6AQXfSp1E3yHwcLYgdE D01l1NUM3cekbdrjb/yl8x2+J+LNsRNn/sgNyvnKYwQo9gb7sfX3hxZI1QDJVDyF3Fh/ ROKSAmn7RPZoZ6vxyzvW1IKpLHZeeAu1E9i7FIPqf79rBhQQ27Jm/lMGfoOHMSsmIp5L kzmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333080; 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=f0Qh0Wuj4rEHauYwskZkaq3bfHMm3Of+nH2V9XjKIrg=; b=XkO2XynKJvd21jSHrLJYk2aLhETPW2uZtd+qiJe7Piv1R8DhbyhnbH72DAV/73z7Ke dz+NtSSNqYteUO1axY4EzYkVv0x7nYPbfdONsjiV2Fao5y1N/0A0H1WitavvXbCE/yv2 qB5euIK9pLCdWpcdRnl+/9c2DVj+Rs06LQMiSyWHaUFu98+TTL+HjKUMZ0Fg45fiL/q1 NMhrbHcTyXXhqAnIxEaYoE0rnR07KgFp1vShf7hLktzV2NEXl4Fdy60LO1Yonhs0AUMY xuEpHNTb6bVxUipd5VEEVLDn+fEgXQxNPf195xMYJuLMrtRNdI55RhA3Ka7oqoYuIzUC Hw7A== X-Gm-Message-State: AO0yUKX//mPiPNH64olBgM2swDNObuYvaGQi2o+GFN31zuInMFnuDmZ6 hiUTc9rfoGG02BlS7uZn0yJfGh2J/yA= X-Google-Smtp-Source: AK7set/uIEQpDRGKDLgmhXRfn8j/sdCRhWYQQhmoHFQ4d6UDodIIGEQsfPfhfEbjVHe0XkmLsSbgBw== X-Received: by 2002:a05:6214:da5:b0:56e:a07b:f4df with SMTP id h5-20020a0562140da500b0056ea07bf4dfmr54444769qvh.13.1679333079915; Mon, 20 Mar 2023 10:24:39 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:24:39 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:22:32 -0400 Message-Id: <20230320172349.12752-45-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/ruby.scm (ruby-marcel): Move to... * gnu/packages/rails.scm (ruby-marcel): ... here. [home-page]: Update URL. --- gnu/packages/rails.scm | 25 +++++++++++++++++++++++++ gnu/packages/ruby.scm | 24 ------------------------ 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 43db167671..9638aee3ae 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2021, 2022 Efraim Flashner +;;; Copyright © 2019 Christopher Baines ;;; Copyright © 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. @@ -725,6 +726,30 @@ (define-public ruby-actionmailer (home-page "https://rubyonrails.org/") (license license:expat))) +(define-public ruby-marcel + (package + (name "ruby-marcel") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "marcel" version)) + (sha256 + (base32 + "0kky3yiwagsk8gfbzn3mvl2fxlh3b39v6nawzm4wpjs6xxvvc4x0")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + (list ruby-mimemagic)) + (synopsis "MIME type detection using magic numbers, filenames and extensions") + (description + "@code{marcel} provides @acronym{MIME, Multipurpose Internet Mail +Extensions} type detection using magic numbers, filenames, and extensions") + (home-page "https://github.com/rails/marcel") + (license license:expat))) + (define-public ruby-railties (package (name "ruby-railties") diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 3854281058..df42b713b8 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5750,30 +5750,6 @@ (define-public ruby-arel various relational database implementations.") (license license:expat))) -(define-public ruby-marcel - (package - (name "ruby-marcel") - (version "1.0.2") - (source - (origin - (method url-fetch) - (uri (rubygems-uri "marcel" version)) - (sha256 - (base32 - "0kky3yiwagsk8gfbzn3mvl2fxlh3b39v6nawzm4wpjs6xxvvc4x0")))) - (build-system ruby-build-system) - (arguments - '(;; No included tests - #:tests? #f)) - (propagated-inputs - (list ruby-mimemagic)) - (synopsis "MIME type detection using magic numbers, filenames and extensions") - (description - "@code{marcel} provides @acronym{MIME, Multipurpose Internet Mail -Extensions} type detection using magic numbers, filenames, and extensions") - (home-page "https://github.com/basecamp/marcel") - (license license:expat))) - (define-public ruby-minitar ;; We package from the GitHub source to fix the security issue reported at ;; https://github.com/halostatue/minitar/issues/16.