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

Updated Emacs default version from 23.3 to 24.1.

Browse Source 
Yay!

svn path=/nixpkgs/trunk/; revision=34461
This commit is contained in:
Peter Simons 2012-06-11 16:41:31 +00:00
parent 09321105f1
commit e0f5d8870e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6501,7 +6501,7 @@ let
elvis = callPackage ../applications/editors/elvis { }; elvis = callPackage ../applications/editors/elvis { };
emacs = emacs23; emacs = emacs24;
emacs22 = callPackage ../applications/editors/emacs-22 { emacs22 = callPackage ../applications/editors/emacs-22 {
stdenv = stdenv =
@ -6542,7 +6542,7 @@ let
librsvg = null /* if stdenv.isDarwin then null else librsvg */; librsvg = null /* if stdenv.isDarwin then null else librsvg */;
}; };
emacs24 = lowPrio (callPackage ../applications/editors/emacs-24 { emacs24 = callPackage ../applications/editors/emacs-24 {
# use override to select the appropriate gui toolkit # use override to select the appropriate gui toolkit
libXaw = if stdenv.isDarwin then xlibs.libXaw else null; libXaw = if stdenv.isDarwin then xlibs.libXaw else null;
Xaw3d = null; Xaw3d = null;
@ -6553,7 +6553,7 @@ let
# alsa only on linux # alsa only on linux
alsaLib = if stdenv.isLinux then alsaLib else null; alsaLib = if stdenv.isLinux then alsaLib else null;
imagemagick = imagemagickBig; imagemagick = imagemagickBig;
}); };
emacsPackages = emacs: self: let callPackage = newScope self; in rec { emacsPackages = emacs: self: let callPackage = newScope self; in rec {
inherit emacs; inherit emacs;
@ -6624,8 +6624,8 @@ let
}; };
emacs22Packages = emacsPackages emacs22 pkgs.emacs22Packages; emacs22Packages = emacsPackages emacs22 pkgs.emacs22Packages;
emacs23Packages = recurseIntoAttrs (emacsPackages emacs23 pkgs.emacs23Packages); emacs23Packages = emacsPackages emacs23 pkgs.emacs23Packages;
emacs24Packages = emacsPackages emacs24 pkgs.emacs24Packages; emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages);
epdfview = callPackage ../applications/misc/epdfview { }; epdfview = callPackage ../applications/misc/epdfview { };
@ -8296,7 +8296,7 @@ let
isabelle = import ../applications/science/logic/isabelle { isabelle = import ../applications/science/logic/isabelle {
inherit (pkgs) stdenv fetchurl nettools perl polyml; inherit (pkgs) stdenv fetchurl nettools perl polyml;
inherit (pkgs.emacs23Packages) proofgeneral; inherit (pkgs.emacs24Packages) proofgeneral;
}; };
iprover = callPackage ../applications/science/logic/iprover {}; iprover = callPackage ../applications/science/logic/iprover {};