amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

guix: texlive importer: Adjust version for meta packages.

Browse source 
* guix/import/texlive.scm (tlpdb->package): Use (package-version
package-source) instead of %texlive-revision when importing a meta package.
* tests/texlive.scm ("texlive->guix-package, meta-package"): Test it.

Change-Id: I2a5d2eb6529dafe0c888b2a7a5a1b38af1160235
This commit is contained in:
Nicolas Goaziou 2025-03-25 21:58:56 +01:00 • committed by Andreas Enge
parent 3b34f33bb5
commit 3cf3880212
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
guix/import/texlive.scm
View file

@ -669,7 +669,9 @@ at VERSION."
(values (values
`(package `(package
(name ,name) (name ,name)
(version ,(if empty-package? '%texlive-version version)) (version ,(if empty-package?
'(package-version texlive-source)
version))
(source (source
,(and (not meta-package?) ,(and (not meta-package?)
`(origin `(origin

4
tests/texlive.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2022 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2023, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2023, 2024, 2025 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -587,7 +587,7 @@ completely compatible with Plain TeX.")
(match result (match result
(('package (('package
('name "texlive-collection-texworks") ('name "texlive-collection-texworks")
('version '%texlive-version) ('version '(package-version texlive-source))
('source #f) ('source #f)
('build-system 'trivial-build-system) ('build-system 'trivial-build-system)
('arguments ('arguments