mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-31 06:46:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: clustershell: Update to 1.9.2.

Browse source 
* gnu/packages/ssh.scm (clustershell): Update to 1.9.2.
[arguments]<tests?>: Explicitly disable them as non of them were picked
and when invoked with nosetest mostly fail.
<phases>: Remove 'record-opnssh-file-name, add 'fix-pathes.
[native-inputs]: Add python-setuptools and python-wheel.

Change-Id: I52ebe7f7ed5f2624ecd5182b915bdeaffc207420
This commit is contained in:
Sharlatan Hellseher 2024-12-09 21:16:17 +00:00
parent e0500cd2ca
commit 51ee3a7278
No known key found for this signature in database
GPG key ID: 76D727BFF62CD2B5
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gnu/packages/ssh.scm
View file

@ -866,7 +866,7 @@ (define-public python-asyncssh
(define-public clustershell (define-public clustershell
(package (package
(name "clustershell") (name "clustershell")
(version "1.8.4") (version "1.9.2")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -875,19 +875,32 @@ (define-public clustershell
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "11b87vyamcw4rvgxz74jxwkr9ly0h9ldp2wqsi5wc19p0r06la5j")))) (base32 "1zk3syrdck2gi27b9njaq98fnnjf14831yvkma2n4ydsf2mxnkaw"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list (list
#:tests? #f ; tests require python-nose, and most of them fail
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'build 'record-openssh-file-name (add-before 'build 'fix-pathes
(lambda _ (lambda _
(let ((ssh #$(this-package-input "openssh"))) (let ((ssh #$(this-package-input "openssh")))
(substitute* "lib/ClusterShell/Worker/Ssh.py" (substitute* (list "lib/ClusterShell/Worker/Ssh.py"
(("info\\(\"ssh_path\"\\) or \"ssh\"") "lib/ClusterShell/Worker/fastsubprocess.py")
(string-append "info(\"ssh_path\") or \"" (("\"/bin/sh\"") (format #f "'~a'" (which "sh")))
ssh "/bin/ssh\""))))))))) (("\"ssh\"") (format #f "'~a/bin/ssh'" ssh))
(("\"scp\"") (format #f "'~a/bin/scp'" ssh)))
(substitute* (find-files "./tests" "\\.py$")
(("\"/bin/hostname\"") (format #f "'~a'" (which "hostname")))
(("/bin/sleep") "sleep")
(("/bin/echo") "echo")
(("/bin/uname") "uname")
(("/bin/false") "false")
(("/bin/true") "true")
(("/usr/bin/printf") "printf"))))))))
(native-inputs
(list python-setuptools
python-wheel))
(inputs (inputs
(list openssh)) (list openssh))
(propagated-inputs (propagated-inputs