From 1e28118d8d599277d77ee6858a1e37e9791ba445 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Tue, 10 Oct 2017 22:34:35 +0200
Subject: gnu: curl: Incorporate grafted changes.

* gnu/packages/curl.scm (curl-7.56.0): Remove variable.
(curl): Update to 7.56.0.
---
 gnu/packages/curl.scm | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'gnu/packages/curl.scm')

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 60a71f8c6c..df2310b37c 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -43,15 +43,14 @@ (define-module (gnu packages curl)
 (define-public curl
   (package
    (name "curl")
-   (version "7.55.1")
-   (replacement curl-7.56.0)
+   (version "7.56.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "https://curl.haxx.se/download/curl-"
                                 version ".tar.xz"))
             (sha256
              (base32
-              "1dvbcwcar3dv488h9378hy145ma3ws2fwpbr6mgszd7chipcmbry"))))
+              "0wni3zkw7jyrwgwkqnrkf2x2b7c78wsp7p4z6a246hz9l367nhrj"))))
    (build-system gnu-build-system)
    (outputs '("out"
               "doc"))                             ;1.2 MiB of man3 pages
@@ -131,16 +130,3 @@ (define-public curl
    (license (license:non-copyleft "file://COPYING"
                                   "See COPYING in the distribution."))
    (home-page "https://curl.haxx.se/")))
-
-(define-public curl-7.56.0
-  (package
-    (inherit curl)
-    (version "7.56.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "https://curl.haxx.se/download/curl-"
-                            version ".tar.xz"))
-        (sha256
-         (base32
-          "0wni3zkw7jyrwgwkqnrkf2x2b7c78wsp7p4z6a246hz9l367nhrj"))))))
-- 
cgit v1.2.3