1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-23 10:40:31 +02:00
Commit Graph

1209 Commits

Author SHA1 Message Date
Sarah Morgensen
6dc8a61bb1 gnu: emacs: Remove obsolete phase.
* gnu/packages/emacs.scm (emacs)[arguments]<#:phases>: Remove
'make-compressed-files-writable phase.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-01-10 11:44:48 -05:00
Ludovic Courtès
8394619bac gnu: Simplify package inputs.
This commit was obtained by running:

  ./pre-inst-env guix style

without any additional argument.
2021-12-13 17:48:25 +01:00
Efraim Flashner
c89940a43a gnu: Use librsvg-bootstrap.
* gnu/packages/emacs.scm (emacs)[inputs]: Use librsvg-bootstrap.
* gnu/pacakges/gtk.scm (gtk+-2, gtk+)[propagated-inputs]: Same.
2021-12-12 15:19:00 +02:00
Ludovic Courtès
3bd7ce6053 gnu: emacs: Use 'librsvg-for-system'.
* gnu/packages/emacs.scm (emacs)[inputs]: Use 'librsvg-for-system'
unconditionally.
2021-12-05 22:42:26 +01:00
Ricardo Wurmus
9bc0f45df5 Merge remote-tracking branch 'origin/master' into core-updates-frozen 2021-12-05 19:17:41 +01:00
Liliana Marie Prikler
15404ff19b gnu: emacs: Load package descriptors from packages referenced by subdirs.el
* gnu/packages/aux-files/emacs/guix-emacs.el
(guix-emacs--non-core-load-path): New procedure.
(guix-emacs-autoload-packages): Use it here.
(guix-emacs-load-package-descriptors): New procedure.
* gnu/packages/emacs.scm (emacs)[install-site-start]: Install advice to run
‘guix-emacs-load-package-descriptors’.
2021-12-03 21:39:50 +01:00
Liliana Marie Prikler
4baeb72717 gnu: emacs: Make DocView PDF work out of the box.
* gnu/packages/emacs.scm (emacs)[patch-program-file-names]: Add patches for
the programs “gs”, “dvipdf”, “ps2pdf” and “pdftotext”.
[inputs]: Add ghostscript and poppler.
2021-12-03 21:39:49 +01:00
Liliana Marie Prikler
f725279cdd gnu: emacs: Find real GVFS processes.
* gnu/packages/emacs.scm (emacs)[#:phases]<patch-program-file-names>: Expand
calls to “tramp-compat-process-running-p” so that Guix wrappers are also
matched.
2021-12-03 21:39:49 +01:00
John Kehayias
85de88f1ad gnu: emacs-xwidgets{,-next-pgtk}: Use webkitgtk-with-libsoup2.
* gnu/packages/emacs.scm (emacs-xwidgets, emacs-next-pgtk)[inputs]:
Replace webkitgtk with webkitgtk-with-libsoup2.
* gnu/packages/webkit.scm (webkitgtk-with-libsoup2): Add further
information about where this package is used and upstream tracker for
libsoup3.
2021-11-21 16:43:12 +01:00
Efraim Flashner
bc5155b952 Merge remote-tracking branch 'origin/master' into core-updates-frozen 2021-10-31 14:49:47 +02:00
Morgan Smith
49d19b35ce gnu: emacs: Handle pdump filenames that contain a fingerprint.
* gnu/packages/emacs.scm (emacs) [restore-emacs-pdmp]: Use lax regular
expressions to match files by the “.pdmp” file ending only.  Adjust comment
accordingly.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
2021-10-24 10:49:45 +02:00
Mathieu Othacehe
a1eca979fb Merge remote-tracking branch 'origin/master' into core-updates-frozen. 2021-10-12 17:46:23 +00:00
Liliana Marie Prikler
719bbcc15e Update copyright assignments for Liliana Marie Prikler.
* doc/guix.texi: Update copyright name for Liliana Marie Prikler.
* gnu/packages/build-tools.scm: Update copyright name and email for Liliana
Marie Prikler.
* gnu/packages/convmv.scm: Likewise.
* gnu/packages/emacs-xyz.scm: Likewise.
* gnu/packages/emacs.scm: Likewise.
* gnu/packages/esolangs.scm: Likewise.
* gnu/packages/game-development.scm: Likewise.
* gnu/packages/games.scm: Likewise.
* gnu/packages/gnome-xyz.scm: Likewise.
* gnu/packages/gnome.scm: Likewise.
* gnu/packages/gstreamer.scm: Likewise.
* gnu/packages/guile-xyz.scm: Likewise.
* gnu/packages/minetest.scm: Likewise.
* gnu/packages/music.scm: Likewise.
* gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch: Likewise.
* gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch: Likewise.
* gnu/packages/patches/webkitgtk-bind-all-fonts.patch: Likewise.
* gnu/packages/python-xyz.scm: Likewise.
* gnu/packages/unicode.scm: Likewise.
* gnu/packages/xorg.scm: Likewise.
* gnu/services/sound.scm: Likewise.
* guix/build-system/renpy.scm: Likewise.
* guix/build/emacs-utils.scm: Likewise.
* guix/build/renpy-build-system.scm: Likewise.
2021-09-25 09:34:36 +02:00
Marius Bakke
8d59c262ad Merge branch 'master' into core-updates
Conflicts:
	gnu/local.mk
	gnu/packages/algebra.scm
	gnu/packages/bioinformatics.scm
	gnu/packages/curl.scm
	gnu/packages/docbook.scm
	gnu/packages/emacs-xyz.scm
	gnu/packages/maths.scm
	gnu/packages/plotutils.scm
	gnu/packages/python-web.scm
	gnu/packages/python-xyz.scm
	gnu/packages/radio.scm
	gnu/packages/readline.scm
	gnu/packages/tls.scm
	gnu/packages/xml.scm
	gnu/packages/xorg.scm
2021-06-06 21:16:32 +02:00
Tobias Geerinckx-Rice
947398c70a gnu: emacs: Support console mice.
* gnu/packages/emacs.scm (emacs)[inputs]: Add gpm.
2021-05-29 16:09:48 +02:00
Marius Bakke
dbcf2b61b1 gnu: Fix erroneous uses of 'package/inherit'.
These packages use a different source/version from the inherited package, and
thus should not inherit replacements.

* gnu/packages/check.scm (googletest-1.8, python-pytest-runner-2): Use record
inheritance instead of PACKAGE/INHERIT.
* gnu/packages/crates-io.scm (rust-bindgen-0.49, rust-bytes-0.4,
rust-colored-1.9.1, rust-difference-1, rust-docopt-0.8, rust-html5ever-0.23,
rust-http-0.1, rust-http-body-0.1, rust-loom-0.2, rust-loom-0.1,
rust-pulldown-cmark-0.0.8, rust-ring-0.13, rust-rustls-0.12, rust-sct-0.3,
rust-term-0.2, rust-untrusted-0.6, rust-webpki-0.18, rust-webpki-roots-0.17,
rust-webpki-roots-0.14): Likewise.
* gnu/packages/emacs.scm (emacs-next, emacs-next-pgtk, guile-emacs): Likewise.
* gnu/packages/guile.scm (guile-2.2.4): Likewise.
* gnu/packages/maths.scm (hdf5-1.10, hdf5-1.12): Likewise.
* gnu/packages/protobuf.scm (protobuf-3.6, protobuf-3.5, python-protobuf-3.6):
Likewise.
* gnu/packages/python-web.scm (python2-html2text): Likewise.
* gnu/packages/python-xyz.scm (python-pygments/fixed, python2-numpy,
python2-urwid, python2-markdown, python2-fonttools): Likewise.
* gnu/packages/racket.scm (racket): Likewise.
* gnu/packages/sequoia.scm (sequoia4pEp): Likewise.
2021-05-23 17:49:56 +02:00
Marius Bakke
f034264204 Merge branch 'master' into core-updates
Conflicts:
	gnu/local.mk
	gnu/packages/bioinformatics.scm
	gnu/packages/django.scm
	gnu/packages/gtk.scm
	gnu/packages/llvm.scm
	gnu/packages/python-web.scm
	gnu/packages/python.scm
	gnu/packages/tex.scm
	guix/build-system/asdf.scm
	guix/build/emacs-build-system.scm
	guix/profiles.scm
2021-05-09 21:29:46 +02:00
Leo Prikler
d13b46fae4 gnu: emacs: Add coreutils and gzip to PATH.
Some parts of Emacs (dired, compression handling, Tramp) shell out to commands
and patching them all is a daunting task.  Also, w.r.t. Tramp, we need those
commands to be portable across multiple machines, which need not only be Guix
machines (and even if they are, store items can be different).  This patch
ensures a ‘sane’ setup FSVO ‘sane’.

* gnu/packages/emacs.scm (emacs)[wrap-load-path]: Rename to...
[wrap-emacs-paths] ... this.  Also patch PATH.
2021-05-01 15:56:37 +02:00
Leo Prikler
307a2d2e2a gnu: emacs: Wrap EMACSLOADPATH.
With this, the search path specification of EMACSLOADPATH does no longer
depend on the version of Emacs, which should make upgrading major versions
less painful.  See also:
- <https://bugs.gnu.org/43627>
- <https://bugs.gnu.org/47458>

* gnu/packages/emacs.scm (emacs)[#:phases]: Add ‘wrap-load-path’.
[native-search-path]<EMACSLOADPATH>: Do not search for builtin libraries.
(emacs-next)[native-search-path]: Inherit from emacs.
2021-05-01 15:56:37 +02:00
Efraim Flashner
fcc39864db Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
	gnu/local.mk
	gnu/packages/boost.scm
	gnu/packages/chez.scm
	gnu/packages/compression.scm
	gnu/packages/crates-io.scm
	gnu/packages/docbook.scm
	gnu/packages/engineering.scm
	gnu/packages/gcc.scm
	gnu/packages/gl.scm
	gnu/packages/gtk.scm
	gnu/packages/nettle.scm
	gnu/packages/python-check.scm
	gnu/packages/python-xyz.scm
	gnu/packages/radio.scm
	gnu/packages/rust.scm
	gnu/packages/sqlite.scm
	guix/build-system/node.scm
2021-04-16 14:39:48 +03:00
Tobias Geerinckx-Rice
f5ef08c437 gnu: emacs: Update to 27.2.
* gnu/packages/emacs.scm (emacs): Update to 27.2.
2021-03-25 21:03:39 +01:00
Chris Marusich
5d2863dfe4 gnu: Restore emacs' supported systems.
Recently, librsvg was updated to depend upon rust.  That change inadvertently
restricted the "supported" systems of emacs (among other packages) to
x86_64-linux only, since that is the only system declared in the rust
package's list of supported systems.  This unintentionally made emacs
unavailable on all other systems.

This change fixes that by removing the rust dependency from some packages.
The packages remain unchanged from the perspective of an x86_64-linux system,
but from the perspective of other systems, the packages are now supported
again (albeit without certain optional SVG features).

* gnu/packages/gtk.scm (gtk+, gtk+-2)[propagated-inputs]: If compiling for
x86_64, use gdk-pixbuf+svg as the "gdk-pixbuf" input, as usual.  Otherwise,
use gdk-pixbuf, which avoids adding librsvg (thus rust) to the closure of
inputs.  Note that both gtk+ and gtk+-2 are in the transitive closure of
inputs of emacs, so these two changes are necessary.
* gnu/packages/emacs (emacs)[inputs]: If compiling for x86_64, add librsvg to
the inputs, as usual.  Otherwise, do not add it, which avoids adding rust to
the closure of inputs.
2021-03-10 22:59:13 -08:00
Léo Le Bouter
5ecc09551b gnu: emacs-next-pgtk: Update to 28.0.50-1.ae18c8e.
* gnu/packages/emacs.scm (emacs-next-pgtk): Update to 28.0.50-1.ae18c8e.

Signed-off-by: Leo Famulari <leo@famulari.name>
2021-02-01 18:53:28 -05:00
Morgan Smith
8d2465fcfe gnu: emacs: Make strip-double-wrap more robust
* gnu/packages/emacs.scm (emacs) [strip-double-wrap]:
Use regex to find emacs executable. This works even when the version is
changed by package transformations (ex: version=git.master)

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2021-01-31 21:49:58 +01:00
Ryan Prior
50b18b5c10 gnu: emacs-next-pgtk: Update to savannah feature/pgtk branch.
* gnu/packages/emacs.scm (emacs-next-pgtk): Update to savannah feature/pgtk branch.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2020-12-01 00:10:48 +01:00
Andrew Tropin
2a1eda5a9b gnu: Add emacs-next-pgtk.
* gnu/packages/emacs.scm (emacs-next-pgtk): New variable.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
2020-11-26 23:39:16 +01:00
Marius Bakke
b05c96d93d gnu: emacs.scm: Remove unused module import.
* gnu/packages/emacs.scm: Don't import (gnu packages imagemagick).
2020-11-11 21:37:11 +01:00
Nicolas Goaziou
c41c089ad0 Revert "gnu: emacs: Make strip-double-wrap more robust."
This reverts commit b107a19ffb.

It causes too many rebuilds related to emacs-minimal, and fails with "No code
for module (guix build glib-or-gtk-build-system)".
2020-11-03 12:07:18 +01:00
Morgan Smith
b107a19ffb gnu: emacs: Make strip-double-wrap more robust.
* gnu/packages/emacs.scm (emacs) [strip-double-wrap]: Use regex to find emacs
executable.  This works even when the version is changed by package
transformations (e.g., version=git.master).

Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
2020-11-03 10:30:03 +01:00
Morgan Smith
f88fea0eaa gnu: emacs-next: Fix load path and version.
Fixes <http://issues.guix.info/43277>.

* gnu/packages/emacs.scm (emacs)[strip-double-wrap]: Modify to work with
emacs-next.
(emacs-next)[version]: Use git-version to produce the version string.
[arguments]: Remove field.
[native-search-paths]: Add field.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2020-10-01 11:03:56 -04:00
Morgan Smith
562f7e3fdb gnu: Add emacs-next.
* gnu/packages/emacs.scm (emacs-next): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2020-09-02 17:17:37 +02:00
Leo Prikler
68be4da830 gnu: emacs: Strip double wrap.
* gnu/packages/emacs.scm (emacs)[#:phases]: Add 'strip-double-wrap.
(emacs-minimal emacs-xwidgets emacs-no-x)
(emacs-no-x-toolkit guile-emacs)[#:phases]: Delete 'strip-double-wrap.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2020-08-31 08:48:54 +02:00
Mathieu Othacehe
6c77a50406 Revert "gnu: emacs: Strip double wrap."
This reverts commit 0ec6b8afd7 that prevents the
load of Emacs packages.
2020-08-29 15:58:53 +02:00
Leo Prikler
0ec6b8afd7 gnu: emacs: Strip double wrap.
* gnu/packages/emacs.scm (emacs)[#:phases]: Add 'strip-double-wrap.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2020-08-29 13:24:50 +02:00
Mark H Weaver
36a09d1853 gnu: emacs: Update to 27.1.
* gnu/packages/emacs.scm (emacs): Update to 27.1.
[source]: In snippet, use 'find-files' to find 'eshell/esh-groups.el'
if it exists, but gracefully handle its absence.
[arguments]: Add "--with-cairo" to configure-flags.  Add 'restore-emacs-pdmp'
and 'make-compressed-files-writable' phases.  Explicitly return #t from
'install-site-start' phase.
[inputs]: Add cairo, pango, harfbuzz, jansson, and gmp.  Remove imagemagick.
(emacs-next): Remove variable.
(emacs-minimal, emacs-xwidgets): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.
(emacs-no-x): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags.  Remove
'restore-emacs-pdmp' phase.
[inputs]: Remove cairo, pango, and harfbuzz.
(emacs-no-x-toolkit): Use 'package/inherit'.
[arguments]: Remove 'restore-emacs-pdmp' phase.  Remove superfluous
quasiquote+unquote-splicing pair.
(emacs-wide-int): Use 'package/inherit'.
(guile-emacs): Use 'package/inherit'.
[arguments]: Remove "--with-cairo" from configure-flags.  Remove
'restore-emacs-pdmp' phase.
* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch,
gnu/packages/patches/emacs-source-date-epoch.patch: Adapt to
apply cleanly to emacs-27.1.
* gnu/packages/patches/emacs-exec-path.patch: Replace with the previous
contents of 'emacs27-exec-path.patch', but remove the superfluous comment
about it being "like emacs-exec-path.patch, but for Emacs 27".
* gnu/packages/patches/emacs27-exec-path.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove 'emacs27-exec-path.patch'.
2020-08-28 00:13:51 -04:00
Leo Prikler
f574f859ee gnu: emacs: Ignore empty XIM styles.
As of libx11 version 1.6.10, xim may be NULL, which causes a segmentation
fault in the execution of ARRAYELTS.  As a cautionary measure, we
short-circuit this logic.

* gnu/packages/patches/emacs-ignore-empty-xim-styles.patch: New file.
* gnu/packages/emacs.scm (emacs emacs-next)[patches]: Use it.
* gnu/local.mk: Register it.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2020-08-03 12:26:02 +02:00
nikita
3c986a7dc2 mailmap: Update entries for Nikita.
* .mailmap: change email and name for Nikita.
* Makefile.am, doc/guix.texi, etc/completion/fish/guix.fish,
gnu/packages/accessibility.scm, gnu/packages/admin.scm,
gnu/packages/audio.scm, gnu/packages/autotools.scm, gnu/packages/cdrom.scm,
gnu/packages/check.scm, gnu/packages/cinnamon.scm,
gnu/packages/compression.scm, gnu/packages/crypto.scm,
gnu/packages/databases.scm, gnu/packages/django.scm, gnu/packages/dns.scm,
gnu/packages/elixir.scm, gnu/packages/emacs-xyz.scm, gnu/packages/emacs.scm,
gnu/packages/enlightenment.scm, gnu/packages/erlang.scm,
gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/forth.scm,
gnu/packages/fvwm.scm, gnu/packages/games.scm, gnu/packages/gl.scm,
gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm,
gnu/packages/gtk.scm, gnu/packages/guile-wm.scm, gnu/packages/guile-xyz.scm,
gnu/packages/haskell-apps.scm, gnu/packages/haskell-check.scm,
gnu/packages/haskell-crypto.scm, gnu/packages/haskell-xyz.scm,
gnu/packages/haskell.scm, gnu/packages/image-viewers.scm,
gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/language.scm,
gnu/packages/libcanberra.scm, gnu/packages/linux.scm,
gnu/packages/lisp-xyz.scm, gnu/packages/lisp.scm, gnu/packages/lolcode.scm,
gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/mail.scm,
gnu/packages/markup.scm, gnu/packages/mate.scm, gnu/packages/maths.scm,
gnu/packages/mc.scm, gnu/packages/messaging.scm, gnu/packages/music.scm,
gnu/packages/ncurses.scm, gnu/packages/networking.scm,
gnu/packages/nickle.scm, gnu/packages/openbox.scm, gnu/packages/pdf.scm,
gnu/packages/perl-check.scm, gnu/packages/perl.scm,
gnu/packages/python-compression.scm, gnu/packages/python-crypto.scm,
gnu/packages/python-web.scm, gnu/packages/python-xyz.scm,
gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/ruby.scm,
gnu/packages/rust.scm, gnu/packages/scheme.scm,
gnu/packages/serialization.scm, gnu/packages/shells.scm,
gnu/packages/ssh.scm, gnu/packages/suckless.scm, gnu/packages/tbb.scm,
gnu/packages/telephony.scm, gnu/packages/text-editors.scm,
gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tls.scm,
gnu/packages/tor.scm, gnu/packages/version-control.scm,
gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/web.scm,
gnu/packages/wm.scm, gnu/packages/xdisorg.scm, gnu/packages/xfce.scm,
gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/services/certbot.scm,
gnu/services/desktop.scm, gnu/services/version-control.scm,
gnu/services/web.scm, guix/import/hackage.scm, guix/licenses.scm: Likewise.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
2020-05-13 09:30:26 +03:00
Ludovic Courtès
7829fc779b gnu: emacs: Remove unneeded import.
This is a followup to ef0cb0dd1d.
Suggested by Jack Hill <jackhill@jackhill.us>.

* gnu/packages/emacs.scm: Remove unneeded (ice-9 match) import.
2020-05-10 16:08:36 +02:00
Marius Bakke
c263cfdcde Merge branch 'master' into core-updates 2020-05-06 23:37:40 +02:00
Jack Hill
ef0cb0dd1d gnu: emacs-next: Upgrade to 27.0.91.
* gnu/packages/emacs.scm (emacs-next): Upgrade to 27.0.91.
[inputs]: Remove imagemagick.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
2020-05-05 23:45:57 +02:00
Marius Bakke
8bf8cd9b85 Merge branch 'master' into core-updates
Conflicts:
	gnu/local.mk
	gnu/packages/backup.scm
	gnu/packages/emacs-xyz.scm
	gnu/packages/guile.scm
	gnu/packages/lisp.scm
	gnu/packages/openldap.scm
	gnu/packages/package-management.scm
	gnu/packages/web.scm
	gnu/packages/xorg.scm
2020-04-30 23:47:49 +02:00
Diego Nicola Barbato
abbca232ca gnu: Add emacs-wide-int.
* gnu/packages/emacs.scm (emacs-wide-int): New variable.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
2020-04-28 20:44:27 +03:00
Marius Bakke
ae0badf5bb Merge branch 'master' into core-updates
Conflicts:
	gnu/packages/admin.scm
	gnu/packages/commencement.scm
	gnu/packages/guile.scm
	gnu/packages/linux.scm
	gnu/packages/package-management.scm
	gnu/packages/pulseaudio.scm
	gnu/packages/web.scm
2020-03-30 12:17:33 +02:00
Alexey Abramov
5b8a60ff5d gnu: emacs-next: Add harfbuzz (text shaping engine) to inputs.
* gnu/packages/emacs.scm (emacs-next)[inputs]: Add harfbuzz.
[arguments]: Enable harfbuzz in #:configure-flags.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
2020-03-29 22:34:47 +02:00
Amin Bandali
c2cf286c62 Update email address and Savannah handle for Amin Bandali.
* .mailmap, gnu/local.mk, gnu/packages/emacs-xyz.scm, gnu/packages/emacs.scm,
gnu/packages/fonts.scm, gnu/packages/fpga.scm, gnu/packages/lean.scm,
gnu/packages/maths.scm, gnu/packages/pulseaudio.scm: Update my email address.
* build-aux/git-authenticate.scm: Update my Savannah handle.
2020-03-28 16:30:07 -04:00
Marius Bakke
a3efa4f9eb gnu: emacs: Fix format strings for compatibility with Guile 3.
* gnu/packages/emacs.scm (emacs)[arguments]: In the 'patch-program-file-names'
and 'install-site-start' phases, specify port in the calls to FORMAT.
2020-03-27 15:24:02 +01:00
Marius Bakke
18af687037 Merge branch 'master' into core-updates
Conflicts:
	gnu/packages/icu4c.scm
	gnu/packages/man.scm
	gnu/packages/python-xyz.scm
	guix/scripts/environment.scm
	guix/scripts/pack.scm
	guix/scripts/package.scm
	guix/scripts/pull.scm
	guix/store.scm
2020-03-27 00:12:15 +01:00
Maxim Cournoyer
4cbd60698d gnu: emacs: Patch references to /bin/sh.
When attempting to run ert-runner in the build side environment where /bin/sh
doesn't exist as part of the emacs-elpy test suite, Emacs was throwing the
error "Searching for program: No such file or directory, /bin/sh".  This is
because the default shell when SHELL is not set was "/bin/sh", as can be seen
in callproc.c:

  sh = getenv ("SHELL");
  Vshell_file_name = build_string (sh ? sh : "/bin/sh");

Thus, patch the occurrences of "/bin/sh" in the source files of Emacs to refer
to their correct store location.

* gnu/packages/emacs.scm (emacs)[phases]{patch-program-file-names}: Add phase.
2020-03-22 21:17:39 -04:00
Maxim Cournoyer
393c5e6928 gnu: emacs-minimal: Install the custom site-start file.
This makes the EMACS-MINIMAL package more generally useful, by adding support
to load autoload definitions.  Note that this doesn't negatively impact the
performance of the emacs-build-system, because at that time the --quick option
is used, which disables loading site-start.el (which is the one calling
GUIX-EMACS-AUTOLOAD-PACKAGES).

* gnu/packages/emacs.scm (emacs-minimal)[phases]: Do not delete the
'install-site-start phase.
[inputs]: Add the emacs/guix-emacs.el auxiliary file.
2020-03-22 21:17:39 -04:00
Maxim Cournoyer
3bd3a6257f gnu: emacs: Re-indent.
* gnu/packages/emacs.scm (emacs): Fix indentation.
2020-03-22 21:17:39 -04:00