diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-06-24 00:03:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-24 00:03:38 +0000 |
| commit | fca5c19283f5e09512443c6daf6f463d031afcfa (patch) | |
| tree | 184534ff4d8729fe347e07e1934adb89610b2b34 /pkgs/applications/editors | |
| parent | 56e59031d2f75ceaa1c4d5d48f35c75473d86cc9 (diff) | |
| parent | 761210ff4fad1dd465530430e6dfc186affe47fe (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/editors')
4 files changed, 49 insertions, 3 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index 8d25c1ec2c2f1..1ba0ea1519b06 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -4453,10 +4453,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7pre0.20240521.135840"; + version = "9.7pre0.20240530.133120"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.7pre0.20240521.135840.tar"; - sha256 = "06j7kjbpd390i0kqvvnlkpdzqkwiicbdgjymif338l0qx2kl4sg5"; + url = "https://elpa.gnu.org/devel/org-9.7pre0.20240530.133120.tar"; + sha256 = "sha256-DuuLDBJKI2LwC0PH9PtujcPvaqaKLWYij+KzP1U7o9M="; }; packageRequires = [ emacs ]; meta = { 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 00f50233d50f1..9550969adbbe2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -64,6 +64,26 @@ self: let ''; }); + org = super.org.overrideAttrs (old: { + dontUnpack = false; + patches = old.patches or [ ] ++ [ + # security fix backported from 9.7.5 + (pkgs.fetchpatch { + url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8"; + hash = "sha256-bGgsnTSn6SMu1J8P2BfJjrKx2845FCsUB2okcIrEjDg="; + stripLen = 1; + }) + ]; + postPatch = old.postPatch or "" + "\n" + '' + pushd .. + local content_directory=${old.ename}-${old.version} + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + popd + ''; + dontBuild = true; + }); + pq = super.pq.overrideAttrs (old: { buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.postgresql ]; }); diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 18a0a36fc06cb..a3d729b636eee 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -141,6 +141,26 @@ self: let }; }); + org = super.org.overrideAttrs (old: { + dontUnpack = false; + patches = old.patches or [ ] ++ [ + # security fix backported from 9.7.5 + (pkgs.fetchpatch { + url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8"; + hash = "sha256-bGgsnTSn6SMu1J8P2BfJjrKx2845FCsUB2okcIrEjDg="; + stripLen = 1; + }) + ]; + postPatch = old.postPatch or "" + "\n" + '' + pushd .. + local content_directory=${old.ename}-${old.version} + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + popd + ''; + dontBuild = true; + }); + plz = super.plz.overrideAttrs ( old: { dontUnpack = false; diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index e1bea448e5856..da243044b689a 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -93,6 +93,12 @@ in url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/12_all_org-remote-unsafe.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; hash = "sha256-b6WU1o3PfDV/6BTPfPNUFny6oERJCNsDrvflxX3Yvek="; }) + + # security fix from Emacs 29.4 + (fetchpatch { + url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=c645e1d8205f0f0663ec4a2d27575b238c646c7c"; + hash = "sha256-G+gGQx5w3KuWMotR1n/sYYL8WyAABYW3fUPeffMMs38="; + }) ]; }); |