From fdcd6eee1b01fadb5121f31b0d660cab6fe023a3 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Thu, 27 Jun 2024 03:06:45 +0800 Subject: emacs.pkgs.org: stop applying a patch if not needed Org 9.7.5 has this patch. This fixes https://github.com/nix-community/emacs-overlay/issues/411. --- pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix') diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index a3d729b636ee..3e8ab4625fec 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -143,7 +143,7 @@ self: let org = super.org.overrideAttrs (old: { dontUnpack = false; - patches = old.patches or [ ] ++ [ + patches = old.patches or [ ] ++ lib.optionals (lib.versionOlder old.version "9.7.5") [ # security fix backported from 9.7.5 (pkgs.fetchpatch { url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8"; -- cgit v1.2.3