From: Christopher Baines <mail@cbaines.net>
To: 28773@debbugs.gnu.org
Subject: [bug#28773] [PATCH 3/3] gnu: Remove redundant wrapping from packages using ruby-build-system.
Date: Tue, 10 Oct 2017 08:47:05 +0100 [thread overview]
Message-ID: <20171010074705.5676-3-mail@cbaines.net> (raw)
In-Reply-To: <20171010074705.5676-1-mail@cbaines.net>
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
next prev parent reply other threads:[~2017-10-10 7:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-10 7:44 [bug#28773] [PATCH] Wrap bin files in the ruby build system Christopher Baines
2017-10-10 7:47 ` [bug#28773] [PATCH 1/3] ruby-build-system: Add wrap-ruby-program Christopher Baines
2017-10-10 7:47 ` [bug#28773] [PATCH 2/3] ruby-build-system: Add a new wrap phase Christopher Baines
2017-10-10 7:47 ` Christopher Baines [this message]
2017-10-16 13:19 ` [bug#28773] [PATCH] Wrap bin files in the ruby build system Ludovic Courtès
2017-10-18 10:39 ` Ben Woodcroft
2018-01-11 21:47 ` Ludovic Courtès
2018-01-12 6:51 ` Ben Woodcroft
2018-01-14 22:22 ` Christopher Baines
2018-01-14 22:22 ` Christopher Baines
2018-01-14 22:25 ` bug#28773: [PATCH] Specify native search path for all ruby packages Christopher Baines
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171010074705.5676-3-mail@cbaines.net \
--to=mail@cbaines.net \
--cc=28773@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.