[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/09: gnu: r-haven: Unvendor readstat.
From: |
guix-commits |
Subject: |
02/09: gnu: r-haven: Unvendor readstat. |
Date: |
Tue, 2 Mar 2021 17:13:14 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 2075b83b2dbd9896e2e69070e3363f3d43fbe133
Author: Lars-Dominik Braun <lars@6xq.net>
AuthorDate: Tue Feb 23 14:07:14 2021 +0100
gnu: r-haven: Unvendor readstat.
* gnu/packages/cran.scm (r-haven) [snippet]: Remove bundled readstat.
[arguments]: Patch Makevars to use system readstat.
[inputs]: Replace zlib with readstat.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
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 baf8e08..1d574b9 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
- branch master updated (3905580 -> 24b2b5f), guix-commits, 2021/03/02
- 01/09: gnu: Add readstat., guix-commits, 2021/03/02
- 04/09: gnu: Add python-jinja2-cli., guix-commits, 2021/03/02
- 02/09: gnu: r-haven: Unvendor readstat.,
guix-commits <=
- 07/09: gnu: Add usync., guix-commits, 2021/03/02
- 09/09: openpgp: Remove now unnecessary procedure., guix-commits, 2021/03/02
- 08/09: gnu: usync: Patch shebang., guix-commits, 2021/03/02
- 05/09: gnu: stgit: Update to 1.0., guix-commits, 2021/03/02
- 03/09: gnu: Add pcg-cpp., guix-commits, 2021/03/02
- 06/09: gnu: ocaml-llvm: Move to (gnu packages llvm)., guix-commits, 2021/03/02