* Update thomaslabs/packages/tex.scm

1 files changed, 37 insertions, 153 deletions

diff --git a/thomaslabs/packages/tex.scm b/thomaslabs/packages/tex.scm
index 5b6a780..7d533f7 100644
--- a/thomaslabs/packages/tex.scm
+++ b/thomaslabs/packages/tex.scm
@@ -1,40 +1,21 @@
 (define-module (thomaslabs packages tex)
   #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
 
-  #:use-module (guix build-system texlive)
-  #:use-module (guix build-system gnu)
-
-  #:use-module (gnu packages)
-  #:use-module (gnu packages cpp)
-  #:use-module (gnu packages digest)
-
-  #:use-module (gnu packages tex)
-  #:use-module (gnu packages gettext)
-  #:use-module (gnu packages autotools)
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages python)
-  #:use-module (gnu packages compression)
-  #:use-module (gnu packages fontutils)
-  #:use-module (gnu packages m4)
-  #:use-module (gnu packages ghostscript))
-
-(define simple-texlive-package
-  (@@ (gnu packages tex) simple-texlive-package))
+  #:use-module (guix build-system texlive))
 
 (define-public texlive-circuitikz
   (package
-    (inherit (simple-texlive-package
-              "texlive-circuitikz"
-              (list "doc/latex/circuitikz/"
-                    "tex/latex/circuitikz/"
-                    "tex/generic/circuitikz/"
-                    "tex/context/third/circuitikz/")
-              (base32
-               "0xd2xyg9hqvl16a921hb7bxx4x7sxzzqap37h6is8g26swmw8jb2")
-              #:trivial? #t))
+    (name "texlive-circuitikz")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/circuitikz/"
+                   "tex/latex/circuitikz/"
+                   "tex/generic/circuitikz/"
+                   "tex/context/third/circuitikz/")
+             (base32
+              "00zh7pxshi0fikzr3hnr4bwkn8zm45qscqh7jhdg1w6p09h9wi0k")))
     (build-system texlive-build-system)
     (home-page "")
     (synopsis "")
@@ -44,13 +25,14 @@
 
 (define-public texlive-esdiff
   (package
-    (inherit (simple-texlive-package
-              "texlive-esdiff"
-              (list "doc/latex/esdiff/"
-                    "tex/latex/esdiff/")
-              (base32
-               "1qivxp937zmndzb5569dabq6x1gnq40kvyyhmf1srkkk3fy5admp")
-              #:trivial? #t))
+    (name "texlive-esdiff")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/esdiff/"
+                   "tex/latex/esdiff/")
+             (base32
+              "1qivxp937zmndzb5569dabq6x1gnq40kvyyhmf1srkkk3fy5admp")))
     (build-system texlive-build-system)
     (home-page "")
     (synopsis "")
@@ -60,16 +42,17 @@
 
 (define-public texlive-pgfplots
   (package
-    (inherit (simple-texlive-package
-              "texlive-pgfplots"
-              (list "doc/latex/pgfplots/"
-                    "tex/latex/pgfplots/"
-                    "tex/generic/pgfplots/"
-                    "tex/plain/pgfplots/"
-                    "scripts/pgfplots/")
-              (base32
-               "1313xc5dn32fx86pyki2gm0vyzgv1450bca03x8cmk6j0liik28n")
-              #:trivial? #t))
+    (name "texlive-pgfplots")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "doc/latex/pgfplots/"
+                   "tex/latex/pgfplots/"
+                   "tex/generic/pgfplots/"
+                   "tex/plain/pgfplots/"
+                   "scripts/pgfplots/")
+             (base32
+              "0dz6f1ap69pvjkdd1sp49882p3nzs12vpniawpmwf9962b3vmlij")))
     (build-system texlive-build-system)
     (home-page "")
     (synopsis "")
@@ -79,115 +62,16 @@
 
 (define-public texlive-mhchem
   (package
-    (inherit (simple-texlive-package
-              "texlive-mhchem"
-              (list "tex/latex/mhchem/")
-              (base32
-               "0cp7dfkry418kb0md1bvkv5b7x8m5r5ygj6lnz3arym2fzmmrp7z")
-              #:trivial? #t))
+    (name "texlive-mhchem")
+    (version (number->string %texlive-revision))
+    (source (texlive-origin
+             name version
+             (list "tex/latex/mhchem/")
+             (base32
+              "07dnb38z8p5a46fp8rx3nqhqni0lwg48wzi2bc2nxb4yb0wlcfai")))
     (build-system texlive-build-system)
     (home-page "")
     (synopsis "")
     (description
      "")
     (license license:lppl)))
-
-;; (define-public texlive-mathtools
-;;   (package
-;;     (inherit (simple-texlive-package
-;;               "texlive-mathtools"
-;;               (list "doc/latex/pgfplots/"
-;;                     "tex/latex/pgfplots/"
-;;                     "tex/generic/pgfplots/"
-;;                     "tex/plain/pgfplots/"
-;;                     "scripts/pgfplots/")
-;;               (base32
-;;                "1313xc5dn32fx86pyki2gm0vyzgv1450bca03x8cmk6j0liik28n")
-;;               #:trivial? #t))
-;;     (build-system texlive-build-system)
-;;     (home-page "")
-;;     (synopsis "")
-;;     (description
-;;      "")
-;;     (license license:lppl)))
-
-(define-public texlive-latex-base-fixed
-  (package
-    (inherit texlive-latex-base)
-    (name "texlive-latex-base-fixed")
-    (propagated-inputs (modify-inputs
-                           (package-propagated-inputs texlive-latex-base)
-                         (append texlive-babel)))))
-
-;; (define-public dvisvgm
-;;   (package
-;;     (name "dvisvgm")
-;;     (version "3.0.3")
-;;     (source
-;;      (origin
-;;        (method git-fetch)
-;;        (uri (git-reference
-;;              (url "https://github.com/mgieseki/dvisvgm")
-;;              (commit version)))
-;;        (file-name (git-file-name name version))
-;;        (sha256
-;;         (base32 "11r401yqbw61n1mwsfk5qmwx2c92djwpl0q756qkds5kh25l9ci8"))))
-;;     (native-inputs
-;;      (list pkg-config
-;;            autoconf
-;;            autoconf-archive
-;;            automake
-;;            python-wrapper
-;;            libtool))
-;;     (inputs
-;;      (list texlive-libkpathsea
-;;            freetype
-;;            fontforge
-;;            clipper
-;;            ghostscript
-;;            xxhash
-;;            google-brotli
-;;            woff2
-;;            zlib))
-;;     (build-system gnu-build-system)
-;;     (synopsis "Command-line utility for generating SVG from DVI, EPS and PDF
-;; files")
-;;     (description "`dvisvgm' converts TeX DVI, EPS and PDF files into an
-;; SVG (Scalable Vector Graphics) image.  It provides full font support including
-;; virtual fonts, font maps and sub-fonts.  The embedded SVG fonts can optionally
-;; be replaced with graphics paths for applications that do not support SVG
-;; fonts.  `dvisvgm' supports also colors, emTeX, tpic, papersize, PDF mapfile
-;; and PostScript specials.  A working TeX installation in needed.")
-;;     (home-page "https://dvisvgm.de/")
-;;     (license license:gpl3+)))
-
-;; (define-public digestif
-;;   (package
-;;    (name "digestif")
-;;    (version "0.0.1")
-;;    (source (origin
-;;             (uri (git-reference
-;;                   (url "https://github.com/astoff/digestif.git")
-;;                   (commit "505ca88a54012be5534654238baaa457f8446fed")))
-;;             (sha256
-;;              (base32 "1prv5nqskvilyyx3z9b2jiz72lwpz2xcas57qjpbv6qq5l2si1xm"))
-;;             (method git-fetch)))
-;;    (inputs
-;;     `(("lua" ,lua)
-;;       ("lua-lpeg" ,lua-lpeg)))
-;;    (build-system copy-build-system)
-;;    (arguments '(#:phases
-;;                 (modify-phases %standard-phases
-;;                   (add-before 'install 'fix
-;;                               (lambda* (#:key outputs #:allow-other-keys)
-;;                                 (m)
-;;                                 (let ((files '("digestif-dev-1.rockspec"
-;;                                                ".travis.yml"
-;;                                                "spec"
-;;                                                "scripts"))))
-;;                       ()
-;;                       #t)))))
-;;    (synopsis "")
-;;    (description "")
-;;    (home-page "a")
-;;    (license license:gpl3)))