Commit graph

1268 commits

Author SHA1 Message Date
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
Efraim Flashner
4cf1acc7f3
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
	doc/guix.texi
	gnu/local.mk
	gnu/packages/admin.scm
	gnu/packages/base.scm
	gnu/packages/chromium.scm
	gnu/packages/compression.scm
	gnu/packages/databases.scm
	gnu/packages/diffoscope.scm
	gnu/packages/freedesktop.scm
	gnu/packages/gnome.scm
	gnu/packages/gnupg.scm
	gnu/packages/guile.scm
	gnu/packages/inkscape.scm
	gnu/packages/llvm.scm
	gnu/packages/openldap.scm
	gnu/packages/pciutils.scm
	gnu/packages/ruby.scm
	gnu/packages/samba.scm
	gnu/packages/sqlite.scm
	gnu/packages/statistics.scm
	gnu/packages/syndication.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
	gnu/packages/xml.scm
	guix/build-system/copy.scm
	guix/scripts/home.scm
2023-01-30 12:39:40 +02:00
Fredrik Salomonsson
99f2a39c8d
gnu: emacs-next: Update to 29.0.50-4.6adc193.
* gnu/packages/emacs.scm (emacs-next): Update to 29.0.50-4.6adc193.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2023-01-26 11:11:19 +01:00
Liliana Marie Prikler
1267cc97a9
gnu: emacs-minimal: Do not patch compilation driver.
The ‘patch-compilation-driver’ phase pulls in libgccjit even though it has
been deliberately removed from emacs-minimal.

