guix_mirror_bot pushed a commit to branch next-master
in repository guix.

commit 29fd86040d4add14dfae508e0e409fcff8e19f10
Author: Andreas Enge <[email protected]>
AuthorDate: Tue Jan 6 12:35:17 2026 +0100

    gnu: texlive: Deprecate in favor of texlive-scheme-full.
    
    * gnu/packages/texlive.scm (%texlive-date, %texlive-year,
    texlive-extra-src, texlive-texmf-src, texlivebin, texlivetexmf): Delete
    variables.
    (texlive): Redefine as texlive-scheme-full.
    * gnu/packages/books.scm: Remove module inclusion.
    * doc/guix.texi: Remove documentation for monolithic texlive.
    
    Change-Id: I23837ca29cbbc080833be122972dcfe31c0fd1bb
---
 doc/guix.texi            |  22 +--
 gnu/packages/books.scm   |   1 -
 gnu/packages/texlive.scm | 403 +----------------------------------------------
 3 files changed, 6 insertions(+), 420 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 93918f1944..52b1de35d6 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -55150,27 +55150,9 @@ related typesetting systems, taken from the
 Because @TeX{} Live is so huge and because finding one's way in this
 maze is tricky, this section provides some guidance on how to deploy
 the relevant packages to compile @TeX{} and @LaTeX{} documents.
-
-@TeX{} Live currently comes in two mutually exclusive flavors in Guix:
-
-@itemize
-@item
-The ``monolithic'' @code{texlive} package: it comes with @emph{every
-single @TeX{} Live package} (roughly 4,200), but it is huge---more than
-4@tie{}GiB for a single package!
-
-@item
-A ``modular'' @TeX{} Live distribution, in which you only install the
+Guix contains the full @TeX{} Live distribution in a modular setup,
+in which you only install the
 packages you need, whose name is always prefixed with @samp{texlive-}.
-@end itemize
-
-To insist, these two flavors cannot be combined@footnote{No rule
-without exception! As the monolithic @TeX{} Live does not contain the
-@command{biber} executable, it is okay to combine it with
-@code{texlive-biber}, which does.}.  If in the modular setting your
-document does not compile, the solution is not to add the monolithic
-@code{texlive} package, but to add the set of missing packages from the
-modular distribution.
 
 Building a coherent system that provides all the essential tools and, at
 the same time, satisfies all of its internal dependencies can be
diff --git a/gnu/packages/books.scm b/gnu/packages/books.scm
index edd463d48a..0ebe09a178 100644
--- a/gnu/packages/books.scm
+++ b/gnu/packages/books.scm
@@ -64,7 +64,6 @@
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages tex)
   #:use-module (gnu packages texinfo)
-  #:use-module (gnu packages texlive)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages webkit)
   #:use-module (gnu packages xml))
diff --git a/gnu/packages/texlive.scm b/gnu/packages/texlive.scm
index 45ab5e9c14..ec6533fa11 100644
--- a/gnu/packages/texlive.scm
+++ b/gnu/packages/texlive.scm
@@ -1,25 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2023, 2024, 2025 Andreas Enge 
<[email protected]>
-;;; Copyright © 2014 Eric Bavier <[email protected]>
-;;; Copyright © 2015 Mark H Weaver <[email protected]>
-;;; Copyright © 2016 Roel Janssen <[email protected]>
-;;; Copyright © 2016, 2018-2021, 2023 Efraim Flashner <[email protected]>
-;;; Copyright © 2016 Federico Beffa <[email protected]>
-;;; Copyright © 2016 Thomas Danckaert <[email protected]>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus 
<[email protected]>
-;;; Copyright © 2017 Leo Famulari <[email protected]>
-;;; Copyright © 2017, 2020, 2021 Marius Bakke <[email protected]>
-;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <[email protected]>
-;;; Copyright © 2018 Danny Milosavljevic <[email protected]>
-;;; Copyright © 2018, 2020 Arun Isaac <[email protected]>
-;;; Copyright © 2020 Vincent Legoll <[email protected]>
-;;; Copyright © 2020, 2021 Paul Garlick <[email protected]>
-;;; Copyright © 2021 Maxim Cournoyer <[email protected]>
-;;; Copyright © 2021 Leo Le Bouter <[email protected]>
-;;; Copyright © 2021 Xinglu Chen <[email protected]>
-;;; Copyright © 2021 Ivan Gankevich <[email protected]>
-;;; Copyright © 2021 Julien Lepiller <[email protected]>
-;;; Copyright © 2021 Thiago Jung Bauermann <[email protected]>
+;;; Copyright © 2026 Andreas Enge <[email protected]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37,384 +17,9 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages texlive)
-  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system trivial)
-  #:use-module (guix utils)
-  #:use-module (gnu packages autotools)
-  #:use-module (gnu packages bash)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages fontutils)
-  #:use-module (gnu packages gd)
-  #:use-module (gnu packages ghostscript)
-  #:use-module (gnu packages gtk)
-  #:use-module (gnu packages icu4c)
-  #:use-module (gnu packages image)
-  #:use-module (gnu packages lua)
-  #:use-module (gnu packages multiprecision)
-  #:use-module (gnu packages perl)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages python)
-  #:use-module (gnu packages ruby)
-  #:use-module (gnu packages shells)
-  #:use-module (gnu packages xdisorg)
-  #:use-module (gnu packages xorg))
+  #:use-module (gnu packages tex))
 
