summaryrefslogtreecommitdiff
path: root/gnu/packages/ghostscript.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2017-03-30 22:59:53 +0200
committerMarius Bakke <mbakke@fastmail.com>2017-03-30 22:59:53 +0200
commit84157bb8bf2c610584e0836047da4c710f8eaf76 (patch)
treebe5d8c7238e32802221db55a3ee83e7f6a58affb /gnu/packages/ghostscript.scm
parentfa63939acba69e11df44073a7eb687bd2ba48349 (diff)
parent03d0aa8b22223b67ec9bbd363c4d5800efdbaf82 (diff)
Merge branch 'master' into core-updates
Most conflicts are from 6fd52309b8f52c9bb59fccffac53e029ce94b698.
Diffstat (limited to 'gnu/packages/ghostscript.scm')
-rw-r--r--gnu/packages/ghostscript.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index a6403e67a9a..076046e721c 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -204,7 +204,7 @@ file format. It also includes a C library that implements the graphics
204capabilities of the PostScript language. It supports a wide variety of 204capabilities of the PostScript language. It supports a wide variety of
205output file formats and printers.") 205output file formats and printers.")
206 (license license:agpl3+) 206 (license license:agpl3+)
207 (home-page "http://www.gnu.org/software/ghostscript/") 207 (home-page "https://www.gnu.org/software/ghostscript/")
208 (properties '((upstream-name . "gnu-ghostscript"))))) 208 (properties '((upstream-name . "gnu-ghostscript")))))
209 209
210(define-public ghostscript/x 210(define-public ghostscript/x
@@ -255,7 +255,7 @@ output file formats and printers.")
255provides the reference implementation of the raster printer driver 255provides the reference implementation of the raster printer driver
256architecture.") 256architecture.")
257 (license license:expat) 257 (license license:expat)
258 (home-page "http://www.gnu.org/software/ghostscript/"))) 258 (home-page "https://www.gnu.org/software/ghostscript/")))
259 259
260(define-public gs-fonts 260(define-public gs-fonts
261 (package 261 (package