cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #95169 from adisbladis/emacs-27

Browse source 
emacs: 26.3 -> 27.1
This commit is contained in:
adisbladis 2020-08-11 15:13:51 +02:00 committed by GitHub
commit 5c68e3171e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/applications/editors/emacs/clean-env.patch
View file

@ -2,14 +2,15 @@ Dump temacs in an empty environment to prevent -dev paths from ending
up in the dumped image. up in the dumped image.
diff --git a/src/Makefile.in b/src/Makefile.in diff --git a/src/Makefile.in b/src/Makefile.in
index fd05a45df5..13f529c253 100644
--- a/src/Makefile.in --- a/src/Makefile.in
+++ b/src/Makefile.in +++ b/src/Makefile.in
@@ -535,7 +535,7 @@ ifeq ($(CANNOT_DUMP),yes) @@ -570,7 +570,7 @@ emacs$(EXEEXT): temacs$(EXEEXT) \
ln -f temacs$(EXEEXT) $@ lisp.mk $(etc)/DOC $(lisp) \
else $(lispsource)/international/charprop.el ${charsets}
unset EMACS_HEAP_EXEC; \ ifeq ($(DUMPING),unexec)
- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump - LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump
+ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump + env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump
ifneq ($(PAXCTL_dumped),) ifneq ($(PAXCTL_dumped),)
$(PAXCTL_dumped) $@ $(PAXCTL_dumped) emacs$(EXEEXT)
endif endif

9
pkgs/applications/editors/emacs/default.nix
View file

@ -32,7 +32,7 @@ assert withXwidgets -> withGTK3 && webkitgtk != null;
let let
version = "26.3"; version = "27.1";
versionModifier = ""; versionModifier = "";
name = "emacs-${version}${versionModifier}"; name = "emacs-${version}${versionModifier}";
@ -41,7 +41,7 @@ in stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "mirror://gnu/emacs/${name}.tar.xz"; url = "mirror://gnu/emacs/${name}.tar.xz";
sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d"; sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -49,11 +49,6 @@ in stdenv.mkDerivation {
patches = [ patches = [
./clean-env.patch ./clean-env.patch
./tramp-detect-wrapped-gvfsd.patch ./tramp-detect-wrapped-gvfsd.patch
# unbreak macOS unexec
(fetchpatch {
url = "https://github.com/emacs-mirror/emacs/commit/888ffd960c06d56a409a7ff15b1d930d25c56089.patch";
sha256 = "08q3ygdigqwky70r47rcgzlkc5jy82xiq8am5kwwy891wlpl7frw";
})
]; ];
postPatch = lib.concatStringsSep "\n" [ postPatch = lib.concatStringsSep "\n" [

10
pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch
View file

@ -1,14 +1,12 @@
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index f370abba31..f2806263a9 100644 index 34a234c..b5a471c 100644
--- a/lisp/net/tramp-gvfs.el --- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el
@@ -164,7 +164,8 @@ tramp-gvfs-enabled @@ -122,6 +122,7 @@
(and (featurep 'dbusbind)
(tramp-compat-funcall 'dbus-get-unique-name :system) (tramp-compat-funcall 'dbus-get-unique-name :system)
(tramp-compat-funcall 'dbus-get-unique-name :session) (tramp-compat-funcall 'dbus-get-unique-name :session)
- (or (tramp-compat-process-running-p "gvfs-fuse-daemon") (or (tramp-compat-process-running-p "gvfs-fuse-daemon")
+ (or (tramp-compat-process-running-p ".gvfsd-fuse-wrapped") + (tramp-compat-process-running-p ".gvfsd-fuse-wrapped")
+ (tramp-compat-process-running-p "gvfs-fuse-daemon")
(tramp-compat-process-running-p "gvfsd-fuse")))) (tramp-compat-process-running-p "gvfsd-fuse"))))
"Non-nil when GVFS is available.") "Non-nil when GVFS is available.")