[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/452: gnu: texlive-latex-trimspaces -> texlive-trimspaces.
From: |
guix-commits |
Subject: |
12/452: gnu: texlive-latex-trimspaces -> texlive-trimspaces. |
Date: |
Fri, 9 Jun 2023 13:42:47 -0400 (EDT) |
ngz pushed a commit to branch tex-team-next
in repository guix.
commit 49a9ac925b427817205e551edde2bbc03ac0b9b0
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Tue May 9 23:06:28 2023 +0200
gnu: texlive-latex-trimspaces -> texlive-trimspaces.
* gnu/packages/tex.scm (texlive-trimspaces): New variable.
(texlive-latex-trimspaces):
(texlive-pstool):
* gnu/packages/python-xyz.scm (python-nbconvert):
---
gnu/packages/python-xyz.scm | 2 +-
gnu/packages/tex.scm | 56 +++++++++++++++++++++++----------------------
2 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 98abf038a5..cac3123394 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14929,7 +14929,7 @@ time.")
texlive-latex-jknapltx
texlive-ms
texlive-latex-parskip
- texlive-latex-trimspaces
+ texlive-trimspaces
texlive-latex-upquote
texlive-stringenc
texlive-tcolorbox
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 226d812136..57fdafe18d 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -5234,8 +5234,8 @@ rotated.")
texlive-l3kernel ; for expl3
texlive-oberdiek
texlive-latex-psfrag
- texlive-tools ; for shellesc
- texlive-latex-trimspaces
+ texlive-tools ; for shellesc
+ texlive-trimspaces
texlive-latex-xkeyval))
(home-page "https://www.ctan.org/pkg/pstool")
(synopsis "Process PostScript graphics within pdfLaTeX documents")
@@ -5354,40 +5354,42 @@ and the ability to create new ‘List of ...’. The ToC
@code{\\parskip} may
be changed.")
(license license:lppl1.3c+)))
-(define-public texlive-latex-trimspaces
+(define-public texlive-trimspaces
(package
- (name "texlive-latex-trimspaces")
+ (name "texlive-trimspaces")
(version (number->string %texlive-revision))
- (source (origin
- (method svn-fetch)
- (uri (texlive-ref "latex" "trimspaces"))
- (file-name (string-append name "-" version "-checkout"))
- (sha256
- (base32
- "0da00lb32am4g63mn96625wg48p3pj3spx79lajrk17d549apwqa"))))
+ (source (texlive-origin
+ name version
+ (list "doc/latex/trimspaces/"
+ "source/latex/trimspaces/"
+ "tex/latex/trimspaces/")
+ (base32
+ "0if7pqaib533fbrj9r62mmr4h012hrpszdxs759rwhmyycikg6dk")))
+ (outputs '("out" "doc"))
(build-system texlive-build-system)
(arguments
- '(#:tex-directory "latex/trimspaces"
- #:tex-format "latex"
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-bug
- (lambda _
- ;; The "ins" file refers to the wrong source file.
- (substitute* "trimspaces.ins"
- (("pstool.tex") "trimspaces.tex"))
- #t)))))
- (inputs
+ (list
+ #:tex-format "latex"
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-bug
+ (lambda _
+ ;; The "ins" file refers to the wrong source file.
+ (substitute* "source/latex/trimspaces/trimspaces.ins"
+ (("pstool\\.tex") "trimspaces.tex")))))))
+ (propagated-inputs
(list texlive-filecontents))
- (home-page "https://www.ctan.org/pkg/trimspaces")
+ (home-page "https://ctan.org/pkg/trimspaces")
(synopsis "Trim spaces around an argument or within a macro")
(description
- "This very short package allows you to expandably remove spaces around a
-token list (commands are provided to remove spaces before, spaces after, or
-both); or to remove surrounding spaces within a macro definition, or to define
-space-stripped macros.")
+ "This package provides a very short package that allows you to expandably
+remove spaces around a token list (commands are provided to remove spaces
+before, spaces after, or both); or to remove surrounding spaces within a macro
+definition, or to define space-stripped macros.")
(license license:lppl)))
+(define-deprecated-package texlive-latex-trimspaces texlive-trimspaces)
+
(define-public texlive-calrsfs
(package
(inherit
- branch tex-team-next created (now ad5bd4bd68), guix-commits, 2023/06/09
- 02/452: gnu: Simplify simple-texlive-package for non-trivial packages., guix-commits, 2023/06/09
- 04/452: guix: import: Improve home-page generation in texlive importer., guix-commits, 2023/06/09
- 06/452: guix: import: Fix multiple licenses output in texlive importer., guix-commits, 2023/06/09
- 01/452: guix: texlive-build-system: Improvements on non-trivial packages., guix-commits, 2023/06/09
- 05/452: guix: import: texlive use full file names for generic directories., guix-commits, 2023/06/09
- 08/452: gnu: texlive-latex-blindtext -> texlive-blindtext., guix-commits, 2023/06/09
- 09/452: gnu: texlive-latex-dinbrief -> texlive-dinbrief., guix-commits, 2023/06/09
- 12/452: gnu: texlive-latex-trimspaces -> texlive-trimspaces.,
guix-commits <=
- 10/452: gnu: Add texlive-everypage., guix-commits, 2023/06/09
- 11/452: gnu: texlive-latex-draftwatermark -> texlive-draftwatermark., guix-commits, 2023/06/09
- 07/452: gnu: texlive-latex-l3kernel -> texlive-l3kernel., guix-commits, 2023/06/09
- 03/452: guix: import: Update texlive importer according to new build system., guix-commits, 2023/06/09
- 14/452: gnu: texlive-latex-eqparbox -> texlive-eqparbox., guix-commits, 2023/06/09
- 23/452: gnu: Add texlive-lualatex-math., guix-commits, 2023/06/09
- 17/452: gnu: Add texlive-minitoc., guix-commits, 2023/06/09
- 20/452: gnu: Add texlive-mfirstuc., guix-commits, 2023/06/09
- 15/452: gnu: texlive-latex-etoc -> texlive-etoc., guix-commits, 2023/06/09
- 28/452: gnu: Add texlive-refstyle., guix-commits, 2023/06/09