[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
122/418: gnu: texlive-tex-texinfo -> texlive-texinfo.
From: |
guix-commits |
Subject: |
122/418: gnu: texlive-tex-texinfo -> texlive-texinfo. |
Date: |
Mon, 29 May 2023 17:39:01 -0400 (EDT) |
ngz pushed a commit to branch tex-team-next
in repository guix.
commit b0f9e324a199049db51349826f68592566d7c564
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Sun May 14 21:47:36 2023 +0200
gnu: texlive-tex-texinfo -> texlive-texinfo.
* gnu/packages/tex.scm (texlive-texinfo): New variable.
(texlive-tex-texinfo): Deprecate variable.
* doc/build.scm (pdf-manual):
* gnu/packages/finance.scm (optionmatrix):
* gnu/packages/lisp.scm (sbcl):
* gnu/packages/plotutils.scm (asymptote):
* gnu/packages/scheme.scm (mit-scheme):
* gnu/packages/xdisorg.scm (xforms): Use new name.
---
doc/build.scm | 2 +-
gnu/packages/finance.scm | 2 +-
gnu/packages/lisp.scm | 2 +-
gnu/packages/plotutils.scm | 2 +-
gnu/packages/scheme.scm | 5 +++--
gnu/packages/tex.scm | 38 ++++++++++++--------------------------
gnu/packages/xdisorg.scm | 2 +-
7 files changed, 20 insertions(+), 33 deletions(-)
diff --git a/doc/build.scm b/doc/build.scm
index 08a523235a..d3d55a9559 100644
--- a/doc/build.scm
+++ b/doc/build.scm
@@ -907,7 +907,7 @@ makeinfo OPTIONS."
texlive-bin ;for GUIX_TEXMF
texlive-epsf
texlive-ec
- texlive-tex-texinfo)))))
+ texlive-texinfo)))))
(define build
(with-imported-modules '((guix build utils))
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 112246f07c..0f5e6651c6 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -2158,7 +2158,7 @@ trading, and risk management in real-life.")
(list gsl gtk+ ncurses))
(native-inputs
(list pkg-config texinfo
- (texlive-updmap.cfg (list texlive-epsf texlive-tex-texinfo))))
+ (texlive-updmap.cfg (list texlive-epsf texlive-texinfo))))
(home-page "https://anthonybradford.github.io/optionmatrix/")
(synopsis "Financial derivative calculator")
(description
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 000c8e8e66..fd40dff13e 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -475,7 +475,7 @@ an interpreter, a compiler, a debugger, and much more.")
ed
inetutils ;for hostname(1)
texinfo
- (texlive-updmap.cfg (list texlive-tex-texinfo))
+ (texlive-updmap.cfg (list texlive-texinfo))
which))
(inputs
(list gmp ; for sb-gmp
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index 4a681d3ecb..db14272804 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -325,7 +325,7 @@ colors, styles, options and details.")
texlive-ocgx2
texlive-parskip
texlive-pdftexcmds
- texlive-tex-texinfo))))
+ texlive-texinfo))))
(inputs
(list bash-minimal
eigen
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 2337b60ee9..17ed85d582 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -185,8 +185,9 @@
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)
- ("texlive" ,(texlive-updmap.cfg (list texlive-tex-texinfo
- texlive-epsf)))
+ ("texlive" ,(texlive-updmap.cfg
+ (list texlive-epsf
+ texlive-texinfo)))
("texinfo" ,texinfo)
("ghostscript" ,ghostscript)
("m4" ,m4)))
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 9376d47a63..883a20c651 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6531,34 +6531,18 @@ a few situations where longtable has problems.")
(define-deprecated-package texlive-latex-supertabular texlive-supertabular)
-(define-public texlive-tex-texinfo
+(define-public texlive-texinfo
(package
- (name "texlive-tex-texinfo")
+ (name "texlive-texinfo")
(version (number->string %texlive-revision))
- (source (origin
- (method svn-fetch)
- (uri (svn-reference
- (url (string-append "svn://www.tug.org/texlive/tags/"
- %texlive-tag "/Master/texmf-dist/"
- "/tex/texinfo"))
- (revision %texlive-revision)))
- (file-name (string-append name "-" version "-checkout"))
- (sha256
- (base32
- "1qcmcsxdsibca0mad559vhz36xaxsbkivgv1hc98vdyd90fg4y31"))))
- (build-system trivial-build-system)
- (arguments
- `(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils))
- (let ((target (string-append (assoc-ref %outputs "out")
- "/share/texmf-dist/tex/texinfo")))
- (mkdir-p target)
- (copy-recursively (assoc-ref %build-inputs "source") target)
- #t))))
- (home-page "https://www.ctan.org/pkg/texinfo")
- (synopsis "TeX macros to handle Texinfo files")
+ (source (texlive-origin
+ name version
+ (list "tex/texinfo/")
+ (base32
+ "0wbbhjr1jqiicnssiy6n5s4v5p6axhlilpkfhix4kavbj8mb6mfn")))
+ (build-system texlive-build-system)
+ (home-page "https://ctan.org/pkg/texinfo")
+ (synopsis "Texinfo documentation system")
(description
"Texinfo is the preferred format for documentation in the GNU project;
the format may be used to produce online or printed output from a single
@@ -6567,6 +6551,8 @@ other programs in the distribution offer online
interactive use (with
hypertext linkages in some cases).")
(license license:gpl3+)))
+(define-deprecated-package texlive-tex-texinfo texlive-texinfo)
+
(define-public texlive-textcase
(package
(inherit (simple-texlive-package
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 008b2fdb75..a4e4c6758c 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -3487,7 +3487,7 @@ the following features:
texinfo
texi2html
(texlive-updmap.cfg (list texlive-epsf
- texlive-tex-texinfo))
+ texlive-texinfo))
imagemagick))
(propagated-inputs (list libx11 libxpm libjpeg-turbo))
(home-page "http://xforms-toolkit.org/")
- 93/418: gnu: texlive-preprint: Fix build., (continued)
- 93/418: gnu: texlive-preprint: Fix build., guix-commits, 2023/05/29
- 100/418: gnu: texlive-latex-ucs -> texlive-ucs., guix-commits, 2023/05/29
- 95/418: gnu: Add texlive-luatexbase., guix-commits, 2023/05/29
- 96/418: gnu: Add texlive-luacode., guix-commits, 2023/05/29
- 104/418: gnu: texlive-latex-ocgx2 -> texlive-ocgx2., guix-commits, 2023/05/29
- 105/418: gnu: texlive-latex-changepage -> texlive-changepage., guix-commits, 2023/05/29
- 106/418: gnu: texlive-latex-eukdate -> texlive-eukdate., guix-commits, 2023/05/29
- 107/418: gnu: texlive-latex-readarray -> texlive-readarray., guix-commits, 2023/05/29
- 110/418: gnu: texlive-latex-xmpincl -> texlive-xmpincl., guix-commits, 2023/05/29
- 114/418: gnu: texlive-latex-hyphenat -> texlive-hyphenat., guix-commits, 2023/05/29
- 122/418: gnu: texlive-tex-texinfo -> texlive-texinfo.,
guix-commits <=
- 125/418: gnu: texlive-wasysym: Refresh package definition., guix-commits, 2023/05/29
- 128/418: gnu: Add texlive-svn-prov., guix-commits, 2023/05/29
- 131/418: gnu: texlive-fontaxes: Refresh package definition., guix-commits, 2023/05/29
- 134/418: gnu: texlive-ifoddpage: Refresh package definition., guix-commits, 2023/05/29
- 139/418: gnu: texlive-metafont: Refresh package definition., guix-commits, 2023/05/29
- 141/418: gnu: Add texlive-xetexconfig., guix-commits, 2023/05/29
- 147/418: gnu: texlive-sourcesanspro: Refresh package definition., guix-commits, 2023/05/29
- 149/418: gnu: texlive-comment: Refresh package definition., guix-commits, 2023/05/29
- 148/418: gnu: texlive-physics: Refresh package definition., guix-commits, 2023/05/29
- 152/418: gnu: texlive-relsize: Refresh package definition., guix-commits, 2023/05/29