From 4d8806c3d662c74e6d48d0f0d6ce423fce9a3a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 13 May 2017 21:53:53 +0200
Subject: [PATCH] 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.
---
gnu/packages/package-management.scm | 2 +-
gnu/packages/ssh.scm | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 3e0449a8534..8ebf6b05788 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -249,7 +249,7 @@ (define (copy arch)
(propagated-inputs
`(("gnutls" ,gnutls/guile-2.2) ;for 'guix download' & co.
("guile-json" ,guile-json)
- ("guile-ssh" ,guile2.2-ssh)))
+ ("guile-ssh" ,guile-ssh)))
(home-page "https://www.gnu.org/software/guix/")
(synopsis "Functional package manager for installed software packages and versions")
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 4590f3561c7..1fd395049ab 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -265,7 +265,7 @@ (define-public guile-ssh
("texinfo" ,texinfo)
("pkg-config" ,pkg-config)
("which" ,which)))
- (inputs `(("guile" ,guile-2.0)
+ (inputs `(("guile" ,guile-2.2)
("libssh" ,libssh)
("libgcrypt" ,libgcrypt)))
(synopsis "Guile bindings to libssh")
@@ -276,10 +276,13 @@ (define-public guile-ssh
(license license:gpl3+)))
(define-public guile2.2-ssh
+ (deprecated-package "guile2.2-ssh" guile-ssh))
+
+(define-public guile2.0-ssh
(package
(inherit guile-ssh)
- (name "guile2.2-ssh")
- (inputs `(("guile" ,guile-2.2)
+ (name "guile2.0-ssh")
+ (inputs `(("guile" ,guile-2.0)
,@(alist-delete "guile" (package-inputs guile-ssh))))))
(define-public corkscrew
--
GitLab