diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2023-07-03 09:23:44 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2023-07-18 18:16:45 +0200 |
| commit | 2e189e8863450669c4e59ce941704fb3237b108f (patch) | |
| tree | 8c49c367ebf8ff52808fc245e671c8100344a9ef /guix/import | |
| parent | 88a3b237f50084c64cc95bdcb3381dd53498eea2 (diff) | |
| download | guix-2e189e8863450669c4e59ce941704fb3237b108f.tar guix-2e189e8863450669c4e59ce941704fb3237b108f.tar.gz | |
guix: texlive importer: Do not pull all "scripts/context/" files.
* guix/import/texlive.scm (texlive-generic-locations): Add "scripts/context/"
since this location is split across multiple packages.
* guix/import/texlive.scm (files->locations): Only single out files from
generic locations, not their sub-directories. E.g., generic location
"scripts/context/lua/" should not fetch "scripts/context/lua/third/" files.
Diffstat (limited to 'guix/import')
| -rw-r--r-- | guix/import/texlive.scm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index 8f90be0c7b..fe28b24715 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -52,10 +52,12 @@ ;; Package definitions should single out files stored there, or all files in ;; the directory from all involved packages would be downloaded. (define texlive-generic-locations - (list "doc/generic/hyph-utf8/" - "doc/info/" - "doc/man/" + (list "doc/info/" + "doc/man/man1/" + "doc/man/man5/" "doc/web2c/" + "scripts/context/lua/" + "scripts/context/perl/" "scripts/texlive/" "scripts/texlive-extra/" "tex/generic/config/" @@ -359,7 +361,9 @@ of those files are returned that are unexpectedly installed." ;; imported. (let-values (((generic specific) (partition (lambda (f) - (any (cut string-prefix? <> f) + ;; Only grab files from generic locations, not + ;; sub-directories. + (any (cut string=? <> (trim-filename f)) texlive-generic-locations)) files))) (append generic |