From 2e189e8863450669c4e59ce941704fb3237b108f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 3 Jul 2023 09:23:44 +0200 Subject: 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. --- guix/import/texlive.scm | 12 ++++++++---- 1 file 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 @@ (define-module (guix import texlive) ;; 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 @@ (define (trim-filename entry) ;; 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 -- cgit v1.2.3