From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:45323) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isDdS-0003iV-Hh for guix-patches@gnu.org; Thu, 16 Jan 2020 17:29:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isDdN-0007wA-Vj for guix-patches@gnu.org; Thu, 16 Jan 2020 17:29:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60783) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1isDdN-0007vG-Qa for guix-patches@gnu.org; Thu, 16 Jan 2020 17:29:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1isDdN-0001qT-OF for guix-patches@gnu.org; Thu, 16 Jan 2020 17:29:01 -0500 Subject: [bug#39157] [PATCH 1/2] gnu: ruby-sassc: Update to 2.2.1. References: <87v9pbox9f.fsf@cbaines.net> In-Reply-To: <87v9pbox9f.fsf@cbaines.net> Resent-Message-ID: From: Christopher Baines Date: Thu, 16 Jan 2020 22:28:39 +0000 Message-Id: <20200116222840.12308-1-mail@cbaines.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39157@debbugs.gnu.org * gnu/packages/ruby.scm (ruby-sassc): Update to 2.2.1. [arguments]: Fix using the included libsass copy. [native-inputs]: Add ruby-rake-compiler. --- gnu/packages/ruby.scm | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ad675dc488..bc4752ba29 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7764,23 +7764,34 @@ features that don't exist yet like variables, nesting, mixins and inheritance.") (define-public ruby-sassc (package (name "ruby-sassc") - (version "2.0.1") + (version "2.2.1") (source (origin (method url-fetch) (uri (rubygems-uri "sassc" version)) (sha256 (base32 - "1sr4825rlwsrl7xrsm0sgalcpf5zgp4i56dbi3qxfa9lhs8r6zh4")))) + "09bnid7r5z5hcin5hykvpvv8xig27wbbckxwis60z2aaxq4j9siz")))) (build-system ruby-build-system) (arguments - '(#:phases + '(#:modules ((guix build ruby-build-system) + (guix build utils) + (ice-9 textual-ports)) + #:phases (modify-phases %standard-phases ;; TODO: This would be better as a snippet, but the ruby-build-system ;; doesn't seem to support that (add-after 'unpack 'remove-libsass (lambda _ (delete-file-recursively "ext") + (with-atomic-file-replacement "sassc.gemspec" + (lambda (in out) + (let* ((gemspec (get-string-all in)) + (index (string-contains gemspec "libsass_dir"))) + (display (string-append + (string-take gemspec index) + "\nend\n") + out)))) #t)) (add-after 'unpack 'dont-check-the-libsass-version (lambda _ @@ -7790,18 +7801,17 @@ features that don't exist yet like variables, nesting, mixins and inheritance.") (add-after 'unpack 'remove-git-from-gemspec (lambda _ (substitute* "sassc.gemspec" - (("`git ls-files -z`") "`find . -type f -print0 |sort -z`") - (("`git submodule --quiet foreach pwd`") "''")) + (("`git ls-files -z`") "`find . -type f -print0 |sort -z`")) #t)) (add-after 'unpack 'remove-extensions-from-gemspec (lambda _ (substitute* "sassc.gemspec" - (("\\[\"ext/Rakefile\"\\]") "[]")) + (("\\[\"ext/extconf.rb\"\\]") "[]")) #t)) (add-after 'unpack 'fix-Rakefile (lambda _ (substitute* "Rakefile" - (("test: 'libsass:compile'") ":test")) + (("test: 'compile:libsass'") ":test")) #t)) (add-after 'unpack 'remove-unnecessary-dependencies (lambda _ @@ -7826,6 +7836,7 @@ features that don't exist yet like variables, nesting, mixins and inheritance.") `(("libsass" ,libsass))) (native-inputs `(("bundler" ,bundler) + ("ruby-rake-compiler" ,ruby-rake-compiler) ("ruby-minitest-around" ,ruby-minitest-around) ("ruby-test-construct" ,ruby-test-construct))) (synopsis "Use libsss from Ruby") -- 2.24.1