guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/03: gnu: bash-completion: Remove util-linux overrides.


From: guix-commits
Subject: 03/03: gnu: bash-completion: Remove util-linux overrides.
Date: Mon, 8 Aug 2022 11:32:12 -0400 (EDT)

efraim pushed a commit to branch core-updates
in repository guix.

commit decdb5a59d0b1316d53564712b543a718c1f627c
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Aug 7 22:49:26 2022 +0300

    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 @@ variant logs the history to syslog.")))
               (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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]