From: Lars-Dominik Braun <lars@6xq.net>
To: 46717@debbugs.gnu.org
Subject: [bug#46717] [PATCH 2/2] gnu: r-haven: Unvendor readstat.
Date: Tue, 23 Feb 2021 14:07:14 +0100 [thread overview]
Message-ID: <YDT+Al0e3i0+lk7R@noor.fritz.box> (raw)
In-Reply-To: <YDT9bv1yvXluUI6Z@noor.fritz.box>
* gnu/packages/cran.scm (r-haven) [snippet]: Remove bundled readstat.
[arguments]: Patch Makevars to use system readstat.
[inputs]: Replace zlib with readstat.
---
gnu/packages/cran.scm | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 4a88cf1677..d675b7e37a 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -2309,10 +2309,25 @@ including functions for geolocation and routing.")
(uri (cran-uri "haven" version))
(sha256
(base32
- "03cypgqhdkrfbfpl1yx2wb7flczrbak1w654wkicmd5ajwr9zvkf"))))
+ "03cypgqhdkrfbfpl1yx2wb7flczrbak1w654wkicmd5ajwr9zvkf"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; unvendor readstat
+ (delete-file-recursively "src/readstat")
+ #t))))
(build-system r-build-system)
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'unbundle-readstat
+ (lambda _
+ ;; Not required, since we’re not building readstat.
+ (substitute* "src/Makevars"
+ (("-lz") "-lreadstat"))
+ #t)))))
(inputs
- `(("zlib" ,zlib)))
+ `(("readstat" ,readstat)))
(native-inputs
`(("r-knitr" ,r-knitr)))
(propagated-inputs
--
2.26.2
next prev parent reply other threads:[~2021-02-23 13:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-23 13:04 [bug#46717] [PATCH 0/2] r-haven: Unvendor readstat Lars-Dominik Braun
2021-02-23 13:06 ` [bug#46717] [PATCH 1/2] gnu: Add readstat Lars-Dominik Braun
2021-02-23 13:07 ` Lars-Dominik Braun [this message]
2021-03-02 19:32 ` bug#46717: [PATCH 0/2] r-haven: Unvendor readstat Ludovic Courtès
2021-03-05 11:57 ` [bug#46717] " Ludovic Courtès
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=YDT+Al0e3i0+lk7R@noor.fritz.box \
--to=lars@6xq.net \
--cc=46717@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.