me
/
guix
Archived
1
0
Fork 0
Commit Graph

1298 Commits (37e44944100d277409c179363844cbce5b872d90)

Author SHA1 Message Date
Liliana Marie Prikler cde1176e6f
gnu: emacs-minimal: Ungraft.
The current graft breaks native compilation and would do so even if reduced to
an ABI hash.  Thus remove it, and rebuild all Emacsen.

* gnu/packages/emacs.scm (emacs-minimal): Update to 29.4.
[replacement]: Remove.  Add note for future replacements.
(emacs-minimal/fixed): Remove variable.

Fixes: Emacs native compilation across grafts <https://bugs.gnu.org/72045>
2024-07-21 09:42:13 +02:00
Liliana Marie Prikler 74d723b4a8
gnu: emacs-next: Update to 30.0.60-1.4e22ef8.
* gnu/packages/aux-files/emacs/comp-integrity-next.el: New file.
* Makefile.am (AUX_FILES): Register it here.
* gnu/packages/emacs.scm (emacs-next-minimal): Update to 30.0.60-1.4e22ef8.
(emacs->emacs-next)[arguments]: Swap out ‘validate-comp-integrity’ phase,
so as to refer to the new integrity check.
2024-07-07 08:04:47 +02:00
Liliana Marie Prikler 11c403ec05
Revert "gnu: emacs: Update to 29.4. (security fixes)"
This reverts commit 7e15704613.
It causes rebuilds to all of emacs-*, whereas a graft has already been
applied in 868a022cdc.
2024-06-23 11:34:14 +02:00
Liliana Marie Prikler 7e15704613
gnu: emacs: Update to 29.4. (security fixes)
This fixes an issue where org-mode would run arbitrary shell code on startup.
See <https://lists.gnu.org/archive/html/emacs-devel/2024-06/msg00695.html> for
the release announcement.

* gnu/packages/emacs.scm (emacs-minimal): Update to 29.4.
2024-06-23 10:36:04 +02:00
Zheng Junjie 868a022cdc
gnu: emacs-minimal: Graft with 29.4 [security fixes].
Arbitrary shell commands are no longer run when turning on Org mode.
This is for security reasons, to avoid running malicious commands.

* gnu/packages/emacs.scm (emacs-minimal/fixed): New variable.
(emacs-minimal)[replacement]: Graft.

Change-Id: Idb74ee0a05486bfe5052c4dd804fbdaec8921774
2024-06-23 11:41:24 +08:00
Liliana Marie Prikler 0485e3a4a6
gnu: emacs: Also skip integrity check for i686-linux.
The same cases fail as with armhf-linux.

