alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

emacs25pre: 25.0.50-1b5630e -> 25.0.92

Browse source 
(cherry picked from commit 9b52caaa0c)
This commit is contained in:
Damien Cassou 2016-04-05 09:32:58 +02:00 committed by Peter Simons
parent 73e0cc9b8e
commit 54cab9cafe
2 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
pkgs/applications/editors/emacs-25/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchgit, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
, alsaLib, cairo, acl, gpm, AppKit, Foundation, libobjc , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO
, autoconf, automake , autoconf, automake
, withX ? !stdenv.isDarwin , withX ? !stdenv.isDarwin
, withGTK3 ? false, gtk3 ? null , withGTK3 ? false, gtk3 ? null
@ -23,17 +23,16 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "emacs-25.0.50-1b5630e"; name = "emacs-25.0.92";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchgit { src = fetchurl {
url = "git://git.savannah.gnu.org/emacs.git"; url = "ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-25.0.92.tar.xz";
rev = "1b5630eb47d3f4bade09708c958ab006b83b3fc0"; sha256 = "13jnj1js2l90k4yk219r3z67fff90r6mniprsp0sgip2kaak75y2";
sha256 = "0n3qbri84akmy7ad1pbv89j4jn4x9pnkz0p4nbhh6m1c37cbz58l";
}; };
patches = stdenv.lib.optionals stdenv.isDarwin [ patches = lib.optionals stdenv.isDarwin [
./at-fdcwd.patch ./at-fdcwd.patch
]; ];
@ -52,11 +51,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (withX && withGTK3) gtk3 ++ stdenv.lib.optional (withX && withGTK3) gtk3
++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo; ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo;
propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Foundation libobjc propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
];
NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
"/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
configureFlags = configureFlags =
if stdenv.isDarwin if stdenv.isDarwin
@ -81,18 +76,16 @@ stdenv.mkDerivation rec {
mv nextstep/Emacs.app $out/Applications mv nextstep/Emacs.app $out/Applications
''; '';
doCheck = !stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/issues/13573
doCheck = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "GNU Emacs 25 (pre), the extensible, customizable text editor"; description = "GNU Emacs 25 (pre), the extensible, customizable text editor";
homepage = http://www.gnu.org/software/emacs/; homepage = http://www.gnu.org/software/emacs/;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny ]; maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny jwiegley ];
platforms = platforms.all; platforms = platforms.all;
# So that Exuberant ctags is preferred
priority = 1;
longDescription = '' longDescription = ''
GNU Emacs is an extensible, customizable text editor—and more. At its GNU Emacs is an extensible, customizable text editor—and more. At its
core is an interpreter for Emacs Lisp, a dialect of the Lisp core is an interpreter for Emacs Lisp, a dialect of the Lisp

3
pkgs/top-level/all-packages.nix
View file

@ -11933,8 +11933,7 @@ let
imagemagick = null; imagemagick = null;
acl = null; acl = null;
gpm = null; gpm = null;
inherit (darwin.apple_sdk.frameworks) AppKit Foundation; inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO;
inherit (darwin) libobjc;
}); });
emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec { emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {