Merge branch 'master' into core-updates

Conflicts:
	gnu-system.am
	gnu/packages/gstreamer.scm
This commit is contained in:
Mark H Weaver 2015-04-17 09:54:11 -04:00
commit 933204e5b1
33 changed files with 836 additions and 378 deletions

View file

@ -64,7 +64,8 @@
version ".tar.xz"))
(sha256
(base32
"0kn3rzm91qiswi0cql89kbv6mqn27rwsyjfb8xmwy9m5s8fxfiyx"))))
"0kn3rzm91qiswi0cql89kbv6mqn27rwsyjfb8xmwy9m5s8fxfiyx"))
(patches (list (search-patch "emacs-exec-path.patch")))))
(build-system glib-or-gtk-build-system)
(arguments
'(#:phases (alist-cons-before