From 65e33d48d8c6818bbc034ea9e21709c8ed1b9c1a Mon Sep 17 00:00:00 2001 From: Cayetano Santos Date: Tue, 16 Sep 2025 16:41:32 +0200 Subject: [PATCH] gnu: pass-otp: Improve style. * gnu/packages/password-utils.scm (pass-otp)[arguments]: Use G-Expressions. Change-Id: I93c5cde9e54bd7b19d76c9c6e9ce8d996420c292 Signed-off-by: Liliana Marie Prikler --- gnu/packages/password-utils.scm | 45 +++++++++++++++++---------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 0b503fde816..5f53e504880 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -1032,30 +1032,31 @@ from the @code{password-store} package. Files are encrypted with the "0rrs3iazq80dn0wbl20xkh270428jd8l99m5gd7hl93s4r4sc82p")))) (build-system gnu-build-system) (arguments - '(#:make-flags - (let* ((out (assoc-ref %outputs "out")) - (bashcomp (string-append out "/etc/bash_completion.d"))) - (list (string-append "PREFIX=" %output) - (string-append "BASHCOMPDIR=" bashcomp))) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-after 'build 'patch-oath-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "otp.bash" - (("^OATH=.*$") - (string-append - "OATH=" - (assoc-ref inputs "oath-toolkit") - "/bin/oathtool\n")) - ;; courtesy: https://github.com/tadfisher/pass-otp/pull/172 - (("&counter=[$]counter" all) - (format #f "~s" all)))))) - #:test-target "test")) - (inputs - (list oath-toolkit)) + (list + #:make-flags + #~(list (string-append "PREFIX=" #$output) + (string-append + "BASHCOMPDIR=" + (string-append #$output "/etc/bash_completion.d"))) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'build 'patch-oath-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "otp.bash" + (("^OATH=.*$") + (string-append + "OATH=" + (assoc-ref inputs "oath-toolkit") + "/bin/oathtool\n")) + ;; courtesy: https://github.com/tadfisher/pass-otp/pull/172 + (("&counter=[$]counter" all) + (format #f "~s" all)))))) + #:test-target "test")) (native-inputs (list password-store expect git gnupg which)) + (inputs + (list oath-toolkit)) (home-page "https://github.com/tadfisher/pass-otp") (synopsis "Pass extension for managing one-time-password (OTP) tokens") (description