From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43296) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e1pGn-0006pg-7s for guix-patches@gnu.org; Tue, 10 Oct 2017 03:48:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e1pGk-0002F8-4L for guix-patches@gnu.org; Tue, 10 Oct 2017 03:48:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:50380) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e1pGk-0002F1-1G for guix-patches@gnu.org; Tue, 10 Oct 2017 03:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e1pGj-0005xd-Q0 for guix-patches@gnu.org; Tue, 10 Oct 2017 03:48:01 -0400 Subject: [bug#28773] [PATCH 3/3] gnu: Remove redundant wrapping from packages using ruby-build-system. Resent-Message-ID: From: Christopher Baines Date: Tue, 10 Oct 2017 08:47:05 +0100 Message-Id: <20171010074705.5676-3-mail@cbaines.net> In-Reply-To: <20171010074705.5676-1-mail@cbaines.net> References: <20171010074705.5676-1-mail@cbaines.net> 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: 28773@debbugs.gnu.org Now that the build system does wrapping automatically, it can be removed from the packages that do it manually. * gnu/packages/databases.scm (es-dump-restore)[arguments]: Remove #:phases. * gnu/packages/ruby.scm (ruby-redcloth)[arguments]: Remove #:phases. (ruby-httpclient)[arguments]: Remove 'wrap-bin-httpclient from the modified phases. --- gnu/packages/databases.scm | 13 +------------ gnu/packages/ruby.scm | 18 ++---------------- 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 62f940e90..69bb9fd7d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -273,18 +273,7 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.") "020yk7f1hw48clmf5501z3xv9shsdchyymcv0y2cci2c1xvr1mim")))) (build-system ruby-build-system) (arguments - '(#:tests? #f ;; No testsuite. - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-bin-es_dump_restore - (lambda* (#:key outputs #:allow-other-keys) - (wrap-program (string-append (assoc-ref outputs "out") - "/bin/es_dump_restore") - `("GEM_PATH" ":" prefix (,(string-append - (getenv "GEM_PATH") - ":" - (getenv "GEM_HOME"))))) - #t))))) + '(#:tests? #f)) ;; No testsuite. (propagated-inputs `(("ruby-httpclient" ,ruby-httpclient) ("ruby-multi-json" ,ruby-multi-json) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index f2333dbcb..83e106d3c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2896,15 +2896,7 @@ alternative to Marshal for Object serialization. ") ;; existing gemspec. (replace 'build (lambda _ - (zero? (system* "gem" "build" "redcloth.gemspec")))) - ;; Make sure that the "redcloth" executable finds required Ruby - ;; libraries. - (add-after 'install 'wrap-bin-redcloth - (lambda* (#:key outputs #:allow-other-keys) - (wrap-program (string-append (assoc-ref outputs "out") - "/bin/redcloth") - `("GEM_HOME" ":" prefix (,(getenv "GEM_HOME")))) - #t))))) + (zero? (system* "gem" "build" "redcloth.gemspec"))))))) (native-inputs `(("bundler" ,bundler) ("ruby-diff-lcs" ,ruby-diff-lcs) @@ -3752,13 +3744,7 @@ It has built-in support for the legacy @code{cookies.txt} and (system* "ruby" "-Ilib" "test/runner.rb")) - #t))) - (add-after 'install 'wrap-bin-httpclient - (lambda* (#:key outputs #:allow-other-keys) - (wrap-program (string-append (assoc-ref outputs "out") - "/bin/httpclient") - `("GEM_HOME" ":" prefix (,(getenv "GEM_HOME")))) - #t))))) + #t)))))) (native-inputs `(("ruby-rack" ,ruby-rack))) (synopsis -- 2.14.2