Merge pull request #238586 from adisbladis/emacs-passhru-nativecomp-fixup
emacs: add back nativeComp/treeSitter passthru
This commit is contained in:
commit
23bd312777
|
@ -386,6 +386,9 @@ mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation {
|
|||
inherit withTreeSitter;
|
||||
pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage);
|
||||
tests = { inherit (nixosTests) emacs-daemon; };
|
||||
# Backwards compatibility aliases. Remove this at some point before 23.11 release cut-off.
|
||||
nativeComp = builtins.trace "emacs.passthru: nativeComp was renamed to withNativeCompilation and will be removed in 23.11" withNativeCompilation;
|
||||
treeSitter = builtins.trace "emacs.passthru: treeSitter was renamed to withTreeSitter and will be removed in 23.11" withTreeSitter;
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -36,8 +36,8 @@ in customEmacsPackages.withPackages (epkgs: [ epkgs.evil epkgs.magit ])
|
|||
self:
|
||||
let
|
||||
inherit (self) emacs;
|
||||
withNativeCompilation = emacs.withNativeCompilation or false;
|
||||
withTreeSitter = emacs.withTreeSitter or false;
|
||||
withNativeCompilation = emacs.withNativeCompilation or emacs.nativeComp or false;
|
||||
withTreeSitter = emacs.withTreeSitter or emacs.treeSitter or false;
|
||||
in
|
||||
packagesFun: # packages explicitly requested by the user
|
||||
let
|
||||
|
|
Loading…
Reference in a new issue