[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/04: gnu: curl: Remove unused input.
From: |
guix-commits |
Subject: |
04/04: gnu: curl: Remove unused input. |
Date: |
Tue, 14 May 2019 14:15:32 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 52cb7748cbdb61b87e5c2bbc99e12284f21a304d
Author: Marius Bakke <address@hidden>
Date: Tue May 14 20:08:36 2019 +0200
gnu: curl: Remove unused input.
* gnu/packages/curl.scm (curl)[inputs]: Remove LIBSSH2-1.8.0.
* gnu/packages/ssh.scm (libssh2-1.8.0): Remove variable.
---
gnu/packages/curl.scm | 5 -----
gnu/packages/ssh.scm | 18 ------------------
2 files changed, 23 deletions(-)
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index a83760a..9a13815 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -64,11 +64,6 @@
"doc")) ;1.2 MiB of man3 pages
(inputs `(("gnutls" ,gnutls)
("libidn" ,libidn)
- ;; TODO XXX <https://bugs.gnu.org/34927>
- ;; Curl doesn't actually use or refer to libssh2 because the build
- ;; is not configured with '--with-libssh2'. Remove this input
when
- ;; a mass rebuild is appropriate (e.g. core-updates).
- ("libssh2" ,libssh2-1.8.0)
("openldap" ,openldap)
("mit-krb5" ,mit-krb5)
("nghttp2" ,nghttp2 "lib")
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index e887cd7..a763c6a 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -143,24 +143,6 @@ a server that supports the SSH-2 protocol.")
(license license:bsd-3)
(home-page "https://www.libssh2.org/")))
-;; XXX A hidden special obsolete libssh2 for temporary use in the curl package.
-;; <https://bugs.gnu.org/34927>
-(define-public libssh2-1.8.0
- (hidden-package
- (package
- (inherit libssh2)
- (version "1.8.0")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://www.libssh2.org/download/libssh2-"
- version ".tar.gz"))
- (sha256
- (base32
- "1m3n8spv79qhjq4yi0wgly5s5rc8783jb1pyra9bkx1md0plxwrr"))
- (patches
- (search-patches
"libssh2-fix-build-failure-with-gcrypt.patch")))))))
-
(define-public openssh
(package
(name "openssh")