From 6d16fb7c50474f3650a19ccd3e6dc2e3556173f9 Mon Sep 17 00:00:00 2001 From: Marien Zwart Date: Sun, 1 Sep 2024 22:23:31 +1000 Subject: [PATCH] Drop tree-sitter site-dir renaming 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. --- elisp-packages.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/elisp-packages.nix b/elisp-packages.nix index 9477cda..2eaa346 100644 --- a/elisp-packages.nix +++ b/elisp-packages.nix @@ -182,21 +182,12 @@ # out: patch that version number to match what nixpkgs put in the grammar bundle. let 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 esuper.tree-sitter-langs.overrideAttrs (old: { postPatch = old.postPatch or "" + '' sed -i -e '/defconst tree-sitter-langs--bundle-version/ s/"[0-9.]*"/"${version}"/' \ ./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). phpactor = esuper.phpactor.overrideAttrs (attrs: {