From: guix-patches--- via <guix-patches@gnu.org>
To: 46145@debbugs.gnu.org
Cc: EuAndreh <eu@euandre.org>
Subject: [bug#46145] [PATCH v2] gnu: jekyll: Update to 4.2.0
Date: Wed, 27 Jan 2021 19:55:26 -0300 [thread overview]
Message-ID: <20210127225526.302-1-eu@euandre.org> (raw)
In-Reply-To: <46144@debbugs.gnu.org>
* 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 <mail@nicolasgoaziou.fr>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Holgr Peters <holger.peters@posteo.de>
+;;; Copyright © 2020 EuAndreh <eu@euandre.org>
;;;
;;; 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
next parent reply other threads:[~2021-01-27 22:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <46144@debbugs.gnu.org>
2021-01-27 22:55 ` guix-patches--- via [this message]
[not found] ` <handler.46145.B.161178817330884.ack@debbugs.gnu.org>
2021-01-27 23:04 ` [bug#46145] Acknowledgement ([PATCH v2] gnu: jekyll: Update to 4.2.0) guix-patches--- via
2021-01-27 23:36 ` guix-patches--- via
2021-01-27 23:38 ` guix-patches--- via
2021-02-05 20:50 ` [bug#46145] [PATCH v2] gnu: jekyll: Update to 4.2.0 Nicolas Goaziou
2021-02-05 22:36 ` EuAndreh via Guix-patches via
2021-02-06 8:13 ` Nicolas Goaziou
2021-02-08 17:26 ` [bug#46145] [PATCH 1/5] gnu: ruby-sassc: Update to 2.4.0 EuAndreh via Guix-patches via
2021-02-08 17:26 ` [bug#46145] [PATCH 2/5] gnu: ruby-jekyll-sass-converter: Update to 2.1.0 EuAndreh via Guix-patches via
2021-02-08 17:26 ` [bug#46145] [PATCH 3/5] gnu: ruby-mercenary: Update to 0.4.0 EuAndreh via Guix-patches via
2021-02-08 17:26 ` [bug#46145] [PATCH 4/5] gnu: Add ruby-terminal-table EuAndreh via Guix-patches via
2021-02-08 17:26 ` [bug#46145] [PATCH 5/5] gnu: jekyll: Update to 4.2.0 EuAndreh via Guix-patches via
2021-02-08 17:29 ` EuAndreh via Guix-patches via
2021-02-08 17:37 ` EuAndreh via Guix-patches via
2021-02-08 19:26 ` Nicolas Goaziou
2021-02-08 22:13 ` EuAndreh via Guix-patches via
2021-02-09 10:13 ` bug#46145: " Nicolas Goaziou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210127225526.302-1-eu@euandre.org \
--to=guix-patches@gnu.org \
--cc=46145@debbugs.gnu.org \
--cc=eu@euandre.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).