gnu: guile-ssh: Rename "guile2.2-ssh" to "guile-ssh".

* gnu/packages/ssh.scm (guile-ssh)[inputs]: Change GUILE-2.0 to
GUILE-2.2.
(guile2.2-ssh): Define using 'deprecated-package'.
(guile2.0-ssh): New variable.
* gnu/packages/package-management.scm (guix)[propagated-inputs]: Adjust
accordingly.
This commit is contained in:
Ludovic Courtès 2017-05-13 21:53:53 +02:00
parent 2252f087d4
commit 4d8806c3d6
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 7 additions and 4 deletions

View File

@ -249,7 +249,7 @@
(propagated-inputs (propagated-inputs
`(("gnutls" ,gnutls/guile-2.2) ;for 'guix download' & co. `(("gnutls" ,gnutls/guile-2.2) ;for 'guix download' & co.
("guile-json" ,guile-json) ("guile-json" ,guile-json)
("guile-ssh" ,guile2.2-ssh))) ("guile-ssh" ,guile-ssh)))
(home-page "https://www.gnu.org/software/guix/") (home-page "https://www.gnu.org/software/guix/")
(synopsis "Functional package manager for installed software packages and versions") (synopsis "Functional package manager for installed software packages and versions")

View File

@ -265,7 +265,7 @@ Additionally, various channel-specific options can be negotiated.")
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("which" ,which))) ("which" ,which)))
(inputs `(("guile" ,guile-2.0) (inputs `(("guile" ,guile-2.2)
("libssh" ,libssh) ("libssh" ,libssh)
("libgcrypt" ,libgcrypt))) ("libgcrypt" ,libgcrypt)))
(synopsis "Guile bindings to libssh") (synopsis "Guile bindings to libssh")
@ -276,10 +276,13 @@ libssh library.")
(license license:gpl3+))) (license license:gpl3+)))
(define-public guile2.2-ssh (define-public guile2.2-ssh
(deprecated-package "guile2.2-ssh" guile-ssh))
(define-public guile2.0-ssh
(package (package
(inherit guile-ssh) (inherit guile-ssh)
(name "guile2.2-ssh") (name "guile2.0-ssh")
(inputs `(("guile" ,guile-2.2) (inputs `(("guile" ,guile-2.0)
,@(alist-delete "guile" (package-inputs guile-ssh)))))) ,@(alist-delete "guile" (package-inputs guile-ssh))))))
(define-public corkscrew (define-public corkscrew