diff options
| author | Lin Jian <me@linj.tech> | 2024-06-27 04:57:38 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-27 04:57:38 +0800 |
| commit | 89ea90fc07fb1cf634eec834f62fc4ac582755b5 (patch) | |
| tree | 7a5d4ef55852567d1f2df661373f2ba46ea9b596 /pkgs | |
| parent | 1d92da3bbe7654e490e8edcff105e80d61d85c35 (diff) | |
| parent | fdcd6eee1b01fadb5121f31b0d660cab6fe023a3 (diff) | |
Merge pull request #322721 from linj-fork/pr/fix-new-org
emacs.pkgs.org: stop applying a patch if not needed
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index 9550969adbbe..192320fab674 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -66,7 +66,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"; 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"; |