guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

365/418: gnu: texlive-catchfile: Remove SIMPLE-TEXLIVE-PACKAGE call.


From: guix-commits
Subject: 365/418: gnu: texlive-catchfile: Remove SIMPLE-TEXLIVE-PACKAGE call.
Date: Fri, 2 Jun 2023 17:25:56 -0400 (EDT)

ngz pushed a commit to branch tex-team-next
in repository guix.

commit fcaebace6f85e0cd3087f55de6f745f0d349019e
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Thu May 18 13:45:41 2023 +0200

    gnu: texlive-catchfile: Remove SIMPLE-TEXLIVE-PACKAGE call.
    
    * gnu/packages/tex.scm (texlive-catchfile!): Remove SIMPLE-TEXLIVE-PACKAGE
    call.
    [propagated-inputs]: Add TEXLIVE-ETEXCMDS, TEXLIVE-INFWARERR,
    TEXLIVE-LTXCMDS.
---
 gnu/packages/tex.scm | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 463461ba06..307ccf70ef 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6358,24 +6358,26 @@ for physicists.")
     (license license:lppl)))
 
 (define-public texlive-catchfile
-  (let ((template (simple-texlive-package
-                   "texlive-catchfile"
-                   (list "/doc/latex/catchfile/"
-                         "/source/latex/catchfile/"
-                         "/tex/generic/catchfile/")
-                   (base32
-                    "1dpxy64hs0bjp8d2dmikflc995vazf7fi6z92w51fnj2fidgl8gx"))))
-    (package
-      (inherit template)
-      (arguments
-       (substitute-keyword-arguments (package-arguments template)
-         ((#:tex-directory _ #t)
-          "latex/catchfile")))
-      (home-page "https://ctan.org/macros/latex/contrib/catchfile";)
-      (synopsis "Catch an external file into a macro")
-      (description
-       "Catchfile catches the contents of a file and puts it in a macro.")
-      (license license:lppl1.3+))))
+  (package
+    (name "texlive-catchfile")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/catchfile/" "source/latex/catchfile/"
+                   "tex/generic/catchfile/")
+             (base32
+              "1dpxy64hs0bjp8d2dmikflc995vazf7fi6z92w51fnj2fidgl8gx")))
+    (outputs '("out" "doc"))
+    (build-system texlive-build-system)
+    (propagated-inputs
+     (list texlive-etexcmds
+           texlive-infwarerr
+           texlive-ltxcmds))
+    (home-page "https://ctan.org/macros/latex/contrib/catchfile";)
+    (synopsis "Catch an external file into a macro")
+    (description
+     "Catchfile catches the contents of a file and puts it in a macro.")
+    (license license:lppl1.3+)))
 
 (define-public texlive-ddphonism
   (package



reply via email to

[Prev in Thread] Current Thread [Next in Thread]