summaryrefslogtreecommitdiff
path: root/gnu/packages/tex.scm
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2019-07-16 13:15:21 +0200
committerRicardo Wurmus <rekado@elephly.net>2019-07-24 09:46:49 +0200
commit8bc9afeb9e63a473b29a440f04659171a032ee23 (patch)
treed9f45eaa8eb94d16f51458d5df3f406e4cb012db /gnu/packages/tex.scm
parent0901f1b04263db840d51010e032516237cf6ec2d (diff)
downloadpatches-8bc9afeb9e63a473b29a440f04659171a032ee23.tar
patches-8bc9afeb9e63a473b29a440f04659171a032ee23.tar.gz
gnu: Add texlive-xypic.
* gnu/packages/tex.scm (texlive-xypic): New variable. (texlive-fonts-xypic, texlive-generic-xypic): Deprecate them.
Diffstat (limited to 'gnu/packages/tex.scm')
-rw-r--r--gnu/packages/tex.scm148
1 files changed, 37 insertions, 111 deletions
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index a4d7b4006b..e1c1d173cf 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -7200,119 +7200,45 @@ titles.")
;; No version of the GPL is specified.
(license license:gpl3+)))
-(define-public texlive-generic-xypic
- (package
- (name "texlive-generic-xypic")
- (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/generic/xypic"))
- (revision %texlive-revision)))
- (file-name (string-append name "-" version "-checkout"))
- (sha256
- (base32
- "1g5cyxwdfznq4lk9zl6fkjkapmhmwd2cm4m5aibxj20qgwnaggfz"))))
- (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/generic/xypic")))
- (mkdir-p target)
- (copy-recursively (assoc-ref %build-inputs "source") target)
- #t))))
- (home-page "https://www.ctan.org/pkg/xypic")
- (synopsis "Flexible diagramming macros for TeX")
- (description
- "A package for typesetting a variety of graphs and diagrams with TeX.
-Xy-pic works with most formats (including LaTeX, AMS-LaTeX, AMS-TeX, and plain
-TeX).")
- (license license:gpl3+)))
+(define-public texlive-xypic
+ (let ((template (simple-texlive-package
+ "texlive-xypic"
+ (list "/doc/generic/xypic/"
+ "/dvips/xypic/xy389dict.pro"
+ "/fonts/enc/dvips/xypic/"
+ "/fonts/map/dvips/xypic/xypic.map"
+
+ "/fonts/source/public/xypic/"
+ "/fonts/afm/public/xypic/"
+ "/fonts/tfm/public/xypic/"
+ "/fonts/type1/public/xypic/"
+
+ ;;"/tex/generic/xypic/" ; I guess these are generated
+ )
+ (base32
+ "0sqkkvjzzsiazvh8803qqyrcv4is3m1qs9x9v2m35jjikbqc08y8"))))
+ (package
+ (inherit template)
+ (arguments
+ (substitute-keyword-arguments (package-arguments template)
+ ((#:tex-directory _ #t)
+ "tex/generic/xypic")
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (delete 'reset-gzip-timestamps)))))
+ (home-page "https://www.ctan.org/pkg/xypic")
+ (synopsis "Flexible diagramming macros")
+ (description "This is a package for typesetting a variety of graphs and
+diagrams with TeX. Xy-pic works with most formats (including LaTeX,
+AMS-LaTeX, AMS-TeX, and plain TeX). The distribution includes Michael Barr's
+@code{diag} package, which was previously distributed stand-alone.")
+ (license license:gpl3+))))
(define-public texlive-fonts-xypic
- (package
- (name "texlive-fonts-xypic")
- (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/"
- "/fonts/source/public/xypic"))
- (revision %texlive-revision)))
- (file-name (string-append name "-" version "-checkout"))
- (sha256
- (base32
- "0p20v1257kwsqnrk98cdhhiz2viv8l3ly4xay4by0an3j37m9xs3"))))
- (build-system trivial-build-system)
- (arguments
- `(#:modules ((guix build utils)
- (ice-9 match))
- #:builder
- (begin
- (use-modules (guix build utils)
- (ice-9 match))
- (let ((root (string-append (assoc-ref %outputs "out")
- "/share/texmf-dist/"))
- (pkgs '(("source" . "fonts/source/public/xypic")
- ("xypic-afm" . "fonts/afm/public/xypic")
- ("xypic-type1" . "fonts/type1/public/xypic")
- ("xypic-enc" . "fonts/enc/dvips/xypic"))))
- (for-each (match-lambda
- ((pkg . dir)
- (let ((target (string-append root dir)))
- (mkdir-p target)
- (copy-recursively (assoc-ref %build-inputs pkg)
- target))))
- pkgs)
- #t))))
- (native-inputs
- `(("xypic-afm"
- ,(origin
- (method svn-fetch)
- (uri (svn-reference
- (url (string-append "svn://www.tug.org/texlive/tags/"
- %texlive-tag "/Master/texmf-dist/"
- "/fonts/afm/public/xypic"))
- (revision %texlive-revision)))
- (file-name (string-append name "-afm-" version "-checkout"))
- (sha256
- (base32
- "149xdijxp8lw3s0qv2aqxxxyyn748z57dpr596rjvkqdffpnsddh"))))
- ("xypic-type1"
- ,(origin
- (method svn-fetch)
- (uri (svn-reference
- (url (string-append "svn://www.tug.org/texlive/tags/"
- %texlive-tag "/Master/texmf-dist/"
- "/fonts/type1/public/xypic"))
- (revision %texlive-revision)))
- (file-name (string-append name "-type1-" version "-checkout"))
- (sha256
- (base32
- "1bln89wib7g3hcv2jny3qi6jb73k9d2vbgx3wnnjwp3ryg0846if"))))
- ("xypic-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/xypic"))
- (revision %texlive-revision)))
- (file-name (string-append name "-enc-" version "-checkout"))
- (sha256
- (base32
- "0yi8vms3203l3p5slnhrrlzzp0f0jw77fkcvcaicrz2vmw9z99x7"))))))
- (home-page "https://www.ctan.org/pkg/xypic")
- (synopsis "Fonts for XY-pic")
- (description "This package provides the XY-pic fonts.")
- (license license:gpl3+)))
+ (deprecated-package "texlive-fonts-xypic" texlive-xypic))
+
+(define-public texlive-generic-xypic
+ (deprecated-package "texblive-generic-xypic" texlive-xypic))
(define-public texlive-bibtex
(package