public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emacs: 27.1 -> 27.2

This commit is contained in:
Tim Steinbach 2021-04-04 12:17:21 -04:00 committed by Peter Hoeg
parent 239d8e2517
commit 7d10c949fa
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/emacs/27.nix
View File

@ -1,6 +1,6 @@
import ./generic.nix (rec { import ./generic.nix (rec {
version = "27.1"; version = "27.2";
sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a"; sha256 = "sha256-tKfMTnjmPzeGJOCRkhW5EK9bsqCvyBn60pgnLp9Awbk=";
patches = [ patches = [
./tramp-detect-wrapped-gvfsd.patch ./tramp-detect-wrapped-gvfsd.patch
]; ];

11
pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch
View File

@ -1,12 +1,11 @@
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 34a234c..b5a471c 100644 index 9e26c8fd6d..fa220e513c 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
@@ -122,6 +122,7 @@ @@ -125,5 +125,6 @@
(tramp-compat-funcall 'dbus-get-unique-name :system) ;; for some processes. Better we don't check.
(tramp-compat-funcall 'dbus-get-unique-name :session) (<= emacs-major-version 25)
(or (tramp-compat-process-running-p "gvfs-fuse-daemon") (tramp-compat-process-running-p "gvfs-fuse-daemon")
+ (tramp-compat-process-running-p ".gvfsd-fuse-wrapped") + (tramp-compat-process-running-p ".gvfsd-fuse-wrapped")
(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.")