Commit graph

95 commits

Author SHA1 Message Date
Femi Agbabiaka
8b221ef854 Fetch Emacs source via git instead of cgit snapshot
Upstream Emacs disabled their cgit snapshot services again.  It is
more future-proofing to fetch Emacs source via git.

More context: https://github.com/nix-community/emacs-overlay/pull/523#discussion_r2609355135

Note that this patch does not affect Emacs forks whose source code is
hosted on and fetched via GitHub.

Ref: #523
Co-authored-by: Lin Jian <me@linj.tech>
2025-12-14 05:18:21 +08:00
Brian Leung
4ed9b13256
Revert "Remove srcRepo override"
This reverts commit 3ebbd963cd.
2025-08-29 08:01:23 -07:00
Brian Leung
289484e721
Revert "fixup! Remove srcRepo override"
This reverts commit c58a057db0.
2025-08-29 08:01:19 -07:00
Brian Leung
c58a057db0
fixup! Remove srcRepo override
This is a follow-up of 3ebbd963cd. At
the time of writing, origin/nixos-unstable includes autoreconfHook and
texinfo irrespective of the `srcRepo` value, so this preserves those
dependencies when
https://github.com/NixOS/nixpkgs/pull/437637/commits/4a2ad8134b8b40f198c71f7d8d84467d250cd714
becomes used.
2025-08-28 03:15:28 -07:00
Brian Leung
3ebbd963cd
Remove srcRepo override
In compliance with nixpkgs a019344338d84d8e6a79ab0a5a1ede443234e331,
which is now in the nixos-unstable branch, we don't set the
now-nonexistent `srcRepo`. The stable branch has `srcRepo` set to true
by default.
2025-08-27 22:03:48 -07:00
Lin Jian
88c7d87694 Remove emacs-pgtk to not shadow the one from Nixpkgs
Users have been notified for about 4 months[1] which should be long
enough.

This is the second and last PR for #471.  Fixes #471.

[1]: #473
2025-06-28 14:01:16 +12:00
Brian Leung
f45ca856fb
Manually update Emacs, and remove now-merged unstable patch 2025-05-19 12:46:17 -07:00
Brian Leung
6e4d92e5c2
Revert "Temporarily make packages correspond to emacs-unstable"
This reverts commit 4944e1c699.
2025-03-08 11:33:44 -08:00
Brian Leung
4944e1c699
Temporarily make packages correspond to emacs-unstable 2025-03-08 11:19:59 -08:00
Lin Jian
c34d22888c
overlay/emacs: update patch for #318 (upstream bug#63288 bug#76523)
The new patch is contained in master and feature/igc branches, so we
only add it to the unstable Emacs.
2025-03-08 17:55:47 +08:00
Lin Jian
d6871ef57d overlays/emacs: rename emacs-pgtk to emacs-git-pgtk
In the future, emacs-pgtk will be removed and after that it will point
to the one[1] in Nixpkgs.

[1]: 4347ffbee0
2025-03-06 16:22:49 +08:00
naveen-seth
86d525f88f Add emacs-igc and emacs-igc-pgtk 2025-01-26 14:51:07 +13:00
Lin Jian
519b67faa4 Reapply "Disable webkit2gtk integration"
This reverts commit 8823d47619.

Due to the way the default values of withFoo flags are specified and
the way Emacs variants are overridden, default values of those flags
in this overlay may be incorrect.

This commit is a workaround.  We should do a proper fix later.
2024-12-17 01:15:37 +08:00
Lin Jian
8823d47619
Revert "Disable webkit2gtk integration"
This reverts commit ce4ed6b670.

The needed change has reached stable and unstable Nixpkgs channels.
No need to duplicate it here now.
2024-12-16 21:21:37 +08:00
Andreas Fuchs
d3342b2b1b
nativeComp: darwin: Allow emacs to find the path for libSystem
This mirrors https://github.com/NixOS/nixpkgs/pull/361752 and removes
the warning emitted about a malfunctioning libgccjit on Darwin when
building emacs from git.

Co-authored-by: Lin Jian <me@linj.tech>
2024-12-05 03:20:18 +08:00
Shanyou Li
ebe446814a
remove: withGTK2, see #431 2024-09-28 12:17:43 +08:00
Brian Leung
971818ced1
Fix incomplete rebase 2024-09-26 21:50:35 -07:00
Brian Leung
a4ee09a79b Fix typo in name prefix for emacs-unstable-pgtk 2024-09-27 04:31:59 +00:00
Brian Leung
e417bd7c85 Reapply "Use --replace-warn instead of --replace in substituteInPlace"
This reverts commit 0a9f220646.

