andreas pushed a commit to branch tex-team
in repository guix.
commit 5dd0a664097a6655073652108375ff8164ffc581
Author: Nicolas Goaziou <m...@nicolasgoaziou.fr>
AuthorDate: Tue Mar 25 21:58:56 2025 +0100
guix: texlive importer: Adjust version for meta packages.
* 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
---
guix/import/texlive.scm | 4 +++-
tests/texlive.scm | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm
index bac6a88168..ce58ffe7fd 100644
--- a/guix/import/texlive.scm
+++ b/guix/import/texlive.scm
@@ -669,7 +669,9 @@ at VERSION."
(values
`(package
(name ,name)
- (version ,(if empty-package? '%texlive-version version))
+ (version ,(if empty-package?
+ '(package-version texlive-source)
+ version))
(source
,(and (not meta-package?)
`(origin
diff --git a/tests/texlive.scm b/tests/texlive.scm
index 8e7e596962..651be5bfec 100644
--- a/tests/texlive.scm
+++ b/tests/texlive.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2022 Ricardo Wurmus <rek...@elephly.net>
-;;; Copyright © 2023, 2024 Nicolas Goaziou <m...@nicolasgoaziou.fr>
+;;; Copyright © 2023, 2024, 2025 Nicolas Goaziou <m...@nicolasgoaziou.fr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -587,7 +587,7 @@ completely compatible with Plain TeX.")
(match result
(('package
('name "texlive-collection-texworks")
- ('version '%texlive-version)
+ ('version '(package-version texlive-source))
('source #f)
('build-system 'trivial-build-system)
('arguments
