guix/guix
3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Code Issues Releases Wiki Activity

gnu: guile-ssh: Update to 0.13.1.

Browse source 
* gnu/packages/ssh.scm (guile-ssh): Update to 0.13.1.
This commit is contained in:
Ludovic Courtès 2020-08-28 23:27:18 +02:00
parent 4ec66950f0
commit 096f442d7d
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 74 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

149
gnu/packages/ssh.scm
View file

@ -296,81 +296,80 @@ Additionally, various channel-specific options can be negotiated.")
(synopsis "OpenSSH client and server without X11 support"))) (synopsis "OpenSSH client and server without X11 support")))
(define-public guile-ssh (define-public guile-ssh
;; This unreleased commit fixes for <https://issues.guix.gnu.org/42740>. (package
(let ((commit "688d7f3797b5155257a6c2ee4ea5084b3d8cc244") (name "guile-ssh")
(revision "1")) (version "0.13.1")
(package (home-page "https://github.com/artyom-poptsov/guile-ssh")
(name "guile-ssh") (source (origin
(version (git-version "0.13.0" revision commit)) (method git-fetch)
(home-page "https://github.com/artyom-poptsov/guile-ssh") (uri (git-reference
(source (origin (url home-page)
(method git-fetch) (commit (string-append "v" version))))
(uri (git-reference (file-name (string-append name "-" version ".tar.gz"))
(url home-page) (sha256
(commit commit))) (base32
(file-name (git-file-name name version)) "1xpxkvgj7wgcl450djkcrmrf957mcy2f36hfs5g6kpla1gax2d1g"))
(sha256 (modules '((guix build utils)))))
(base32 (build-system gnu-build-system)
"0mbff4v8738pmcs6sdma4b9gqb0bklraj346i5g5b1mwdywhzljj")) (outputs '("out" "debug"))
(modules '((guix build utils))))) (arguments
(build-system gnu-build-system) `(;; It makes no sense to build libguile-ssh.a.
(outputs '("out" "debug")) #:configure-flags '("--disable-static")
(arguments
`(#:configure-flags '("--disable-static") #:phases (modify-phases %standard-phases
#:phases (add-before 'build 'fix-libguile-ssh-file-name
(modify-phases %standard-phases (lambda* (#:key outputs #:allow-other-keys)
(add-before 'build 'fix-libguile-ssh-file-name ;; Build and install libguile-ssh.so so that we can use
(lambda* (#:key outputs #:allow-other-keys) ;; its absolute file name in .scm files, before we build
;; Build and install libguile-ssh.so so that we can use ;; the .go files.
;; its absolute file name in .scm files, before we build (let* ((out (assoc-ref outputs "out"))
;; the .go files. (lib (string-append out "/lib")))
(let* ((out (assoc-ref outputs "out")) (invoke "make" "install"
(lib (string-append out "/lib"))) "-C" "libguile-ssh"
(invoke "make" "install" "-j" (number->string
"-C" "libguile-ssh" (parallel-job-count)))
"-j" (number->string (substitute* (find-files "." "\\.scm$")
(parallel-job-count))) (("\"libguile-ssh\"")
(substitute* (find-files "." "\\.scm$") (string-append "\"" lib "/libguile-ssh\"")))
(("\"libguile-ssh\"") #t)))
(string-append "\"" lib "/libguile-ssh\""))) ,@(if (%current-target-system)
#t))) '()
,@(if (%current-target-system) '((add-before 'check 'fix-guile-path
'() (lambda* (#:key inputs #:allow-other-keys)
'((add-before 'check 'fix-guile-path (let ((guile (assoc-ref inputs "guile")))
(lambda* (#:key inputs #:allow-other-keys) (substitute* "tests/common.scm"
(let ((guile (assoc-ref inputs "guile"))) (("/usr/bin/guile")
(substitute* "tests/common.scm" (string-append guile "/bin/guile")))
(("/usr/bin/guile") #t)))))
(string-append guile "/bin/guile"))) (add-after 'install 'remove-bin-directory
#t))))) (lambda* (#:key outputs #:allow-other-keys)
(add-after 'install 'remove-bin-directory (let* ((out (assoc-ref outputs "out"))
(lambda* (#:key outputs #:allow-other-keys) (bin (string-append out "/bin"))
(let* ((out (assoc-ref outputs "out")) (examples (string-append
(bin (string-append out "/bin")) out "/share/guile-ssh/examples")))
(examples (string-append (mkdir-p examples)
out "/share/guile-ssh/examples"))) (rename-file (string-append bin "/ssshd.scm")
(mkdir-p examples) (string-append examples "/ssshd.scm"))
(rename-file (string-append bin "/ssshd.scm") (rename-file (string-append bin "/sssh.scm")
(string-append examples "/ssshd.scm")) (string-append examples "/sssh.scm"))
(rename-file (string-append bin "/sssh.scm") (delete-file-recursively bin)
(string-append examples "/sssh.scm")) #t))))))
(delete-file-recursively bin) (native-inputs `(("autoconf" ,autoconf)
#t)))))) ("automake" ,automake)
(native-inputs `(("autoconf" ,autoconf) ("libtool" ,libtool)
("automake" ,automake) ("texinfo" ,texinfo)
("libtool" ,libtool) ("pkg-config" ,pkg-config)
("texinfo" ,texinfo) ("which" ,which)
("pkg-config" ,pkg-config) ("guile" ,guile-3.0))) ;needed when cross-compiling.
("which" ,which) (inputs `(("guile" ,guile-3.0)
("guile" ,guile-3.0))) ;needed when cross-compiling. ("libssh" ,libssh)
(inputs `(("guile" ,guile-3.0) ("libgcrypt" ,libgcrypt)))
("libssh" ,libssh) (synopsis "Guile bindings to libssh")
("libgcrypt" ,libgcrypt))) (description
(synopsis "Guile bindings to libssh") "Guile-SSH is a library that provides access to the SSH protocol for
(description "Guile-SSH is a library that provides access to the SSH programs written in GNU Guile interpreter. It is a wrapper to the underlying
protocol for programs written in GNU Guile interpreter. It is a wrapper to libssh library.")
the underlying libssh library.") (license license:gpl3+)))
(license license:gpl3+))))
(define-public guile2.0-ssh (define-public guile2.0-ssh
(package (package