diff --git a/pkgs/applications/editors/emacs/27.nix b/pkgs/applications/editors/emacs/27.nix index 8bc65bad8b50..b629c2d21207 100644 --- a/pkgs/applications/editors/emacs/27.nix +++ b/pkgs/applications/editors/emacs/27.nix @@ -1,6 +1,6 @@ import ./generic.nix (rec { - version = "27.1"; - sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a"; + version = "27.2"; + sha256 = "sha256-tKfMTnjmPzeGJOCRkhW5EK9bsqCvyBn60pgnLp9Awbk="; patches = [ ./tramp-detect-wrapped-gvfsd.patch ]; diff --git a/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch b/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch index 5af6fcaba8c0..b27dfd47e60e 100644 --- a/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch +++ b/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch @@ -1,12 +1,11 @@ diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el -index 34a234c..b5a471c 100644 +index 9e26c8fd6d..fa220e513c 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el -@@ -122,6 +122,7 @@ - (tramp-compat-funcall 'dbus-get-unique-name :system) - (tramp-compat-funcall 'dbus-get-unique-name :session) - (or (tramp-compat-process-running-p "gvfs-fuse-daemon") +@@ -125,5 +125,6 @@ + ;; for some processes. Better we don't check. + (<= emacs-major-version 25) + (tramp-compat-process-running-p "gvfs-fuse-daemon") + (tramp-compat-process-running-p ".gvfsd-fuse-wrapped") (tramp-compat-process-running-p "gvfsd-fuse")))) "Non-nil when GVFS is available.") -