From e0500cd2ca75e7ef5a52d79df38fecf843dd383c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 9 Dec 2024 20:24:43 +0000 Subject: gnu: clustershell: Improve package style. * gnu/packages/ssh.scm (clustershell): Use G-expressions, re-order fields. [build-system]: Swap to pyproject-build-system. Change-Id: I3a4983eef65d88f0b94577679ec8788fcb5b4d40 --- gnu/packages/ssh.scm | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 054a4cc7218..9da797d9bdc 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -876,18 +876,22 @@ framework.") (file-name (git-file-name name version)) (sha256 (base32 "11b87vyamcw4rvgxz74jxwkr9ly0h9ldp2wqsi5wc19p0r06la5j")))) - (build-system python-build-system) - (inputs (list openssh)) - (propagated-inputs (list python-pyyaml)) + (build-system pyproject-build-system) (arguments - `(#:phases (modify-phases %standard-phases - (add-before 'build 'record-openssh-file-name - (lambda* (#:key inputs #:allow-other-keys) - (let ((ssh (assoc-ref inputs "openssh"))) - (substitute* "lib/ClusterShell/Worker/Ssh.py" - (("info\\(\"ssh_path\"\\) or \"ssh\"") - (string-append "info(\"ssh_path\") or \"" - ssh "/bin/ssh\""))))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'record-openssh-file-name + (lambda _ + (let ((ssh #$(this-package-input "openssh"))) + (substitute* "lib/ClusterShell/Worker/Ssh.py" + (("info\\(\"ssh_path\"\\) or \"ssh\"") + (string-append "info(\"ssh_path\") or \"" + ssh "/bin/ssh\""))))))))) + (inputs + (list openssh)) + (propagated-inputs + (list python-pyyaml)) (home-page "https://cea-hpc.github.io/clustershell/") (synopsis "Scalable event-driven Python framework for cluster administration") (description -- cgit v1.3