Merge branch 'master' into core-updates

Conflicts:
	gnu/packages/commencement.scm
	gnu/packages/xml.scm
This commit is contained in:
Mark H Weaver 2015-06-14 08:49:42 -04:00
commit bcf2971f6e
46 changed files with 1508 additions and 441 deletions

View file

@ -38,7 +38,6 @@
(define (cross p target)
(package (inherit p)
(location (source-properties->location (current-source-location)))
(name (string-append (package-name p) "-cross-" target))
(arguments
(substitute-keyword-arguments (package-arguments p)