From 167ce06eaa4b66a2abc565465010b05a059a87c5 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 3 Dec 2021 17:00:22 +0000 Subject: [PATCH 01/11] python3Packages.mahotas: fix freeimage support use a much stronger binding to our specific freeimage that works reliably on linux. previously it didn't and the tests covering freeimage support were just being skipped as they assumed it to be disabled. once the binding works it reveals slight breakage in the tests themselves, mostly fixed with an upstream patch (skipping one remaining breakage). these breakages were already revealing themselves on darwin as the freeimage binding was "working" there. (cherry picked from c81cf6a24297fcde7783d01cf4b8d87b8920c693 with modifications) --- .../python-modules/mahotas/default.nix | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index 707ad9f3c8f6..321435bdd4a5 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -1,4 +1,15 @@ -{ buildPythonPackage, fetchFromGitHub, pillow, scipy, numpy, pytestCheckHook, imread, freeimage, lib, stdenv }: +{ buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pillow +, scipy +, numpy +, pytestCheckHook +, imread +, freeimage +, lib +, stdenv +}: buildPythonPackage rec { pname = "mahotas"; @@ -11,11 +22,22 @@ buildPythonPackage rec { sha256 = "029gvy1fb855pvxvy8zwj44k4s7qpqi0161bg5wldfiprrysn1kw"; }; + patches = [ + (fetchpatch { + name = "fix-freeimage-tests.patch"; + url = "https://github.com/luispedro/mahotas/commit/08cc4aa0cbd5dbd4c37580d52b822810c03b2c69.patch"; + sha256 = "0389sz7fyl8h42phw8sn4pxl4wc3brcrj9d05yga21gzil9bfi23"; + excludes = [ "ChangeLog" ]; + }) + ]; + propagatedBuildInputs = [ numpy imread pillow scipy freeimage ]; checkInputs = [ pytestCheckHook ]; postPatch = '' - substituteInPlace mahotas/io/freeimage.py --replace "/opt/local/lib" "${freeimage}/lib" + substituteInPlace mahotas/io/freeimage.py \ + --replace "ctypes.util.find_library('freeimage')" 'True' \ + --replace 'ctypes.CDLL(libname)' 'np.ctypeslib.load_library("libfreeimage", "${freeimage}/lib")' ''; # tests must be run in the build directory @@ -29,6 +51,12 @@ buildPythonPackage rec { "test_ellipse_axes" "test_normalize" "test_haralick3d" + "test_uint16" + ]; + + pythonImportsCheck = [ + "mahotas" + "mahotas.freeimage" ]; disabled = stdenv.isi686; # Failing tests From aa673c51940e0967c0ad152b63912c9357cc870d Mon Sep 17 00:00:00 2001 From: Vonfry Date: Thu, 2 Dec 2021 10:27:29 +0800 Subject: [PATCH 02/11] emacsPackages.orgPackages: deprecated org elpa is deprecated and moved into gnu elpa and nongnu elpa. link: nix-community/emacs-overlay#191 (cherry picked from commit 932ab304f0b8e3241c1311b9b731d3d330291715) --- .../from_md/release-notes/rl-2111.section.xml | 11 +++++++ .../manual/release-notes/rl-2111.section.md | 2 ++ .../emacs/elisp-packages/org-packages.nix | 33 ------------------- .../emacs/elisp-packages/update-from-overlay | 4 --- .../editors/emacs/elisp-packages/update-org | 4 --- pkgs/top-level/emacs-packages.nix | 6 ---- 6 files changed, 13 insertions(+), 47 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/elisp-packages/org-packages.nix delete mode 100755 pkgs/applications/editors/emacs/elisp-packages/update-org diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index f17f94fac486..a64efa36e450 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -2040,6 +2040,17 @@ Superuser created successfully. hydrus manual. + + + pkgs.emacsPackages.orgPackages is removed + because org elpa is deprecated. The packages in the top level + of pkgs.emacsPackages, such as org and + org-contrib, refer to the ones in + pkgs.emacsPackages.elpaPackages and + pkgs.emacsPackages.nongnuPackages where the + new versions will release. + + diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 63d1e59ffbd1..09c1b9590ed9 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -551,3 +551,5 @@ In addition to numerous new and upgraded packages, this release has the followin - RetroArch has been upgraded from version `1.8.5` to `1.9.13.2`. Since the previous release was quite old, if you're having issues after the upgrade, please delete your `$XDG_CONFIG_HOME/retroarch/retroarch.cfg` file. - hydrus has been upgraded from version `438` to `463`. Since upgrading between releases this old is advised against, be sure to have a backup of your data before upgrading. For details, see [the hydrus manual](https://hydrusnetwork.github.io/hydrus/help/getting_started_installing.html#big_updates). + +- `pkgs.emacsPackages.orgPackages` is removed because org elpa is deprecated. The packages in the top level of `pkgs.emacsPackages`, such as org and org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and `pkgs.emacsPackages.nongnuPackages` where the new versions will release. diff --git a/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix deleted file mode 100644 index 12680336e0e8..000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix +++ /dev/null @@ -1,33 +0,0 @@ -/* - -# Updating - -To update the list of packages from Org (ELPA), - -1. Run `./update-org`. -2. Check for evaluation errors: - env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../.. -A emacs.pkgs.orgPackages -3. Run `git commit -m "org-packages $(date -Idate)" -- org-generated.nix` - -*/ - -{ lib }: - -self: let - - generateOrg = lib.makeOverridable ({ - generated ? ./org-generated.nix - }: let - - imported = import generated { - inherit (self) callPackage; - }; - - super = imported; - - overrides = { - }; - - in super // overrides); - -in generateOrg { } diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay index 41cde07a211c..052364c803c1 100755 --- a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay +++ b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay @@ -11,10 +11,6 @@ curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/ nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages --show-trace git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacs.pkgs.elpa-packages: $(date --iso)" -- elpa-generated.nix -curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/org/org-generated.nix -nix-instantiate ../../../../../ -A emacs.pkgs.orgPackages --show-trace -git diff --exit-code org-generated.nix > /dev/null || git commit -m "emacs.pkgs.org-packages: $(date --iso)" -- org-generated.nix - curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaStablePackages nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaPackages diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-org b/pkgs/applications/editors/emacs/elisp-packages/update-org deleted file mode 100755 index 2119a1672287..000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/update-org +++ /dev/null @@ -1,4 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell --show-trace ./emacs2nix.nix -i bash - -exec org-packages.sh --names $EMACS2NIX/names.nix -o org-generated.nix diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index ba1ed113ab60..0ac3ae8b4339 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -45,10 +45,6 @@ let inherit lib pkgs; }; - mkOrgPackages = { lib }: import ../applications/editors/emacs/elisp-packages/org-packages.nix { - inherit lib; - }; - mkManualPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/manual-packages.nix { inherit lib pkgs; }; @@ -66,14 +62,12 @@ in makeScope pkgs'.newScope (self: makeOverridable ({ , nongnuPackages ? mkNongnuPackages { inherit pkgs lib; } self , melpaStablePackages ? melpaGeneric { inherit pkgs lib; } "stable" self , melpaPackages ? melpaGeneric { inherit pkgs lib; } "unstable" self - , orgPackages ? mkOrgPackages { inherit lib; } self , manualPackages ? mkManualPackages { inherit pkgs lib; } self }: ({} // elpaPackages // { inherit elpaPackages; } // nongnuPackages // { inherit nongnuPackages; } // melpaStablePackages // { inherit melpaStablePackages; } // melpaPackages // { inherit melpaPackages; } - // orgPackages // { inherit orgPackages; } // manualPackages // { inherit manualPackages; } // { From 45d245bf827b26aa1825781df03e40a673484d4d Mon Sep 17 00:00:00 2001 From: leo60228 Date: Thu, 9 Dec 2021 19:14:35 -0500 Subject: [PATCH 03/11] latte-dock: 0.10.0 -> 0.10.4 (cherry picked from commit 8713ef19486f88cd82c6860a72fc98ad9a136ae0) --- pkgs/applications/misc/latte-dock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index b1ba73566999..6451a3efb70a 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -3,11 +3,11 @@ mkDerivation rec { pname = "latte-dock"; - version = "0.10.0"; + version = "0.10.4"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "04kq86qmrjbzidrkknj000pv1b5z0r7nfidhy2zv67ks8fdi4zln"; + sha256 = "XRop+MNcbeCcbnL2LM1i67QvMudW3CjWYEPLkT/qbGM="; name = "${pname}-${version}.tar.xz"; }; From 794c4847d25f0904c23cbdccb2e148ff95ef7855 Mon Sep 17 00:00:00 2001 From: Joerie de Gram Date: Tue, 14 Dec 2021 00:12:23 +0100 Subject: [PATCH 04/11] apache-jena: 4.2.0 -> 4.3.1; apache-jena-fuseki: 4.2.0 -> 4.3.1 Fixes CVE-2021-44228. See #150288. (cherry picked from commit d2d9d4c862b37eb85358d9bc8c1b869e131cd341) --- pkgs/servers/nosql/apache-jena/binary.nix | 6 +++--- pkgs/servers/nosql/apache-jena/fuseki-binary.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index 2ceb4afc0cd0..0a86d1438c30 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena"; - version = "4.2.0"; + version = "4.3.1"; name="${baseName}-${version}"; - url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz"; - sha256 = "1yiqlsp1g2fladal8mj164b9s0qsl5csllg54p7x7w63wf7gixnq"; + url="https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz"; + sha256 = "02asp88smayn68hc019fwp0si9mc79vxn8py7qhx3qzwjk6j9p71"; }; buildInputs = [ makeWrapper diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 9be009f3b1f1..849827c075d7 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena-fuseki"; - version = "4.2.0"; + version = "4.3.1"; name="${baseName}-${version}"; - url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz"; - sha256 = "1x3va4yqmxh55lhr6ms85ks9v0lqkl3y41h0bpjdycp8j96lsy3h"; + url="https://dlcdn.apache.org/jena/binaries/apache-jena-fuseki-${version}.tar.gz"; + sha256 = "1r0vfa7d55lzw22yfx46mxxmz8x8pkr666vggqw2m1rzzj52z9nx"; }; buildInputs = [ makeWrapper From 17b36ae877e768cfe20ed70276b7dca6a592abe6 Mon Sep 17 00:00:00 2001 From: talyz Date: Mon, 13 Dec 2021 16:21:50 +0100 Subject: [PATCH 05/11] keycloak: 15.0.2 -> 15.1.0 (cherry picked from commit b94a1f842a267892ddbeab454ff9615424074abe) --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index cd8373f0842b..ef168272fe76 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "15.0.2"; + version = "15.1.0"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - sha256 = "sha256-GlnSsvAYBjRTtabMVrpWUH0EWEdLIe6ud+HIXJqTsqY="; + sha256 = "0s8nvp1ca30569k1a7glbn2zvvchz35s2r8d08fbs5zjngnz3276"; }; nativeBuildInputs = [ makeWrapper ]; From f88342cb01b49587c95dbad428622af1dddec22b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 6 Dec 2021 14:45:35 +1000 Subject: [PATCH 06/11] runc: 1.0.2 -> 1.0.3 https://github.com/opencontainers/runc/releases/tag/v1.0.3 (cherry picked from commit db70d35c839e1cd4c1e59e6a1db3cb91c88c0632) --- pkgs/applications/virtualization/runc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 6b0764e04ba5..79a21075f038 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "runc"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "sha256-l+Uq7aiXFrI+qbKSOZpYFIXz0VJBBR7ZZxlAJeGb7K4="; + sha256 = "sha256-Tl/JKbIpao+FCjngPzaVkxse50zo3XQ9Mg/AdkblMcI="; }; vendorSha256 = null; From d4d92cc66e48db6128659f498b43b47fd77a9d91 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 14 Dec 2021 15:23:52 +0100 Subject: [PATCH 07/11] chromium: 96.0.4664.93 -> 96.0.4664.110 https://chromereleases.googleblog.com/2021/12/stable-channel-update-for-desktop_13.html This update includes 5 security fixes. Google is aware of reports that an exploit for CVE-2021-4102 exists in the wild. CVEs: CVE-2021-4098 CVE-2021-4099 CVE-2021-4100 CVE-2021-4101 CVE-2021-4102 (cherry picked from commit 9528f0d87e3134b8ce272161a9315c0569149e1b) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index d133f7718647..c305fa9be98f 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "96.0.4664.93", - "sha256": "14rlm91pzpdll6x2r1sxdswiv19h1ykxcq0csi9k9g0a9s71yyvw", - "sha256bin64": "15233njj6ln7q3c112ssfh9s4m3shhp920zw8648z9dr7k8512qb", + "version": "96.0.4664.110", + "sha256": "1s3ilq0ik36qgqp7l88gfd1yx97zscn8yr2kprsrjfp9q8lrva9n", + "sha256bin64": "17cyj1jx47fz6y26f196xhlngrw5gnjgcvapvgkgswlwd7y67jcb", "deps": { "gn": { "version": "2021-09-24", From 6fb2d969d9469cb3751f4594dd0d5d32e994bd37 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 14 Dec 2021 14:11:19 -0300 Subject: [PATCH 08/11] gping: add NixOS support patch This backport a patch made to add NixOS as a supported Operating System fixing the wrong rendering issues I faced during test. Signed-off-by: Otavio Salvador (cherry picked from commit 4516cecba0c039cdf76bca0bb83fea80e49f0a96) --- pkgs/tools/networking/gping/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index a08c02806e7d..24dc47176e89 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -2,6 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub +, fetchpatch , libiconv }: @@ -18,6 +19,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-xEASs6r5zxYJXS+at6aX5n0whGp5qwuNwq6Jh0GM+/4="; + patches = [ + (fetchpatch { + url = "https://github.com/orf/gping/commit/b843beb9617e4b7b98d4f6d3942067cad59c9d60.patch"; + sha256 = "sha256-9DIeeweCuGqymvUj4EBct82XVevkFSbHWaV76ExjGbs="; + }) + ]; + buildInputs = lib.optional stdenv.isDarwin libiconv; meta = with lib; { From bb15985b4ff86f583954d240c4fac8ad7fb7d401 Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Tue, 14 Dec 2021 21:35:10 +0100 Subject: [PATCH 09/11] [21.11] calibre: fix CVE-2021-44686 (security) --- pkgs/applications/misc/calibre/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index a991d7c0d13d..3fe954336ca0 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -42,6 +42,13 @@ mkDerivation rec { url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${version}%2Bdfsg-1/debian/patches/0001-only-plugin-update.patch"; sha256 = "sha256-dLzO1TWP7Q4nw2a3oN7qlhGCmcA0NKJrZidUnD6hUMA="; }) + + # fix for CVE-2021-44686 + (fetchpatch { + name = "0002-CVE-2021-44686.patch"; + url = "https://github.com/kovidgoyal/calibre/commit/235b7e38c197ba4a3c17531e516610af8795e348.patch"; + sha256 = "07ncv6r2v05m8rnv4syjfalkpksqpjag6icf1z57nv7k9dkkfmfw"; + }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; From 55a8b28339c1f6adf3f728222fb69e5acab811cc Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 14 Dec 2021 13:41:16 -0800 Subject: [PATCH 10/11] emacs: Remove unused gvfs patch (cherry picked from commit 21961650ea68c2f0e653bd6a1575c1514b256b47) --- .../emacs/tramp-detect-wrapped-gvfsd-26.patch | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch diff --git a/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch b/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch deleted file mode 100644 index 5d16194fd202..000000000000 --- a/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd-26.patch +++ /dev/null @@ -1,14 +0,0 @@ -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.") - From df2cb912847131321178977b275b51b00a0c1466 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 14 Dec 2021 14:20:40 -0800 Subject: [PATCH 11/11] emacs: Use string replacement for gvfs tramp detection rather than a patch The patches are unwieldy to manage, especially with the automated packaging flows in the Emacs overlay. (cherry picked from commit 4b89ac58bba54a071fdd65ec96ca9d4d45494797) --- pkgs/applications/editors/emacs/27.nix | 1 - pkgs/applications/editors/emacs/generic.nix | 10 ++++++++++ .../editors/emacs/tramp-detect-wrapped-gvfsd.patch | 11 ----------- 3 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch diff --git a/pkgs/applications/editors/emacs/27.nix b/pkgs/applications/editors/emacs/27.nix index e0e41a78b9ce..436785c34f68 100644 --- a/pkgs/applications/editors/emacs/27.nix +++ b/pkgs/applications/editors/emacs/27.nix @@ -2,7 +2,6 @@ import ./generic.nix (rec { version = "27.2"; sha256 = "sha256-tKfMTnjmPzeGJOCRkhW5EK9bsqCvyBn60pgnLp9Awbk="; patches = fetchpatch: [ - ./tramp-detect-wrapped-gvfsd.patch (fetchpatch { name = "fix-aarch64-darwin-triplet.patch"; url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=a88f63500e475f842e5fbdd9abba4ce122cdb082"; diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 2a1ed2f8b1a4..6b4491169212 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -64,6 +64,16 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { rm -fr .git '') + # Add the name of the wrapped gvfsd + # This used to be carried as a patch but it often got out of sync with upstream + # and was hard to maintain for emacs-overlay. + (lib.concatStrings (map (fn: '' + sed -i 's#(${fn} "gvfs-fuse-daemon")#(${fn} "gvfs-fuse-daemon") (${fn} ".gvfsd-fuse-wrapped")#' lisp/net/tramp-gvfs.el + '') [ + "tramp-compat-process-running-p" + "tramp-process-running-p" + ])) + # Reduce closure size by cleaning the environment of the emacs dumper '' substituteInPlace src/Makefile.in \ diff --git a/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch b/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch deleted file mode 100644 index b27dfd47e60e..000000000000 --- a/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el -index 9e26c8fd6d..fa220e513c 100644 ---- a/lisp/net/tramp-gvfs.el -+++ b/lisp/net/tramp-gvfs.el -@@ -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.")