diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2024-01-08 12:04:58 -0500 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2024-01-08 12:04:58 -0500 |
| commit | 7a7c8920aeddaf9ab8d68c572780bc34b404711b (patch) | |
| tree | 35c2507bd9fd61f26edb8ee8a73ca40695af770a /gnu/packages/curl.scm | |
| parent | 9018c6af4907c4532a95017df9f45d9439c30064 (diff) | |
| parent | d9dee5ea2f564fa6979ae552fd9bd5ac22f86ecc (diff) | |
Merge branch 'mesa-updates'
Change-Id: I671d2733eac4c021eed191fc6bb61ea5492c3740
Diffstat (limited to 'gnu/packages/curl.scm')
| -rw-r--r-- | gnu/packages/curl.scm | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index b33f4d36d4..f73aed679d 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -65,14 +65,14 @@ (define-public curl (package (name "curl") - (version "8.4.0") + (version "8.5.0") (source (origin (method url-fetch) (uri (string-append "https://curl.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "0bd8y8v66biyqvg70ka1sdd0aixs6yzpnvfsig907xzh9af2mihn")) + "1sqfflilf7mcz1g03lazyr6v6pf1rsrzprrknsir10hdwawqvas2")) (patches (search-patches "curl-use-ssl-cert-env.patch")))) (build-system gnu-build-system) (outputs '("out" @@ -127,15 +127,20 @@ (if parallel-tests? (number->string (parallel-job-count)) "1"))) + ;; Ignore test 1477 due to a missing file in the 8.5.0 + ;; release. See + ;; <https://github.com/curl/curl/issues/12462>. (arguments `("-C" "tests" "test" ,@make-flags ,(if #$(or (system-hurd?) (target-arm32?) (target-aarch64?)) ;; protocol FAIL - (string-append "TFLAGS=\"~1474 " - job-count "\"") - (string-append "TFLAGS=" job-count))))) + (string-append "TFLAGS=~1474 " + "!1477 " + job-count) + (string-append "TFLAGS=\"~1477 " + job-count "\""))))) ;; The top-level "make check" does "make -C tests quiet-test", which ;; is too quiet. Use the "test" target instead, which is more ;; verbose. |