ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-14 07:00:32 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

guix: import texlive: Rename some functions.

Browse source 
* guix/import/texlive.scm (filter-depends): Rename from `translate-depends'.
Clarify docstring.
(list-formats): Renamed from `formats'.
(tlpdb->package): Apply renaming.

Change-Id: If573cb8bde8be3ac65186298cf439f71f733f8eb
This commit is contained in:
Nicolas Goaziou 2024-06-15 23:15:19 +02:00 committed by Ludovic Courtès
parent 7d6a97d6ce
commit 4cd299c643
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
guix/import/texlive.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -152,12 +153,10 @@ (define (guix-name name)
(chr (char-downcase chr)))
name)))
(define* (translate-depends depends #:optional texlive-only)
"Translate TeX Live packages DEPENDS into their equivalent Guix names
in `(gnu packages tex)' module, without \"texlive-\" prefix. The function
also removes packages not necessary in Guix.
When TEXLIVE-ONLY is true, only TeX Live packages are returned."
(define* (filter-depends depends #:optional texlive-only)
"Filter upstream package names DEPENDS to include only their equivalent Guix
package names, without \"texlive-\" prefix. When TEXLIVE-ONLY is true, ignore
Guix-specific packages."
(delete-duplicates
(filter-map (match-lambda
;; Hyphenation. Every TeX Live package is replaced with
@ -288,10 +287,10 @@ (define latex-bin-dependency-tree
(list "latex-bin" "metafont" "modes" "tex"))
(deps '()))
(if (null? packages)
;; `translate-depends' will always translate "hyphen-base" into
;; `filter-depends' will always translate "hyphen-base" into
;; "hyphen-complete". Make sure plain hyphen-base appears in the
;; dependency tree.
(cons "hyphen-base" (translate-depends deps))
(cons "hyphen-base" (filter-depends deps))
(loop (append-map (lambda (name)
(let ((data (assoc-ref package-database name)))
(or (assoc-ref data 'depend)
@ -299,7 +298,7 @@ (define latex-bin-dependency-tree
packages)
(append packages deps)))))))
(define (formats package-data)
(define (list-formats package-data)
"Return a list of formats to build according to PACKAGE-DATA."
(and=> (assoc-ref package-data 'execute)
(lambda (actions)
@ -443,9 +442,9 @@ (define (tlpdb->package name version package-database)
(list (string-append name "-bin"))
'())
;; Regular dependencies, as specified in database.
(map guix-name (translate-depends depends)))
(map guix-name (filter-depends depends)))
string<?)))
(tex-formats (formats data))
(tex-formats (list-formats data))
(meta-package? (null? locs))
(empty-package? (and meta-package? (not (pair? tex-formats)))))
(values
@ -540,7 +539,7 @@ (define (tlpdb->package name version package-database)
((assoc-ref data 'catalogue-license) => string->license)
(else #f))))
;; List of pure TeX Live dependencies for recursive calls.
(translate-depends depends #t)))))
(filter-depends depends #t)))))
(define texlive->guix-package
(memoize