From patchwork Mon Mar 20 17:29:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48359 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 D9F8816F2D; Mon, 20 Mar 2023 17:31:19 +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 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 4AECD16F44 for ; Mon, 20 Mar 2023 17:31:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJLC-0001MD-F0; Mon, 20 Mar 2023 13:30:38 -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 1peJKt-00011n-Ni for guix-patches@gnu.org; Mon, 20 Mar 2023 13:30:23 -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 1peJKo-0007QS-7f for guix-patches@gnu.org; Mon, 20 Mar 2023 13:30:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJKo-0004nC-2X for guix-patches@gnu.org; Mon, 20 Mar 2023 13:30:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 216/223] gnu: ruby-autoprefixer-rails: Update to 10.4.13.0. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:30:14 +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.167933341118364 (code B ref 62196); Mon, 20 Mar 2023 17:30:14 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:30:11 +0000 Received: from localhost ([127.0.0.1]:56398 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJKk-0004lz-Ru for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:30:11 -0400 Received: from mail-qt1-f170.google.com ([209.85.160.170]:37385) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJKZ-0004he-3D for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:29:59 -0400 Received: by mail-qt1-f170.google.com with SMTP id r5so14008475qtp.4 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:29:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333393; 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=goWqr7pDCsIAiCmh51yzvtoTzGvbRtpZ7kdkqVC2GA4=; b=iyLlVv0J/sYfZ/6yOdVldh4bL5tV30USmFynyeVB27vrmNltrm320g+6YaAP46Evv0 BEvbHrgw1Kq2WLSYr62Qkrb5HqCdjyIgAspDWhvfwjn4CXk32dBSU0mCKjYK0XsR785u bIf4AICIPzcBEtltEYdaNocfkiEoicj+e1KwK+Zh3szV3BhwUHdrj6Y0+NGLZ+S9SLck nGiqL9P83e/ViSoky/Iqt8VuPhNwQP5MJpFGhvvfHC+w5xxleGZuuJY8d8CtDD2Opy9x Wqv6d7/5lrIAD6l9jJyS+ePPwRYN+VsaRtCvl6FQXB0kts5veXYrmt2yrqxFi1zRWDeE tfjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333393; 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=goWqr7pDCsIAiCmh51yzvtoTzGvbRtpZ7kdkqVC2GA4=; b=qGq9Iec5tzOSkU8PgxIUL+lkKpIxdWUORhZdIl6SJxI79MpPmH+WJ7HZzBDqHHQSAo k3B/NNSwry0lKUzHvQVH427gSltOoWS9lLCXdXZwIw/h7GpZG85zD10H8T81U4uMH+R/ 7NwMEz88z0NQ0i89YzJ4pTUtZ4olrToXmwofDusXbBmIbgyejbFJ9C8qOnTkLsKiDkHK 4Qs/alTbN64k5NhqlrKaEq5KgQ/wTIuGcLGPkP8eE3gxg+kH+wUA78ElZCbCXIj0N61O aONiMcjHpdSQ/rSjzq/C4fRX+4+EogzuplGUoaBgncm96hWWPQWOF6toWsXdzD/rYoS8 gAKg== X-Gm-Message-State: AO0yUKUOUvKvyKlt5K9venDgJcF73Jkka06zU8UDiDn0jDSaKUDxbQzp 5zpJyg7Ngo2uHOzvTJ5cNCcMEkSoXsc= X-Google-Smtp-Source: AK7set+PzxJ5tetbzmkOC8W0tHMZZU+cDIOJ5u7swcPd7ODmY0isrg3UOV/6f3BNWQQDtnVVh5+5fw== X-Received: by 2002:ac8:5a91:0:b0:3bf:da79:6703 with SMTP id c17-20020ac85a91000000b003bfda796703mr15038qtc.3.1679333393517; Mon, 20 Mar 2023 10:29:53 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-46.b2b2c.ca. [72.10.128.46]) by smtp.gmail.com with ESMTPSA id g2-20020a37b602000000b0071aacb2c76asm7536708qkf.132.2023.03.20.10.29.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:29:53 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:29:26 -0400 Message-Id: <20230320172933.13101-15-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230320172933.13101-1-maxim.cournoyer@gmail.com> References: <20230320172933.13101-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-autoprefixer-rails): Update to 10.4.13.0. [source]: Fetch via git. [phases]: Rename remove-unnecessary-dependencies to relax-requirements and update phase. [native-inputs]: Remove ruby-sass. Add ruby-sassc-rails, ruby-sprockets and ruby-standard. --- gnu/packages/rails.scm | 45 ++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 0f8d3a7613..c830620b82 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -231,45 +231,42 @@ (define-public ruby-debug-inspector (define-public ruby-autoprefixer-rails (package (name "ruby-autoprefixer-rails") - (version "9.4.7") - (source - (origin - (method url-fetch) - (uri (rubygems-uri "autoprefixer-rails" version)) - (sha256 - (base32 - "0fxbfl3xrrjj84n98x24yzxbz4nvm6c492dxj41kkrl9z97ga13i")))) + (version "10.4.13.0") + (source (origin + (method git-fetch) ;for tests + (uri (git-reference + (url "https://github.com/ai/autoprefixer-rails") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1i34apjlav1qz8mdg2fyf0hvs5z32inv1snycdkhmqpkfj2ri2hh")))) (build-system ruby-build-system) (arguments '(#:test-target "spec" #:phases (modify-phases %standard-phases - (add-after 'extract-gemspec 'remove-unnecessary-dependencies + (add-after 'extract-gemspec 'relax-requirements (lambda _ - ;; Remove the testing of compass, as its use is deprecated, and - ;; it's unpackaged for Guix. - (substitute* "autoprefixer-rails.gemspec" - ((".*%q.*") "\n") - (("\"spec/compass_spec\\.rb\"\\.freeze, ") "")) - (delete-file "spec/compass_spec.rb") - (substitute* "Gemfile" ;; Remove overly strict requirement on sprockets ((", '>= 4\\.0\\.0\\.beta1'") "") ;; The mini_racer gem isn't packaged yet, and it's not directly ;; required, as other backends for ruby-execjs can be used. - (("gem 'mini_racer'") "") - ;; For some reason, this is required for the gems to be picked - ;; up - (("gemspec") "gemspec\ngem 'tzinfo-data'\ngem 'sass'")) - #t))))) + (("gem \"mini_racer\"") "") + ;; For some reason, this is required for the tzinfo-data gem to + ;; be picked up. + (("gemspec") "gemspec\ngem 'tzinfo-data'\n")) + (substitute* "autoprefixer-rails.gemspec" + ((".*rubocop.*") ""))))))) ;provided by 'standard' (native-inputs (list bundler ruby-rails ruby-rspec-rails - ;; This is needed for a test, but I'm unsure why - ruby-sass - ;; This is used as the ruby-execjs runtime + ruby-sassc-rails + ruby-sprockets + ruby-standard + ;; This is used at runtime by ruby-execjs. node)) (propagated-inputs (list ruby-execjs))