nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: curl: Use 'modify-phases'. 

* gnu/packages/curl.scm (curl)[arguments]: Use 'modify-phases'.
This commit is contained in:
Ludovic Courtès 2015-09-09 22:43:36 +02:00
parent eb55e28c84
commit 5625adfccc
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
gnu/packages/curl.scm
View File

@ -63,40 +63,40 @@
`(#:configure-flags '("--with-gnutls" "--with-gssapi") `(#:configure-flags '("--with-gnutls" "--with-gssapi")
;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl ;; Add a phase to patch '/bin/sh' occurances in tests/runtests.pl
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'check (replace
(lambda _ 'check
(substitute* "tests/runtests.pl" (lambda _
(("/bin/sh") (which "sh"))) (substitute* "tests/runtests.pl"
;; Test #1135 requires extern-scan.pl, which is not part of the (("/bin/sh") (which "sh")))
;; tarball due to a mistake. It has been fixed upstream. We can ;; Test #1135 requires extern-scan.pl, which is not part of the
;; simply disable the test as it is specific to VMS and OS/400. ;; tarball due to a mistake. It has been fixed upstream. We can
(delete-file "tests/data/test1135") ;; simply disable the test as it is specific to VMS and OS/400.
(delete-file "tests/data/test1135")
;; XXX FIXME: Test #1510 seems to work on some machines and not ;; XXX FIXME: Test #1510 seems to work on some machines and not
;; others, possibly based on the kernel version. It works on GuixSD ;; others, possibly based on the kernel version. It works on GuixSD
;; on x86_64 with linux-libre-4.1, but fails on Hydra for both i686 ;; on x86_64 with linux-libre-4.1, but fails on Hydra for both i686
;; and x86_64 with the following error: ;; and x86_64 with the following error:
;; ;;
;; test 1510...[HTTP GET connection cache limit (CURLOPT_MAXCONNECTS)] ;; test 1510...[HTTP GET connection cache limit (CURLOPT_MAXCONNECTS)]
;; ;;
;; 1510: output (log/stderr1510) FAILED: ;; 1510: output (log/stderr1510) FAILED:
;; --- log/check-expected 2015-06-27 07:45:53.166720834 +0000 ;; --- log/check-expected 2015-06-27 07:45:53.166720834 +0000
;; +++ log/check-generated 2015-06-27 07:45:53.166720834 +0000 ;; +++ log/check-generated 2015-06-27 07:45:53.166720834 +0000
;; @@ -1,5 +1,5 @@ ;; @@ -1,5 +1,5 @@
;; * Connection #0 to host server1.example.com left intact[LF] ;; * Connection #0 to host server1.example.com left intact[LF]
;; * Connection #1 to host server2.example.com left intact[LF] ;; * Connection #1 to host server2.example.com left intact[LF]
;; * Connection #2 to host server3.example.com left intact[LF] ;; * Connection #2 to host server3.example.com left intact[LF]
;; -* Closing connection 0[LF] ;; -* Closing connection 0[LF]
;; +* Closing connection 1[LF] ;; +* Closing connection 1[LF]
;; * Connection #3 to host server4.example.com left intact[LF] ;; * Connection #3 to host server4.example.com left intact[LF]
(delete-file "tests/data/test1510") (delete-file "tests/data/test1510")
;; The top-level "make check" does "make -C tests quiet-test", which ;; The top-level "make check" does "make -C tests quiet-test", which
;; is too quiet. Use the "test" target instead, which is more ;; is too quiet. Use the "test" target instead, which is more
;; verbose. ;; verbose.
(zero? (system* "make" "-C" "tests" "test"))) (zero? (system* "make" "-C" "tests" "test")))))))
%standard-phases)))
(synopsis "Command line tool for transferring data with URL syntax") (synopsis "Command line tool for transferring data with URL syntax")
(description (description
"curl is a command line tool for transferring data with URL syntax, "curl is a command line tool for transferring data with URL syntax,