aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/applications/editors/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/emacs')
-rw-r--r--nixpkgs/pkgs/applications/editors/emacs/25.nix146
-rw-r--r--nixpkgs/pkgs/applications/editors/emacs/26.nix8
-rw-r--r--nixpkgs/pkgs/applications/editors/emacs/27.nix8
-rw-r--r--nixpkgs/pkgs/applications/editors/emacs/clean-env-26.patch15
-rw-r--r--nixpkgs/pkgs/applications/editors/emacs/clean-env.patch15
-rw-r--r--nixpkgs/pkgs/applications/editors/emacs/generic.nix (renamed from nixpkgs/pkgs/applications/editors/emacs/default.nix)125
-rw-r--r--nixpkgs/pkgs/applications/editors/emacs/macport.nix23
-rw-r--r--nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch14
-rw-r--r--nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch10
9 files changed, 152 insertions, 212 deletions
diff --git a/nixpkgs/pkgs/applications/editors/emacs/25.nix b/nixpkgs/pkgs/applications/editors/emacs/25.nix
deleted file mode 100644
index 5bc29a046bc..00000000000
--- a/nixpkgs/pkgs/applications/editors/emacs/25.nix
+++ /dev/null
@@ -1,146 +0,0 @@
-{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d, fetchpatch
-, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
-, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
-, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO
-, withX ? !stdenv.isDarwin
-, withGTK2 ? false, gtk2 ? null
-, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
-, withXwidgets ? false, webkitgtk, wrapGAppsHook ? null, glib-networking ? null
-, withCsrc ? true
-, autoconf ? null, automake ? null, texinfo ? null
-}:
-
-assert (libXft != null) -> libpng != null; # probably a bug
-assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise
-assert withGTK2 -> withX || stdenv.isDarwin;
-assert withGTK3 -> withX || stdenv.isDarwin;
-assert withGTK2 -> !withGTK3 && gtk2 != null;
-assert withGTK3 -> !withGTK2 && gtk3 != null;
-assert withXwidgets -> withGTK3 && webkitgtk != null;
-
-let
- toolkit =
- if withGTK2 then "gtk2"
- else if withGTK3 then "gtk3"
- else "lucid";
-in
-stdenv.mkDerivation rec {
- name = "emacs-${version}${versionModifier}";
- version = "25.3";
- versionModifier = "";
-
- src = fetchurl {
- url = "mirror://gnu/emacs/${name}.tar.xz";
- sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5";
- };
-
- enableParallelBuilding = true;
-
- patches = lib.optionals stdenv.isDarwin [
- ./at-fdcwd.patch
-
- # Backport of the fix to
- # https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html
- # Should be removed when switching to Emacs 26.1
- (fetchurl {
- url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch";
- sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj";
- })
- ] ++ [
- # Backport patches so we can use webkitgtk with xwidgets.
- (fetchpatch {
- name = "0001-Omit-unnecessary-includes-from-xwidget-c.patch";
- url = "https://github.com/emacs-mirror/emacs/commit/a36ed9b5e95afea5716256bac24d883263aefbaf.patch";
- sha256 = "1j34c0vkj87il87xy1px23yk6bw73adpr7wqa79ncj89i4lc8qkb";
- })
- (fetchpatch {
- name = "0002-xwidget-Use-WebKit2-API.patch";
- url = "https://github.com/emacs-mirror/emacs/commit/d781662873f228b110a128f7a2b6583a4d5e0a3a.patch";
- sha256 = "1lld56zi4cw2hmjxhhdcc0f07k8lbj32h10wcq4ml3asdwa31ryr";
- })
- ];
-
- nativeBuildInputs = [ pkgconfig autoconf automake texinfo ]
- ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
-
- buildInputs =
- [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ]
- ++ lib.optionals stdenv.isLinux [ dbus libselinux ]
- ++ lib.optionals withX
- [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
- imagemagick gconf ]
- ++ lib.optional (withX && withGTK2) gtk2
- ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ]
- ++ lib.optional (stdenv.isDarwin && withX) cairo
- ++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ]
- ++ lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
-
- hardeningDisable = [ "format" ];
-
- configureFlags = [ "--with-modules" ] ++
- (if stdenv.isDarwin
- then [ "--with-ns" "--disable-ns-self-contained" ]
- else if withX
- then [ "--with-x-toolkit=${toolkit}" "--with-xft" ]
- else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
- "--with-gif=no" "--with-tiff=no" ])
- ++ lib.optional withXwidgets "--with-xwidgets";
-
- preConfigure = ''
- ./autogen.sh
- '' + ''
- substituteInPlace lisp/international/mule-cmds.el \
- --replace /usr/share/locale ${gettext}/share/locale
-
- for makefile_in in $(find . -name Makefile.in -print); do
- substituteInPlace $makefile_in --replace /bin/pwd pwd
- done
- '';
-
- installTargets = [ "tags" "install" ];
-
- postInstall = ''
- mkdir -p $out/share/emacs/site-lisp
- cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el
- $out/bin/emacs --batch -f batch-byte-compile $out/share/emacs/site-lisp/site-start.el
-
- rm -rf $out/var
- rm -rf $out/share/emacs/${version}/site-lisp
- '' + lib.optionalString withCsrc ''
- for srcdir in src lisp lwlib ; do
- dstdir=$out/share/emacs/${version}/$srcdir
- mkdir -p $dstdir
- find $srcdir -name "*.[chm]" -exec cp {} $dstdir \;
- cp $srcdir/TAGS $dstdir
- echo '((nil . ((tags-file-name . "TAGS"))))' > $dstdir/.dir-locals.el
- done
- '' + lib.optionalString stdenv.isDarwin ''
- mkdir -p $out/Applications
- mv nextstep/Emacs.app $out/Applications
- '';
-
- meta = with stdenv.lib; {
- description = "The extensible, customizable GNU text editor";
- homepage = "https://www.gnu.org/software/emacs/";
- license = licenses.gpl3Plus;
- maintainers = with maintainers; [ lovek323 peti jwiegley ];
- platforms = platforms.all;
-
- longDescription = ''
- GNU Emacs is an extensible, customizable text editor—and more. At its
- core is an interpreter for Emacs Lisp, a dialect of the Lisp
- programming language with extensions to support text editing.
-
- The features of GNU Emacs include: content-sensitive editing modes,
- including syntax coloring, for a wide variety of file types including
- plain text, source code, and HTML; complete built-in documentation,
- including a tutorial for new users; full Unicode support for nearly all
- human languages and their scripts; highly customizable, using Emacs
- Lisp code or a graphical interface; a large number of extensions that
- add other functionality, including a project planner, mail and news
- reader, debugger interface, calendar, and more. Many of these
- extensions are distributed with GNU Emacs; others are available
- separately.
- '';
- };
-}
diff --git a/nixpkgs/pkgs/applications/editors/emacs/26.nix b/nixpkgs/pkgs/applications/editors/emacs/26.nix
new file mode 100644
index 00000000000..a151006a995
--- /dev/null
+++ b/nixpkgs/pkgs/applications/editors/emacs/26.nix
@@ -0,0 +1,8 @@
+import ./generic.nix (rec {
+ version = "26.3";
+ sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d";
+ patches = [
+ ./clean-env-26.patch
+ ./tramp-detect-wrapped-gvfsd-26.patch
+ ];
+})
diff --git a/nixpkgs/pkgs/applications/editors/emacs/27.nix b/nixpkgs/pkgs/applications/editors/emacs/27.nix
new file mode 100644
index 00000000000..1037c0cd91d
--- /dev/null
+++ b/nixpkgs/pkgs/applications/editors/emacs/27.nix
@@ -0,0 +1,8 @@
+import ./generic.nix (rec {
+ version = "27.1";
+ sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a";
+ patches = [
+ ./clean-env.patch
+ ./tramp-detect-wrapped-gvfsd.patch
+ ];
+})
diff --git a/nixpkgs/pkgs/applications/editors/emacs/clean-env-26.patch b/nixpkgs/pkgs/applications/editors/emacs/clean-env-26.patch
new file mode 100644
index 00000000000..88befda899a
--- /dev/null
+++ b/nixpkgs/pkgs/applications/editors/emacs/clean-env-26.patch
@@ -0,0 +1,15 @@
+Dump temacs in an empty environment to prevent -dev paths from ending
+up in the dumped image.
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -535,7 +535,7 @@ ifeq ($(CANNOT_DUMP),yes)
+ ln -f temacs$(EXEEXT) $@
+ else
+ unset EMACS_HEAP_EXEC; \
+- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
++ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
+ ifneq ($(PAXCTL_dumped),)
+ $(PAXCTL_dumped) $@
+ endif
diff --git a/nixpkgs/pkgs/applications/editors/emacs/clean-env.patch b/nixpkgs/pkgs/applications/editors/emacs/clean-env.patch
index 88befda899a..2ffe8b777a0 100644
--- a/nixpkgs/pkgs/applications/editors/emacs/clean-env.patch
+++ b/nixpkgs/pkgs/applications/editors/emacs/clean-env.patch
@@ -2,14 +2,15 @@ Dump temacs in an empty environment to prevent -dev paths from ending
up in the dumped image.
diff --git a/src/Makefile.in b/src/Makefile.in
+index fd05a45df5..13f529c253 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -535,7 +535,7 @@ ifeq ($(CANNOT_DUMP),yes)
- ln -f temacs$(EXEEXT) $@
- else
- unset EMACS_HEAP_EXEC; \
-- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
-+ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
+@@ -570,7 +570,7 @@ emacs$(EXEEXT): temacs$(EXEEXT) \
+ lisp.mk $(etc)/DOC $(lisp) \
+ $(lispsource)/international/charprop.el ${charsets}
+ ifeq ($(DUMPING),unexec)
+- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump
++ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump
ifneq ($(PAXCTL_dumped),)
- $(PAXCTL_dumped) $@
+ $(PAXCTL_dumped) emacs$(EXEEXT)
endif
diff --git a/nixpkgs/pkgs/applications/editors/emacs/default.nix b/nixpkgs/pkgs/applications/editors/emacs/generic.nix
index 570dc28c684..71bb472d097 100644
--- a/nixpkgs/pkgs/applications/editors/emacs/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs/generic.nix
@@ -1,7 +1,17 @@
+{
+ version
+ , sha256
+ , versionModifier ? ""
+ , pname ? "emacs"
+ , name ? "emacs-${version}${versionModifier}"
+ , patches ? [ ]
+}:
{ stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm
, Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
+, jansson, harfbuzz
+, libgccjit, targetPlatform, makeWrapper # native-comp params
, systemd ? null
, withX ? !stdenv.isDarwin
, withNS ? stdenv.isDarwin
@@ -9,8 +19,9 @@
, withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null
, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null
, withCsrc ? true
-, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
+, srcRepo ? false, autoreconfHook ? null, texinfo ? null
, siteStart ? ./site-start.el
+, nativeComp ? false
, toolkit ? (
if withGTK2 then "gtk2"
else if withGTK3 then "gtk3"
@@ -28,51 +39,76 @@ assert withGTK3 -> !withGTK2 && gtk3-x11 != null;
assert withXwidgets -> withGTK3 && webkitgtk != null;
-stdenv.mkDerivation rec {
- name = "emacs-${version}${versionModifier}";
- version = "26.3";
- versionModifier = "";
+let
+
+in stdenv.mkDerivation {
+ inherit pname version patches;
src = fetchurl {
url = "mirror://gnu/emacs/${name}.tar.xz";
- sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d";
+ inherit sha256;
};
enableParallelBuilding = true;
- patches = [
- ./clean-env.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" [
+ (lib.optionalString srcRepo ''
+ rm -fr .git
+ '')
- postPatch = lib.optionalString srcRepo ''
- rm -fr .git
- '';
+ ''
+ substituteInPlace lisp/international/mule-cmds.el \
+ --replace /usr/share/locale ${gettext}/share/locale
+
+ for makefile_in in $(find . -name Makefile.in -print); do
+ substituteInPlace $makefile_in --replace /bin/pwd pwd
+ done
+ ''
+
+ # Make native compilation work both inside and outside of nix build
+ (lib.optionalString nativeComp (let
+ backendPath = (lib.concatStringsSep " "
+ (builtins.map (x: ''\"-B${x}\"'') [
+ # Paths necessary so the JIT compiler finds its libraries:
+ "${lib.getLib libgccjit}/lib"
+ "${lib.getLib libgccjit}/lib/gcc"
+ "${lib.getLib stdenv.cc.libc}/lib"
+
+ # Executable paths necessary for compilation (ld, as):
+ "${lib.getBin stdenv.cc.cc}"
+ "${lib.getBin stdenv.cc.bintools}"
+ "${lib.getBin stdenv.cc.bintools.bintools}"
+ ]));
+ in ''
+ substituteInPlace lisp/emacs-lisp/comp.el --replace \
+ "(defcustom comp-native-driver-options nil" \
+ "(defcustom comp-native-driver-options '(${backendPath})"
+ ''))
+ ""
+ ];
CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=101200";
- nativeBuildInputs = [ pkgconfig ]
- ++ lib.optionals srcRepo [ autoconf automake texinfo ]
+ LIBRARY_PATH = if nativeComp then "${lib.getLib stdenv.cc.libc}/lib" else "";
+
+ nativeBuildInputs = [ pkgconfig makeWrapper ]
+ ++ lib.optionals srcRepo [ autoreconfHook texinfo ]
++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
buildInputs =
- [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ]
+ [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext jansson harfbuzz.dev ]
++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ]
++ lib.optionals withX
[ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff libXft
- gconf ]
+ gconf cairo ]
++ lib.optionals (withX || withNS) [ imagemagick librsvg ]
++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ]
++ lib.optional (withX && withGTK2) gtk2-x11
++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ]
- ++ lib.optional (stdenv.isDarwin && withX) cairo
++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ]
- ++ lib.optionals withNS [ AppKit GSS ImageIO ];
+ ++ lib.optionals withNS [ AppKit GSS ImageIO ]
+ ++ lib.optionals nativeComp [ libgccjit ]
+ ;
hardeningDisable = [ "format" ];
@@ -85,34 +121,28 @@ stdenv.mkDerivation rec {
(if withNS
then [ "--disable-ns-self-contained" ]
else if withX
- then [ "--with-x-toolkit=${toolkit}" "--with-xft" ]
+ then [ "--with-x-toolkit=${toolkit}" "--with-xft" "--with-cairo" ]
else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
"--with-gif=no" "--with-tiff=no" ])
- ++ lib.optional withXwidgets "--with-xwidgets";
-
- preConfigure = lib.optionalString srcRepo ''
- ./autogen.sh
- '' + ''
- substituteInPlace lisp/international/mule-cmds.el \
- --replace /usr/share/locale ${gettext}/share/locale
-
- for makefile_in in $(find . -name Makefile.in -print); do
- substituteInPlace $makefile_in --replace /bin/pwd pwd
- done
- '';
+ ++ lib.optional withXwidgets "--with-xwidgets"
+ ++ lib.optional nativeComp "--with-nativecomp"
+ ;
installTargets = [ "tags" "install" ];
postInstall = ''
mkdir -p $out/share/emacs/site-lisp
cp ${siteStart} $out/share/emacs/site-lisp/site-start.el
+
$out/bin/emacs --batch -f batch-byte-compile $out/share/emacs/site-lisp/site-start.el
+ siteVersionDir=`ls $out/share/emacs | grep -v site-lisp | head -n 1`
+
rm -rf $out/var
- rm -rf $out/share/emacs/${version}/site-lisp
+ rm -rf $siteVersionDir
'' + lib.optionalString withCsrc ''
for srcdir in src lisp lwlib ; do
- dstdir=$out/share/emacs/${version}/$srcdir
+ dstdir=$siteVersionDir/$srcdir
mkdir -p $dstdir
find $srcdir -name "*.[chm]" -exec cp {} $dstdir \;
cp $srcdir/TAGS $dstdir
@@ -123,16 +153,19 @@ stdenv.mkDerivation rec {
mv nextstep/Emacs.app $out/Applications
'';
- postFixup =
- let libPath = lib.makeLibraryPath [
- libXcursor
- ];
- in lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") ''
+ postFixup = lib.concatStringsSep "\n" [
+
+ (lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") ''
patchelf --set-rpath \
- "$(patchelf --print-rpath "$out/bin/emacs"):${libPath}" \
+ "$(patchelf --print-rpath "$out/bin/emacs"):${lib.makeLibraryPath [ libXcursor ]}" \
"$out/bin/emacs"
patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs"
- '';
+ '')
+ ];
+
+ passthru = {
+ inherit nativeComp;
+ };
meta = with stdenv.lib; {
description = "The extensible, customizable GNU text editor";
diff --git a/nixpkgs/pkgs/applications/editors/emacs/macport.nix b/nixpkgs/pkgs/applications/editors/emacs/macport.nix
index 1624e62026a..f991fe7ea66 100644
--- a/nixpkgs/pkgs/applications/editors/emacs/macport.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs/macport.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake
+{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake, jansson
, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit
, ImageCaptureCore, GSS, ImageIO # These may be optional
}:
stdenv.mkDerivation rec {
pname = "emacs";
- version = "26.3";
+ version = "27.1";
emacsName = "emacs-${version}";
- macportVersion = "7.7";
+ macportVersion = "8.0";
name = "emacs-mac-${version}-${macportVersion}";
src = fetchurl {
url = "mirror://gnu/emacs/${emacsName}.tar.xz";
- sha256 = "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d";
+ sha256 = "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a";
};
macportSrc = fetchurl {
url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
- sha256 = "18jadknm47ymbl7skrgc7y8xsdldcbgnlfl7qpgzm1ym8d92as6j";
+ sha256 = "0rjk82k9qp1g701pfd4f0q2myzvsnp9q8xzphlxwi5yzwbs91kjq";
};
hiresSrc = fetchurl {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoconf automake ];
- buildInputs = [ ncurses libxml2 gnutls texinfo gettext
+ buildInputs = [ ncurses libxml2 gnutls texinfo gettext jansson
AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
ImageCaptureCore GSS ImageIO # may be optional
];
@@ -76,7 +76,16 @@ stdenv.mkDerivation rec {
cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el
'';
- doCheck = true;
+ # fails with:
+
+ # Ran 3870 tests, 3759 results as expected, 6 unexpected, 105 skipped
+ # 5 files contained unexpected results:
+ # lisp/url/url-handlers-test.log
+ # lisp/simple-tests.log
+ # lisp/files-x-tests.log
+ # lisp/cedet/srecode-utest-template.log
+ # lisp/net/tramp-tests.log
+ doCheck = false;
meta = with stdenv.lib; {
description = "The extensible, customizable text editor";
diff --git a/nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch b/nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch
new file mode 100644
index 00000000000..5d16194fd20
--- /dev/null
+++ b/nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch
@@ -0,0 +1,14 @@
+diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
+index f370abba31..f2806263a9 100644
+--- a/lisp/net/tramp-gvfs.el
++++ b/lisp/net/tramp-gvfs.el
+@@ -164,7 +164,8 @@ tramp-gvfs-enabled
+ (and (featurep 'dbusbind)
+ (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")
++ (or (tramp-compat-process-running-p ".gvfsd-fuse-wrapped")
++ (tramp-compat-process-running-p "gvfs-fuse-daemon")
+ (tramp-compat-process-running-p "gvfsd-fuse"))))
+ "Non-nil when GVFS is available.")
+
diff --git a/nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch b/nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch
index 5d16194fd20..5af6fcaba8c 100644
--- a/nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch
+++ b/nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch
@@ -1,14 +1,12 @@
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
+++ b/lisp/net/tramp-gvfs.el
-@@ -164,7 +164,8 @@ tramp-gvfs-enabled
- (and (featurep 'dbusbind)
+@@ -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")
-+ (or (tramp-compat-process-running-p ".gvfsd-fuse-wrapped")
-+ (tramp-compat-process-running-p "gvfs-fuse-daemon")
+ (or (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.")
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 10:18:23 +0000