From decdb5a59d0b1316d53564712b543a718c1f627c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 7 Aug 2022 22:49:26 +0300 Subject: gnu: bash-completion: Remove util-linux overrides. These completions are deprecated or removed upstream, and bash-completion defers to upstream completions. * gnu/packages/bash.scm (bash-completion)[native-inputs]: Remove field. [arguments]: Remove field. --- gnu/packages/bash.scm | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 97891f5cb6..080db6acfb 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -310,35 +310,8 @@ (define-public bash-completion (patches (search-patches "bash-completion-directories.patch")))) (build-system gnu-build-system) - (native-inputs (list util-linux)) (arguments - `(#:tests? #f ; Unclear how to make tests pass. - #:phases (modify-phases %standard-phases - (add-after - 'install 'remove-redundant-completions - (lambda* (#:key - inputs native-inputs - outputs #:allow-other-keys) - ;; Util-linux comes with a bunch of completion files for - ;; its own commands which are more sophisticated and - ;; up-to-date than those of bash-completion. Remove those - ;; from bash-completion. - (let* ((out (assoc-ref outputs "out")) - (util-linux (assoc-ref (or native-inputs inputs) - "util-linux")) - (completions (string-append out - "/share/bash-completion" - "/completions")) - (already (find-files - (string-append - util-linux - "/etc/bash_completion.d")))) - (with-directory-excursion completions - (for-each (lambda (file) - (when (file-exists? file) - (delete-file file))) - (map basename already))) - #t)))))) + `(#:tests? #f)) ; Unclear how to make tests pass. (synopsis "Bash completions for common commands") (description "This package provides extensions that allow Bash to provide adapted -- cgit v1.2.3