summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2016-09-02 13:12:07 +0300
committerEfraim Flashner <efraim@flashner.co.il>2016-09-02 14:35:40 +0300
commitfb0b9ff1fabb3106ff72f3fe5f531b14f96bda8d (patch)
tree01df8f810d0e1a826bb9f2576bd81a755d5775c1
parentfa68a9bbe97c89cf67b27c8767c709301e2b433d (diff)
gnu: Use ghostscript over ghostscript-gs.
* gnu/packages/engineering.scm (fastcap)[native-inputs], gnu/packages/lout.scm (lout)[native-inputs], gnu/packages/ocaml.scm (unison)[native-inputs], gnu/packages/plotutils.scm (asymptote)[native-inputs], gnu/packages/skribilo.scm (skribilo)[native-inputs]: Remove ghostscript-gs. * gnu/packages/gv.scm (gv)[propagated-inputs], gnu/packages/music.scm (lilypond)[inputs], gnu/packages/scheme.scm (chez-scheme)[native-inputs]: Use ghostscript over ghostscript-gs.
-rw-r--r--gnu/packages/engineering.scm3
-rw-r--r--gnu/packages/gv.scm3
-rw-r--r--gnu/packages/lout.scm3
-rw-r--r--gnu/packages/music.scm2
-rw-r--r--gnu/packages/ocaml.scm2
-rw-r--r--gnu/packages/plotutils.scm3
-rw-r--r--gnu/packages/scheme.scm2
-rw-r--r--gnu/packages/skribilo.scm3
8 files changed, 9 insertions, 12 deletions
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index dad38e0310..daa70c6071 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -233,8 +233,7 @@ optimizer; and it can produce photorealistic and design review images.")
(build-system gnu-build-system)
(native-inputs
`(("texlive" ,texlive)
- ("ghostscript" ,ghostscript)
- ("ghostscript" ,ghostscript-gs)))
+ ("ghostscript" ,ghostscript)))
(arguments
`(#:make-flags '("CC=gcc" "RM=rm" "SHELL=sh" "all")
#:parallel-build? #f
diff --git a/gnu/packages/gv.scm b/gnu/packages/gv.scm
index 240e3fc96c..e1e86a83a6 100644
--- a/gnu/packages/gv.scm
+++ b/gnu/packages/gv.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -39,7 +40,7 @@
(sha256 (base32
"0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"))))
(build-system gnu-build-system)
- (propagated-inputs `(("ghostscript" ,ghostscript-gs/x)))
+ (propagated-inputs `(("ghostscript" ,ghostscript/x)))
(inputs `(("libx11" ,libx11)
("libxaw3d" ,libxaw3d)
("libxinerama" ,libxinerama)
diff --git a/gnu/packages/lout.scm b/gnu/packages/lout.scm
index 1355e0387a..f2c724ae07 100644
--- a/gnu/packages/lout.scm
+++ b/gnu/packages/lout.scm
@@ -88,8 +88,7 @@
(build-system gnu-build-system) ; actually, just a makefile
(outputs '("out" "doc"))
(native-inputs
- `(("ghostscript" ,ghostscript)
- ("ghostscript-gs" ,ghostscript-gs)))
+ `(("ghostscript" ,ghostscript)))
(arguments `(#:modules ((guix build utils)
(guix build gnu-build-system)
(srfi srfi-1)) ; we need SRFI-1
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 88743aa14d..c3f8aa1524 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -406,7 +406,7 @@ interface. It is implemented as a frontend to @code{klick}.")
("font-tex-gyre" ,font-tex-gyre)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
- ("ghostscript" ,ghostscript-gs)
+ ("ghostscript" ,ghostscript)
("pango" ,pango)
("python" ,python-2)))
(native-inputs
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 1f4c3e471a..8345040cda 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -573,7 +574,6 @@ libpanel, librsvg and quartz.")
(native-inputs
`(("ocaml" ,ocaml)
;; For documentation
- ("ghostscript-gs" ,ghostscript-gs)
("ghostscript" ,ghostscript)
("texlive" ,texlive)
("hevea" ,hevea)
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index c913955975..74d209192f 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -186,8 +186,7 @@ colors, styles, options and details.")
;; "help" command in interactive mode, so adding a "doc" output is not
;; currently useful.
(native-inputs
- `(("gs" ,ghostscript-gs) ;For tests
- ("gs-2" ,ghostscript) ;For dvipdfm
+ `(("gs" ,ghostscript) ;For tests
("texinfo" ,texinfo) ;For generating documentation
("texlive" ,texlive) ;For tests and documentation
("emacs" ,emacs-minimal)
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 797cd153d2..373b6f37b3 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -635,7 +635,7 @@ threads.")
("stex" ,stex)))
(native-inputs
`(("texlive" ,texlive)
- ("ghostscript" ,ghostscript-gs)
+ ("ghostscript" ,ghostscript)
("netpbm" ,netpbm)))
(outputs '("out" "doc"))
(arguments
diff --git a/gnu/packages/skribilo.scm b/gnu/packages/skribilo.scm
index 40bf659297..52ed1c34e3 100644
--- a/gnu/packages/skribilo.scm
+++ b/gnu/packages/skribilo.scm
@@ -63,8 +63,7 @@
#:parallel-build? #f))
- (native-inputs `(("pkg-config" ,pkg-config)
- ("ghostscript-gs" , ghostscript-gs)))
+ (native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-2.0)
("imagemagick" ,imagemagick)