gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emacs.pkgs.org: backport a security fix from 9.7.5

Browse Source 
https://list.orgmode.org/87sex5gdqc.fsf@localhost/T/

We have to bump emacs.elpaDevelPackages.org because the old source is
not available any more.
This commit is contained in:
Lin Jian
2024-06-23 08:21:59 +08:00
parent b37ed3f2a1
commit aa45c7e67d
3 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
+3 -3
View File
@@ -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 = {
pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
+20
View File
@@ -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 ];
});
pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
+20
View File
@@ -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;