gnu: guile-ssh: Upgrade to 0.5.0.

* gnu/packages/ssh.scm (guile-ssh): Upgrade to 0.5.0.
  [arguments]: Adjust 'autoreconf' phase.  Add #:parallel-tests? #f and
  #:tests? #f.
  [native-inputs]: Add TEXINFO.
This commit is contained in:
Ludovic Courtès 2014-03-01 15:41:18 +01:00
parent 706e9e575d
commit 00ee3a712f
1 changed files with 12 additions and 4 deletions

View File

@ -27,6 +27,7 @@
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages which) #:use-module (gnu packages which)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
@ -185,7 +186,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.4.0") (version "0.5.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -193,13 +194,13 @@ Additionally, various channel-specific options can be negotiated.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0vw02r261amkp6238cflww2y9y1v6vfx9ias6hvn8dlx0ghrd5dw")))) "13wk2fj08b8zjylvf78l3d9pf8y3zqcd7h75jf15a46iprk00n7q"))))
(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* "src/Makefile.am" (substitute* "ssh/Makefile.am"
(("-lssh_threads" match) (("-lssh_threads" match)
(string-append "-L" (assoc-ref inputs "libssh") (string-append "-L" (assoc-ref inputs "libssh")
"/lib " match))) "/lib " match)))
@ -223,10 +224,17 @@ Additionally, various channel-specific options can be negotiated.")
%standard-phases)) %standard-phases))
#:configure-flags (list (string-append "--with-guilesitedir=" #:configure-flags (list (string-append "--with-guilesitedir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/share/guile/site/2.0")))) "/share/guile/site/2.0"))
;; Two client/server tests use the same port.
#:parallel-tests? #f
;; XXX: There are test failures reported and being fixed.
#:tests? #f))
(native-inputs `(("autoconf" ,autoconf) (native-inputs `(("autoconf" ,autoconf)
("automake" ,automake) ("automake" ,automake)
("libtool" ,libtool "bin") ("libtool" ,libtool "bin")
("texinfo" ,texinfo)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("which" ,which))) ("which" ,which)))
(inputs `(("guile" ,guile-2.0) (inputs `(("guile" ,guile-2.0)