diff options
Diffstat (limited to 'gnu/packages/ssh.scm')
| -rw-r--r-- | gnu/packages/ssh.scm | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 135083ad22..1fd395049a 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -135,8 +135,8 @@ a server that supports the SSH-2 protocol.") (sha256 (base32 "1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq")))) (build-system gnu-build-system) - (inputs `(("groff" ,groff) - ("openssl" ,openssl) + (native-inputs `(("groff" ,groff))) + (inputs `(("openssl" ,openssl) ("pam" ,linux-pam) ("mit-krb5" ,mit-krb5) ("zlib" ,zlib) @@ -213,7 +213,7 @@ Additionally, various channel-specific options can be negotiated.") (define-public guile-ssh (package (name "guile-ssh") - (version "0.10.2") + (version "0.11.0") (home-page "https://github.com/artyom-poptsov/guile-ssh") (source (origin ;; ftp://memory-heap.org/software/guile-ssh/guile-ssh-VERSION.tar.gz @@ -225,7 +225,16 @@ Additionally, various channel-specific options can be negotiated.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0pkiq3fm15pr4w1r420rrwwfmi4jz492r6l6vzjk6v73xlyfyfl3")))) + "0r261i8kc3avbmbwgyzak2vnqwssjlgz37g2y2fwm80w9bmn2m7j")) + (modules '((guix build utils))) + (snippet + ;; 'configure.ac' mistakenly tries to link files from examples/ + ;; that are not instantiated yet. Work around it. + '(substitute* "configure.ac" + (("AC_CONFIG_LINKS\\(\\[examples/([^:]+):.*" _ file) + (string-append "AC_CONFIG_FILES([examples/" file + "], [chmod +x examples/" + file "])\n")))))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -256,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") @@ -267,25 +276,14 @@ libssh library.") (license license:gpl3+))) (define-public guile2.2-ssh - ;; This is a snapshot of a unofficial copy of Guile-SSH, which hopefully - ;; reflects the upcoming release well enough. - (let ((commit "926a0843626f89e3db02d01a6b01cc1f0d9cefcf") - (revision "0")) - (package - (inherit guile-ssh) - (name "guile2.2-ssh") - (version (string-append "0.10.2." revision "." (string-take commit 7))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://notabug.org/civodul/guile-ssh/") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0hf28macq8d1w05g0xy2lw1s5vzmcrixh7m43x7qvvdd31c998ip")))) - (inputs `(("guile" ,guile-2.2) - ,@(alist-delete "guile" (package-inputs guile-ssh))))))) + (deprecated-package "guile2.2-ssh" guile-ssh)) + +(define-public guile2.0-ssh + (package + (inherit guile-ssh) + (name "guile2.0-ssh") + (inputs `(("guile" ,guile-2.0) + ,@(alist-delete "guile" (package-inputs guile-ssh)))))) (define-public corkscrew (package |