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

emacsPackages: Drop old emacsPackages (non-NG) sets

Browse Source 
These have been deprecated for a long time now and has not seen much maintenance.
This commit is contained in:
adisbladis 2019-08-07 23:52:22 +01:00
parent bd87895d73
commit 41d1b8fa88
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
10 changed files with 37 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/package-specific-user-notes.xml
View File

@ -6,7 +6,7 @@
answer some of the frequently asked questions
related to Nixpkgs use.
Some useful information related to package use
Some useful information related to package use
can be found in <link linkend="chap-package-notes">package-specific development notes</link>.
</para>
@ -196,7 +196,7 @@ overrides = self: super: rec {
haskell-mode = self.melpaPackages.haskell-mode;
...
};
((emacsPackagesNgGen emacs).overrideScope' overrides).emacsWithPackages (p: with p; [
((emacsPackagesGen emacs).overrideScope' overrides).emacsWithPackages (p: with p; [
# here both these package will use haskell-mode of our own choice
ghc-mod
dante

9
nixos/doc/manual/release-notes/rl-1909.xml
View File

@ -338,10 +338,17 @@
For nginx, the dependencies are still automatically managed when <option>services.nginx.virtualhosts.&lt;name&gt;.enableACME</option> is enabled just like before. What changed is that nginx now directly depends on the specific certificates that it needs,
instead of depending on the catch-all <literal>acme-certificates.target</literal>. This target unit was also removed from the codebase.
This will mean nginx will no longer depend on certificates it isn't explicitly managing and fixes a bug with certificate renewal
ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at
ordering racing with nginx restarting which could lead to nginx getting in a broken state as described at
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/60180">NixOS/nixpkgs#60180</link>.
</para>
</listitem>
<listitem>
<para>
The old deprecated <literal>emacs</literal> package sets have been dropped.
What used to be called <literal>emacsPackagesNg</literal> is now simply called <literal>emacsPackages</literal>.
</para>
</listitem>
</itemizedlist>
</section>

20
nixos/modules/services/editors/emacs.xml
View File

@ -9,6 +9,7 @@
Damien Cassou @DamienCassou
Thomas Tuegel @ttuegel
Rodney Lorrimar @rvl
Adam Hoese @adisbladis
-->
<para>
<link xlink:href="https://www.gnu.org/software/emacs/">Emacs</link> is an
@ -130,15 +131,6 @@
Emacs packages through nixpkgs.
</para>
<note>
<para>
This documentation describes the new Emacs packages framework in NixOS
16.03 (<varname>emacsPackagesNg</varname>) which should not be confused
with the previous and deprecated framework
(<varname>emacs24Packages</varname>).
</para>
</note>
<para>
The first step to declare the list of packages you want in your Emacs
installation is to create a dedicated derivation. This can be done in a
@ -164,7 +156,7 @@ $ ./result/bin/emacs
let
myEmacs = pkgs.emacs; <co xml:id="ex-emacsNix-2" />
emacsWithPackages = (pkgs.emacsPackagesNgGen myEmacs).emacsWithPackages; <co xml:id="ex-emacsNix-3" />
emacsWithPackages = (pkgs.emacsPackagesGen myEmacs).emacsWithPackages; <co xml:id="ex-emacsNix-3" />
in
emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ <co xml:id="ex-emacsNix-4" />
magit # ; Integrate git &lt;C-x g&gt;
@ -262,10 +254,10 @@ in
<example xml:id="module-services-emacs-querying-packages">
<title>Querying Emacs packages</title>
<programlisting><![CDATA[
nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.elpaPackages
nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.melpaPackages
nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.melpaStablePackages
nix-env -f "<nixpkgs>" -qaP -A emacsPackagesNg.orgPackages
nix-env -f "<nixpkgs>" -qaP -A emacsPackages.elpaPackages
nix-env -f "<nixpkgs>" -qaP -A emacsPackages.melpaPackages
nix-env -f "<nixpkgs>" -qaP -A emacsPackages.melpaStablePackages
nix-env -f "<nixpkgs>" -qaP -A emacsPackages.orgPackages
]]></programlisting>
</example>
</para>

4
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View File

@ -6,8 +6,8 @@ To update the list of packages from MELPA,
1. Run ./update-melpa
2. Check for evaluation errors:
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackagesNg.melpaStablePackages
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackagesNg.melpaPackages
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages
3. `git commit -m "melpa-packages: $(date -Idate)" recipes-archive-melpa.json`
*/

2
pkgs/applications/editors/emacs-modes/updater-emacs.nix
View File

@ -1,7 +1,7 @@
let
pkgs = import ../../../.. {};
emacsEnv = (pkgs.emacsPackagesNgFor pkgs.emacs26).emacsWithPackages (epkgs: let
emacsEnv = (pkgs.emacsPackagesFor pkgs.emacs26).emacsWithPackages (epkgs: let
promise = epkgs.trivialBuild {
pname = "promise";

4
pkgs/build-support/emacs/wrapper.nix
View File

@ -18,10 +18,10 @@ the correct version of Emacs.
`emacsWithPackages` inherits the package set which contains it, so the
correct way to override the provided package set is to override the
set which contains `emacsWithPackages`. For example, to override
`emacsPackagesNg.emacsWithPackages`,
`emacsPackages.emacsWithPackages`,
```
let customEmacsPackages =
emacsPackagesNg.overrideScope' (self: super: {
emacsPackages.overrideScope' (self: super: {
# use a custom version of emacs
emacs = ...;
# use the unstable MELPA version of magit

6
pkgs/development/tools/cask/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, emacsPackagesNg }:
{ stdenv, fetchurl, python, emacsPackages }:
stdenv.mkDerivation rec {
name = "cask-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
doCheck = true;
buildInputs = with emacsPackagesNg; [
buildInputs = with emacsPackages; [
s f dash ansi ecukes servant ert-runner el-mock
noflet ert-async shell-split-string git package-build
];
@ -44,5 +44,5 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.flexw ];
};
nativeBuildInputs = [ emacsPackagesNg.emacs python ];
nativeBuildInputs = [ emacsPackages.emacs python ];
}

6
pkgs/top-level/aliases.nix
View File

@ -87,9 +87,11 @@ mapAliases ({
double_conversion = double-conversion; # 2017-11-22
docker_compose = docker-compose; # 2018-11-10
dwarf_fortress = dwarf-fortress; # added 2016-01-23
emacsMelpa = emacs25PackagesNg; # for backward compatibility
emacsMelpa = emacs25Packages; # for backward compatibility
emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
emacsPackagesNgGen = emacsPackagesNgFor; # added 2018-08-18
emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18
emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07
emacsPackagesNg = emacsPackages; # added 2019-08-07
emby = throw "The Emby derivation has been removed, see jellyfin instead for a free software fork."; # added 2019-05-01
enblendenfuse = enblend-enfuse; # 2015-09-30
evolution_data_server = evolution-data-server; # added 2018-02-25

163
pkgs/top-level/all-packages.nix
View File

@ -377,7 +377,7 @@ in
mkShell = callPackage ../build-support/mkshell { };
nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackagesNg) inherit-local; };
nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackages) inherit-local; };
nix-gitignore = callPackage ../build-support/nix-gitignore { };
@ -7919,7 +7919,7 @@ in
# package. Wishing we could merge it into one irony package, to avoid this issue,
# but its emacs-side expression is autogenerated, and we can't hook into it (other
# than peek into its version).
inherit (emacsPackagesNg.melpaStablePackages) irony;
inherit (emacsPackages.melpaStablePackages) irony;
};
hugs = callPackage ../development/interpreters/hugs { };
@ -17917,7 +17917,6 @@ in
emacs = emacs26;
emacsPackages = emacs26Packages;
emacsPackagesNg = emacs26PackagesNg;
emacs26 = callPackage ../applications/editors/emacs {
# use override to enable additional features
@ -17962,153 +17961,7 @@ in
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
};
emacsPackagesFor = emacs: self: let callPackage = newScope self; in rec {
inherit emacs;
autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { };
bbdb = callPackage ../applications/editors/emacs-modes/bbdb { };
bbdb3 = callPackage ../applications/editors/emacs-modes/bbdb/3.nix {};
cedet = callPackage ../applications/editors/emacs-modes/cedet { };
calfw = callPackage ../applications/editors/emacs-modes/calfw { };
cedille = callPackage ../applications/editors/emacs-modes/cedille { cedille = pkgs.cedille; };
coffee = callPackage ../applications/editors/emacs-modes/coffee { };
colorTheme = callPackage ../applications/editors/emacs-modes/color-theme { };
colorThemeSolarized = callPackage ../applications/editors/emacs-modes/color-theme-solarized { };
cryptol = callPackage ../applications/editors/emacs-modes/cryptol { };
cua = callPackage ../applications/editors/emacs-modes/cua { };
d = callPackage ../applications/editors/emacs-modes/d { };
darcsum = callPackage ../applications/editors/emacs-modes/darcsum { };
# ecb = callPackage ../applications/editors/emacs-modes/ecb { };
emacsClangCompleteAsync = callPackage ../applications/editors/emacs-modes/emacs-clang-complete-async { };
emacsSessionManagement = callPackage ../applications/editors/emacs-modes/session-management-for-emacs { };
emacsw3m = callPackage ../applications/editors/emacs-modes/emacs-w3m { };
emms = callPackage ../applications/editors/emacs-modes/emms { };
ensime = callPackage ../applications/editors/emacs-modes/ensime { };
erlangMode = callPackage ../applications/editors/emacs-modes/erlang { };
ess = callPackage ../applications/editors/emacs-modes/ess { };
flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { };
gh = callPackage ../applications/editors/emacs-modes/gh { };
graphvizDot = callPackage ../applications/editors/emacs-modes/graphviz-dot { };
gist = callPackage ../applications/editors/emacs-modes/gist { };
haskellMode = callPackage ../applications/editors/emacs-modes/haskell { };
hsc3Mode = callPackage ../applications/editors/emacs-modes/hsc3 { };
hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { };
htmlize = callPackage ../applications/editors/emacs-modes/htmlize { };
ido-ubiquitous = callPackage ../applications/editors/emacs-modes/ido-ubiquitous { };
icicles = callPackage ../applications/editors/emacs-modes/icicles { };
idris = callPackage ../applications/editors/emacs-modes/idris { };
jabber = callPackage ../applications/editors/emacs-modes/jabber { };
jade = callPackage ../applications/editors/emacs-modes/jade { };
jdee = callPackage ../applications/editors/emacs-modes/jdee { };
js2 = callPackage ../applications/editors/emacs-modes/js2 { };
let-alist = callPackage ../applications/editors/emacs-modes/let-alist { };
logito = callPackage ../applications/editors/emacs-modes/logito { };
loremIpsum = callPackage ../applications/editors/emacs-modes/lorem-ipsum { };
markdownMode = callPackage ../applications/editors/emacs-modes/markdown-mode { };
maudeMode = callPackage ../applications/editors/emacs-modes/maude { };
metaweblog = callPackage ../applications/editors/emacs-modes/metaweblog { };
monky = callPackage ../applications/editors/emacs-modes/monky { };
notmuch = lowPrio (pkgs.notmuch.override { inherit emacs; });
ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { };
offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {};
# This is usually a newer version of Org-Mode than that found in GNU Emacs, so
# we want it to have higher precedence.
org = hiPrio (callPackage ../applications/editors/emacs-modes/org { });
org2blog = callPackage ../applications/editors/emacs-modes/org2blog { };
pcache = callPackage ../applications/editors/emacs-modes/pcache { };
phpMode = callPackage ../applications/editors/emacs-modes/php { };
prologMode = callPackage ../applications/editors/emacs-modes/prolog { };
proofgeneral = callPackage ../applications/editors/emacs-modes/proofgeneral/4.4.nix {
texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; };
};
proofgeneral_HEAD = callPackage ../applications/editors/emacs-modes/proofgeneral/HEAD.nix {
texinfo = texinfo4 ;
texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; };
};
quack = callPackage ../applications/editors/emacs-modes/quack { };
rainbowDelimiters = callPackage ../applications/editors/emacs-modes/rainbow-delimiters { };
rectMark = callPackage ../applications/editors/emacs-modes/rect-mark { };
rudel = callPackage ../applications/editors/emacs-modes/rudel { };
s = callPackage ../applications/editors/emacs-modes/s { };
sbtMode = callPackage ../applications/editors/emacs-modes/sbt-mode { };
scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { };
scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { };
structuredHaskellMode = haskellPackages.structured-haskell-mode;
sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { };
tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { };
writeGood = callPackage ../applications/editors/emacs-modes/writegood { };
xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { };
cask = callPackage ../applications/editors/emacs-modes/cask { };
};
emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25 pkgs.emacs25Packages);
emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26 pkgs.emacs26Packages);
emacsPackagesNgFor = emacs: import ./emacs-packages.nix {
emacsPackagesFor = emacs: import ./emacs-packages.nix {
inherit lib newScope stdenv pkgs;
inherit fetchFromGitHub fetchurl;
inherit emacs texinfo makeWrapper runCommand writeText;
@ -18133,12 +17986,12 @@ in
};
};
emacs25PackagesNg = dontRecurseIntoAttrs (emacsPackagesNgFor emacs25);
emacs26PackagesNg = dontRecurseIntoAttrs (emacsPackagesNgFor emacs26);
emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25);
emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26);
emacs25WithPackages = emacs25PackagesNg.emacsWithPackages;
emacs26WithPackages = emacs26PackagesNg.emacsWithPackages;
emacsWithPackages = emacsPackagesNg.emacsWithPackages;
emacs25WithPackages = emacs25Packages.emacsWithPackages;
emacs26WithPackages = emacs26Packages.emacsWithPackages;
emacsWithPackages = emacsPackages.emacsWithPackages;
inherit (gnome3) empathy;

2
pkgs/top-level/release.nix
View File

@ -192,7 +192,7 @@ let
# Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66
#emacsPackagesNg = packagePlatforms pkgs.emacsPackagesNg;
#emacsPackages = packagePlatforms pkgs.emacsPackages;
#rPackages = packagePlatforms pkgs.rPackages;
ocamlPackages = { };
perlPackages = { };