nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Remove redundant wrapping from packages using ruby-build-system. 

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.
This commit is contained in:
Christopher Baines 2017-10-10 08:42:02 +01:00
parent 2c2ec3d04a
commit 0076f5a98c
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
2 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/databases.scm
View File

@ -291,18 +291,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 (,(getenv "GEM_PATH")
,(string-append
(assoc-ref outputs "out")
"/lib/ruby/vendor_ruby"))))
#t)))))
'(#:tests? #f)) ;; No testsuite.
(propagated-inputs
`(("ruby-httpclient" ,ruby-httpclient)
("ruby-multi-json" ,ruby-multi-json)

20
gnu/packages/ruby.scm
View File

@ -2852,17 +2852,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_PATH" ":" prefix (,(string-append
(assoc-ref outputs "out")
"/lib/ruby/vendor_ruby"))))
#t)))))
(zero? (system* "gem" "build" "redcloth.gemspec")))))))
(native-inputs
`(("bundler" ,bundler)
("ruby-diff-lcs" ,ruby-diff-lcs)
@ -3710,13 +3700,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_PATH" ":" prefix (,(getenv "GEM_PATH"))))
#t)))))
#t))))))
(native-inputs
`(("ruby-rack" ,ruby-rack)))
(synopsis