guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/44: gnu: r-curl: Update to 6.0.1.


From: guix-commits
Subject: 03/44: gnu: r-curl: Update to 6.0.1.
Date: Thu, 14 Nov 2024 05:14:57 -0500 (EST)

rekado pushed a commit to branch r-team
in repository guix.

commit abd073a4f49ac6b41743d1942d61a0177839835b
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Thu Nov 14 11:12:15 2024 +0100

    gnu: r-curl: Update to 6.0.1.
    
    * gnu/packages/cran.scm (r-curl): Update to 6.0.1.
    [arguments]: Remove because CURL_CA_BUNDLE is now respected on all 
platforms.
    
    Change-Id: Icfaf266c6140ef69f6636c7991b18437563a88b9
---
 gnu/packages/cran.scm | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 3d1fea746b..44861042fa 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -5482,34 +5482,17 @@ LaTeX.")
 (define-public r-curl
   (package
     (name "r-curl")
-    (version "5.2.3")
+    (version "6.0.1")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "curl" version))
               (sha256
                (base32
-                "1gq72y38glifhgqifasbpgspn1l84b6rcam6i58zldb0xpy91q5v"))))
+                "0qi3skrkdr43siiw28fmwdkjfqy3ynql5r94nlm9fpvlsyz90744"))))
     (properties
      `((upstream-name . "curl")
        (updater-extra-inputs . ("curl"))))
     (build-system r-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         ;; The environment variable CURL_CA_BUNDLE is only respected when
-         ;; running Windows, so we disable the platform checks.
-         ;; This can be removed once the libcurl has been patched.
-         (add-after 'unpack 'allow-CURL_CA_BUNDLE
-           (lambda _
-             (substitute* "R/onload.R"
-               (("if \\(!grepl\\(\"mingw\".*")
-                "if (FALSE)\n"))
-             (substitute* "src/handle.c"
-               (("/\\* Only set" m)
-                (string-append "\
-const char *_ca_bundle = getenv(\"CURL_CA_BUNDLE\");
-if(_ca_bundle != NULL) { curl_easy_setopt(handle, CURLOPT_CAINFO, _ca_bundle); 
}
-" m))))))))
     (inputs
      (list curl zlib))
     (native-inputs



reply via email to

[Prev in Thread] Current Thread [Next in Thread]