[bug#32964] [PATCH] Remove a couple of duplicate Ruby gem package definitions

[bug#32964] [PATCH] Remove a couple of duplicate Ruby gem package definitions

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 262 bytes --]


Christopher Baines (2):
  gnu: Remove duplicate ruby-concurrent package definition.
  gnu: Remove duplicate ruby-yard package definition.

 gnu/packages/ruby.scm | 44 ++-----------------------------------------
 1 file changed, 2 insertions(+), 42 deletions(-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]

[bug#32964] [PATCH 1/2] gnu: Remove duplicate ruby-concurrent package definition.

[Christopher Baines]

* gnu/packages/ruby.scm (ruby-concurrent): Remove one of the two definitions
for this variable.
---
 gnu/packages/ruby.scm | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 2080944cae..2c5777fdf8 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -194,25 +194,6 @@ a focus on simplicity and productivity.")
                (("/bin/sh") (which "sh")))
              #t)))))))
 
-(define-public ruby-concurrent
-  (package
-    (name "ruby-concurrent")
-    (version "1.0.5")
-    (source (origin
-              (method url-fetch)
-              (uri (rubygems-uri "concurrent-ruby" version))
-              (sha256
-               (base32
-                "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"))))
-    (build-system ruby-build-system)
-    (arguments `(#:tests? #f)); No rakefile
-    (home-page "https://github.com/ruby-concurrency/concurrent-ruby")
-    (synopsis "Concurrency tools for Ruby")
-    (description "This gem provides concurrency tools for Ruby.  It provides
-a library of common thread-safe types and data-structures as well as abstractions
-for concurrency and communication between threads.")
-    (license license:expat)))
-
 (define-public ruby-highline
   (package
     (name "ruby-highline")
-- 
2.19.0

[bug#32964] [PATCH 2/2] gnu: Remove duplicate ruby-yard package definition.

[Christopher Baines]

* gnu/packages/ruby.scm (ruby-yard): Remove one of the two package
definitions, and update the other to the latest release.
---
 gnu/packages/ruby.scm | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 2c5777fdf8..7e8c8be290 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -3766,7 +3766,7 @@ A modified copy of yajl is used, and included in the package.")
 (define-public ruby-yard
   (package
     (name "ruby-yard")
-    (version "0.9.6")
+    (version "0.9.16")
     (source
      (origin
        (method url-fetch)
@@ -3776,7 +3776,7 @@ A modified copy of yajl is used, and included in the package.")
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0rsz4bghgx7fryzyhlz8wlnd2m9xgyvf1xhrq58mnzfrrfm41bdg"))))
+         "0sqpbayy9sb406jh0zqg6qha1xds863qz9531dh6vp58hc00clfq"))))
     (build-system ruby-build-system)
     (arguments
      `(#:phases
@@ -5673,27 +5673,6 @@ support the tests found in Prawn, a pure Ruby PDF generation library.")
 functionality from Prawn.")
     (license license:gpl3+)))
 
-(define-public ruby-yard
-  (package
-    (name "ruby-yard")
-    (version "0.9.16")
-    (source (origin
-              (method url-fetch)
-              (uri (rubygems-uri "yard" version))
-              (sha256
-               (base32
-                "0lmmr1839qgbb3zxfa7jf5mzy17yjl1yirwlgzdhws4452gqhn67"))))
-    (build-system ruby-build-system)
-    (arguments `(#:test-target "spec"))
-    (home-page "https://yardoc.org/")
-    (synopsis "Ruby documentation tool")
-    (description "YARD is a documentation generation tool for the Ruby
-programming language.  It enables the user to generate consistent, usable
-documentation that can be exported to a number of formats very easily, and
-also supports extending for custom Ruby constructs such as custom class level
-definitions.")
-    (license license:expat)))
-
 (define-public ruby-prawn
   (package
     (name "ruby-prawn")
-- 
2.19.0

[bug#32964] [PATCH] Remove a couple of duplicate Ruby gem package definitions

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 244 bytes --]

On Sun, Oct 07, 2018 at 10:41:03AM +0100, Christopher Baines wrote:
> 
> Christopher Baines (2):
>   gnu: Remove duplicate ruby-concurrent package definition.
>   gnu: Remove duplicate ruby-yard package definition.

Thanks, please push!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#32964: [PATCH] Remove a couple of duplicate Ruby gem package definitions

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 310 bytes --]


Leo Famulari <leo@famulari.name> writes:

> On Sun, Oct 07, 2018 at 10:41:03AM +0100, Christopher Baines wrote:
>> 
>> Christopher Baines (2):
>>   gnu: Remove duplicate ruby-concurrent package definition.
>>   gnu: Remove duplicate ruby-yard package definition.
>
> Thanks, please push!

Done :)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]