[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
87/110: gnu: texlive-latex-graphics: Simplify.
From: |
guix-commits |
Subject: |
87/110: gnu: texlive-latex-graphics: Simplify. |
Date: |
Mon, 22 Jul 2019 15:25:49 -0400 (EDT) |
rekado pushed a commit to branch wip-texlive
in repository guix.
commit fdb5b1fae9c272e9693b0e0f4cab471bb044af9f
Author: Ricardo Wurmus <address@hidden>
Date: Sun Jul 14 22:51:57 2019 +0200
gnu: texlive-latex-graphics: Simplify.
* gnu/packages/tex.scm (texlive-latex-graphics)[arguments]: Remove custom
phases.
[native-inputs]: Remove.
[propagated-inputs]: Add texlive-graphics-cfg and texlive-graphics-def.
[license]: Update.
---
gnu/packages/tex.scm | 56 +++++-----------------------------------------------
1 file changed, 5 insertions(+), 51 deletions(-)
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index e056c69..d26b30f 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -2874,54 +2874,10 @@ set default \"driver\" options for the color and
graphics packages.")
(base32
"0nlfhn55ax89rcvpkrl9570671b62kcr4c9l5ch3w5zw9vmi00dz"))))
(build-system texlive-build-system)
- (arguments
- '(#:tex-directory "latex/graphics"
- #:phases
- (modify-phases %standard-phases
- (add-after 'install 'install-config
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((cfg (assoc-ref inputs "graphics-cfg"))
- (target (string-append (assoc-ref outputs "out")
-
"/share/texmf-dist/tex/latex/graphics-cfg")))
- (mkdir-p target)
- (install-file (string-append cfg "/graphics.cfg") target)
- (install-file (string-append cfg "/color.cfg") target)
- #t)))
- (add-after 'install 'install-defs
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((def (assoc-ref inputs "graphics-def"))
- (target (string-append (assoc-ref outputs "out")
-
"/share/texmf-dist/tex/latex/graphics-def")))
- (mkdir-p target)
- (copy-recursively def target)
- #t))))))
- (native-inputs
- `(("graphics-cfg"
- ,(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/latex3/graphics-cfg.git")
- (commit "19d1238af17df376cd46333b229579b0f7f3a41f")))
- (file-name (string-append "graphics-cfg-"
- (number->string %texlive-revision)
- "-checkout"))
- (sha256
- (base32
- "12kbgbm52gmmgn8zajb74s8n5rvnxcfdvs3iyj8vcw5vrsw5i6mh"))))
- ("graphics-def"
- ,(origin
- (method svn-fetch)
- (uri (svn-reference
- (url (string-append "svn://www.tug.org/texlive/tags/"
- %texlive-tag "/Master/texmf-dist/"
- "/tex/latex/graphics-def"))
- (revision %texlive-revision)))
- (file-name (string-append "graphics-def-"
- (number->string %texlive-revision)
- "-checkout"))
- (sha256
- (base32
- "17zpcgrfsr29g1dkz9np1qi63kjv7gb12rg979c6dai6qksbr3vq"))))))
+ (arguments '(#:tex-directory "latex/graphics"))
+ (propagated-inputs
+ `(("texlive-graphics-cfg" ,texlive-graphics-cfg)
+ ("texlive-graphics-def" ,texlive-graphics-def)))
(home-page "https://www.ctan.org/pkg/latex-graphics")
(synopsis "LaTeX standard graphics bundle")
(description
@@ -2929,9 +2885,7 @@ set default \"driver\" options for the color and graphics
packages.")
graphics (e.g. PostScript) files, and rotation and scaling of text in LaTeX
documents. It comprises the packages color, graphics, graphicx, trig, epsfig,
keyval, and lscape.")
- ;; The configuration files are released under CC0.
- (license (list license:lppl1.3c+
- license:cc0))))
+ (license license:lppl1.3c+)))
(define-public texlive-latex-xcolor
(package
- 79/110: gnu: Add texlive-fontinst., (continued)
- 79/110: gnu: Add texlive-fontinst., guix-commits, 2019/07/22
- 88/110: gnu: Add texlive-url., guix-commits, 2019/07/22
- 80/110: gnu: Add texlive-mflogo-font., guix-commits, 2019/07/22
- 78/110: gnu: Add texlive-docstrip., guix-commits, 2019/07/22
- 86/110: gnu: Add texlive-graphics-cfg., guix-commits, 2019/07/22
- 82/110: gnu: texlive-fontname: Simplify., guix-commits, 2019/07/22
- 85/110: gnu: Add texlive-graphics-def., guix-commits, 2019/07/22
- 83/110: gnu: Add texlive-lm., guix-commits, 2019/07/22
- 89/110: gnu: Add texlive-filemod., guix-commits, 2019/07/22
- 90/110: gnu: Add texlive-pstool., guix-commits, 2019/07/22
- 87/110: gnu: texlive-latex-graphics: Simplify.,
guix-commits <=
- 84/110: gnu: Add texlive-epsf., guix-commits, 2019/07/22
- 93/110: gnu: Add texlive-etoolbox., guix-commits, 2019/07/22
- 91/110: gnu: Add texlive-seminar., guix-commits, 2019/07/22
- 92/110: gnu: Add texlive-doi., guix-commits, 2019/07/22
- 99/110: gnu: Replace uses of texlive-*-amsfonts., guix-commits, 2019/07/22
- 102/110: gnu: Add texlive-txfonts., guix-commits, 2019/07/22
- 101/110: gnu: Add texlive-ae., guix-commits, 2019/07/22
- 94/110: gnu: Add texlive-kpathsea., guix-commits, 2019/07/22
- 95/110: gnu: texlive-bin: Include scripts., guix-commits, 2019/07/22
- 100/110: gnu: texlive-fonts-ec: Update license URL., guix-commits, 2019/07/22