summary refs log tree commit diff
path: root/gnu/packages
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-05-13 21:53:53 +0200
committerLudovic Courtès <ludo@gnu.org>2017-05-13 22:25:23 +0200
commit4d8806c3d662c74e6d48d0f0d6ce423fce9a3a08 (patch)
tree7ba81ed9d3f86197a1126d4a204c6cd3bfa0c7ea /gnu/packages
parent2252f087d4bd450ab41a71379320467887edfc0f (diff)
downloadguix-4d8806c3d662c74e6d48d0f0d6ce423fce9a3a08.tar.gz
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.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/package-management.scm2
-rw-r--r--gnu/packages/ssh.scm9
2 files changed, 7 insertions, 4 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 3e0449a853..8ebf6b0578 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -249,7 +249,7 @@
       (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 4590f3561c..1fd395049a 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -265,7 +265,7 @@ Additionally, various channel-specific options can be negotiated.")
                      ("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 @@ libssh library.")
     (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