emacs25: Drop outdated version
This commit is contained in:
adisbladis
parent
2adf17f8c2
commit
13276abce9
@ -1,146 +0,0 @@
|
||||
{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d, fetchpatch
|
||||
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
|
||||
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
|
||||
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO
|
||||
, withX ? !stdenv.isDarwin
|
||||
, withGTK2 ? false, gtk2 ? null
|
||||
, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
|
||||
, withXwidgets ? false, webkitgtk, wrapGAppsHook ? null, glib-networking ? null
|
||||
, withCsrc ? true
|
||||
, autoconf ? null, automake ? null, texinfo ? null
|
||||
}:
|
||||
|
||||
assert (libXft != null) -> libpng != null; # probably a bug
|
||||
assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise
|
||||
assert withGTK2 -> withX || stdenv.isDarwin;
|
||||
assert withGTK3 -> withX || stdenv.isDarwin;
|
||||
assert withGTK2 -> !withGTK3 && gtk2 != null;
|
||||
assert withGTK3 -> !withGTK2 && gtk3 != null;
|
||||
assert withXwidgets -> withGTK3 && webkitgtk != null;
|
||||
|
||||
let
|
||||
toolkit =
|
||||
if withGTK2 then "gtk2"
|
||||
else if withGTK3 then "gtk3"
|
||||
else "lucid";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "emacs-${version}${versionModifier}";
|
||||
version = "25.3";
|
||||
versionModifier = "";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/emacs/${name}.tar.xz";
|
||||
sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [
|
||||
./at-fdcwd.patch
|
||||
|
||||
# Backport of the fix to
|
||||
# https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html
|
||||
# Should be removed when switching to Emacs 26.1
|
||||
(fetchurl {
|
||||
url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch";
|
||||
sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj";
|
||||
})
|
||||
] ++ [
|
||||
# Backport patches so we can use webkitgtk with xwidgets.
|
||||
(fetchpatch {
|
||||
name = "0001-Omit-unnecessary-includes-from-xwidget-c.patch";
|
||||
url = "https://github.com/emacs-mirror/emacs/commit/a36ed9b5e95afea5716256bac24d883263aefbaf.patch";
|
||||
sha256 = "1j34c0vkj87il87xy1px23yk6bw73adpr7wqa79ncj89i4lc8qkb";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "0002-xwidget-Use-WebKit2-API.patch";
|
||||
url = "https://github.com/emacs-mirror/emacs/commit/d781662873f228b110a128f7a2b6583a4d5e0a3a.patch";
|
||||
sha256 = "1lld56zi4cw2hmjxhhdcc0f07k8lbj32h10wcq4ml3asdwa31ryr";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoconf automake texinfo ]
|
||||
++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
|
||||
|
||||
buildInputs =
|
||||
[ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ]
|
||||
++ lib.optionals stdenv.isLinux [ dbus libselinux ]
|
||||
++ lib.optionals withX
|
||||
[ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
|
||||
imagemagick gconf ]
|
||||
++ lib.optional (withX && withGTK2) gtk2
|
||||
++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ]
|
||||
++ lib.optional (stdenv.isDarwin && withX) cairo
|
||||
++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ]
|
||||
++ lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
configureFlags = [ "--with-modules" ] ++
|
||||
(if stdenv.isDarwin
|
||||
then [ "--with-ns" "--disable-ns-self-contained" ]
|
||||
else if withX
|
||||
then [ "--with-x-toolkit=${toolkit}" "--with-xft" ]
|
||||
else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
|
||||
"--with-gif=no" "--with-tiff=no" ])
|
||||
++ lib.optional withXwidgets "--with-xwidgets";
|
||||
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
'' + ''
|
||||
substituteInPlace lisp/international/mule-cmds.el \
|
||||
--replace /usr/share/locale ${gettext}/share/locale
|
||||
|
||||
for makefile_in in $(find . -name Makefile.in -print); do
|
||||
substituteInPlace $makefile_in --replace /bin/pwd pwd
|
||||
done
|
||||
'';
|
||||
|
||||
installTargets = [ "tags" "install" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el
|
||||
$out/bin/emacs --batch -f batch-byte-compile $out/share/emacs/site-lisp/site-start.el
|
||||
|
||||
rm -rf $out/var
|
||||
rm -rf $out/share/emacs/${version}/site-lisp
|
||||
'' + lib.optionalString withCsrc ''
|
||||
for srcdir in src lisp lwlib ; do
|
||||
dstdir=$out/share/emacs/${version}/$srcdir
|
||||
mkdir -p $dstdir
|
||||
find $srcdir -name "*.[chm]" -exec cp {} $dstdir \;
|
||||
cp $srcdir/TAGS $dstdir
|
||||
echo '((nil . ((tags-file-name . "TAGS"))))' > $dstdir/.dir-locals.el
|
||||
done
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
mv nextstep/Emacs.app $out/Applications
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The extensible, customizable GNU text editor";
|
||||
homepage = "https://www.gnu.org/software/emacs/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ lovek323 peti jwiegley ];
|
||||
platforms = platforms.all;
|
||||
|
||||
longDescription = ''
|
||||
GNU Emacs is an extensible, customizable text editor—and more. At its
|
||||
core is an interpreter for Emacs Lisp, a dialect of the Lisp
|
||||
programming language with extensions to support text editing.
|
||||
|
||||
The features of GNU Emacs include: content-sensitive editing modes,
|
||||
including syntax coloring, for a wide variety of file types including
|
||||
plain text, source code, and HTML; complete built-in documentation,
|
||||
including a tutorial for new users; full Unicode support for nearly all
|
||||
human languages and their scripts; highly customizable, using Emacs
|
||||
Lisp code or a graphical interface; a large number of extensions that
|
||||
add other functionality, including a project planner, mail and news
|
||||
reader, debugger interface, calendar, and more. Many of these
|
||||
extensions are distributed with GNU Emacs; others are available
|
||||
separately.
|
||||
'';
|
||||
};
|
||||
}
|
||||
@ -9,7 +9,6 @@
|
||||
, llvmPackages_5
|
||||
, gmp
|
||||
, emacs
|
||||
, emacs25-nox
|
||||
, jre_headless
|
||||
, tcl
|
||||
, tk
|
||||
@ -73,7 +72,7 @@ in stdenv.mkDerivation rec {
|
||||
llvmPackages_5.clang
|
||||
llvmPackages_5.clang-unwrapped
|
||||
gmp
|
||||
emacs25-nox
|
||||
emacs
|
||||
jre_headless
|
||||
tcl
|
||||
tk
|
||||
|
||||
@ -114,7 +114,6 @@ mapAliases ({
|
||||
docker_compose = docker-compose; # 2018-11-10
|
||||
draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14
|
||||
dwarf_fortress = dwarf-fortress; # added 2016-01-23
|
||||
emacsMelpa = emacs25Packages; # for backward compatibility
|
||||
emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
|
||||
emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18
|
||||
emacsPackagesNgFor = emacsPackagesFor; # added 2019-08-07
|
||||
|
||||
@ -9305,7 +9305,9 @@ in
|
||||
|
||||
mosml = callPackage ../development/compilers/mosml { };
|
||||
|
||||
mozart2 = callPackage ../development/compilers/mozart { };
|
||||
mozart2 = callPackage ../development/compilers/mozart {
|
||||
emacs = emacs-nox;
|
||||
};
|
||||
|
||||
mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { };
|
||||
|
||||
@ -19899,24 +19901,6 @@ in
|
||||
withGTK3 = false;
|
||||
}));
|
||||
|
||||
emacs25 = callPackage ../applications/editors/emacs/25.nix {
|
||||
# use override to enable additional features
|
||||
libXaw = xorg.libXaw;
|
||||
Xaw3d = null;
|
||||
gconf = null;
|
||||
alsaLib = null;
|
||||
imagemagick = null;
|
||||
acl = null;
|
||||
gpm = null;
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit GSS ImageIO;
|
||||
};
|
||||
|
||||
emacs25-nox = lowPrio (appendToName "nox" (emacs25.override {
|
||||
withX = false;
|
||||
withGTK2 = false;
|
||||
withGTK3 = false;
|
||||
}));
|
||||
|
||||
emacsMacport = callPackage ../applications/editors/emacs/macport.nix {
|
||||
inherit (darwin.apple_sdk.frameworks)
|
||||
AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
|
||||
@ -19948,10 +19932,8 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
emacs25Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs25);
|
||||
emacs26Packages = dontRecurseIntoAttrs (emacsPackagesFor emacs26);
|
||||
|
||||
emacs25WithPackages = emacs25Packages.emacsWithPackages;
|
||||
emacs26WithPackages = emacs26Packages.emacsWithPackages;
|
||||
emacsWithPackages = emacsPackages.emacsWithPackages;
|
||||
|
||||
|
||||
@ -38,7 +38,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
|
||||
dhcp = linux;
|
||||
diffutils = all;
|
||||
e2fsprogs = linux;
|
||||
emacs25 = linux;
|
||||
emacs = linux;
|
||||
enscript = all;
|
||||
file = all;
|
||||
findutils = all;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user