From ac23a7c459d8f6035fcadcac274ff40f1e21a7e9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 28 May 2018 11:35:20 -0400 Subject: emacs: 25.3 → 26.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/editors/emacs/at-fdcwd.patch | 15 --------------- pkgs/applications/editors/emacs/clean-env.patch | 4 ++-- pkgs/applications/editors/emacs/default.nix | 14 ++------------ 3 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/at-fdcwd.patch diff --git a/pkgs/applications/editors/emacs/at-fdcwd.patch b/pkgs/applications/editors/emacs/at-fdcwd.patch deleted file mode 100644 index 2d8099b73736..000000000000 --- a/pkgs/applications/editors/emacs/at-fdcwd.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h -index 84ede3e..8e8f42e 100644 ---- a/lib/careadlinkat.h -+++ b/lib/careadlinkat.h -@@ -23,6 +23,10 @@ - #include - #include - -+#ifndef AT_FDCWD -+#define AT_FDCWD -2 -+#endif -+ - struct allocator; - - /* Assuming the current directory is FD, get the symbolic link value diff --git a/pkgs/applications/editors/emacs/clean-env.patch b/pkgs/applications/editors/emacs/clean-env.patch index f80efeeef706..7b4cb9d52667 100644 --- a/pkgs/applications/editors/emacs/clean-env.patch +++ b/pkgs/applications/editors/emacs/clean-env.patch @@ -8,8 +8,8 @@ diff -ru -x '*~' emacs-25.3/src/Makefile.in emacs-25.3-new/src/Makefile.in ifeq ($(CANNOT_DUMP),yes) ln -f temacs$(EXEEXT) $@ else -- LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump -+ env -i LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump +- LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump ++ env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump ifneq ($(PAXCTL_dumped),) $(PAXCTL_dumped) $@ endif diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index ba243629cc3e..b82f97e445f6 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -26,28 +26,18 @@ let in stdenv.mkDerivation rec { name = "emacs-${version}${versionModifier}"; - version = "25.3"; + version = "26.1"; versionModifier = ""; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.xz"; - sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5"; + sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w"; }; enableParallelBuilding = true; patches = [ ./clean-env.patch - ] ++ 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"; - }) ]; nativeBuildInputs = [ pkgconfig ] -- cgit 1.4.1 From a87b50bc6341c4539ee49fc6b1d14820b85a23db Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 28 May 2018 11:42:38 -0400 Subject: emacs: readd version 25 --- pkgs/applications/editors/emacs/25.nix | 136 +++++++++++++++++++++++++ pkgs/applications/editors/emacs/at-fdcwd.patch | 15 +++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 31 ++++-- 4 files changed, 177 insertions(+), 6 deletions(-) create mode 100644 pkgs/applications/editors/emacs/25.nix create mode 100644 pkgs/applications/editors/emacs/at-fdcwd.patch diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix new file mode 100644 index 000000000000..b659e060e3b4 --- /dev/null +++ b/pkgs/applications/editors/emacs/25.nix @@ -0,0 +1,136 @@ +{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d +, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif +, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux +, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO +, withX ? !stdenv.isDarwin +, withGTK2 ? false, gtk2 ? null +, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null +, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null +, withCsrc ? true +, srcRepo ? false, 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 && webkitgtk24x-gtk3 != 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"; + }) + ]; + + nativeBuildInputs = [ pkgconfig ] + ++ lib.optionals srcRepo [ 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) [ webkitgtk24x-gtk3 glib-networking ]; + + propagatedBuildInputs = 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 = lib.optionalString srcRepo '' + ./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 = http://www.gnu.org/software/emacs/; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny 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. + ''; + }; +} diff --git a/pkgs/applications/editors/emacs/at-fdcwd.patch b/pkgs/applications/editors/emacs/at-fdcwd.patch new file mode 100644 index 000000000000..2d8099b73736 --- /dev/null +++ b/pkgs/applications/editors/emacs/at-fdcwd.patch @@ -0,0 +1,15 @@ +diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h +index 84ede3e..8e8f42e 100644 +--- a/lib/careadlinkat.h ++++ b/lib/careadlinkat.h +@@ -23,6 +23,10 @@ + #include + #include + ++#ifndef AT_FDCWD ++#define AT_FDCWD -2 ++#endif ++ + struct allocator; + + /* Assuming the current directory is FD, get the symbolic link value diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 35a16699d430..5724adf16ad7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -78,6 +78,7 @@ mapAliases (rec { double_conversion = double-conversion; # 2017-11-22 dwarf_fortress = dwarf-fortress; # added 2016-01-23 emacs25Macport_25_1 = emacs25Macport; # added 2018-04-25 + emacsMelpa = emacs25PackagesNg; # for backward compatibility enblendenfuse = enblend-enfuse; # 2015-09-30 evolution_data_server = evolution-data-server; # added 2018-02-25 etcdctl = etcd; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 972052dab5e2..4831d3fb9196 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15382,12 +15382,29 @@ with pkgs; elvis = callPackage ../applications/editors/elvis { }; - emacs = emacs25; - emacsPackages = emacs25Packages; - emacsPackagesNg = emacs25PackagesNg; - emacsMelpa = emacs25PackagesNg; # for backward compatibility + emacs = emacs26; + emacsPackages = emacs26Packages; + emacsPackagesNg = emacs26PackagesNg; - emacs25 = callPackage ../applications/editors/emacs { + emacs26 = callPackage ../applications/editors/emacs { + # 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 CoreWLAN GSS Kerberos ImageIO; + }; + + emacs26-nox = lowPrio (appendToName "nox" (emacs26.override { + withX = false; + withGTK2 = false; + withGTK3 = false; + })); + + emacs25 = callPackage ../applications/editors/emacs/25.nix { # use override to enable additional features libXaw = xorg.libXaw; Xaw3d = null; @@ -15556,6 +15573,7 @@ with pkgs; }; emacs25Packages = emacsPackagesGen emacs25 pkgs.emacs25Packages; + emacs26Packages = emacsPackagesGen emacs26 pkgs.emacs26Packages; emacsPackagesNgGen = emacs: import ./emacs-packages.nix { inherit lib newScope stdenv; @@ -15579,8 +15597,9 @@ with pkgs; }; emacs25PackagesNg = emacsPackagesNgGen emacs25; - emacs25WithPackages = emacs25PackagesNg.emacsWithPackages; + emacs26PackagesNg = emacsPackagesNgGen emacs26; + emacs26WithPackages = emacs26PackagesNg.emacsWithPackages; emacsWithPackages = emacsPackagesNg.emacsWithPackages; inherit (gnome3) empathy; -- cgit 1.4.1 From aa2160e1b62bdc6795c465e68301ec8684540b24 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 28 May 2018 13:33:08 -0400 Subject: emacs26: add some tweaks from jwiegley’s overlay MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit original src: https://github.com/jwiegley/nix-config/blob/f85c560bf8165fecbbd6a28bc2ba0ebbafeb3cf3/overlays/10-emacs.nix --- pkgs/applications/editors/emacs/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index b82f97e445f6..67afdb24cd47 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -40,6 +40,12 @@ stdenv.mkDerivation rec { ./clean-env.patch ]; + postPatch = lib.optionalString srcRepo '' + rm -fr .git + ''; + + CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=101200"; + nativeBuildInputs = [ pkgconfig ] ++ lib.optionals srcRepo [ autoconf automake texinfo ] ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; -- cgit 1.4.1