* gnu/packages/emacs.scm (emacs-no-x)[#:phases]<validate-comp-integrity>:
Also skip check on i686-linux.
2024-03-30 13:51:34 +01:00
Liliana Marie Prikler ce999ae3a2
gnu: emacs-no-x: Skip integrity test on armhf-linux.
* gnu/packages/emacs.scm (emacs-no-x)[#:phases]<validate-runpath>: Move
checks to GExpression expansion.  Add check against armhf-linux.
2024-03-28 19:21:57 +01:00
Liliana Marie Prikler c7252a2c14
gnu: emacs: Update to 29.3.
* gnu/packages/emacs.scm (emacs-minimal): Update to 29.3.
2024-03-26 21:55:08 +01:00
Liliana Marie Prikler 84e125eb27
gnu: emacs-next-minimal: Update to 30.0.50-2.170c655.
* gnu/packages/emacs.scm (emacs-next-minimal): Update to 30.0.50-2.170c655.
* gnu/packages/aux-files/emacs/comp-integrity.el: Adjust accordingly.
2024-03-02 18:04:22 +01:00
Liliana Marie Prikler 3621493e4c
gnu: emacs: Disable jit compilation.
* gnu/packages/patches/emacs-disable-jit-compilation.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/emacs.scm (emacs-minimal)[patches]: Use it here.
2024-02-24 08:08:31 +01:00
Liliana Marie Prikler 35fc3027f3
gnu: emacs: Check integrity of native-compiled files.
In the previous commit, we've added a patch that potentially messes with
how built-in (especially preloaded) Lisp libraries are loaded.  Thus, we
might want to assert that these files still load fine, as reported when
querying the builtin documentation of functions provided by them.

* gnu/packages/aux-files/emacs/comp-integrity.el: New file.
* gnu/Makefile.am (dist_noinst_DATA): Register it here.
* gnu/packages/emacs.scm (emacs-no-x)[#:phases]: Add ‘validate-comp-integrity’.
2024-02-24 08:08:17 +01:00
Liliana Marie Prikler e2b04973fd
gnu: emacs: Don't hash file names in native compilation.
* gnu/packages/patches/emacs-native-comp-fix-filenames.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/emacs.scm (emacs-minimal)[source]: Use it here.

Change-Id: I2b7f6b45742a985760f0097bb53910f068e3d8e5
2024-02-24 07:26:51 +01:00
Liliana Marie Prikler 833ccf20a9
gnu: emacs: Build trampolines.
* gnu/packages/emacs.scm (emacs-no-x)[#:phases]: Add ‘build-trampolines’.

Change-Id: I33303bcbaf6cbda15867a5546e793c05d1f0e67b
2024-02-24 07:26:51 +01:00
Liliana Marie Prikler aae61f54ff
gnu: emacs-minimal: Update to 29.2.
* gnu/packages/emacs.scm (emacs-minimal): Update to 29.2.
2024-01-21 10:04:25 +01:00
Liliana Marie Prikler c7f937cfdd
gnu: emacs-minimal: Set upstream-name to “emacs”.
* gnu/packages/emacs.scm (emacs-minimal)[properties]: Add ‘upstream-name’.
2024-01-21 09:32:28 +01:00
Maxim Cournoyer 90b1fe57d0
gnu: emacs: Patch awk, find, sed and sh commands.
Before this change, using Emacs in a pure environment, e.g. 'guix shell --pure
emacs', would cause problems such as:

  jka-compr-insert-file-contents: Uncompression program ‘sh’ not found

And other problems were found requiring the other tools.

* gnu/packages/emacs.scm (emacs-minimal) [arguments]: Extend the
patch-program-file-names phase.
[inputs]: Add findutils, gawk and sed.

Series-changes: 2
 - Patch references in place instead of wrapping via PATH

Change-Id: Ifb4fe2fc12ddc9eae387adb3da3f7821fab78e65
2024-01-18 22:10:58 -05:00
Liliana Marie Prikler 2e0ed79118
gnu: emacs-next-minimal: Apply Guix patches.
* gnu/packages/patches/emacs-next-native-comp-driver-options.patch: Add file.
* gnu/packages/patches/emacs-next-exec-path.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register them here.
* gnu/packages/emacs.scm (emacs-next-minimal)[origin](patches): Include the
same patches as emacs-minimal, save for the variants specific to emacs-next
introduced above.

Co-Authored-By: Nicolas Graves <ngraves@ngraves.fr>
Fixes: ‘emacs-next’ is almost unusable <https://bugs.gnu.org/66227>
2023-10-08 08:40:57 +02:00
Liliana Marie Prikler 95ddf01d11
gnu: Add emacs-next-tree-sitter.
This package currently exists on master, where both emacs and emacs-next are
built without tree-sitter.  Since most of our Emacsen now build with
tree-sitter, it is no longer needed, but let's issue a warning rather than
a hard error to those who rely on it.

* gnu/packages/emacs.scm (emacs-next-tree-sitter): New variable.
2023-09-09 16:34:51 +02:00
Liliana Marie Prikler e12610bede
gnu: Add emacs-next-pgtk-xwidgets.
* gnu/packages/emacs.scm (emacs-next-pgtk-xwidgets): New variable.
2023-09-09 16:32:31 +02:00
Liliana Marie Prikler cef9f37999
gnu: Add emacs-next-pgtk.
* gnu/packages/emacs.scm (emacs-next-pgtk): New variable.
2023-09-09 16:32:09 +02:00
Liliana Marie Prikler f65a727cb3
gnu: Add emacs-next.
* gnu/packages/emacs.scm (emacs->emacs-next, emacs-next): New variable.
2023-09-09 16:29:07 +02:00
Liliana Marie Prikler 1aa5537dfe
gnu: Add emacs-next-minimal.
* gnu/packages/emacs.scm (emacs-next-minimal): New variable.
2023-09-09 16:24:58 +02:00
Maxim Cournoyer b02ad19305
gnu: emacs: Reload subdirs.el files in ‘guix-emacs-autoload-packages’.
This fixes a regression introduced with 79cfe30f3 ("build-system: emacs: Use
subdirectories again.") which caused the 'guix-emacs-autoload-packages' to no
longer be able to autoload all packages.

* gnu/packages/aux-files/emacs/guix-emacs.el
(guix-emacs-autoload-packages): Reload subdirs.el files unless NO-RELOAD is
provided.  Update docstring.
* doc/guix.texi (Application Setup): Document that
‘guix-emacs-autoload-packages’ can be invoked interactively to auto-reload
newly installed Emacs packages.
* gnu/packages/emacs.scm (emacs)[arguments]<#:phases>: Call
guix-emacs-autoload-packages with an argument in the site-start.el file.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
2023-09-07 20:25:07 +02:00
Liliana Marie Prikler 3349a50d70
gnu: emacs: Update to 29.1.
* gnu/packages/emacs.scm (emacs-minimal): Update to 29.1.
[source]: Use url-fetch again.
2023-08-02 20:30:11 +02:00
Liliana Marie Prikler 8de4131b2d
Merge branch 'master' into emacs-team 2023-08-01 22:21:09 +02:00
Janneke Nieuwenhuizen 772eaa69f3
gnu: emacs: Depend on libc-for-target.
* gnu/packages/emacs.scm (emacs)[inputs]: Change glibc to (libc-for-target).
2023-07-18 18:34:55 +02:00
Liliana Marie Prikler 15406013fe
Merge branch 'master' into emacs-team 2023-07-13 17:21:32 +02:00
Hilton Chain e40d6bb7d7
gnu: emacs-next: Update to 29.0.92.
* gnu/packages/emacs.scm (emacs-next): Update to 29.0.92.

Signed-off-by: Andrew Tropin <andrew@trop.in>
2023-07-10 10:54:49 +04:00
Liliana Marie Prikler a3ac317ab4
gnu: Construct Emacs packages from bottom up.
This makes relationships within the Emacs variants slightly easier to reason
about.  In particular, it makes it so that inputs get added on top of the
previous stack rather than removed (which brings the risk of not adjusting
changes downwards).

* gnu/packages/emacs.scm (emacs-minimal): Expand package definition.
[inputs]: Reorder and add bash-minimal.
(emacs-no-x): Inherit from emacs-minimal.
(emacs): Inherit from emacs-no-x.
(emacs-motif, emacs-no-x-toolkit): Inherit from emacs-no-x.
Only inherit inputs from emacs.
2023-06-09 19:23:02 +02:00
Liliana Marie Prikler a016453a95
gnu: Make emacs-next-tree-sitter the new emacs.
* gnu/packages/patches/emacs-source-date-epoch.patch: Delete file
* gnu/local.mk (dist_patch_DATA): Remove it from here.
* gnu/packages/emacs.scm (emacs): Update to 29.0.91.
[source]<patches>: Remove “emacs-source-date-epoch.patch”.
Add “emacs-pgtk-super-key-fix.patch”.
[arguments]: Use “--with-native-compilation=aot” instead of #:make-flags.
[inputs]: Add sqlite and tree-sitter.
(emacs-next-pgtk): Rename to…
(emacs-pgtk): … this.
(emacs-next-pgtk-xwidgets): Rename to…
(emacs-pgtk-xwidgets): … this.
(emacs-minimal)[native-inputs]: Add texinfo.
(emacs-xwidgets): Inherit build system, configure-flags and phases normally.
(emacs-next, emacs-next-tree-sitter): Remove variables.
2023-06-09 18:20:00 +02:00
Liliana Marie Prikler 8391bceceb
gnu: emacs-next-tree-sitter: "Downgrade" to 29.0.91.
* gnu/packages/emacs.scm (emacs-next-tree-sitter)[version, source]: Inherit
fields from emacs-next.
2023-05-28 23:14:18 +02:00
Liliana Marie Prikler c3133fe96f
gnu: emacs-next: Update to 29.0.91.
* gnu/packages/emacs.scm (emacs-next): Update to 29.0.91.
2023-05-28 23:14:16 +02:00
Antero Mejr 4c3532d7ab
gnu: Add emacs-next-pgtk-xwidgets.
* gnu/packages/emacs.scm (emacs-next-pgtk-xwidgets): New variable.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
2023-05-07 17:55:27 +02:00
Efraim Flashner 5834953573
gnu: emacs: Use librsvg-for-system.
* gnu/packages/emacs.scm (emacs)[inputs]: Replace librsvg input logic
with librsvg-for-system.
2023-04-30 15:17:25 +03:00
Liliana Marie Prikler e7550b8d93
gnu: emacs-next: Update to 29.0.90.
* gnu/packages/emacs.scm (emacs-next): Update to 29.0.90.
2023-04-19 20:12:21 -04:00
Andreas Enge ccb62d8feb
Merge remote-tracking branch 'origin/master' into core-updates 2023-03-20 18:49:06 +01:00
Z572 84a70d7c15
gnu: m17n-lib: Fix cross-compile.
* gnu/packages/emacs.scm (m17n-lib)
[source]: Add m17n-lib-1.8.0-use-pkg-config-for-freetype.patch.
[native-inputs]: When cross-compile add pkg-config, libtool, gettext-minimal,
autoconf, automake.
[arguments]: When cross-compile, add phase to fix rpl_malloc undefined references.
* gnu/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
2023-03-17 18:33:38 +08:00
Z572 bf2c66b44e
gnu: m17n-db: Fix cross-compile.
* gnu/packages/emacs.scm (m17n-db)
[inputs]: Move gettext-minimal to ...
[native-inputs]: ... here.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
2023-03-17 18:33:38 +08:00
Andrew Tropin 7001cc68b6
gnu: emacs-next-pgtk: Inherit from emacs-next-tree-sitter.
Inherit pgtk emacs from tree-sitter to have both features available for
wayland users.  For more details:
https://yhetil.org/guix-devel/87r0txr99u.fsf@inventati.org/T/#u

* gnu/packages/emacs.scm (emacs-next-pgtk): Inherit from
emacs-next-tree-sitter.
2023-03-12 08:00:22 +04:00
Andrew Tropin 110406dcc3
gnu: emacs-next-tree-sitter: Inherit from emacs-next.
Make tree-sitter emacs available without pgtk.  It's part of ongoing
iheritance hierarchy update, tree-sitter have less implications than pgtk and
thus it should be placed earlier in inheritance chain. For more details:
https://yhetil.org/guix-devel/87r0txr99u.fsf@inventati.org/T/#u

* gnu/packages/emacs.scm (emacs-next-tree-sitter): Inherit from emacs-next.
2023-03-12 07:53:05 +04:00
Andrew Tropin 070c335a91
gnu: emacs-next-tree-sitter: Inherit from emacs-next-pgtk.
Make emacs with tree-sitter work on wayland as well.

* gnu/packages/emacs.scm (emacs-next-tree-sitter): Inherit from
emacs-next-pgtk, remove uneeded native-inputs, add synopsis and description.
[source]: Use inherited patches.
2023-03-09 15:31:10 +04:00
Andrew Tropin b4c64ddce4
gnu: emacs-next-pgtk: Remove xwidgets support.
xwidgets is beefy and buggy, but emacs-next-pgtk is important for wayland
users, so it seems a good idea to remove xwidgets from emacs-next-pgtk.  Also,
we have a separate emacs-xwidgets package for those who wants to experiment.

* gnu/packages/emacs.scm (emacs-next-pgtk)[propagated-inputs]: Remove
gsettings-desktop-schemas glib-networking.
[arguments]<#:configure-flags>: Remove --with-xwidgets.
[inputs]: Remove webkitgtk-with-libsoup2.
[home-page]: PGTK is merged to upstream emacs repository now, so inherit
home-page from emacs-next.
2023-03-09 15:31:09 +04:00
Christopher Baines 7df09ee0ab
Merge remote-tracking branch 'savannah/master' into core-updates
Conflicts:
	gnu/local.mk
	gnu/packages/autotools.scm
	gnu/packages/cmake.scm
	gnu/packages/gnuzilla.scm
	gnu/packages/haskell.scm
	gnu/packages/pdf.scm
	gnu/packages/python-xyz.scm
	gnu/packages/samba.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/wxwidgets.scm
2023-03-02 10:55:08 +00:00
Andy Tai c05adaddb1
gnu: Add emacs-motif.
* gnu/packages/text-editors.scm (emacs-motif): New variable.

Signed-off-by: Christopher Baines <mail@cbaines.net>
2023-03-01 15:15:50 +00:00
Liliana Marie Prikler d529be6abb
gnu: emacs-next: Update to 29.0.60-1.f1f571e.
* gnu/packages/emacs.scm (emacs-next): Update to 29.0.60-1.f1f571e.
2023-02-26 08:51:56 +01:00
Liliana Marie Prikler 420cf2bf2a
gnu: Add emacs-next-tree-sitter.
* gnu/packages/emacs.scm (emacs-next-tree-sitter): New variable.
(emacs-next): Remove tree sitter support.
2023-02-26 08:51:55 +01:00
Pierre Langlois 18f1a4d38a
gnu: Remove tree-sitter comment from emacs.scm imports.
* gnu/packages/emacs.scm: Remove tree-sitter comment.

Signed-off-by: Andrew Tropin <andrew@trop.in>
2023-02-12 11:32:21 +04:00
Andrew Tropin c77a3d4554
gnu: emacs: Add TREE_SITTER_GRAMMAR_PATH support.
gnu/packages/emacs.scm (emacs)[native-search-paths]: Add a search-path for
tree-sitter grammars.
gnu/packages/aux-files/emacs/guix-emacs.el: Add directories from
TREE_SITTER_GRAMMAR_PATH to treesit-extra-load-path.
2023-02-11 12:02:46 +04:00
Pierre Langlois ce7d0d689c
gnu: tree-sitter: Move to its own module.
* gnu/packages/text-editors.scm (tree-sitter): Move to ...
* gnu/packages/tree-sitter.scm: ... here, a new module.
* gnu/packages/vim.scm: Use (gnu packages tree-sitter).
* gnu/packages/emacs.scm: Use (gnu packages tree-sitter).
* gnu/local.mk (GNU_SYSTEM_MODULES): Register tree-sitter.scm new module.

Signed-off-by: Andrew Tropin <andrew@trop.in>
2023-02-09 17:36:23 +04:00
Declan Tsien 6f0c905324
gnu: emacs-next: Enable tree-sitter support.
* gnu/packages/emacs.scm (emacs-next): Update to 29.0.60-0.ac7ec87.
* gnu/packages/emacs.scm (emacs-next)[inputs]: Add tree-sitter.

Signed-off-by: Andrew Tropin <andrew@trop.in>
2023-02-04 08:48:31 +04:00