[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
417/418: gnu: texlive-texmf: Improve package style.
From: |
guix-commits |
Subject: |
417/418: gnu: texlive-texmf: Improve package style. |
Date: |
Fri, 2 Jun 2023 17:26:04 -0400 (EDT) |
ngz pushed a commit to branch tex-team-next
in repository guix.
commit 8c9e72cf77c65f26f659fd8ea9d6db87c24686c8
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Sun May 28 16:48:30 2023 +0200
gnu: texlive-texmf: Improve package style.
* gnu/packages/tex.scm (texlive-texmf)[version]: Inherit from TEXLIVE-BIN.
[source]: Use autonomous origin instead of relying on another layer.
[inputs]: Remove labels. Sort alphabetically.
[arguments]: Use G-expressions. Remove trailing #T from phases.
(texlive-texmf-src): Remove variable.
---
gnu/packages/tex.scm | 77 ++++++++++++++++++++++++++--------------------------
1 file changed, 38 insertions(+), 39 deletions(-)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e64d590d5f..7ea5832690 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -194,13 +194,6 @@ use."
(sha256 (base32
"171kg1n9zapw3d2g47d8l0cywa99bl9m54xkqvp9625ks22z78s6"))))
-(define texlive-texmf-src
- (origin
- (method url-fetch)
- (uri
"ftp://tug.org/historic/systems/texlive/2021/texlive-20210325-texmf.tar.xz")
- (sha256 (base32
- "070gczcm1h9rx29w2f02xd3nhd84c4k28nfmm8qgp69yq8vd84pz"))))
-
(define-public texlive-bin
(package
(name "texlive-bin")
@@ -8687,51 +8680,57 @@ documents as well as DVI output.")
(define texlive-texmf
(package
- (name "texlive-texmf")
- (version "20210325")
- (source texlive-texmf-src)
- (build-system gnu-build-system)
- (inputs
- `(("texlive-bin" ,texlive-bin)
- ("lua" ,lua)
- ("perl" ,perl)
- ("python" ,python)
- ("ruby" ,ruby)
- ("tcsh" ,tcsh)))
- (arguments
- `(#:modules ((guix build gnu-build-system)
- (guix build utils)
- (srfi srfi-26))
+ (name "texlive-texmf")
+ (version (package-version texlive-bin))
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "ftp://tug.org/historic/systems/texlive/"
+ (string-take version 4)
+ "/texlive-" version "-texmf.tar.xz"))
+ (sha256
+ (base32
+ "070gczcm1h9rx29w2f02xd3nhd84c4k28nfmm8qgp69yq8vd84pz"))))
+ (build-system gnu-build-system)
+ (inputs
+ (list lua
+ perl
+ python
+ ruby
+ tcsh
+ texlive-bin))
+ (arguments
+ (list
+ #:modules '((guix build gnu-build-system)
+ (guix build utils)
+ (srfi srfi-26))
;; This package takes 4 GiB, which we can't afford to distribute from
;; our servers.
#:substitutable? #f
#:phases
- (modify-phases (map (cut assq <> %standard-phases)
+ #~(modify-phases (map (cut assq <> %standard-phases)
'(set-paths unpack patch-source-shebangs))
(add-after 'unpack 'unset-environment-variables
(lambda _
(unsetenv "TEXMF")
- (unsetenv "TEXMFCNF")
- #t))
+ (unsetenv "TEXMFCNF")))
(add-after 'patch-source-shebangs 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((share (string-append (assoc-ref outputs "out") "/share")))
+ (lambda _
+ (let ((share (string-append #$output "/share")))
(mkdir-p share)
(invoke "mv" "texmf-dist" share))))
(add-after 'install 'texmf-config
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (share (string-append out "/share"))
+ (lambda _
+ (let* ((share (string-append #$output "/share"))
(texmfroot (string-append share "/texmf-dist/web2c"))
(texmfcnf (string-append texmfroot "/texmf.cnf"))
(fmtutilcnf (string-append texmfroot "/fmtutil.cnf"))
- (texlive-bin (assoc-ref inputs "texlive-bin"))
+ (texlive-bin #$(this-package-input "texlive-bin"))
(texbin (string-append texlive-bin "/bin"))
(tlpkg (string-append texlive-bin "/share/tlpkg")))
;; LuaJIT is not ported to powerpc64* yet.
- (if ,(target-ppc64le?)
+ (if #$(target-ppc64le?)
(substitute* fmtutilcnf
(("^(luajittex|luajithbtex|mfluajit)" m)
(string-append "#! " m))))
@@ -8744,7 +8743,7 @@ documents as well as DVI output.")
(("!!\\$TEXMFLOCAL") "$TEXMFLOCAL"))
;; Register paths in texmfcnf.lua, needed for context.
(substitute* (string-append texmfroot "/texmfcnf.lua")
- (("selfautodir:") out)
+ (("selfautodir:") #$output)
(("selfautoparent:") (string-append share "/")))
;; Set path to TeXLive Perl modules
(setenv "PERL5LIB"
@@ -8756,17 +8755,17 @@ documents as well as DVI output.")
(invoke "updmap-sys" "--nohash" "--syncwithtrees")
(invoke "mktexlsr")
(invoke "fmtutil-sys" "--all")))))))
- (properties `((max-silent-time . 9600))) ; don't time out while grafting
- (synopsis "TeX Live, a package of the TeX typesetting system")
- (description
- "TeX Live provides a comprehensive TeX document production system.
+ (properties `((max-silent-time . 9600))) ; don't time out while grafting
+ (synopsis "TeX Live, a package of the TeX typesetting system")
+ (description
+ "TeX Live provides a comprehensive TeX document production system.
It includes all the major TeX-related programs, macro packages, and fonts
that are free software, including support for many languages around the
world.
This package contains the complete tree of texmf-dist data.")
- (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))
- (home-page "https://www.tug.org/texlive/")))
+ (license (license:fsf-free "https://www.tug.org/texlive/copying.html"))
+ (home-page "https://www.tug.org/texlive/")))
(define-public texlive
(package
- 342/418: gnu: texlive-cm: Refresh package definition., (continued)
- 342/418: gnu: texlive-cm: Refresh package definition., guix-commits, 2023/06/02
- 341/418: gnu: texlive-cm-lgc: Refresh package definition., guix-commits, 2023/06/02
- 353/418: gnu: Add texlive-manfnt-font., guix-commits, 2023/06/02
- 358/418: gnu: texlive-latex-base: Refresh package definition., guix-commits, 2023/06/02
- 361/418: gnu: simple-texlive-package: Turn it into a stub., guix-commits, 2023/06/02
- 394/418: gnu: texlive-mflogo-font: Fix build., guix-commits, 2023/06/02
- 397/418: gnu: texlive-amsfonts: Fix build., guix-commits, 2023/06/02
- 401/418: gnu: texlive-stmaryrd: Fix build., guix-commits, 2023/06/02
- 410/418: gnu: texlive-xindy: Use TEXLIVE-BUILD-SYSTEM and related tools., guix-commits, 2023/06/02
- 415/418: gnu: Add texlive-mfware., guix-commits, 2023/06/02
- 417/418: gnu: texlive-texmf: Improve package style.,
guix-commits <=
- 156/418: gnu: texlive-datetime2: Refresh package definition., guix-commits, 2023/06/02
- 231/418: gnu: texlive-babel-french: Refresh package definition., guix-commits, 2023/06/02
- 240/418: gnu: texlive-makecmds: Refresh package definition., guix-commits, 2023/06/02
- 225/418: gnu: Add texlive-xmltexconfig., guix-commits, 2023/06/02
- 245/418: gnu: texlive-polyglossia: Refresh package definition., guix-commits, 2023/06/02
- 256/418: gnu: texlive-numprint: Refresh package definition., guix-commits, 2023/06/02
- 258/418: gnu: texlive-bigintcalc: Refresh package definition., guix-commits, 2023/06/02
- 260/418: gnu: texlive-etexcmds: Refresh package definition., guix-commits, 2023/06/02
- 268/418: gnu: texlive-uniquecounter: Refresh package definition., guix-commits, 2023/06/02
- 269/418: gnu: Add texlive-colorprofiles., guix-commits, 2023/06/02