diff options
| author | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/xfig.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/xfig.scm')
| -rw-r--r-- | gnu/packages/xfig.scm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index c3d02619b4..9004c79e22 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 Eric Bavier <[email protected]> ;;; Copyright © 2014 Federico Beffa <[email protected]> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <[email protected]> +;;; Copyright © 2021 Efraim Flashner <[email protected]> ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +26,7 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages ghostscript) #:use-module (gnu packages xorg) #:use-module (gnu packages image) #:use-module (gnu packages compression)) @@ -32,7 +34,7 @@ (define-public xfig (package (name "xfig") - (version "3.2.7a") + (version "3.2.8b") (source (origin (method url-fetch) @@ -40,11 +42,11 @@ name "-" version ".tar.xz")) (sha256 (base32 - "096zgp0bqnxhgxbrv2jjylrjz3pr4da0xxznlk2z7ffxr5pri2fa")))) + "0fndgbm1mkqb1sn2v2kj3nx9mxj70jbp31y2bjvzcmmkry0q3k5j")))) (build-system gnu-build-system) (native-inputs ;; For tests. - `(("desktop-file-utils" ,desktop-file-utils))) + (list desktop-file-utils ghostscript)) (inputs `(("libxaw3d" ,libxaw3d) ("libjpeg" ,libjpeg-turbo) @@ -86,8 +88,7 @@ selected in various ways. For text, 35 fonts are available.") "0i3p7qmg2w8qrad3pn42b0miwarql7yy0gpd49b1bpal6bqsiicf")))) (build-system gnu-build-system) (native-inputs - `(("imake" ,imake) - ("makedepend" ,makedepend))) + (list imake makedepend)) (inputs `(("xfig" ,xfig) ("libjpeg" ,libjpeg-turbo) |