amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: cURL: Use G-expression.

Browse source 
...and reindent.

* gnu/packages/curl.scm (curl)[arguments]: Convert to G-expression.
(curl-ssh)[arguments]: Likewise.
This commit is contained in:
Marius Bakke 2022-08-29 13:00:56 +02:00
parent 9fe0131904
commit 0877f66987
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 74 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

26
gnu/packages/curl.scm
View file

@ -93,16 +93,17 @@
(separator #f) ;single entry (separator #f) ;single entry
(files '("etc/ssl/certs/ca-certificates.crt"))))) (files '("etc/ssl/certs/ca-certificates.crt")))))
(arguments (arguments
`(#:disallowed-references ("doc") (list
#:configure-flags (list "--with-gnutls" #:disallowed-references '("doc")
#:configure-flags
#~(list "--with-gnutls"
(string-append "--with-gssapi=" (string-append "--with-gssapi="
(dirname (dirname (dirname (dirname
(search-input-file (search-input-file
%build-inputs %build-inputs "lib/libgssrpc.so"))))
"lib/libgssrpc.so"))))
"--disable-static") "--disable-static")
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'tweak-lib3026-test (add-after 'unpack 'tweak-lib3026-test
(lambda _ (lambda _
;; Have that test create a hundred threads, not a thousand. ;; Have that test create a hundred threads, not a thousand.
@ -115,15 +116,12 @@
(substitute* "curl-config.in" (substitute* "curl-config.in"
(("@CONFIGURE_OPTIONS@") (("@CONFIGURE_OPTIONS@")
"\"not available\"")))) "\"not available\""))))
(add-after (add-after 'install 'move-man3-pages
'install 'move-man3-pages (lambda _
(lambda* (#:key outputs #:allow-other-keys)
;; Move section 3 man pages to "doc". ;; Move section 3 man pages to "doc".
(let ((out (assoc-ref outputs "out")) (mkdir-p (string-append #$output:doc "/share/man"))
(doc (assoc-ref outputs "doc"))) (rename-file (string-append #$output "/share/man/man3")
(mkdir-p (string-append doc "/share/man")) (string-append #$output:doc "/share/man/man3"))))
(rename-file (string-append out "/share/man/man3")
(string-append doc "/share/man/man3")))))
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(substitute* "tests/runtests.pl" (substitute* "tests/runtests.pl"
@ -155,7 +153,7 @@ tunneling, and so on.")
(arguments (arguments
(substitute-keyword-arguments (package-arguments curl) (substitute-keyword-arguments (package-arguments curl)
((#:configure-flags flags) ((#:configure-flags flags)
`(cons "--with-libssh2" ,flags)))) #~(cons "--with-libssh2" #$flags))))
(inputs (inputs
(modify-inputs (package-inputs curl) (modify-inputs (package-inputs curl)
(prepend libssh2))) (prepend libssh2)))