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

gnu: libssh: Update to 0.6.5. 

* gnu/packages/ssh.scm (libssh): Update to 0.6.5.
  [source]: Remove 'patches'.
  [inputs]: Use LIBGCRYPT instead of LIBGCRYPT-1.5.
This commit is contained in:
Ludovic Courtès 2015-09-01 13:45:38 +02:00
parent 6e3fdbbe26
commit 87390c155e
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/ssh.scm
View File

@ -43,24 +43,15 @@
(define-public libssh (define-public libssh
(package (package
(name "libssh") (name "libssh")
(version "0.6.3") (version "0.6.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://red.libssh.org/attachments/download/87/libssh-" (uri (string-append
"https://red.libssh.org/attachments/download/121/libssh-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1jyaj9h1iglvn02hrvcchbx8ycjpj8b91h8mi459k7q5jp2xgd9b")) "0b6wyx6bwbb8jpn8x4rhlrdiqwqrwrs0mxjmrnqykm9kw1ijgm8g"))))
(patches
;; Apply the patch as discussed at
;; <http://lists.gnu.org/archive/html/guix-devel/2014-10/msg00180.html>.
(list (origin
(uri
"http://git.libssh.org/projects/libssh.git/patch/?id=a033b93c616f4a81afc3fc6a017396d507d96c19")
(method url-fetch)
(sha256
(base32
"16fdkjcnhc6j7qxz9575fzr9044927ws5259yh0xb9yv1q14j0vh")))))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:configure-flags '("-DWITH_GCRYPT=ON") '(#:configure-flags '("-DWITH_GCRYPT=ON")
@ -68,10 +59,7 @@
;; TODO: Add 'CMockery' and '-DWITH_TESTING=ON' for the test suite. ;; TODO: Add 'CMockery' and '-DWITH_TESTING=ON' for the test suite.
#:tests? #f)) #:tests? #f))
(inputs `(("zlib" ,zlib) (inputs `(("zlib" ,zlib)
;; Link against an older gcrypt, because libssh tries to access ("libgcrypt", libgcrypt)))
;; fields of 'gcry_thread_cbs' that are now private:
;; src/threads.c:72:26: error: 'struct gcry_thread_cbs' has no member named 'mutex_init'
("libgcrypt", libgcrypt-1.5)))
(synopsis "SSH client library") (synopsis "SSH client library")
(description (description
"libssh is a C library implementing the SSHv2 and SSHv1 protocol for "libssh is a C library implementing the SSHv2 and SSHv1 protocol for