dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #132568 from adisbladis/emacs-drop-legacy-aliases

Browse Source 
emacs.pkgs: Drop legacy aliases
This commit is contained in:
adisbladis 2021-08-03 13:02:51 -05:00 committed by GitHub
commit a63d57e0eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
View File

@ -624,6 +624,14 @@
move all files to the new directory.
</para>
</listitem>
<listitem>
<para>
Deprecated package aliases in <literal>emacs.pkgs.*</literal>
have been removed. These aliases were remnants of the old
Emacs package infrastructure. We now use exact upstream names
wherever possible.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-21.11-notable-changes">

2
nixos/doc/manual/release-notes/rl-2111.section.md
View File

@ -157,6 +157,8 @@ pt-services.clipcat.enable).
- `services.uptimed` now uses `/var/lib/uptimed` as its stateDirectory instead of `/var/spool/uptimed`. Make sure to move all files to the new directory.
- Deprecated package aliases in `emacs.pkgs.*` have been removed. These aliases were remnants of the old Emacs package infrastructure. We now use exact upstream names wherever possible.
## Other Notable Changes {#sec-release-21.11-notable-changes}
- The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets.

34
pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
View File

@ -250,38 +250,4 @@
rectMark = rect-mark;
sunriseCommander = sunrise-commander;
# Legacy aliases, these try to mostly map to melpa stable because it's
# closer to the old outdated package infra.
#
# Ideally this should be dropped some time during/after 20.03
autoComplete = self.melpaStablePackages.auto-complete;
bbdb3 = self.melpaStablePackages.bbdb;
colorTheme = self.color-theme;
cryptol = self.melpaStablePackages.cryptol-mode;
d = self.melpaStablePackages.d-mode;
emacsw3m = self.w3m;
erlangMode = self.melpaStablePackages.erlang;
flymakeCursor = self.melpaStablePackages.flymake-cursor;
graphvizDot = self.melpaStablePackages.graphviz-dot-mode;
haskellMode = self.melpaStablePackages.haskell-mode;
hsc3Mode = self.hsc3-mode;
idris = self.melpaStablePackages.idris-mode;
jade = self.jade-mode;
js2 = self.melpaStablePackages.js2-mode;
loremIpsum = self.lorem-ipsum;
markdownMode = self.melpaStablePackages.markdown-mode;
maudeMode = self.maude-mode;
phpMode = self.melpaStablePackages.php-mode;
prologMode = self.prolog-mode;
proofgeneral = self.melpaStablePackages.proof-general;
proofgeneral_HEAD = self.proof-general;
rainbowDelimiters = self.melpaStablePackages.rainbow-delimiters;
sbtMode = self.melpaStablePackages.sbt-mode;
scalaMode1 = self.melpaStablePackages.scala-mode;
# scalaMode2 = null; # No clear mapping as of now
structuredHaskellMode = self.melpaStablePackages.shm;
tuaregMode = self.melpaStablePackages.tuareg;
writeGood = self.melpaStablePackages.writegood-mode;
xmlRpc = self.melpaStablePackages.xml-rpc;
}

19
pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
View File

@ -517,24 +517,7 @@ let
});
};
# Deprecated legacy aliases for backwards compat
aliases = lib.listToAttrs (lib.attrValues (lib.mapAttrs (n: v: { name = v; value = builtins.trace "Melpa attribute '${v}' is a legacy alias that will be removed in 21.05, use '${n}' instead" melpaPackages.${n}; }) (lib.filterAttrs (n: v: lib.hasAttr n melpaPackages) {
"auto-complete-clang-async" = "emacsClangCompleteAsync";
"vterm" = "emacs-libvterm";
"0xc" = "_0xc";
"2048-game" = "_2048-game";
"4clojure" = "_4clojure";
"@" = "at";
"term+" = "term-plus";
"term+key-intercept" = "term-plus-key-intercept";
"term+mux" = "term-plus-mux";
"xml+" = "xml-plus";
})));
melpaPackages = lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super;
in
melpaPackages // aliases);
in lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super);
in
generateMelpa { }