From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id kFXuOgbwEWBvJQAA0tVLHw (envelope-from ) for ; Wed, 27 Jan 2021 22:58:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id IAzUNgbwEWBRXwAAB5/wlQ (envelope-from ) for ; Wed, 27 Jan 2021 22:58:14 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2C6C1940480 for ; Wed, 27 Jan 2021 22:58:14 +0000 (UTC) Received: from localhost ([::1]:42634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4tlM-0005E8-SG for larch@yhetil.org; Wed, 27 Jan 2021 17:58:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4tkE-0004a7-C9 for guix-patches@gnu.org; Wed, 27 Jan 2021 17:57:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34855) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4tkE-000358-4Z for guix-patches@gnu.org; Wed, 27 Jan 2021 17:57:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l4tkE-000838-3L for guix-patches@gnu.org; Wed, 27 Jan 2021 17:57:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46145] [PATCH v2] gnu: jekyll: Update to 4.2.0 Resent-From: EuAndreh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Jan 2021 22:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46145 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46145@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161178817330884 (code B ref -1); Wed, 27 Jan 2021 22:57:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Jan 2021 22:56:13 +0000 Received: from localhost ([127.0.0.1]:46401 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4tjN-00081z-GG for submit@debbugs.gnu.org; Wed, 27 Jan 2021 17:56:13 -0500 Received: from lists.gnu.org ([209.51.188.17]:60880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4tjL-00081r-J9 for submit@debbugs.gnu.org; Wed, 27 Jan 2021 17:56:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4tjL-0003T4-9x for guix-patches@gnu.org; Wed, 27 Jan 2021 17:56:07 -0500 Received: from box.euandre.org ([46.101.160.115]:51865) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4tjI-00030L-6C for guix-patches@gnu.org; Wed, 27 Jan 2021 17:56:06 -0500 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id 5DABEFC3F4; Wed, 27 Jan 2021 19:55:30 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1611788131; bh=CMpXHOtlagpwPVAG2ycwck28lYjNY4gjOmD/dYKfMmU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oAgV6ZWxAc4MLeERZ2mKquYWXJpqkERyYHoN01FinV72rilcD//9CMTFlfVfQzQCM +qfaAaE/nTCvlgwdYzdhALqVxdqsRpzuJyDWdXKE7XpmFpqvN0npLONkSZvxZ/I+CT 5Ppx8wyOE0R+ZqKclawbR6d2RkdE1aWhd1JLWhoIQpy3EBZWktNBBXIQlIiRNJZIrq Pra+z7j2Rl27PAYoFNZcT1UqHvscdEXUjFNPVE+e0w7o7jtENR52SVBnanPIZgI2ss rKp0vg+iX/TgzUa3hWjkMpkGoxtJM0ert9/jekHalA1n3euX8HsB48+ukCjWGG7Iit RRAgUlCi7KjEQ== Date: Wed, 27 Jan 2021 19:55:26 -0300 Message-Id: <20210127225526.302-1-eu@euandre.org> In-Reply-To: <46144@debbugs.gnu.org> References: <46144@debbugs.gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=46.101.160.115; envelope-from=eu@euandre.org; helo=box.euandre.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Cc: EuAndreh Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: EuAndreh X-ACL-Warn: , EuAndreh via Guix-patches From: guix-patches--- via X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.85 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=euandre.org header.s=mail header.b=oAgV6ZWx; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 2C6C1940480 X-Spam-Score: -2.85 X-Migadu-Scanner: scn0.migadu.com X-TUID: +l13J9RbFk7G * gnu/packages/ruby.scm (ruby-sassc): Update to 2.4.0. * gnu/packages/ruby.scm (ruby-jekyll-sass-converter): Update to 2.1.0. * gnu/packages/ruby.scm (ruby-mercenary): Update to 0.4.0. * gnu/packages/ruby.scm (ruby-terminal-table): New variable. * gnu/packages/ruby.scm (ruby-rouge-2): Remove variable. * gnu/packages/ruby.scm (jekyll): Update to 4.2.0. [propagated-inputs]: Use newer version or ruby-rouge, add ruby-sassc and ruby-terminal-table. --- I forgot to add the copyright line. This new patch only differs in this aspect, all the rest is the same. gnu/packages/ruby.scm | 77 +++++++++++++++++++++++++++++++------------ 1 file changed, 56 insertions(+), 21 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b811cbd2c4..885a537c16 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Holgr Peters +;;; Copyright © 2020 EuAndreh ;;; ;;; This file is part of GNU Guix. ;;; @@ -10322,14 +10323,14 @@ features that don't exist yet like variables, nesting, mixins and inheritance.") (define-public ruby-sassc (package (name "ruby-sassc") - (version "2.2.1") + (version "2.4.0") (source (origin (method url-fetch) (uri (rubygems-uri "sassc" version)) (sha256 (base32 - "09bnid7r5z5hcin5hykvpvv8xig27wbbckxwis60z2aaxq4j9siz")))) + "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c")))) (build-system ruby-build-system) (arguments '(#:modules ((guix build ruby-build-system) @@ -10408,13 +10409,13 @@ bindings to the libsass library. This enables rendering (define-public ruby-jekyll-sass-converter (package (name "ruby-jekyll-sass-converter") - (version "1.5.2") + (version "2.1.0") (source (origin (method url-fetch) (uri (rubygems-uri "jekyll-sass-converter" version)) (sha256 (base32 - "008ikh5fk0n6ri54mylcl8jn0mq8p2nfyfqif2q3pp0lwilkcxsk")))) + "04ncr44wrilz26ayqwlg7379yjnkb29mvx4j04i62b7czmdrc9dv")))) (build-system ruby-build-system) (propagated-inputs `(("ruby-sass" ,ruby-sass))) @@ -10869,17 +10870,6 @@ is compatible with stylesheets designed for pygments.") ;; pygments is licensed under bsd-2 license:bsd-2)))) -(define-public ruby-rouge-2 - (package - (inherit ruby-rouge) - (version "2.2.1") - (source (origin - (method url-fetch) - (uri (rubygems-uri "rouge" version)) - (sha256 - (base32 - "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs")))))) - (define-public ruby-hashie (package (name "ruby-hashie") @@ -10966,13 +10956,13 @@ YAML.load suitable for accepting user input in Ruby applications.") (define-public ruby-mercenary (package (name "ruby-mercenary") - (version "0.3.6") + (version "0.4.0") (source (origin (method url-fetch) (uri (rubygems-uri "mercenary" version)) (sha256 (base32 - "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a")))) + "0f2i827w4lmsizrxixsrv2ssa3gk1b7lmqh8brk8ijmdb551wnmj")))) (build-system ruby-build-system) (arguments `(#:test-target "spec")) (native-inputs @@ -11044,16 +11034,59 @@ methods for your source as @code{Forwardable::Extended}.") Pathname.") (license license:expat))) +(define-public ruby-terminal-table + (package + (name "ruby-terminal-table") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "terminal-table" version)) + (sha256 + (base32 + "18rbrh464ysqbdv53iwj0r8frshn65566kyj044cp3x9c2754jwh")))) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'remove-gemfile-lock + (lambda _ + (delete-file "Gemfile.lock"))) + (add-before 'check 'remove-unnecessary-dependencies + (lambda _ + (substitute* "terminal-table.gemspec" + (("s.add_runtime_dependency.*") "\n") + (("s.add_development_dependency.*") "\n")) + (substitute* "Gemfile" + ((".*tins.*") "\n")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "rspec"))))))) + (build-system ruby-build-system) + (propagated-inputs + `(("ruby-unicode-display-width" ,ruby-unicode-display-width))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec))) + (synopsis + "Simple, feature rich ASCII table generation library") + (description + "Terminal Table is a fast and simple, yet feature rich +table generator written in Ruby. It supports ASCII and +Unicode formatted tables.") + (home-page + "https://github.com/tj/terminal-table") + (license license:expat))) + (define-public jekyll (package (name "jekyll") - (version "3.8.6") + (version "4.2.0") (source (origin (method url-fetch) (uri (rubygems-uri "jekyll" version)) (sha256 (base32 - "1ph1jjjl25vmzif7bvxzviq7azjm384pm7ba4k24cah94285bzhz")))) + "0cqkh78jw8scrajyx5nla0vwm9fvp2qql3kdcvvplcq9mazy8snq")))) (build-system ruby-build-system) (arguments ;; No rakefile, but a test subdirectory. @@ -11077,8 +11110,10 @@ Pathname.") ("ruby-liquid" ,ruby-liquid) ("ruby-mercenary" ,ruby-mercenary) ("ruby-pathutil" ,ruby-pathutil) - ("ruby-rouge" ,ruby-rouge-2) - ("ruby-safe-yaml" ,ruby-safe-yaml))) + ("ruby-rouge" ,ruby-rouge) + ("ruby-safe-yaml" ,ruby-safe-yaml) + ("ruby-sassc" ,ruby-sassc) + ("ruby-terminal-table" ,ruby-terminal-table))) (home-page "https://jekyllrb.com/") (synopsis "Static site generator") (description "Jekyll is a simple, blog aware, static site generator.") -- 2.30.0