From: gemmaro <gemmaro.dev@gmail.com>
To: 72009@debbugs.gnu.org
Cc: gemmaro <gemmaro.dev@gmail.com>, Christopher Baines <guix@cbaines.net>
Subject: [bug#72009] [PATCH 2/2] gnu: ruby-libxml: Use newer package style.
Date: Tue, 9 Jul 2024 23:18:21 +0900 [thread overview]
Message-ID: <fa6ac49bc1f8e12bc00846e1eed863d64de47b09.1720534195.git.gemmaro.dev@gmail.com> (raw)
In-Reply-To: <cover.1720534195.git.gemmaro.dev@gmail.com>
* gnu/packages/ruby.scm (ruby-libxml)[arguments]:
Convert to list of G-Expressions.
Use #$output rather than the outputs alist.
Change-Id: If46c6d1a28358be03f854082570c913ee7f80cc7
---
gnu/packages/ruby.scm | 65 ++++++++++++++++++++++---------------------
1 file changed, 33 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 74877ac4a9..fa2d474e4c 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -3224,38 +3224,39 @@ (define-public ruby-libxml
(inputs
(list zlib libxml2))
(arguments
- '(#:gem-flags
- (list "--no-document" ; TODO: Re-enable when documentation
- ; generation works
- "--"
- (string-append "--with-xml2-include="
- (assoc-ref %build-inputs "libxml2")
- "/include/libxml2"))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'skip-failing-tests
- (lambda _
- (for-each
- (lambda (method)
- (substitute* "test/test_canonicalize.rb"
- (((string-append "def " method) def)
- (string-append def "; skip \"CR/LF mismatch\";"))))
- '("test_canonicalize_with_w3c_c14n_3_1"
- "test_canonicalize_with_w3c_c14n_3_2"
- "test_canonicalize_with_w3c_c14n_3_3"
- "test_canonicalize_with_w3c_c14n_3_4"))
- (substitute* "test/test_schema.rb"
- (("def test_schema_load_from_uri" def)
- (string-append def "; skip \"missing XLink schema\";")))))
- (delete 'check)
- (add-after 'install 'set-gem-path
- (lambda* (#:key outputs #:allow-other-keys)
- (setenv "GEM_PATH"
- (string-append
- (getenv "GEM_PATH") ":"
- (assoc-ref outputs "out") "/lib/ruby/vendor_ruby"))))
- (add-after 'set-gem-path 'check
- (assoc-ref %standard-phases 'check)))))
+ (list
+ #:gem-flags #~(list
+ ;; TODO: Re-enable when documentation generation works
+ "--no-document" "--"
+ (string-append "--with-xml2-include="
+ (assoc-ref %build-inputs "libxml2")
+ "/include/libxml2"))
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'skip-failing-tests
+ (lambda _
+ (for-each (lambda (method)
+ (substitute* "test/test_canonicalize.rb"
+ (((string-append "def " method)
+ def)
+ (string-append def
+ "; skip \"CR/LF mismatch\";"))))
+ '("test_canonicalize_with_w3c_c14n_3_1"
+ "test_canonicalize_with_w3c_c14n_3_2"
+ "test_canonicalize_with_w3c_c14n_3_3"
+ "test_canonicalize_with_w3c_c14n_3_4"))
+ (substitute* "test/test_schema.rb"
+ (("def test_schema_load_from_uri" def)
+ (string-append def
+ "; skip \"missing XLink schema\";")))))
+ (delete 'check)
+ (add-after 'install 'set-gem-path
+ (lambda _
+ (setenv "GEM_PATH"
+ (string-append (getenv "GEM_PATH") ":"
+ #$output "/lib/ruby/vendor_ruby"))))
+ (add-after 'set-gem-path 'check
+ (assoc-ref %standard-phases
+ 'check)))))
(synopsis "Ruby bindings for GNOME Libxml2")
(description "The Libxml-Ruby project provides Ruby language bindings for
the GNOME Libxml2 XML toolkit.")
--
2.45.2
prev parent reply other threads:[~2024-07-09 14:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-09 14:11 [bug#72009] [PATCH 0/2] gnu: ruby-libxml: Update to 5.0.3 gemmaro
2024-07-09 14:18 ` [bug#72009] [PATCH 1/2] " gemmaro
2024-07-09 14:18 ` gemmaro [this message]
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=fa6ac49bc1f8e12bc00846e1eed863d64de47b09.1720534195.git.gemmaro.dev@gmail.com \
--to=gemmaro.dev@gmail.com \
--cc=72009@debbugs.gnu.org \
--cc=guix@cbaines.net \
/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.