05/08: import/texlive: Ignore architecture-dependent packages.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit 36f78676e59a2087bc7af5582cb8d63eeb37c8c5
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Wed Mar 29 21:02:45 2023 +0200

    import/texlive: Ignore architecture-dependent packages.
    
    * guix/import/texlive.scm (tlpdb->package): Filter "depend" field to exclude
    package names ending on ".ARCH".
---
 guix/import/texlive.scm | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index 82014ee568..a81805bdca 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, 2022 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2017, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -260,6 +260,12 @@ of those files are returned that are unexpectedly 
installed."
                                        %texlive-tag "/Master/texmf-dist"))
                    (locations dirs)
                    (revision %texlive-revision)))
+             ;; Ignore arch-dependent packages.
+             (filtered-depends
+              (or (and=> (assoc-ref data 'depend)
+                         (lambda (inputs)
+                           (remove (cut string-suffix? ".ARCH" <>) inputs)))
+                  '()))
              (source (with-store store
                        (download-multi-svn-to-store
                         store ref (string-append name 
"-svn-multi-checkout")))))
@@ -278,14 +284,15 @@ of those files are returned that are unexpectedly 
installed."
         ;; package->definition in (guix import utils) expects to see a
         ;; version field.
         (version ,version)
-        ,@(or (and=> (assoc-ref data 'depend)
-                     (lambda (inputs)
-                       `((propagated-inputs
-                          (list ,@(map (lambda (tex-name)
-                                         (let ((name (guix-name tex-name)))
-                                           (string->symbol name)))
-                                       inputs))))))
-              '())
+        ,@(match filtered-depends
+            (() '())
+            (inputs
+             `((propagated-inputs
+                (list ,@(map
+                         (lambda (tex-name)
+                           (let ((name (guix-name tex-name)))
+                             (string->symbol name)))
+                         inputs))))))
         ,@(or (and=> (assoc-ref data 'catalogue-ctan)
                      (lambda (url)
                        `((home-page ,(string-append "https://ctan.org"; url)))))
@@ -295,7 +302,7 @@ of those files are returned that are unexpectedly 
installed."
                        (assoc-ref data 'longdesc)))
         (license ,(string->license
                    (assoc-ref data 'catalogue-license))))
-     (or (assoc-ref data 'depend) (list)))))
+     filtered-depends)))
 
 (define texlive->guix-package
   (memoize