Merge pull request #59377 from adisbladis/emacs26_2

emacs: 26.1 -> 26.2
NixOS · Apr 13, 2019 · f5f0da3 · f5f0da3
2 parents 282f6df + abedaef
commit f5f0da3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 15 deletions.
diff --git a/pkgs/applications/editors/emacs/clean-env-macport.patch b/pkgs/applications/editors/emacs/clean-env-macport.patch
@@ -0,0 +1,15 @@
+Dump temacs in an empty environment to prevent -dev paths from ending
+up in the dumped image.
+
+diff -ru -x '*~' emacs-25.3/src/Makefile.in emacs-25.3-new/src/Makefile.in
+--- emacs-25.3/src/Makefile.in	2017-04-14 17:02:47.000000000 +0200
++++ emacs-25.3-new/src/Makefile.in	2017-09-25 19:03:02.173861038 +0200
+@@ -532,7 +532,7 @@
+ ifeq ($(CANNOT_DUMP),yes)
+ 	ln -f temacs$(EXEEXT) $@
+ else
+-	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/clean-env.patch b/pkgs/applications/editors/emacs/clean-env.patch
@@ -1,13 +1,13 @@
 Dump temacs in an empty environment to prevent -dev paths from ending
 up in the dumped image.
 
-diff -ru -x '*~' emacs-25.3/src/Makefile.in emacs-25.3-new/src/Makefile.in
---- emacs-25.3/src/Makefile.in	2017-04-14 17:02:47.000000000 +0200
-+++ emacs-25.3-new/src/Makefile.in	2017-09-25 19:03:02.173861038 +0200
-@@ -532,7 +532,7 @@
- ifeq ($(CANNOT_DUMP),yes)
+diff --git a/src/Makefile.in b/src/Makefile.in
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -535,7 +535,7 @@ ifeq ($(CANNOT_DUMP),yes)
  	ln -f temacs$(EXEEXT) $@
  else
+ 	unset EMACS_HEAP_EXEC; \
 -	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),)

diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
@@ -31,26 +31,19 @@ let
 in
 stdenv.mkDerivation rec {
   name = "emacs-${version}${versionModifier}";
-  version = "26.1";
+  version = "26.2";
   versionModifier = "";
 
   src = fetchurl {
     url = "mirror://gnu/emacs/${name}.tar.xz";
-    sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w";
+    sha256 = "13n5m60i47k96mpv5pp6km2ph9rv2m5lmbpzj929v02vpsfyc70m";
   };
 
   enableParallelBuilding = true;
 
   patches = [
     ./clean-env.patch
     ./tramp-detect-wrapped-gvfsd.patch
-
-    # should drop this at next package update
-    (fetchpatch {
-      name = "support-hunspell-1.7.0-in-ispell.el.patch";
-      url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=2925ce5a7ec1424cfaea9f2f86bd3cab27832584";
-      sha256 = "0w7cgw6zgr7phbivb98innps1rlqf5q2lhwkrwdmai8sbca5bd11";
-    })
   ];
 
   postPatch = lib.optionalString srcRepo ''

diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     sha256 = "0f2wzdw2a3ac581322b2y79rlj3c9f33ddrq9allj97r1si6v5xk";
   };
 
-  patches = [ ./clean-env.patch ];
+  patches = [ ./clean-env-macport.patch ];
 
   enableParallelBuilding = true;