From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g95lG-0004Ab-DR for guix-patches@gnu.org; Sun, 07 Oct 2018 05:54:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g95lD-0001R1-LD for guix-patches@gnu.org; Sun, 07 Oct 2018 05:54:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:34808) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g95lD-0001Qx-HD for guix-patches@gnu.org; Sun, 07 Oct 2018 05:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g95lD-0001TH-Ev for guix-patches@gnu.org; Sun, 07 Oct 2018 05:54:03 -0400 Subject: [bug#32964] [PATCH 2/2] gnu: Remove duplicate ruby-yard package definition. Resent-Message-ID: From: Christopher Baines Date: Sun, 7 Oct 2018 10:53:40 +0100 Message-Id: <20181007095340.29079-2-mail@cbaines.net> In-Reply-To: <20181007095340.29079-1-mail@cbaines.net> References: <20181007095340.29079-1-mail@cbaines.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 32964@debbugs.gnu.org * 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