logistic-bot/nix-doom-emacs-unstraightened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop tree-sitter site-dir renaming

Browse source 
CI breaks because the "right" (-9999snapshot) path already exists.

Not entirely sure what changed, but Emacs seems to find
tree-sitter-langs without this, so drop it.
This commit is contained in:
Marien Zwart 2024-09-01 22:23:31 +10:00
parent cfd0a1ad09
commit 6d16fb7c50
No known key found for this signature in database
1 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
elisp-packages.nix
View file

@ -182,21 +182,12 @@
# out: patch that version number to match what nixpkgs put in the grammar bundle. # out: patch that version number to match what nixpkgs put in the grammar bundle.
let let
inherit (esuper.melpaStablePackages.tree-sitter-langs) version; inherit (esuper.melpaStablePackages.tree-sitter-langs) version;
elpaDir = "$out/share/emacs/site-lisp/elpa/";
wrongSiteDir = elpaDir + "tree-sitter-langs-${version}";
rightSiteDir = elpaDir + "tree-sitter-langs-9999snapshot";
in in
esuper.tree-sitter-langs.overrideAttrs (old: { esuper.tree-sitter-langs.overrideAttrs (old: {
postPatch = old.postPatch or "" + '' postPatch = old.postPatch or "" + ''
sed -i -e '/defconst tree-sitter-langs--bundle-version/ s/"[0-9.]*"/"${version}"/' \ sed -i -e '/defconst tree-sitter-langs--bundle-version/ s/"[0-9.]*"/"${version}"/' \
./tree-sitter-langs-build.el ./tree-sitter-langs-build.el
''; '';
postInstall = old.postInstall or "" + ''
mkdir ${rightSiteDir}
mv ${wrongSiteDir}/* ${rightSiteDir}/
rmdir ${wrongSiteDir}
'';
}); });
# Fix /build/ leaking into byte-compiled files (patch accepted upstream). # Fix /build/ leaking into byte-compiled files (patch accepted upstream).
phpactor = esuper.phpactor.overrideAttrs (attrs: { phpactor = esuper.phpactor.overrideAttrs (attrs: {