summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/packages/docbook.scm6
-rw-r--r--gnu/packages/tex.scm13
2 files changed, 15 insertions, 4 deletions
diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm
index cb1a0d4d5e..6575bf2d75 100644
--- a/gnu/packages/docbook.scm
+++ b/gnu/packages/docbook.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2021-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -473,7 +473,11 @@ the in DocBook SGML DTDs.")
texlive-latex-footmisc
texlive-hyperref
texlive-latex-jknapltx
+
+ ;; TODO: Use non-deprecated name on
+ ;; next rebuild cycle.
texlive-latex-listings
+
texlive-latex-multirow
texlive-latex-overpic
texlive-latex-pdfpages
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 32707bba5c..758ec601b7 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5836,14 +5836,16 @@ optional arguments, or for macros that are defined as robust macros by
that also takes care of the involved internal macros.")
(license license:lppl1.3c+)))
-(define-public texlive-latex-listings
+(define-public texlive-listings
(package
- (name "texlive-latex-listings")
+ (name "texlive-listings")
(version (number->string %texlive-revision))
(source (origin
(method svn-fetch)
(uri (texlive-ref "latex" "listings"))
- (file-name (string-append name "-" version "-checkout"))
+ (file-name
+ ;; TODO: Drop "latex-" on next rebuild cycle.
+ (string-append "texlive-latex-listings-" version "-checkout"))
(sha256
(base32
"082zri3gp8s6p2difhk1pbix2vzmvsf6fmld2z78v35xwk3fiya0"))))
@@ -5860,6 +5862,8 @@ is needed. Keywords, comments and strings can be typeset using different
styles. Support for @code{hyperref} is provided.")
(license license:lppl1.3+)))
+(define-deprecated-package texlive-latex-listings texlive-listings)
+
(define-public texlive-latex-jknapltx
(package
(name "texlive-latex-jknapltx")
@@ -9035,7 +9039,10 @@ are part of the LaTeX required tools distribution, comprising the packages:
texlive-graphics-def
texlive-xcolor
texlive-latex-footmisc
+
+ ;; TODO: Use non-deprecated name on next rebuild cycle.
texlive-latex-listings
+
texlive-generic-iftex
texlive-pstricks
texlive-pst-text