diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-07-08 23:58:22 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-07-08 23:58:22 +0200 |
| commit | 873325b0307a709be6f305472a5bfb9e07437aaa (patch) | |
| tree | b271f28b229f983841ca7b16c4d3cc52582c864e /gnu/packages/graphics.scm | |
| parent | 68ee10da03b09c2acead8891e4b51c718c24d574 (diff) | |
| parent | 6a8299d267d111da4c80bbdfc83eb5cdfc072b4a (diff) | |
| download | guix-873325b0307a709be6f305472a5bfb9e07437aaa.tar guix-873325b0307a709be6f305472a5bfb9e07437aaa.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/graphics.scm')
| -rw-r--r-- | gnu/packages/graphics.scm | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 52f7ff3ba6..fffe972659 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -26,14 +26,6 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages graphics) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix packages) - #:use-module (guix build-system gnu) - #:use-module (guix build-system cmake) - #:use-module (guix build-system python) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages audio) @@ -42,31 +34,28 @@ #:use-module (gnu packages bison) #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages compression) #:use-module (gnu packages documentation) - #:use-module (gnu packages ghostscript) - #:use-module (gnu packages haskell) - #:use-module (gnu packages image) - #:use-module (gnu packages imagemagick) - #:use-module (gnu packages python) #:use-module (gnu packages flex) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) - #:use-module (gnu packages perl) - #:use-module (gnu packages pdf) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages pulseaudio) ;libsndfile, libsamplerate - #:use-module (gnu packages compression) - #:use-module (gnu packages multiprecision) - #:use-module (gnu packages boost) + #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) - #:use-module (gnu packages gnome) + #:use-module (gnu packages haskell) #:use-module (gnu packages image) + #:use-module (gnu packages imagemagick) #:use-module (gnu packages jemalloc) + #:use-module (gnu packages multiprecision) + #:use-module (gnu packages pdf) + #:use-module (gnu packages perl) #:use-module (gnu packages photo) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages pth) + #:use-module (gnu packages pulseaudio) ; libsndfile, libsamplerate #:use-module (gnu packages python) #:use-module (gnu packages qt) #:use-module (gnu packages readline) @@ -74,7 +63,15 @@ #:use-module (gnu packages swig) #:use-module (gnu packages video) #:use-module (gnu packages xml) - #:use-module (gnu packages xorg)) + #:use-module (gnu packages xorg) + #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) + #:use-module (guix build-system python) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils)) (define-public blender (package |