diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-08-10 00:18:36 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-08-10 00:18:36 +0200 |
| commit | d156c999d0e7413696064992bb4a001d2d95317d (patch) | |
| tree | a525ac1e71ef638ad5b1819feb151665be7cda97 /gnu/packages/curl.scm | |
| parent | cc294bcee6bfaa4524ac43450e41f083539f9cb1 (diff) | |
| parent | 4c6c683862579b9f1fa6782b9482054eb1059225 (diff) | |
| download | guix-d156c999d0e7413696064992bb4a001d2d95317d.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/curl.scm')
| -rw-r--r-- | gnu/packages/curl.scm | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index af15aa38c4..492a049a05 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz> ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> +;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages compression) @@ -40,6 +42,7 @@ (define-public curl (package (name "curl") + (replacement curl-7.55.0) (version "7.54.1") (source (origin (method url-fetch) @@ -119,3 +122,28 @@ tunneling, and so on.") (license (license:non-copyleft "file://COPYING" "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) + +(define-public curl-7.55.0 + (package + (inherit curl) + (version "7.55.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://curl.haxx.se/download/curl-" + version ".tar.xz")) + (sha256 + (base32 + "1785vxi0jamiv9d1wr1l45g0fm9ircxdfyfzf7ld8zv0z0i8bmfd")))) + (arguments + `(,@(substitute-keyword-arguments (package-arguments curl) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'install 'fix-Makefile + ;; Fix a regression in 7.55.0 where docs are not installed. + ;; https://github.com/curl/curl/commit/a7bbbb7c368c6096802007f61f19a02e9d75285b + (lambda _ + (substitute* "Makefile" + (("install-data-hook:\n") + "install-data-hook:\n\tcd docs/libcurl && $(MAKE) install\n")) + #t))))))))) |