[bug#46145] [PATCH v2] gnu: jekyll: Update to 4.2.0

[bug#46145] [PATCH v2] gnu: jekyll: Update to 4.2.0

[guix-patches--- via]

* 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

[bug#46145] Acknowledgement ([PATCH v2] gnu: jekyll: Update to 4.2.0)

[guix-patches--- via]

Something went wrong here. This should belong to bug
https://issues.guix.gnu.org/46144

I ran:

  git send-email --in-reply-to=46144@debbugs.gnu.org HEAD~1

But for some reason a new bug was created.

In fact, even the SMTP headers in the logs show this:

--8<---------------cut here---------------start------------->8---
$ git send-email --in-reply-to=46144@debbugs.gnu.org HEAD~1
/tmp/Vuqee2za8J/0001-gnu-jekyll-Update-to-4.2.0.patch
(mbox) Adding cc: EuAndreh <eu@euandre.org> from line 'From: EuAndreh <eu@euandre.org>'
OK. Log says:
Server: box.euandre.org
MAIL FROM:<eu@euandre.org>
RCPT TO:<guix-patches@gnu.org>
RCPT TO:<eu@euandre.org>
From: EuAndreh <eu@euandre.org>
To: guix-patches@gnu.org
Cc: EuAndreh <eu@euandre.org>
Subject: [PATCH v2] gnu: jekyll: Update to 4.2.0
Date: Wed, 27 Jan 2021 19:55:26 -0300
Message-Id: <20210127225526.302-1-eu@euandre.org>
X-Mailer: git-send-email 2.30.0
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

Result: 250
--8<---------------cut here---------------end--------------->8---

Regardless, this patch supersedes the previous one, so that one may be
simply closed.

[bug#46145] Acknowledgement ([PATCH v2] gnu: jekyll: Update to 4.2.0)

[guix-patches--- via]

Hmm, now I get it. I should have used "--to" instead of "--in-reply-to".

My bad XD

[bug#46145] Acknowledgement ([PATCH v2] gnu: jekyll: Update to 4.2.0)

[guix-patches--- via]

I closed 46144 in favor of this one.  If I have any update to this
patch, I'll make sure to use the correct "--to" flag.

[bug#46145] [PATCH v2] gnu: jekyll: Update to 4.2.0

[Nicolas Goaziou]

Hello,

guix-patches--- via <guix-patches@gnu.org> writes:

> * 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.

Thank you.

Could you split it into independent patches that I can apply sequentially?

> +(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")

Nitpick: This string could be moved on the same line as `synopsis'.

> +    (description
> +     "Terminal Table is a fast and simple, yet feature rich
> +table generator written in Ruby. It supports ASCII and
> +Unicode formatted tables.")

You need to add two spaces after a full stop.

> +    (home-page
> +     "https://github.com/tj/terminal-table")

Nitpick: This could be moved above synopsis.

Otherwise, LGTM!

Regards,
-- 
Nicolas Goaziou

[bug#46145] [PATCH v2] gnu: jekyll: Update to 4.2.0

[EuAndreh via Guix-patches via]

Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:

> Could you split it into independent patches that I can apply sequentially?

Sure.  I chose to do it this way because all the changes were related to
the update of Jekyll, but it does make sense to split on separate steps.

However, I think the removal of 'ruby-rouge-2' should be in together
with the update of Jekyll, as the existance of 'ruby-rouge-2' itself is
exclusively due to being an input to Jekyll.  WDYT?

[bug#46145] [PATCH v2] gnu: jekyll: Update to 4.2.0

[Nicolas Goaziou]

Hello,

EuAndreh <eu@euandre.org> writes:

> However, I think the removal of 'ruby-rouge-2' should be in together
> with the update of Jekyll, as the existance of 'ruby-rouge-2' itself is
> exclusively due to being an input to Jekyll.  WDYT?

Sounds good.

Regards,
-- 
Nicolas Goaziou

[bug#46145] [PATCH 1/5] gnu: ruby-sassc: Update to 2.4.0.

[EuAndreh via Guix-patches via]

* gnu/packages/ruby.scm (ruby-sassc): Update to 2.4.0.
---
 gnu/packages/ruby.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 22faef5588..937a898abf 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2020 Holgr Peters <holger.peters@posteo.de>
 ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2021 EuAndreh <eu@euandre.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -10434,14 +10435,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)
-- 
2.30.0

[bug#46145] [PATCH 2/5] gnu: ruby-jekyll-sass-converter: Update to 2.1.0.

[EuAndreh via Guix-patches via]

* gnu/packages/ruby.scm (ruby-jekyll-sass-converter): Update to 2.1.0.
---
 gnu/packages/ruby.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 937a898abf..fb07e5f820 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -10521,13 +10521,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)))
-- 
2.30.0

[bug#46145] [PATCH 3/5] gnu: ruby-mercenary: Update to 0.4.0.

[EuAndreh via Guix-patches via]

* gnu/packages/ruby.scm (ruby-mercenary): Update to 0.4.0.
---
 gnu/packages/ruby.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index fb07e5f820..ab56e944b4 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -11079,13 +11079,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
-- 
2.30.0

[bug#46145] [PATCH 4/5] gnu: Add ruby-terminal-table.

[EuAndreh via Guix-patches via]

* gnu/packages/ruby.scm (ruby-terminal-table): New variable.
---
 gnu/packages/ruby.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index ab56e944b4..c1a1c3fc1f 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -11157,6 +11157,47 @@ 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)))
+    (home-page "https://github.com/tj/terminal-table")
+    (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.")
+    (license license:expat)))
+
 (define-public jekyll
   (package
     (name "jekyll")
-- 
2.30.0

[bug#46145] [PATCH 5/5] gnu: jekyll: Update to 4.2.0.

[EuAndreh via Guix-patches via]

* 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.
---
 gnu/packages/ruby.scm | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index c1a1c3fc1f..9d855aeca0 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -10982,17 +10982,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")
@@ -11201,13 +11190,13 @@ Unicode formatted tables.")
 (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.
@@ -11231,8 +11220,10 @@ Unicode formatted tables.")
        ("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

[bug#46145] [PATCH 5/5] gnu: jekyll: Update to 4.2.0.

[EuAndreh via Guix-patches via]

This should be it.

Did I miss anything, Nicolas? (or whoever else might be reviewing this)

[bug#46145] [PATCH 5/5] gnu: jekyll: Update to 4.2.0.

[EuAndreh via Guix-patches via]

BTW, I checked that the build is still working after the changes:

  $ ./pre-inst-env guix environment --ad-hoc jekyll -- jekyll --version
  # build logs...
  jekyll 4.2.0

[bug#46145] [PATCH 5/5] gnu: jekyll: Update to 4.2.0.

[Nicolas Goaziou]

Hello,

EuAndreh <eu@euandre.org> writes:

> This should be it.
>
> Did I miss anything, Nicolas? (or whoever else might be reviewing
> this)

You forgot the fifth patch (the jekyll update), didn't you?

Regards,
-- 
Nicolas Goaziou

[bug#46145] [PATCH 5/5] gnu: jekyll: Update to 4.2.0.

[EuAndreh via Guix-patches via]

I don't think I did. Isn't it here [0]?

[0] https://lists.gnu.org/archive/html/guix-patches/2021-02/msg00330.html

bug#46145: [PATCH 5/5] gnu: jekyll: Update to 4.2.0.

[Nicolas Goaziou]

Hello,

EuAndreh <eu@euandre.org> writes:

> I don't think I did. Isn't it here [0]?

You're right. For some reason, I received the patch after sending my
mail.

Anyhow, patch applied (and I forgot to sign them off :().

Thanks!

Regards,
-- 
Nicolas Goaziou