diff options
| author | Leo Famulari <leo@famulari.name> | 2017-01-25 12:49:45 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-01-25 13:23:25 -0500 |
| commit | 678dd8a5ed34ccc81e2b980e2002cd2afa4a6f71 (patch) | |
| tree | 87ee5a1e8167298f51d30b4f6c47c994f57edc72 /gnu | |
| parent | 2663c38826cd6c2ef0c5119f8072fac8e89b2e9b (diff) | |
| download | guix-678dd8a5ed34ccc81e2b980e2002cd2afa4a6f71.tar guix-678dd8a5ed34ccc81e2b980e2002cd2afa4a6f71.tar.gz | |
gnu: curl: Incorporate grafted changes.
* gnu/packages/curl.scm (curl)[replacement]: Remove field.
(curl-7.52.1): Remove variable.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/curl.scm | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 7329d870de..ec982ef65b 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz> ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> -;;; Copyright © 2016 Leo Famulari <leo@famulari.name> +;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,15 +40,14 @@ (define-public curl (package (name "curl") - (replacement curl-7.52.1) - (version "7.50.3") + (version "7.52.1") (source (origin (method url-fetch) (uri (string-append "https://curl.haxx.se/download/curl-" version ".tar.lzma")) (sha256 (base32 - "1spmk0345hq0sgpwxs8d410268lmg3wf1x9v23hxff7wxki5fm4c")))) + "0r937wplchjxifxqqcjxd9rzp6l9rqqdfjn41x1y4djrh95nsa24")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages @@ -120,16 +119,3 @@ tunneling, and so on.") (license (license:non-copyleft "file://COPYING" "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) - -(define curl-7.52.1 - (package - (inherit curl) - (source - (let ((version "7.52.1")) - (origin - (method url-fetch) - (uri (string-append "https://curl.haxx.se/download/curl-" - version ".tar.lzma")) - (sha256 - (base32 - "0r937wplchjxifxqqcjxd9rzp6l9rqqdfjn41x1y4djrh95nsa24"))))))) |