diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2022-08-07 22:49:26 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2022-08-08 18:30:38 +0300 |
| commit | decdb5a59d0b1316d53564712b543a718c1f627c (patch) | |
| tree | 95e42b4f86ac60bb22abf85e53afc1ecd8bad360 /gnu/packages/bash.scm | |
| parent | 675c5c9bbd28e5e666903aa81efaec25b1573811 (diff) | |
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.
Diffstat (limited to 'gnu/packages/bash.scm')
| -rw-r--r-- | gnu/packages/bash.scm | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 97891f5cb6a..080db6acfb1 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm | |||
| @@ -310,35 +310,8 @@ variant logs the history to syslog."))) | |||
| 310 | (patches | 310 | (patches |
| 311 | (search-patches "bash-completion-directories.patch")))) | 311 | (search-patches "bash-completion-directories.patch")))) |
| 312 | (build-system gnu-build-system) | 312 | (build-system gnu-build-system) |
| 313 | (native-inputs (list util-linux)) | ||
| 314 | (arguments | 313 | (arguments |
| 315 | `(#:tests? #f ; Unclear how to make tests pass. | 314 | `(#:tests? #f)) ; Unclear how to make tests pass. |
| 316 | #:phases (modify-phases %standard-phases | ||
| 317 | (add-after | ||
| 318 | 'install 'remove-redundant-completions | ||
| 319 | (lambda* (#:key | ||
| 320 | inputs native-inputs | ||
| 321 | outputs #:allow-other-keys) | ||
| 322 | ;; Util-linux comes with a bunch of completion files for | ||
| 323 | ;; its own commands which are more sophisticated and | ||
| 324 | ;; up-to-date than those of bash-completion. Remove those | ||
| 325 | ;; from bash-completion. | ||
| 326 | (let* ((out (assoc-ref outputs "out")) | ||
| 327 | (util-linux (assoc-ref (or native-inputs inputs) | ||
| 328 | "util-linux")) | ||
| 329 | (completions (string-append out | ||
| 330 | "/share/bash-completion" | ||
| 331 | "/completions")) | ||
| 332 | (already (find-files | ||
| 333 | (string-append | ||
| 334 | util-linux | ||
| 335 | "/etc/bash_completion.d")))) | ||
| 336 | (with-directory-excursion completions | ||
| 337 | (for-each (lambda (file) | ||
| 338 | (when (file-exists? file) | ||
| 339 | (delete-file file))) | ||
| 340 | (map basename already))) | ||
| 341 | #t)))))) | ||
| 342 | (synopsis "Bash completions for common commands") | 315 | (synopsis "Bash completions for common commands") |
| 343 | (description | 316 | (description |
| 344 | "This package provides extensions that allow Bash to provide adapted | 317 | "This package provides extensions that allow Bash to provide adapted |
