summary refs log tree commit diff
path: root/pkgs/top-level/release.nix
diff options
context:
space:
mode:
authorMoritz Ulrich <moritz@tarn-vedra.de>2016-09-18 13:34:28 +0200
committerMoritz Ulrich <moritz@tarn-vedra.de>2016-09-18 13:38:21 +0200
commit01e44ac1f9af1d42ee9b5000426b780f2a03c948 (patch)
tree04b811bb05a6e2deb657805409c96b03e84c4d8c /pkgs/top-level/release.nix
parent20fb07dc4ae8a4dc186779f01f3a65e6cc6eed33 (diff)
downloadnixpkgs-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 'pkgs/top-level/release.nix')
-rw-r--r--pkgs/top-level/release.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 160c19b1d85..d3fb4e646c3 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -90,7 +90,7 @@ let
 
       # Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66
 
-      #emacs24PackagesNg = packagePlatforms pkgs.emacs24PackagesNg;
+      #emacsPackagesNg = packagePlatforms pkgs.emacsPackagesNg;
       #rPackages = packagePlatforms pkgs.rPackages;
       ocamlPackages = { };
       perlPackages = { };