* gnu/packages/emacs.scm (emacs)[#:phases]: Delete ‘patch-compilation-driver’.
2023-01-22 10:05:30 +01:00
jgart
440a3e8d33
gnu: emacs-next: Update to 29.0.50-3.22e8a77.
* gnu/packages/emacs.scm (emacs-next): Update to 29.0.50-3.22e8a77.

Signed-off-by: Christopher Baines <mail@cbaines.net>
2022-11-03 18:18:16 +01:00
Liliana Marie Prikler
4c43c79e40
gnu: emacs: Update to 28.2.
* gnu/packages/emacs.scm (emacs): Update to 28.2.
2022-10-16 11:23:58 +02:00
Marius Bakke
c567a82a69
Merge branch 'staging' 2022-10-16 00:10:07 +02:00
Liliana Marie Prikler
1682aba247
gnu: emacs-next: Update to 29.0.50-2.4aeb80c.
* gnu/packages/patches/emacs-native-comp-driver-options.patch: New file.
* gnu/local.mk: Register it here.
* gnu/packages/emacs.scm (emacs-next): Update to 29.0.50-2.4aeb80c.
2022-10-15 16:32:04 +02:00
Liliana Marie Prikler
407f017663
gnu: emacs-minimal: Reduce to minimal inputs.
This partly reverts dbcba75c0e.  In that commit,
emacs-minimal gained a few inputs that weren't actually used as native
compilation is disabled.
Discovered by djeis in IRC, see also
<http://logs.guix.gnu.org/guix/2022-10-02.log#170047>.

* gnu/packages/emacs.scm (emacs-minimal)[inputs]: Remove ld-wrapper, binutils,
glibc, libgccjit, and zlib.
[arguments]<#:phases>: Delete ‘set-libgccjit-path’.
2022-10-02 18:30:02 +02:00
Maxim Cournoyer
990a4822f1
Merge branch 'staging' into core-updates
Conflicts resolved in:
	gnu/local.mk
	gnu/packages/cran.scm
	gnu/packages/gnome.scm
	gnu/packages/gtk.scm
	gnu/packages/icu4c.scm
	gnu/packages/java.scm
	gnu/packages/machine-learning.scm
	gnu/packages/tex.scm
2022-09-27 15:59:30 -04:00
Andrew Tropin
f7565101e4
gnu: emacs-next-pgtk: Inherit patches from emacs-next.
* gnu/packages/emacs.scm (emacs-next-pgtk)[source]: Inherit patches from
emacs-next.
2022-09-19 07:23:41 +03:00
Marius Bakke
80c76f5d8e
Merge branch 'staging' into core-updates 2022-09-18 16:30:21 +02:00
Andrew Tropin
77e768ac4e
gnu: emacs-next-pgtk: Fix super key problem.
Recent version of emacs 29 with pgtk flag has a problem with handling super
key modifier, due to gtk bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4913
This commit workarounds it.

* gnu/packages/patches/emacs-pgtk-super-key-fix.patch: New file.
* gnu/packages/emacs.scm (emacs-next-pgtk): Use it here.
* gnu/local.mk (dist_patch_DATA): Register it here.
2022-09-16 20:28:34 +03:00
Maxim Cournoyer
4920f6e634
Merge branch 'staging' into core-updates
Conflicts resolved in:
	gnu/local.mk
	gnu/packages/cmake.scm
	gnu/packages/glib.scm
	gnu/packages/gnome.scm
	gnu/packages/gtk.scm
	gnu/packages/sdl.scm

pango-next, vala-next and librsvg-bootstrap were removed in the process.
2022-09-15 11:43:21 -04:00
Liliana Marie Prikler
dbcba75c0e
gnu: emacs: Build with native compilation.
* gnu/packages/emacs.scm (%emacs-modules): New variable.
(emacs)[arguments]<#:modules>: Use it here.
<#:configure-flags> Add “--with-native-compilation”.
<#:make-flags>: Add “NATIVE_FULL_AOT=1”.
<#:phases>: Add ‘set-libgccjit-path’ and ‘patch-compilation-driver’.
[inputs]: Add explicit ld-wrapper, binutils, glibc, and libgccjit.
[search-paths]: Add EMACSNATIVELOADPATH.
(emacs-minimal, emacs-xwidgets, emacs-no-x)
(emacs-no-x-toolkit): Adjust accordingly.
2022-09-11 15:46:32 +02:00
Marius Bakke
b4a7f8c917
gnu: Remove librsvg-bootstrap.
librsvg is already a staging-level package, and the next version will no
longer bundle its dependencies, so we might as well drop it early.

* gnu/packages/gnome.scm (librsvg-bootstrap): Remove variable.
* gnu/packages/bittorrent.scm (deluge)[native-inputs]: Replace
LIBRSVG-BOOTSTRAP with LIBRSVG.
* gnu/packages/emacs.scm (emacs)[inputs]: Likewise.
* gnu/packages/gtk.scm (gtk+-2)[propagated-inputs]: Likewise.
* gnu/packages/gtk.scm (gtk+)[propagated-inputs]: Likewise.
2022-08-12 00:22:28 +02:00
Zhu Zihao
e9f10f1d3b
gnu: emacs-next: Enable SQLite3 support.
[[PGP Signed Part:No public key for 66397F84F76693F9 created at 2022-07-20T06:08:56+0200 using EDDSA]]

[[End of PGP Signed Part]]
>From 068de10c98b5d29adb13963222a1ca21ef7b0a76 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Wed, 20 Jul 2022 12:07:09 +0800
Subject: [PATCH] gnu: emacs-next: Enable SQLite3 support.

* gnu/packages/emacs.scm (emacs-next)[inputs]: Add sqlite.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-08-05 00:14:29 +02:00
John Kehayias
4f9ac2afc7
gnu: emacs: Fix tramp-remote-path.
This variable was moved from tramp-sh.el to tramp.el, causing the substitute*
snippet which patches it to silently fail.
See also <https://issues.guix.gnu.org/55443>.

* gnu/packages/emacs.scm (emacs)[source]<snippet>: Patch tramp.el rather than tramp-sh.el.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
2022-06-22 21:09:23 +02:00
Ludovic Courtès
091eb323ba
Merge branch 'master' into staging 2022-06-08 14:53:16 +02:00
Josselin Poiret
77f84500ed
gnu: emacs-next: Update to 29.0.50-1.0a5477b.
The currently used commit breaks magit, so update to a newer one.

* gnu/packages/emacs.scm (emacs-next): Update to 29.0.50-1.0a5477b.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
2022-06-05 12:11:06 +02:00
Ludovic Courtès
7097e98586
Merge branch 'master' into staging 2022-05-26 17:11:20 +02:00
Ludovic Courtès
6b819f8285
gnu: guile-emacs: Remove input labels.
* gnu/packages/emacs.scm (guile-emacs)[native-inputs]: Remove labels.
2022-05-26 13:19:42 +02:00
Ludovic Courtès
5645307ffb
gnu: guile-emacs: Use gexps.
This is a followup to 64557bc695.

* gnu/packages/emacs.scm (guile-emacs)[arguments]: Use gexps.
2022-05-26 13:17:41 +02:00
wednesday
15870cc08d
gnu: emacs: Add libselinux to inputs.
* gnu/packages/emacs.scm (emacs)[inputs]: Add libselinux to support
  extended attributes.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-05-21 01:01:28 -04:00
wednesday
fd5b7393a0
gnu: emacs: Add lcms to inputs.
* gnu/packages/emacs.scm (emacs)[inputs]: Add lcms.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2022-05-21 01:00:13 -04:00
Liliana Marie Prikler
1110479d2d
gnu: emacs-wide-int: Use new package style.
* gnu/packages/emacs.scm (emacs-wide-int)[arguments]: Convert to list of
G-Expressions.
[inputs]: Use modify-inputs.
2022-05-15 09:17:23 +02:00
Liliana Marie Prikler
484dd71a08
gnu: emacs-no-x-toolkit: Use new package style.
* gnu/packages/emacs.scm (emacs-no-x-toolkit)[arguments]: Convert to list of
G-Expressions.
[inputs]: Use modify-inputs.
2022-05-15 09:17:23 +02:00
Liliana Marie Prikler
4949188d46
gnu: emacs-no-x: Use new package style.
* gnu/packages/emacs.scm (emacs-no-x)[arguments]: Convert to list of
G-Expressions.
[inputs]: Use modify-inputs.
2022-05-15 09:17:23 +02:00
Liliana Marie Prikler
a56a3fa761
gnu: emacs-xwidgets: Use new package style.
* gnu/packages/emacs.scm (emacs-xwidgets)[arguments]: Convert to list of
G-Expressions.
[inputs]: Use modify-inputs.
2022-05-15 09:17:22 +02:00
Liliana Marie Prikler
9a520eb203
gnu: emacs-next-pgtk: Use new package style.
* gnu/packages/emacs.scm (emacs-next-pgtk)[arguments]: Convert to list of
G-Expressions.
[inputs]: Use modify-inputs.
2022-05-15 09:17:22 +02:00
Liliana Marie Prikler
3443cbf8dd
gnu: emacs-minimal: Tidy up coding style.
* gnu/packages/emacs.scm (emacs-minimal)[inputs, native-inputs]: Reduce to a
single line.
[#:configure-flags]: Use G-Expression rather than double quoting.
2022-05-15 01:31:59 +02:00