diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2022-01-10 12:40:18 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2022-01-10 12:42:16 +0100 |
| commit | e412b811c8dd75612d5d24c230ab7e4a3fa359d1 (patch) | |
| tree | 03fe2d99f9ae200316ba4acc02ff313d36ef819f | |
| parent | 85633573e4a224d9643fa32b6d9c52ef3ea15d4e (diff) | |
| download | guix-e412b811c8dd75612d5d24c230ab7e4a3fa359d1.tar.gz | |
import: texlive: Remove more specific entries with the same prefix.
* guix/import/texlive.scm (files->directories): Ensure that any more specific directory is removed if a parent directory is in the list of provided locations.
| -rw-r--r-- | guix/import/texlive.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index bdef9f58b0..d5021669be 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2021 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2017, 2021, 2022 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -197,11 +197,14 @@ (loop all current #false)))))))))))) (define (files->directories files) + (define name->parts (cut string-split <> #\/)) (map (cut string-join <> "/" 'suffix) (delete-duplicates (map (lambda (file) - (drop-right (string-split file #\/) 1)) - files) - equal?))) + (drop-right (name->parts file) 1)) + (sort files string<)) + ;; Remove sub-directories, i.e. more specific + ;; entries with the same prefix. + (lambda (x y) (every equal? x y))))) (define (tlpdb->package name package-database) (and-let* ((data (assoc-ref package-database name)) |