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

gnu: guile-ssh: Update to 0.7.1. 

* gnu/packages/ssh.scm (guile-ssh)[source]: Update to 0.7.1.
  [arguments]: Remove ssh/Makefile.am fiddling from 'autoreconf' phase.
  Remove #:parallel-build? argument.
  [inputs]: Add LIBGCRYPT-1.5.
This commit is contained in:
Ludovic Courtès 2014-10-13 00:32:14 +02:00
parent e3703818db
commit 817efe8bb1
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gnu/packages/ssh.scm
View File

@ -36,6 +36,7 @@
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)) #:use-module (guix build-system cmake))
@ -185,25 +186,21 @@ 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.6.0") (version "0.7.1")
(source (origin (source (origin
(method url-fetch) (method git-fetch)
(uri (string-append (uri (git-reference
"https://github.com/artyom-poptsov/libguile-ssh/archive/v" (url "https://github.com/artyom-poptsov/libguile-ssh.git")
version ".tar.gz")) (commit "e216e1d78bf93a9753ea813f930cac5e68e52180")))
(sha256 (sha256
(base32 (base32
"1v4y5vrwg0g6804pzbr160zahlqvj7k7iwys2bdpfzp7m2i47siq")))) "1sbxhmynmpwfjwb3dp6lrc3cxi5kffqmb6klhx7wnkgqxvs61lsw"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-cons-before '(#:phases (alist-cons-before
'configure 'autoreconf 'configure 'autoreconf
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "ssh/Makefile.am" (chmod "doc/version.texi" #o777) ;make it writable
(("-lssh_threads" match)
(string-append "-L" (assoc-ref inputs "libssh")
"/lib " match)))
(zero? (system* "autoreconf" "-vfi"))) (zero? (system* "autoreconf" "-vfi")))
(alist-cons-after (alist-cons-after
'install 'fix-libguile-ssh-file-name 'install 'fix-libguile-ssh-file-name
@ -225,9 +222,6 @@ Additionally, various channel-specific options can be negotiated.")
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/share/guile/site/2.0")) "/share/guile/site/2.0"))
;; Building the .go requires building libguile-ssh.so first.
#:parallel-build? #f
;; Tests are not parallel-safe. ;; Tests are not parallel-safe.
#:parallel-tests? #f)) #:parallel-tests? #f))
(native-inputs `(("autoconf" ,autoconf) (native-inputs `(("autoconf" ,autoconf)
@ -237,7 +231,8 @@ 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.5))) ("libssh" ,libssh)
("libgcrypt" ,libgcrypt-1.5)))
(synopsis "Guile bindings to libssh") (synopsis "Guile bindings to libssh")
(description (description
"Guile-SSH is a library that provides access to the SSH protocol for "Guile-SSH is a library that provides access to the SSH protocol for