rekado pushed a commit to branch core-updates in repository guix. commit b347317ae67c80d9ff3baca42aaab45002fc73e6 Merge: 82b695b 6cedd61 Author: Ricardo Wurmus <rek...@elephly.net> Date: Tue May 29 15:41:06 2018 +0200
Merge branch 'master' into core-updates NEWS | 5 ++ gnu/bootloader/u-boot.scm | 16 ++++++ gnu/packages/bootloaders.scm | 33 +++++++++++- gnu/packages/calendar.scm | 4 +- gnu/packages/emacs.scm | 31 ++++++----- gnu/packages/engineering.scm | 7 +++ gnu/packages/firmware.scm | 63 ++++++++++++++++++++++ .../patches/emacs-fix-scheme-indent-function.patch | 14 ++--- gnu/services/base.scm | 2 +- gnu/system/install.scm | 6 +++ guix/download.scm | 5 -- 11 files changed, 156 insertions(+), 30 deletions(-) diff --cc gnu/packages/emacs.scm index 8c28b25,48c9a6d..79816e9 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@@ -156,11 -156,11 +156,12 @@@ (list line "\"~/.guix-profile/include\"" "\"/var/guix/profiles/system/profile/include\"") - " "))))))) + " "))) + #t)))) (build-system glib-or-gtk-build-system) (arguments - `(#:phases + `(#:tests? #f ; no check target + #:phases (modify-phases %standard-phases (add-before 'configure 'fix-/bin/pwd (lambda _