vagrantc pushed a commit to branch core-updates-frozen-batched-changes in repository guix.
commit 62f726e6c16fa827ee635e841eb29e26b5719d4f Author: Maxim Cournoyer <[email protected]> AuthorDate: Mon Nov 1 22:47:57 2021 -0400 gnu: guile-ssh: Update to 0.13.1-2e25d85. * gnu/packages/ssh.scm (guile-ssh): Update to 0.13.1-2e25d85. Delete trailing #t. [native-inputs]: Add util-linux. --- gnu/packages/ssh.scm | 147 ++++++++++++++++++++++++++------------------------- 1 file changed, 74 insertions(+), 73 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 7452b5f..9059906 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -302,81 +302,82 @@ Additionally, various channel-specific options can be negotiated.") (synopsis "OpenSSH client and server without X11 support"))) (define-public guile-ssh - (package - (name "guile-ssh") - (version "0.13.1") - (home-page "https://github.com/artyom-poptsov/guile-ssh";) - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1xpxkvgj7wgcl450djkcrmrf957mcy2f36hfs5g6kpla1gax2d1g")) - (patches (search-patches "guile-ssh-fix-test-suite.patch" - "guile-ssh-read-error.patch")))) - (build-system gnu-build-system) - (outputs '("out" "debug")) - (arguments - `(;; It makes no sense to build libguile-ssh.a. - #:configure-flags '("--disable-static") - - #:phases (modify-phases %standard-phases - (add-before 'build 'fix-libguile-ssh-file-name - (lambda* (#:key outputs #:allow-other-keys) - ;; Build and install libguile-ssh.so so that we can use - ;; its absolute file name in .scm files, before we build - ;; the .go files. - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib"))) - (invoke "make" "install" - "-C" "libguile-ssh" - "-j" (number->string - (parallel-job-count))) - (substitute* (find-files "." "\\.scm$") - (("\"libguile-ssh\"") - (string-append "\"" lib "/libguile-ssh\""))) - #t))) - ,@(if (%current-target-system) - '() - '((add-before 'check 'fix-guile-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((guile (assoc-ref inputs "guile"))) - (substitute* "tests/common.scm" - (("/usr/bin/guile") - (string-append guile "/bin/guile"))) - #t))))) - (add-after 'install 'remove-bin-directory - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (examples (string-append - out "/share/guile-ssh/examples"))) - (mkdir-p examples) - (rename-file (string-append bin "/ssshd.scm") - (string-append examples "/ssshd.scm")) - (rename-file (string-append bin "/sssh.scm") - (string-append examples "/sssh.scm")) - (delete-file-recursively bin) - #t)))))) - (native-inputs `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("texinfo" ,texinfo) - ("pkg-config" ,pkg-config) - ("which" ,which) - ("guile" ,guile-3.0))) ;needed when cross-compiling. - (inputs `(("guile" ,guile-3.0) - ("libssh" ,libssh) - ("libgcrypt" ,libgcrypt))) - (synopsis "Guile bindings to libssh") - (description - "Guile-SSH is a library that provides access to the SSH protocol for + ;; This is the last commit of the wip-fix-nonblocking-eof branch, which + ;; includes better timeout handling, useful for offloading. + (let ((commit "2e25d852104f375936e81d9d7163892c6e828e68") + (revision "0")) + (package + (name "guile-ssh") + (version (git-version "0.13.1" revision commit)) + (home-page "https://github.com/artyom-poptsov/guile-ssh";) + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wkmq8d35y3vrb8sh31cqa4dyn1q9f4pgp9cz5mgv9i60hckr1ck")))) + (build-system gnu-build-system) + (outputs '("out" "debug")) + (arguments + `( ;; It makes no sense to build libguile-ssh.a. + #:configure-flags '("--disable-static" + "CFLAGS=-DDEBUG") + + #:phases (modify-phases %standard-phases + (add-before 'build 'fix-libguile-ssh-file-name + (lambda* (#:key outputs #:allow-other-keys) + ;; Build and install libguile-ssh.so so that we can use + ;; its absolute file name in .scm files, before we build + ;; the .go files. + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib"))) + (invoke "make" "install" + "-C" "libguile-ssh" + "-j" (number->string + (parallel-job-count))) + (substitute* (find-files "." "\\.scm$") + (("\"libguile-ssh\"") + (string-append "\"" lib "/libguile-ssh\"")))))) + ,@(if (%current-target-system) + '() + '((add-before 'check 'fix-guile-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((guile (assoc-ref inputs "guile"))) + (substitute* "tests/common.scm" + (("/usr/bin/guile") + (string-append guile "/bin/guile")))))))) + (add-after 'install 'remove-bin-directory + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (examples (string-append + out "/share/guile-ssh/examples"))) + (mkdir-p examples) + (rename-file (string-append bin "/ssshd.scm") + (string-append examples "/ssshd.scm")) + (rename-file (string-append bin "/sssh.scm") + (string-append examples "/sssh.scm")) + (delete-file-recursively bin))))))) + (native-inputs `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo) + ("util-linux" ,util-linux) ;for 'whereis' + ("which" ,which) + ("guile" ,guile-3.0))) ;needed when cross-compiling. + (inputs `(("guile" ,guile-3.0) + ("libssh" ,libssh) + ("libgcrypt" ,libgcrypt))) + (synopsis "Guile bindings to libssh") + (description + "Guile-SSH is a library that provides access to the SSH protocol for programs written in GNU Guile interpreter. It is a wrapper to the underlying libssh library.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public guile2.0-ssh (package