--replace-warn is in 24.05.
2024-09-27 04:31:59 +00:00
Brian Leung
2933ca78e4 Cosmetics: don't specify defaults prescribed by nixpkgs 2024-09-27 04:31:59 +00:00
Brian Leung
fb01b36edc Cosmetics: don't use lib.makeOverridable anymore
It was introduced to sneak in a new attribute back when we managed
tree-sitter plugins here in the overlay, but we now handle that
upstream.
2024-09-27 04:31:59 +00:00
Brian Leung
368359d0f3 Cosmetics: remove <= 23.11 handholding 2024-09-27 04:31:59 +00:00
Brian Leung
c691136bcb Use bytecomp-revert.patch for unstable Emacsen 2024-09-26 22:16:35 +00:00
Brian Leung
ce4ed6b670
Disable webkit2gtk integration
See upstream bug https://lists.gnu.org/archive/html/bug-gnu-emacs/2024-09/msg00695.html
2024-09-26 05:23:21 -07:00
Luigi Sartor Piucco
4427f0bce9
Fix cache miss due to bytecomp-revert
Previously, using the Emacsen where bytecomp-revert.patch is applied
could cause a costly cache miss, because `(emacs-attr).pkgs.emacs` was
not updated to be equal to `(emacs-attr)`; instead, it remained as the
unpatched version. This commit fixes that.
2024-04-06 12:24:07 -03:00
adisbladis
0a9f220646 Revert "Use --replace-warn instead of --replace in substituteInPlace"
This reverts commit 9657a4d41b.
2024-02-24 19:18:56 +13:00
Brian Leung
9657a4d41b
Use --replace-warn instead of --replace in substituteInPlace 2024-02-22 02:06:25 -08:00
Brian Leung
ea1f9f60b6
Revert "Try removing the bytecomp-revert.patch"
This reverts commit d6772c6c10.
2024-01-23 16:39:55 -08:00
Brian Leung
d6772c6c10
Try removing the bytecomp-revert.patch 2024-01-23 13:01:33 -08:00
Chris Montgomery
deaebf8f0a
nativeComp -> withNativeCompilation 2023-07-23 17:25:09 -04:00
Alan Pearce
426089576c Add commercial-emacs attribute 2023-06-28 15:06:23 +02:00
Brian Leung
842fdae419
Revert "Remove 22.11 handholding"
This reverts commit f776194108.

For the apparently very many boomers who use the overlay.
2023-06-18 19:50:39 -07:00
Brian Leung
f776194108
Remove 22.11 handholding 2023-06-14 15:22:35 -07:00
Brian Leung
ec3643e9cf
Account for upstream renaming
See https://github.com/NixOS/nixpkgs/pull/235859
2023-06-05 04:59:35 -07:00
Brian Leung
88d3f72dcc
Fix indentation 2023-05-31 22:22:24 -07:00
adisbladis
fdf09998a0 Align with nixpkgs attribute syntax since https://github.com/NixOS/nixpkgs/pull/233301 2023-06-01 17:14:36 +12:00
Brian Leung
2143986e62
Clarify to-do 2023-05-30 22:30:02 -07:00
Brian Leung
e20a389113
Account for nixpkgs checkouts lacking withTreeSitter attribute 2023-05-30 22:03:38 -07:00
Brian Leung
936f581fed
Make emacsLsp overridable 2023-05-30 17:48:40 -07:00
Brian Leung
77c0c82383
Account for upstream refactor 2023-05-30 16:27:51 -07:00
Brian Leung
509a7ef0ea
Remove tree-sitter stuff
It's now handled in nixpkgs.
2023-05-30 15:42:30 -07:00
Brian Leung
f6f7f8ef79
Revert "Work around https://lists.gnu.org/archive/html/bug-gnu-emacs/2023-05/msg01512.html"
This reverts commit e7cd4e4053.

Upstream is attempting to work around the issue we encountered, so we
revert to avoid conflicts.
2023-05-29 00:25:20 -07:00
Brian Leung
e7cd4e4053
Work around https://lists.gnu.org/archive/html/bug-gnu-emacs/2023-05/msg01512.html 2023-05-25 05:13:43 -07:00
Brian Leung
9a691c7088
Work around #318 2023-05-25 05:13:42 -07:00
Marius Claian
87d3eb48b7 Path fixes resulting from libgccjit changes
6c209e862e
2023-04-15 13:21:57 +03:00
Anders Kaseorg
b1b45ec117 Add emacsUnstablePgtk
Now that emacsUnstable is Emacs 29.0.90, we can add the pgtk variant.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2023-04-12 14:45:32 -07:00
Brian Leung
644ae3ce05
Fix comment 2023-04-10 15:18:46 -07:00
Brian Leung
f73f92e01b
Fix issue link for bug-reference-prog-mode 2023-04-10 15:14:30 -07:00
Brian Leung
c1f6d037d0
Update comment 2023-04-10 13:49:27 -07:00
Brian Leung
e28c8932e5
Enable Emacs 29 features for emacsUnstable 2023-04-10 13:20:55 -07:00