[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/12: gnu: curl: Ungraft.
From: |
guix-commits |
Subject: |
07/12: gnu: curl: Ungraft. |
Date: |
Sun, 5 Nov 2023 23:11:31 -0500 (EST) |
podiki pushed a commit to branch mesa-updates
in repository guix.
commit 00442f15d46cd9d5d02499827946d23426aad0ba
Author: John Kehayias <john.kehayias@protonmail.com>
AuthorDate: Sun Nov 5 16:30:38 2023 -0500
gnu: curl: Ungraft.
* gnu/packages/curl.scm (curl): Update to 8.4.0 from graft, preserving...
[arguments]<#:phases>: ... check phase to skip failing test on Hurd.
[replacement]: Remove.
(curl/fixed): Remove variable.
Change-Id: I9243d6b3a9084d9c24884e755f2f42ffafca4205
---
gnu/packages/curl.scm | 55 ++++++++++++---------------------------------------
1 file changed, 13 insertions(+), 42 deletions(-)
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 9f06f35495..ea1c2c9924 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -15,6 +15,7 @@
;;; Copyright © 2021 Jean-Baptiste Volatier <jbv@pm.me>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -64,15 +65,14 @@
(define-public curl
(package
(name "curl")
- (version "7.85.0")
- (replacement curl/fixed)
+ (version "8.4.0")
(source (origin
(method url-fetch)
(uri (string-append "https://curl.se/download/curl-"
version ".tar.xz"))
(sha256
(base32
- "1rjbn0h5rddclhvxb8p5gddxszcrpbf5cw1whx6wnj4s9dnlmdc8"))
+ "0bd8y8v66biyqvg70ka1sdd0aixs6yzpnvfsig907xzh9af2mihn"))
(patches (search-patches "curl-use-ssl-cert-env.patch"))))
(build-system gnu-build-system)
(outputs '("out"
@@ -118,15 +118,19 @@
(rename-file (string-append #$output "/share/man/man3")
(string-append #$output:doc "/share/man/man3"))))
(replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
+ (lambda* (#:key tests? make-flags #:allow-other-keys)
(substitute* "tests/runtests.pl"
(("/bin/sh") (which "sh")))
-
(when tests?
- ;; The top-level "make check" does "make -C tests quiet-test",
which
- ;; is too quiet. Use the "test" target instead, which is more
- ;; verbose.
- (invoke "make" "-C" "tests" "test"))))
+ (let ((arguments `("-C" "tests" "test"
+ ,@(if #$(system-hurd?)
+ ;; protocol FAIL
+ (list make-flags "TFLAGS=~1474")
+ make-flags))))
+ ;; The top-level "make check" does "make -C tests
quiet-test", which
+ ;; is too quiet. Use the "test" target instead, which is
more
+ ;; verbose.
+ (apply invoke "make" arguments)))))
#$@(if (system-hurd?)
#~((add-after 'unpack 'skip-tests
(lambda _
@@ -155,39 +159,6 @@ tunneling, and so on.")
"See COPYING in the distribution."))
(home-page "https://curl.haxx.se/")))
-(define curl/fixed
- (let ((%version "8.4.0"))
- (package
- (inherit curl)
- (version "8.4.0a") ; add lowercase 'a' for grafting
- (source (origin
- (method url-fetch)
- (uri (string-append "https://curl.se/download/curl-"
- %version ".tar.xz"))
- (sha256
- (base32
- "0bd8y8v66biyqvg70ka1sdd0aixs6yzpnvfsig907xzh9af2mihn"))
- (patches (search-patches "curl-use-ssl-cert-env.patch"))))
- (arguments
- (if (system-hurd?)
- (substitute-keyword-arguments (package-arguments curl)
- ((#:phases phases '%standard-phases)
- #~(modify-phases #$phases
- ;; We cannot simply set #:make-flags because they are
- ;; ignored by curl's custom check phase.
- (replace 'check
- (lambda* (#:key tests? make-flags #:allow-other-keys)
- (substitute* "tests/runtests.pl"
- (("/bin/sh") (which "sh")))
- ;; See comment in curl about check/test.
- (let ((arguments `("-C" "tests" "test"
- ,@make-flags
- ;; protocol FAIL
- "TFLAGS=~1474")))
- (when tests?
- (apply invoke "make" arguments))))))))
- (package-arguments curl))))))
-
(define-public curl-ssh
(package/inherit curl
(arguments
- branch mesa-updates created (now 97f292b47f), guix-commits, 2023/11/05
- 06/12: gnu: nghttp2: Update to 1.58.0 and ungraft., guix-commits, 2023/11/05
- 07/12: gnu: curl: Ungraft.,
guix-commits <=
- 09/12: gnu: mesa: Update to 23.2.1., guix-commits, 2023/11/05
- 02/12: gnu: libxpm: Ungraft., guix-commits, 2023/11/05
- 10/12: gnu: libepoxy: Hardcode paths to GLES libraries., guix-commits, 2023/11/05
- 05/12: gnu: libxkbcommon: Update to 1.6.0., guix-commits, 2023/11/05
- 12/12: gnu: sdl2: Update to 2.28.5., guix-commits, 2023/11/05
- 11/12: gnu: sdl2: Add vulkan-loader to rpath., guix-commits, 2023/11/05
- 08/12: gnu: curl: Run tests in parallel., guix-commits, 2023/11/05
- 04/12: gnu: libdrm: Update to 2.4.117., guix-commits, 2023/11/05
- 03/12: gnu: pixman: Update to 0.42.2., guix-commits, 2023/11/05
- 01/12: gnu: libx11: Ungraft., guix-commits, 2023/11/05