26 lines
1.5 KiB
Diff
26 lines
1.5 KiB
Diff
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 9550969adbbe22..192320fab674d5 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 a3d729b636eee1..3e8ab4625fec25 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";
|