05/158: gnu: r-haven: Update to 2.5.2.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit fce72b352295ddeb8b0144cb812fe0701b97031f
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Fri Mar 17 14:08:04 2023 +0100

    gnu: r-haven: Update to 2.5.2.
    
    * gnu/packages/cran.scm (r-haven): Update to 2.5.2.
    [arguments]: Update to link with readstat.
    [inputs]: Add zlib.
---
 gnu/packages/cran.scm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index bda7725e21..2c7f6d7f17 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -4706,14 +4706,14 @@ including functions for geolocation and routing.")
 (define-public r-haven
   (package
     (name "r-haven")
-    (version "2.5.1")
+    (version "2.5.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "haven" version))
        (sha256
         (base32
-         "0w0aqm0z4h0rm1f7fylm1mbv79p43y2r795w64wczcd0jwh4ch4z"))
+         "07an4d8638m27765l6l4p6vfjxm8nfwbxx2bwpxfy6xffw1znc91"))
        (modules '((guix build utils)))
        (snippet
         ;; unvendor readstat
@@ -4726,12 +4726,13 @@ including functions for geolocation and routing.")
            (lambda _
              ;; We’re not building readstat.
              (substitute* "configure"
-               (("exit 1") "")) ;don't be so dramatic!
-             (substitute* '("src/Makevars.in"
-                            "configure")
-               (("^PKG_LIBS=.*") "PKG_LIBS=\"-lreadstat\"\n")))))))
+               (("^PKG_CONFIG_NAME=\"zlib\"")
+                "PKG_CONFIG_NAME=\"readstat zlib\"")
+               (("^PKG_LIBS=\"-lz\"")
+                "PKG_LIBS=\"-lz -lreadstat\"\n")
+               (("exit 1") "")))))))  ;don't be so dramatic!
     (inputs
-     (list readstat))
+     (list readstat zlib))
     (native-inputs
      (list r-knitr))
     (propagated-inputs