nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: guile-ssh: Update to 0.10.1. 

* gnu/packages/ssh.scm (libssh-0.6): Remove.
(guile-ssh): Update to 0.10.1.
[inputs]: Use LIBSSH instead of LIBSSH-0.7.3.
[arguments]: Remove #:configure-flags.
This commit is contained in:
Ludovic Courtès 2016-10-09 14:57:21 +02:00
parent 92b725829b
commit 6f9d5b2e8c
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gnu/packages/ssh.scm
View File

@ -80,20 +80,6 @@ remote applications.")
(home-page "http://www.libssh.org") (home-page "http://www.libssh.org")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define libssh-0.6 ; kept private for use in guile-ssh
(package (inherit libssh)
(version "0.6.5")
(source (origin
(method url-fetch)
(uri (string-append "https://red.libssh.org/attachments/"
"download/121/libssh-"
version ".tar.xz"))
(sha256
(base32
"0b6wyx6bwbb8jpn8x4rhlrdiqwqrwrs0mxjmrnqykm9kw1ijgm8g"))
(patches (search-patches
"libssh-0.6.5-CVE-2016-0739.patch"))))))
(define-public libssh2 (define-public libssh2
(package (package
(name "libssh2") (name "libssh2")
@ -209,7 +195,7 @@ Additionally, various channel-specific options can be negotiated.")
(define-public guile-ssh (define-public guile-ssh
(package (package
(name "guile-ssh") (name "guile-ssh")
(version "0.9.0") (version "0.10.1")
(source (origin (source (origin
;; ftp://memory-heap.org/software/guile-ssh/guile-ssh-VERSION.tar.gz ;; ftp://memory-heap.org/software/guile-ssh/guile-ssh-VERSION.tar.gz
;; exists, but the server appears to be too slow and unreliable. ;; exists, but the server appears to be too slow and unreliable.
@ -220,7 +206,7 @@ Additionally, various channel-specific options can be negotiated.")
(file-name (string-append name "-" version "-checkout")) (file-name (string-append name "-" version "-checkout"))
(sha256 (sha256
(base32 (base32
"04zs1cykwdyj51ag62ymrkgsja9dbhbaaglkvbfbac0bkxl2ir6d")))) "0ky77kr7rnkhbq938bir61mlr8b86lfjcjjb1bxx1y1fhimsiz72"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases '(#:phases (modify-phases %standard-phases
@ -243,9 +229,6 @@ Additionally, various channel-specific options can be negotiated.")
(("\"libguile-ssh\"") (("\"libguile-ssh\"")
(string-append "\"" libdir "/libguile-ssh\""))) (string-append "\"" libdir "/libguile-ssh\"")))
#t))))) #t)))))
#:configure-flags (list (string-append "--with-guilesitedir="
(assoc-ref %outputs "out")
"/share/guile/site/2.0"))
;; Tests are not parallel-safe. ;; Tests are not parallel-safe.
#:parallel-tests? #f)) #:parallel-tests? #f))
@ -256,7 +239,7 @@ Additionally, various channel-specific options can be negotiated.")
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("which" ,which))) ("which" ,which)))
(inputs `(("guile" ,guile-2.0) (inputs `(("guile" ,guile-2.0)
("libssh" ,libssh-0.6) ("libssh" ,libssh)
("libgcrypt" ,libgcrypt))) ("libgcrypt" ,libgcrypt)))
(synopsis "Guile bindings to libssh") (synopsis "Guile bindings to libssh")
(description (description