guix-commits
[Top][All Lists]
Advanced

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

12/110: gnu: texlive-dvips: Implement with simple-texlive-package.


From: guix-commits
Subject: 12/110: gnu: texlive-dvips: Implement with simple-texlive-package.
Date: Mon, 22 Jul 2019 15:25:32 -0400 (EDT)

rekado pushed a commit to branch wip-texlive
in repository guix.

commit 863b9df6e5999cb480425908a5b502c738541e98
Author: Ricardo Wurmus <address@hidden>
Date:   Mon Jul 8 22:43:43 2019 +0200

    gnu: texlive-dvips: Implement with simple-texlive-package.
    
    * gnu/packages/tex.scm (texlive-dvips): Use simple-texlive-package.
---
 gnu/packages/tex.scm | 66 ++++++++--------------------------------------------
 1 file changed, 10 insertions(+), 56 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 07a362a..3b62e1f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -462,64 +462,18 @@ the autogenerated files @file{language.dat} and 
@file{language.def} (and
 default versions of those), etc.")
     (license license:knuth)))
 
+;; TODO: This package should not exist.  There should not be a single package
+;; containing all of /dvips.  These really belong to different packages.
 (define-public texlive-dvips
   (package
-    (name "texlive-dvips")
-    (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/"
-                                        "/dvips"))
-                    (revision %texlive-revision)))
-              (file-name (string-append name "-" version "-checkout"))
-              (sha256
-               (base32
-                "1ky6wc173jhf0b33lhyb4r3bx1d4bmiqkn6y1hxn92kwjdzl42p7"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let* ((root (string-append (assoc-ref %outputs "out")
-                                     "/share/texmf-dist"))
-                (dvips (string-append root "/dvips"))
-                (maps  (string-append root "/fonts/map/dvips"))
-                (encs  (string-append root "/fonts/enc/dvips/base")))
-           (mkdir-p dvips)
-           (copy-recursively (assoc-ref %build-inputs "source") dvips)
-           (mkdir-p maps)
-           (copy-recursively (assoc-ref %build-inputs "dvips-font-maps") maps)
-           (mkdir-p encs)
-           (copy-recursively (assoc-ref %build-inputs "dvips-base-enc") encs)
-           #t))))
-    (native-inputs
-     `(("dvips-font-maps"
-        ,(origin
-           (method svn-fetch)
-           (uri (svn-reference
-                 (url (string-append "svn://www.tug.org/texlive/tags/"
-                                     %texlive-tag "/Master/texmf-dist/"
-                                     "/fonts/map/dvips"))
-                 (revision %texlive-revision)))
-           (file-name (string-append "dvips-font-maps-" version "-checkout"))
-           (sha256
-            (base32
-             "0nxvfbb5vsvakiw0iviicghdc2sxk05cj056ilqnpa62fffc36a6"))))
-       ("dvips-base-enc"
-        ,(origin
-           (method svn-fetch)
-           (uri (svn-reference
-                 (url (string-append "svn://www.tug.org/texlive/tags/"
-                                     %texlive-tag "/Master/texmf-dist/"
-                                     "/fonts/enc/dvips/base"))
-                 (revision %texlive-revision)))
-           (file-name (string-append "dvips-base-enc-" version "-checkout"))
-           (sha256
-            (base32
-             "1xnf6ms0h87r55kxik4vicwr1907scj789lhqflqns8svvsli5iy"))))))
+    (inherit (simple-texlive-package
+              "texlive-dvips"
+              (list "/fonts/map/dvips/"
+                    "/fonts/enc/dvips/base/"
+                    "/dvips/")
+              (base32
+               "1di07wx8wjczddmagq5z082l2has3inzk5jwkqh4i6wv1qdfqpp6")
+              #:trivial? #t))
     (home-page "https://www.ctan.org/pkg/dvips";)
     (synopsis "DVI to PostScript drivers")
     (description "This package provides files needed for converting DVI files



reply via email to

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