-(define %texlive-date "20250308")
-(define %texlive-year (string-take %texlive-date 4))
-
-(define texlive-extra-src
-  (origin
-    (method url-fetch)
-    (uri (string-append "ftp://tug.org/historic/systems/texlive/";
-                        %texlive-year "/texlive-"
-                        %texlive-date "-extra.tar.xz"))
-    (sha256 (base32
-             "1lk9fsyvxayfz4xjplazwkjgamwk9p5yhxjlqk5ql4wvpkncysga"))))
-
-(define texlive-texmf-src
-  (origin
-    (method url-fetch)
-    (uri (string-append "ftp://tug.org/historic/systems/texlive/";
-                        %texlive-year "/texlive-"
-                        %texlive-date "-texmf.tar.xz"))
-    (sha256 (base32
-             "1ky72r9z8v93nyns5109rkvx6wqlgqciwvrjpdp2y3dz61sdmp08"))))
-
-(define texlivebin
-  (package
-    (name "texlivebin")
-    (version %texlive-date)
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "ftp://tug.org/historic/systems/texlive/";
-                           %texlive-year "/texlive-"
-                           %texlive-date "-source.tar.xz"))
-       (sha256
-        (base32
-         "03s92wj9z334azyxrxp5k20g323a1nj2j8la76j7gha3s6iv3zgz"))
-       (modules '((guix build utils)
-                  (ice-9 ftw)))
-       (snippet
-        ;; TODO: Unbundle stuff in texk/dvisvgm/dvisvgm-src/libs too.
-        '(with-directory-excursion "libs"
-           (let ((preserved-directories
-                 '("." ".." "lua53" "luajit" "pplib" "xpdf")))
-             ;; Delete bundled software, except Lua which cannot easily be
-             ;; used as an external dependency, pplib and xpdf which aren't
-             ;; supported as system libraries (see m4/kpse-xpdf-flags.m4).
-             (for-each
-               delete-file-recursively
-               (scandir "."
-                 (lambda (file)
-                   (and (not (member file preserved-directories))
-                        (eq? 'directory (stat:type (stat file))))))))))))
-    (build-system gnu-build-system)
-    (inputs
-     `(("texlive-extra-src" ,texlive-extra-src)
-       ("config" ,config)
-       ("cairo" ,cairo)
-       ("fontconfig" ,fontconfig)
-       ("fontforge" ,fontforge)
-       ("freetype" ,freetype)
-       ("gd" ,gd)
-       ("gmp" ,gmp)
-       ("ghostscript" ,ghostscript)
-       ("graphite2" ,graphite2)
-       ("harfbuzz" ,harfbuzz)
-       ("icu4c" ,icu4c)
-       ("libpaper" ,libpaper)
-       ("libpng" ,libpng)
-       ("libxaw" ,libxaw)
-       ("libxt" ,libxt)
-       ("mpfi" ,mpfi)
-       ("mpfr" ,mpfr)
-       ("perl" ,perl)
-       ("pixman" ,pixman)
-       ("potrace" ,potrace)
-       ("python" ,python)
-       ;; TODO Move to ruby@3 on the next rebuild cycle.
-       ("ruby" ,ruby-2.7)
-       ("tcsh" ,tcsh)
-       ("teckit" ,teckit)
-       ("zlib" ,zlib)
-       ("zziplib" ,zziplib)))
-    (native-inputs
-     (list pkg-config))
-    (arguments
-     `(#:modules ((guix build gnu-build-system)
-                  (guix build utils)
-                  (ice-9 ftw)
-                  (srfi srfi-1)
-                  (srfi srfi-26))
-       #:out-of-source? #t
-       #:configure-flags
-       '("--disable-static"
-         "--disable-native-texlive-build"
-         "--enable-shared"
-         "--with-banner-add=/GNU Guix"
-         "--with-system-cairo"
-         "--with-system-freetype2"
-         "--with-system-gd"
-         "--with-system-gmp"
-         "--with-system-graphite2"
-         "--with-system-harfbuzz"
-         "--with-system-icu"
-         "--with-system-libpaper"
-         "--with-system-libpng"
-         "--with-system-mpfr"
-         "--with-system-pixman"
-         "--with-system-potrace"
-         "--with-system-teckit"
-         "--with-system-zlib"
-         "--with-system-zziplib"
-         ;; LuaJIT is not ported to some architectures yet.
-         ,@(if (or (target-ppc64le?)
-                   (target-riscv64?))
-             '("--disable-luajittex"
-               "--disable-luajithbtex"
-               "--disable-mfluajit")
-             '()))
-
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-psutils-test
-           (lambda _
-             ;; This test fails due to a rounding difference with libpaper 1.2:
-             ;;   https://github.com/rrthomas/libpaper/issues/23
-             ;; Adjust the expected outcome to account for the minute 
difference.
-             (substitute* "texk/psutils/tests/playres.ps"
-               (("844\\.647799")
-                "844.647797"))))
-         (add-after 'unpack 'configure-ghostscript-executable
-           ;; ps2eps.pl uses the "gswin32c" ghostscript executable on Windows,
-           ;; and the "gs" ghostscript executable on Unix. It detects Unix by
-           ;; checking for the existence of the /usr/bin directory. Since
-           ;; Guix System does not have /usr/bin, it is also detected as 
Windows.
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* "utils/ps2eps/ps2eps-src/bin/ps2eps.pl"
-               (("gswin32c") "gs"))
-             (substitute* "texk/texlive/linked_scripts/epstopdf/epstopdf.pl"
-               (("\"gs\"")
-                (string-append "\"" (assoc-ref inputs "ghostscript") 
"/bin/gs\"")))))
-         (add-after 'unpack 'unpack-texlive-extra
-           (lambda* (#:key inputs #:allow-other-keys)
-             (mkdir "texlive-extra")
-             (with-directory-excursion "texlive-extra"
-               (apply (assoc-ref %standard-phases 'unpack)
-                      (list #:source (assoc-ref inputs 
"texlive-extra-src"))))))
-         (add-after 'install 'post-install
-           (lambda* (#:key inputs outputs #:allow-other-keys #:rest args)
-             (let* ((out (assoc-ref outputs "out"))
-                    (patch-source-shebangs (assoc-ref %standard-phases
-                                                      'patch-source-shebangs))
-                    (share (string-append out "/share"))
-                    (source (string-append
-                             "../" (first (scandir ".." (cut string-suffix?
-                                                             "source" <>)))))
-                    (tl-extra-root (string-append source "/texlive-extra"))
-                    (tl-extra-dir (first
-                                   (scandir tl-extra-root
-                                            (negate
-                                             (cut member <> '("." ".."))))))
-                    (tlpkg-src (string-append tl-extra-root "/" tl-extra-dir
-                                              "/tlpkg"))
-                    (config.guess (search-input-file inputs
-                                                     "/bin/config.guess")))
-
-               ;; Create symbolic links for the latex variants and their man
-               ;; pages.  We link lualatex to luahbtex; see issue #51252 for
-               ;; details.
-               (with-directory-excursion (string-append out "/bin/")
-                 (for-each
-                  symlink
-                  '("pdftex" "pdftex"   "xetex"   "luahbtex" "luatex")
-                  '("latex"  "pdflatex" "xelatex" "lualatex" "dvilualatex")))
-               (with-directory-excursion (string-append share "/man/man1/")
-                 (symlink "luatex.1" "lualatex.1"))
-
-               ;; Install tlpkg.
-               (copy-recursively tlpkg-src (string-append share "/tlpkg"))
-               (with-directory-excursion share
-                 ;; Make sure tlmgr finds its Perl modules.
-                 ;; tlmgr is a script in bin/ that runs tlmgr.pl in
-                 ;; texmf-dist/; so although texmf-dist/ will be discarded in
-                 ;; the texlive package in favour of the one from texlivetexmf,
-                 ;; through the absolute path our modifications will be used
-                 ;; by the script.
-                 (substitute* "texmf-dist/scripts/texlive/tlmgr.pl"
-                   ((".*\\$::installerdir = \\$Master.*" all)
-                    (format #f "  $Master = ~s;~%~a" share all)))
-                 ;; Install the config.guess script, required by tlmgr.
-                 (mkdir-p "tlpkg/installer/")
-                 (symlink config.guess "tlpkg/installer/config.guess"))
-
-               ;; texlua shebangs are not patched by the patch-source-shebangs
-               ;; phase because the texlua executable does not exist at that
-               ;; time.
-               (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin"))
-               (with-directory-excursion out
-                 (patch-source-shebangs))))))))
-
-    (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 binaries.")
-    (license (license:fsf-free "https://www.tug.org/texlive/copying.html";))
-    (home-page "https://www.tug.org/texlive/";)))
-
-
-(define texlivetexmf
-  (package
-   (name "texlivetexmf")
-   (version %texlive-date)
-   (source texlive-texmf-src)
-   (build-system gnu-build-system)
-   (inputs
-    `(("texlive-bin" ,texlivebin)
-      ("lua" ,lua)
-      ("perl" ,perl)
-      ("python" ,python)
-      ("ruby" ,ruby)
-      ("tcsh" ,tcsh)))
-   (arguments
-    `(#: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)
-                            '(set-paths unpack patch-source-shebangs))
-          (add-after 'unpack 'unset-environment-variables
-            (lambda _
-              (unsetenv "TEXMF")
-              (unsetenv "TEXMFCNF")
-              #t))
-          (add-after 'patch-source-shebangs 'install
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let ((share (string-append (assoc-ref outputs "out") "/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"))
-                     (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"))
-                     (texbin (string-append texlive-bin "/bin"))
-                     (tlpkg (string-append texlive-bin "/share/tlpkg")))
-                ;; LuaJIT is not ported to some systems yet.
-                (if ,(or (target-ppc64le?)
-                         (target-riscv64?))
-                    (substitute* fmtutilcnf
-                      (("^(luajittex|luajithbtex|mfluajit)" m)
-                       (string-append "#! " m))))
-                ;; Register SHARE as TEXMFROOT in texmf.cnf.
-                (substitute* texmfcnf
-                  (("TEXMFROOT = \\$SELFAUTOPARENT")
-                   (string-append "TEXMFROOT = " share))
-                  (("TEXMFLOCAL = \\$SELFAUTOGRANDPARENT/texmf-local")
-                   "TEXMFLOCAL = $SELFAUTODIR/share/texmf-local")
-                  (("!!\\$TEXMFLOCAL") "$TEXMFLOCAL"))
-                ;; Register paths in texmfcnf.lua, needed for context.
-                (substitute* (string-append texmfroot "/texmfcnf.lua")
-                  (("selfautodir:") out)
-                  (("selfautoparent:") (string-append share "/")))
-                ;; Set path to TeXLive Perl modules
-                (setenv "PERL5LIB"
-                        (string-append (getenv "PERL5LIB") ":" tlpkg))
-                ;; Configure the texmf-dist tree; inspired from
-                ;; http://slackbuilds.org/repository/13.37/office/texlive/
-                (setenv "PATH" (string-append (getenv "PATH") ":" texbin))
-                (setenv "TEXMFCNF" texmfroot)
-                (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.
-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/";)))
-
-(define-public texlive
-  (package
-   (name "texlive")
-   (version %texlive-date)
-   (source #f)
-   (build-system trivial-build-system)
-   (inputs `(("bash" ,bash-minimal)     ;for wrap-program
-             ("texlive-bin" ,texlivebin)
-             ("texlive-texmf" ,texlivetexmf)))
-   (native-search-paths
-    (list (search-path-specification
-           (variable "TEXMFLOCAL")
-           (files '("share/texmf-local")))))
-   (arguments
-    `(#:modules ((guix build utils))
-      #:builder
-        ;; Build the union of texlive-bin and texlive-texmf, but take the
-        ;; conflicting subdirectory share/texmf-dist from texlive-texmf.
-        (begin
-          (use-modules (guix build utils))
-          (let ((out (assoc-ref %outputs "out"))
-                (bin (assoc-ref %build-inputs "texlive-bin"))
-                (texmf (assoc-ref %build-inputs "texlive-texmf"))
-                (bash (assoc-ref %build-inputs "bash")))
-               (mkdir out)
-               (with-directory-excursion out
-                 (for-each
-                   (lambda (name)
-                     (symlink (string-append bin "/" name) name))
-                   '("include" "lib"))
-                 (mkdir "bin")
-                 (with-directory-excursion "bin"
-                   (setenv "PATH" (string-append bash "/bin"))
-                   (for-each
-                     (lambda (name)
-                       (symlink name (basename name))
-                       (wrap-program
-                         (basename name)
-                         `("TEXMFCNF" =
-                           (,(string-append texmf 
"/share/texmf-dist/web2c")))))
-                     (find-files (string-append bin "/bin/") "")))
-                 (mkdir "share")
-                 (with-directory-excursion "share"
-                   (for-each
-                     (lambda (name)
-                       (symlink (string-append bin "/share/" name) name))
-                     '("info" "man" "tlpkg"))
-                   (for-each
-                     (lambda (name)
-                       (symlink (string-append texmf "/share/" name) name))
-                     '("texmf-dist" "texmf-var"))))
-               #t))))
-   (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 TeX Live distribution.")
-   (license (license:fsf-free "https://www.tug.org/texlive/copying.html";))
-   (home-page "https://www.tug.org/texlive/";)))
+;; 2026-01-06
+(define-deprecated-package texlive texlive-scheme-full)
 

Reply via email to