~ruther/guix-local

3cf3880212d3d901011314cdc2887a00943129a1 — Nicolas Goaziou 1 year, 3 months ago 3b34f33 
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
patch browse .tar.gz .zip 
2 files changed, 5 insertions(+), 3 deletions(-)

M guix/import/texlive.scm
M tests/texlive.scm

M guix/import/texlive.scm => guix/import/texlive.scm +3 -1
@@ 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


M tests/texlive.scm => tests/texlive.scm +2 -2
@@ 1,6 1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; 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.
;;;


@@ 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