diff options
| author | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-09-18 13:34:28 +0200 |
|---|---|---|
| committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-09-18 13:38:21 +0200 |
| commit | 01e44ac1f9af1d42ee9b5000426b780f2a03c948 (patch) | |
| tree | 04b811bb05a6e2deb657805409c96b03e84c4d8c /nixos/modules/services/editors/emacs.xml | |
| parent | 20fb07dc4ae8a4dc186779f01f3a65e6cc6eed33 (diff) | |
| download | nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.tar nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.tar.gz nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.tar.bz2 nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.tar.lz nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.tar.xz nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.tar.zst nixpkgs-01e44ac1f9af1d42ee9b5000426b780f2a03c948.zip | |
emacs: 24.5 -> 25.1
This commit removes all references to emacs24 with the exception of emacs24-macports. The two folders in `pkgs/applications/editors` named `emacs-24` and `emacs-24` are consolidated to a new `emacs` folder. Various parts in nixpkgs also referenced `emacs24Packages` (pinned to `emacs24`) explicitly where `emacsPackages` (non-pinned) is more appropriate. These references get fixed by this commit too.
Diffstat (limited to 'nixos/modules/services/editors/emacs.xml')
| -rw-r--r-- | nixos/modules/services/editors/emacs.xml | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index ee8ef512bc7..618460953a1 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -59,17 +59,17 @@ <variablelist> <varlistentry> <term><varname>emacs</varname></term> - <term><varname>emacs24</varname></term> + <term><varname>emacs25</varname></term> <listitem> <para> - The latest stable version of Emacs 24 using the <link + The latest stable version of Emacs 25 using the <link xlink:href="http://www.gtk.org">GTK+ 2</link> widget toolkit. </para> </listitem> </varlistentry> <varlistentry> - <term><varname>emacs24-nox</varname></term> + <term><varname>emacs25-nox</varname></term> <listitem> <para> Emacs 24 built without any dependency on X11 @@ -86,15 +86,6 @@ </para> </listitem> </varlistentry> - <varlistentry> - <term><varname>emacs25pre</varname></term> - <listitem> - <para> - A pretest version of what will become the first - version of Emacs 25. - </para> - </listitem> - </varlistentry> </variablelist> </para> |