[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/09: gnu: curl: Restore derivation.
From: |
guix-commits |
Subject: |
01/09: gnu: curl: Restore derivation. |
Date: |
Thu, 21 Mar 2019 14:25:48 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit c1f4e6491cecc5d121ef371a8fb2aa0a07030d36
Author: Marius Bakke <address@hidden>
Date: Thu Mar 21 19:14:18 2019 +0100
gnu: curl: Restore derivation.
Commit af8f7eb4f2a664c2d0fb3faabaf2e80c72993ef6 accidentally changed the
cURL
derivation. Remove use of HIDDEN-PACKAGE and restore input order to
prevent a
large number of rebuilds.
* gnu/packages/ssh.scm (libssh2-1.8.0): Move from here ...
* gnu/packages/curl.scm (libssh2-1.8.0): ... to here. Don't use
HIDDEN-PACKAGE and make it non-public.
(curl)[inputs]: Move LIBSSH2-1.8.0 where it was before af8f7eb4f2a66.
---
gnu/packages/curl.scm | 25 +++++++++++++++++++++----
gnu/packages/ssh.scm | 18 ------------------
2 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index a36a1ee..041853c 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -48,6 +48,23 @@
#:use-module (gnu packages tls)
#:use-module (gnu packages web))
+;; XXX A hidden special obsolete libssh2 for temporary use in the curl package.
+;; <https://bugs.gnu.org/34927>
+(define libssh2-1.8.0
+ (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 curl
(package
(name "curl")
@@ -66,14 +83,14 @@
(inputs `(("gnutls" ,gnutls)
("gss" ,gss)
("libidn" ,libidn)
- ("openldap" ,openldap)
- ("nghttp2" ,nghttp2 "lib")
- ("zlib" ,zlib)
;; 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)))
+ ("libssh2" ,libssh2-1.8.0)
+ ("openldap" ,openldap)
+ ("nghttp2" ,nghttp2 "lib")
+ ("zlib" ,zlib)))
(native-inputs
`(("perl" ,perl)
;; to enable the --manual option and make test 1026 pass
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 5b5890a..a75096b 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")
- branch master updated (af8f7eb -> 7ac8d96), guix-commits, 2019/03/21
- 03/09: gnu: elogind: Update to 241.1., guix-commits, 2019/03/21
- 02/09: build-system/meson: Add #:allowed-references and #:disallowed-references., guix-commits, 2019/03/21
- 05/09: gnu: varnish: Update to 6.2.0., guix-commits, 2019/03/21
- 07/09: gnu: glm: Update to 0.9.9.4., guix-commits, 2019/03/21
- 01/09: gnu: curl: Restore derivation.,
guix-commits <=
- 04/09: gnu: libgit2: Update to 0.28.1., guix-commits, 2019/03/21
- 09/09: gnu: gnupg: Update to 2.2.14., guix-commits, 2019/03/21
- 06/09: gnu: tbb: Update to 2019_U5., guix-commits, 2019/03/21
- 08/09: gnu: strace: Update to 5.0., guix-commits, 2019/03/21