summary refs log tree commit diff
path: root/gnu/local.mk
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2023-07-27 11:05:09 +0200
committerAndreas Enge <andreas@enge.fr>2023-08-17 16:19:05 +0200
commit0421160f4a350de72422f4a51d7fd101b3764376 (patch)
treebd65c2f4a1cc6a9b9c2246aa02227be9350813a7 /gnu/local.mk
parent314e984d6c3836a28528f057d8b2418e1cfdbd5b (diff)
downloadguix-0421160f4a350de72422f4a51d7fd101b3764376.tar.gz
gnu: texlive: Reinstate the monolithic texlive package.
This goes back essentially to commit
ad457d01147b8d6fcb4ee64b2dc2d699caa1d1ee and defines the monolithic texlive
packages independently of the modular ones. It also downgrades their
version to 2021. Not using dashes in the names of texlivebin and
texlivetexmf prevents the profile hook for font mapping from being run
during the command "guix shell -D texlive".

* gnu/packages/tex.scm (texlive-bin-full): Remove variable.
(biber): Remove variable deprecation.
(texlive-texm, texlive): Move variables from here...
* gnu/packages/texlive.scm (texlivetexm, texlive): ...to this new file.
(%texlive-date, %texlive-version, %texlive-tag, %texlive-revision,
texlive-extra-src, texlive-texmf-src, texlivebin): New variables.
(biber): Add variable again.
* gnu/packages/patches/biber-adapt-perl-5.36.patch: Add file again.
* gnu/local.mk (GNU_SYSTEM_MODULES, dist_patch_DATA): Register files.
Diffstat (limited to 'gnu/local.mk')
-rw-r--r--gnu/local.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 1ec6ba4523..10cf532d89 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -610,6 +610,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/terraform.scm			\
   %D%/packages/texinfo.scm			\
   %D%/packages/tex.scm				\
+  %D%/packages/texlive.scm                      \
   %D%/packages/textutils.scm			\
   %D%/packages/text-editors.scm			\
   %D%/packages/time.scm				\
@@ -945,6 +946,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/bazaar-CVE-2017-14176.patch		\
   %D%/packages/patches/bc-fix-cross-compilation.patch		\
   %D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch		\
+  %D%/packages/patches/biber-adapt-perl-5.36.patch              \
   %D%/packages/patches/bind-re-add-attr-constructor-priority.patch	\
   %D%/packages/patches/brightnessctl-elogind-support.patch	\
   %D%/packages/patches/bsd-games-2.17-64bit.patch		\