mirror of
https://github.com/nix-community/emacs-overlay.git
synced 2025-12-06 02:40:25 -08:00
Add emacs 28
As the release branch for emacs 28 has been cut, and emacsGit now builds emacs 29, let's add a way to track emacs 28.
This commit is contained in:
parent
7a55c082b4
commit
63002ce581
4 changed files with 28 additions and 0 deletions
14
default.nix
14
default.nix
|
|
@ -95,6 +95,18 @@ let
|
||||||
|
|
||||||
emacsPgtkGcc = mkPgtkEmacs "emacs-pgtkgcc" ./repos/emacs/emacs-feature_pgtk.json { nativeComp = true; };
|
emacsPgtkGcc = mkPgtkEmacs "emacs-pgtkgcc" ./repos/emacs/emacs-feature_pgtk.json { nativeComp = true; };
|
||||||
|
|
||||||
|
emacsGcc28 = (mkGitEmacs "emacs-gcc-28" ./repos/emacs/emacs-emacs-28.json { nativeComp = true; }).overrideAttrs (
|
||||||
|
old: {
|
||||||
|
patches = [ ./patches/tramp-detect-wrapped-gvfsd-28.patch ];
|
||||||
|
});
|
||||||
|
|
||||||
|
emacs28 = (mkGitEmacs "emacs-gcc-28" ./repos/emacs/emacs-emacs-28.json { }).overrideAttrs (
|
||||||
|
old: {
|
||||||
|
patches = [
|
||||||
|
./patches/tramp-detect-wrapped-gvfsd-28.patch
|
||||||
|
];
|
||||||
|
});
|
||||||
|
|
||||||
emacsUnstable = (mkGitEmacs "emacs-unstable" ./repos/emacs/emacs-unstable.json { }).overrideAttrs (
|
emacsUnstable = (mkGitEmacs "emacs-unstable" ./repos/emacs/emacs-unstable.json { }).overrideAttrs (
|
||||||
old: {
|
old: {
|
||||||
patches = [
|
patches = [
|
||||||
|
|
@ -107,6 +119,8 @@ in
|
||||||
{
|
{
|
||||||
inherit emacsGit emacsUnstable;
|
inherit emacsGit emacsUnstable;
|
||||||
|
|
||||||
|
inherit emacs28 emacsGcc28;
|
||||||
|
|
||||||
inherit emacsGcc;
|
inherit emacsGcc;
|
||||||
|
|
||||||
inherit emacsPgtk emacsPgtkGcc;
|
inherit emacsPgtk emacsPgtkGcc;
|
||||||
|
|
|
||||||
12
patches/tramp-detect-wrapped-gvfsd-28.patch
Normal file
12
patches/tramp-detect-wrapped-gvfsd-28.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
|
||||||
|
index 1722c53b..fc5866b9 100644
|
||||||
|
--- a/lisp/net/tramp-gvfs.el
|
||||||
|
+++ b/lisp/net/tramp-gvfs.el
|
||||||
|
@@ -126,6 +126,7 @@
|
||||||
|
;; for some processes. Better we don't check.
|
||||||
|
(<= emacs-major-version 25)
|
||||||
|
(tramp-process-running-p "gvfs-fuse-daemon")
|
||||||
|
+ (tramp-process-running-p ".gvfsd-fuse-wrapped")
|
||||||
|
(tramp-process-running-p "gvfsd-fuse"))))
|
||||||
|
"Non-nil when GVFS is available.")
|
||||||
|
|
||||||
1
repos/emacs/emacs-emacs-28.json
Normal file
1
repos/emacs/emacs-emacs-28.json
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
{"type": "savannah", "repo": "emacs", "rev": "756b8a5f1bd28aeadc804fd2f93ce7e823a1d4a2", "sha256": "05ms14p0v2zl86dii72062z8fy842fvwrxqw5kbfrxxa0d7szb5p", "version": "20211123.0"}
|
||||||
|
|
@ -54,6 +54,7 @@ function update_release() {
|
||||||
|
|
||||||
update_savannah_branch master
|
update_savannah_branch master
|
||||||
update_savannah_branch feature/pgtk
|
update_savannah_branch feature/pgtk
|
||||||
|
update_savannah_branch emacs-28
|
||||||
update_release
|
update_release
|
||||||
|
|
||||||
nix-build --no-out-link --show-trace ./test.nix
|
nix-build --no-out-link --show-trace ./test.nix
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue