Merge branch 'master' into core-updates
gnu: Add haskell-mode. * gnu/packages/emacs.scm (haskell-mode): New variable.
Merge branch 'master' into core-updates Conflicts: gnu/packages/commencement.scm gnu/packages/xml.scm
packages: Make 'location' field innate. * guix/packages.scm (<package>)[location]: Add 'innate' property. * guix/build-system/gnu.scm (static-package): Remove 'loc' parameter and 'location' field. * gnu/packages/autotools.scm (autoconf-wrapper): Remove 'location' field. * gnu/packages/commencement.scm (gnu-make-boot0, diffutils-boot0, gcc-final): Likewise. * gnu/packages/cross-base.scm (cross): Likewise. * gnu/packages/emacs.scm (emacs-no-x, emacs-no-x-toolkit): Likewise. * gnu/packages/make-bootstrap.scm (tarball-package): Likewise. * gnu/packages/maths.scm (petsc-complex): Likewise.
Merge branch 'master' into core-updates
gnu: Add magit-svn. * gnu/packages/emacs.scm (magit-svn): New variable.
Merge branch 'master' into gtk-rebuild Conflicts: gnu/packages/gtk.scm
gnu: Add guile-emacs and guile-for-guile-emacs. * gnu/packages/guile.scm (guile-for-guile-emacs): New variable. * gnu/packages/emacs.scm (guile-emacs): New variable.
gnu: magit: Install .el files directly under share/emacs/site-lisp. Fixes a regression introduced in 7e4871b. * gnu/packages/emacs.scm (magit)[arguments]: Add #:make-flags.
gnu: magit: Update to 1.4.1. * gnu/packages/emacs.scm (magit)[source, version]: Update to 1.4.1 [propagated-inputs]: New field. [arguments]: Add #:test-target. Add 'augment-load-path' phase.
gnu: magit: Move Emacs to 'native-inputs'. * gnu/packages/emacs.scm (magit): Move EMACS-NO-X from 'inputs' to 'native-inputs'.
gnu: magit: Use 'modify-phases'. * gnu/packages/emacs.scm (magit)[arguments]: Use 'modify-phases' instead of 'alist-cons-before' & co.
gnu: Add git-modes. * gnu/packages/emacs.scm (git-modes): New variable.
Merge branch 'core-updates'
Merge branch 'master' into core-updates Conflicts: gnu-system.am gnu/packages/gstreamer.scm
gnu: emacs: Do not keep references to the entries of the build-time $PATH. This reduces the number of references of the output from 54 to 31, removing references notably to gcc, expat, glib:bin, ld-wrapper-0, texinfo, pkg-config, make, gawk, binutils, etc. Reported by David Thompson. * gnu/packages/patches/emacs-exec-path.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/emacs.scm (emacs)[source]: Use it.
Merge branch 'master' into core-updates
gnu: emacs: Update to 24.5. * gnu/packages/emacs.scm (emacs): Update to 24.5.
gnu: Fix incorrect references to %GNU-BUILD-SYSTEM-MODULES. Fixes a regression introduced in 8ff3df5. * gnu/packages/emacs.scm (emacs-w3m)[arguments]: Use quasiquote, not quote. (emacs-wget)[arguments]: Likewise, and use unquote-splicing for %GNU-BUILD-SYSTEM-MODULES. (emms): Likewise. * gnu/packages/haskell.scm (ghc): Likewise. * gnu/packages/samba.scm (samba): Likewise.
Merge branch 'master' into core-updates