summary refs log tree commit diff
path: root/pkgs/top-level/release-small.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-04-11 23:31:33 +0200
committerVladimír Čunát <vcunat@gmail.com>2013-04-11 23:31:33 +0200
commit8249695b618204efe142e2de9db289f989d270ad (patch)
treedad41af95ba4d16bc6640503d003d36d9e1debf2 /pkgs/top-level/release-small.nix
parent7d9607f1511bfe496fcd77ef735e7fc7f1c6eb9f (diff)
parent6640000cb7148ba39bbdcca8e0cd7f5c224bce57 (diff)
downloadnixpkgs-8249695b618204efe142e2de9db289f989d270ad.tar
nixpkgs-8249695b618204efe142e2de9db289f989d270ad.tar.gz
nixpkgs-8249695b618204efe142e2de9db289f989d270ad.tar.bz2
nixpkgs-8249695b618204efe142e2de9db289f989d270ad.tar.lz
nixpkgs-8249695b618204efe142e2de9db289f989d270ad.tar.xz
nixpkgs-8249695b618204efe142e2de9db289f989d270ad.tar.zst
nixpkgs-8249695b618204efe142e2de9db289f989d270ad.zip
Merge branch 'master' into x-updates
Needed that to fix the tarball.
Diffstat (limited to 'pkgs/top-level/release-small.nix')
-rw-r--r--pkgs/top-level/release-small.nix9
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index ed57bc5c21c..cde219eafe6 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -41,7 +41,7 @@ with (import ./release-lib.nix);
   dhcp = linux;
   diffutils = all;
   e2fsprogs = linux;
-  emacs23 = gtkSupported;
+  emacs24 = gtkSupported;
   enscript = all;
   file = all;
   findutils = all;
@@ -204,11 +204,4 @@ with (import ./release-lib.nix);
     tools = linux;
   };
 
-  emacs23Packages = {
-    bbdb = linux;
-    cedet = linux;
-    ecb = linux;
-    emacsw3m = linux;
-    emms = linux;
-  };
 } ))