Package: guix-patches;
Reported by: EuAndreh <eu <at> euandre.org>
Date: Wed, 27 Jan 2021 21:35:02 UTC
Severity: normal
Tags: patch
Done: EuAndreh <eu <at> euandre.org>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: EuAndreh <eu <at> euandre.org> To: 46144 <at> debbugs.gnu.org Cc: EuAndreh <eu <at> euandre.org> Subject: [bug#46144] [PATCH] gnu: jekyll: Update to 4.2.0 Date: Wed, 27 Jan 2021 18:33:39 -0300
* 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 updated all Ruby dependencies that the new version Jekyll demanded.
I think I got the commit message 100% right this time XD, let me know
if something is out of order.
gnu/packages/ruby.scm | 76 +++++++++++++++++++++++++++++++------------
1 file changed, 55 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index b811cbd2c4..2c6b69cd86 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -10322,14 +10322,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 +10408,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 +10869,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 +10955,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 +11033,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 +11109,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
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.