From 6fe9a004dba2d4ddf69ff6f1714af15ffaa7e62a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 10 Jun 2023 16:53:48 -0400 Subject: [PATCH] gnu: cqfd: Update to 5.4.0. * gnu/packages/docker.scm (cqfd): Update to 5.4.0. [arguments]: Use gexps. Add #:make-flags. Remove install phase override. --- gnu/packages/docker.scm | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 3445453093..0b2a18d661 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 David Thompson ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer +;;; Copyright © 2019, 2020, 2021, 2023 Maxim Cournoyer ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Katherine Cox-Buday ;;; Copyright © 2020 Jesse Dowell @@ -664,7 +664,7 @@ (define-public docker-cli (define-public cqfd (package (name "cqfd") - (version "5.3.0") + (version "5.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -673,25 +673,18 @@ (define-public cqfd (file-name (git-file-name name version)) (sha256 (base32 - "0gy4kjy6v52acfk6ffbg5sp02k6176khhkms7zlwmywq8591bpww")))) + "1kilrh4ahza19lka9218s2wkfcbk5r2cq9adczhlnlfggdrqnglg")))) (build-system gnu-build-system) (arguments ;; The test suite requires a docker daemon and connectivity. - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; Fix the directory of the bash completion. - (substitute* "Makefile" - (("completionsdir=.*$") - (string-append "completionsdir=" out - "/etc/bash_completion.d; \\\n"))) - (invoke "make" "install" - (string-append "PREFIX=" out)))))))) + (list + #:tests? #f + #:make-flags #~(list (string-append "COMPLETIONSDIR=" + #$output "/etc/bash_completion.d") + (string-append "PREFIX=" #$output)) + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (delete 'build)))) (home-page "https://github.com/savoirfairelinux/cqfd") (synopsis "Convenience wrapper for Docker") (description "cqfd is a Bash script that provides a quick and convenient