diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 789420fdfc6e..5625dfbb3aa9 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -61,11 +61,7 @@ , wrapGAppsHook # Boolean flags -, nativeComp ? null -, withNativeCompilation ? - if nativeComp != null - then lib.warn "nativeComp option is deprecated and will be removed; use withNativeCompilation instead" nativeComp - else stdenv.buildPlatform.canExecute stdenv.hostPlatform +, withNativeCompilation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform , noGui ? false , srcRepo ? true , withAcl ? false @@ -403,9 +399,6 @@ mkDerivation (finalAttrs: { 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 = meta // { diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 6c1383c53304..59a694286d09 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -36,8 +36,8 @@ in customEmacsPackages.withPackages (epkgs: [ epkgs.evil epkgs.magit ]) self: let inherit (self) emacs; - withNativeCompilation = emacs.withNativeCompilation or emacs.nativeComp or false; - withTreeSitter = emacs.withTreeSitter or emacs.treeSitter or false; + withNativeCompilation = emacs.withNativeCompilation or false; + withTreeSitter = emacs.withTreeSitter or false; in packagesFun: # packages explicitly requested by the user let