diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-04-07 18:04:34 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-04-07 18:04:34 +0200 |
| commit | 71b4974a40347bdc651c3a1f923780733d96ded7 (patch) | |
| tree | 662bd5f5c4aec009e404bbd5d9a4eb3881274ec1 | |
| parent | 3613ce46dceff657c5ea14008722fc83475fc56a (diff) | |
| download | guix-71b4974a40347bdc651c3a1f923780733d96ded7.tar guix-71b4974a40347bdc651c3a1f923780733d96ded7.tar.gz | |
gnu: libssh2@1.8.0: Move to ssh.scm.
This fixes a top-level circular dependency introduced in
c1f4e6491cecc5d121ef371a8fb2aa0a07030d36.
* gnu/packages/curl.scm (libssh2-1.8.0): Move to...
* gnu/packages/ssh.scm (libssh2-1.8.0): ... here.
| -rw-r--r-- | gnu/packages/curl.scm | 18 | ||||
| -rw-r--r-- | gnu/packages/ssh.scm | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 9f2c27d623..e04e3d9454 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -48,24 +48,6 @@ #: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-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 curl (package (name "curl") diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index abbc0dad89..83a831660d 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -143,6 +143,24 @@ 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") |