Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,6 @@ mapAliases {
elm-github-install = throw "'elm-github-install' has been removed as it is abandoned upstream and only supports Elm 0.18.0"; # Added 2025-08-25
emacsMacport = throw "'emacsMacport' has been renamed to/replaced by 'emacs-macport'"; # Converted to throw 2025-10-27
emacsNativeComp = throw "'emacsNativeComp' has been renamed to/replaced by 'emacs'"; # Converted to throw 2025-10-27
emacsPackages = throw "'emacsPackages' has been renamed to/replaced by 'emacs.pkgs'"; # Converted to throw 2025-10-27
embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14
EmptyEpsilon = throw "'EmptyEpsilon' has been renamed to/replaced by 'empty-epsilon'"; # Converted to throw 2025-10-27
emulationstation = throw "emulationstation was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
Expand Down
4 changes: 4 additions & 0 deletions pkgs/top-level/all-packages.nix
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we have to choose one, I slightly prefer removing emacsPackages from search.nixos.org over undeprecating emacsPackages as I said in #437197. But I am also fine with undeprecating emacsPackages. WDYT? cc @adisbladis @AndersonTorres @panchoh

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If emacsPackages gets removed from search.nixos.org, this means that users won’t be able to use search.nixos.org to locate Emacs packages at all, or that they will be exposed differently, maybe with an alternate prefix, or no prefix at all?

(I would think that, as a user, being able to locate Emacs packages at search.nixos.org is desirable, to say the least).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer removing it too.

The purpose of throw is precisely to break user config and force they to fix it, with the plus of being graceful.
But being graceful to user became being annoying to us packagers. Let's remove it and optionally make some announcement.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(I would think that, as a user, being able to locate Emacs packages at search.nixos.org is desirable, to say the least).

I very much agree.

Also, remember: Removing it essentially opts out of ever evaluating emacsPackages in CI. It's unlikely that these packages will be built by hydra, OK. Currently this also means they are not tested by GHA Eval. But my goal is to change that in the future. And for that to work, there needs to be something that can be recursed into - emacsPackages.

Again, all other major package sets have this. There is no point in making emacs differ here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding emacsPackages to CI sounds good! Maybe emacsPackages can be added to CI via something similar packages-ocnfig.nix. (Just saying. I have not read the CI code and I do not think I have a say in CI things.)

Original file line number Diff line number Diff line change
Expand Up @@ -10937,6 +10937,10 @@ with pkgs;
pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set
};

# emacsPackages is exposed on search.nixos.org.
# Also see pkgs/top-level/packages-config.nix
emacsPackages = dontRecurseIntoAttrs emacs.pkgs;

espeak-classic = callPackage ../applications/audio/espeak { };

espeak = espeak-ng;
Expand Down
Loading