me/guix
Archived
1
0
Fork 0
Code Activity

guix: texlive importer: Do not pull all "scripts/context/" files.

Browse source 
* 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.
This commit is contained in:
Nicolas Goaziou 2023-07-03 09:23:44 +02:00
parent 88a3b237f5
commit 2e189e8863
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
guix/import/texlive.scm
View file

@ -52,10 +52,12 @@
;; Package definitions should single out files stored there, or all files in ;; Package definitions should single out files stored there, or all files in
;; the directory from all involved packages would be downloaded. ;; the directory from all involved packages would be downloaded.
(define texlive-generic-locations (define texlive-generic-locations
(list "doc/generic/hyph-utf8/" (list "doc/info/"
"doc/info/" "doc/man/man1/"
"doc/man/" "doc/man/man5/"
"doc/web2c/" "doc/web2c/"
"scripts/context/lua/"
"scripts/context/perl/"
"scripts/texlive/" "scripts/texlive/"
"scripts/texlive-extra/" "scripts/texlive-extra/"
"tex/generic/config/" "tex/generic/config/"
@ -359,7 +361,9 @@ of those files are returned that are unexpectedly installed."
;; imported. ;; imported.
(let-values (((generic specific) (let-values (((generic specific)
(partition (lambda (f) (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)) texlive-generic-locations))
files))) files)))
(append generic (append generic