home

commit 8a921c18e47e84b50e1a8662a242700b039ce388
parent aff8066c6d8d56a1eaf33eb2bff22ecf2b368b60
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Thu,  5 Mar 2020 14:30:01 +0100

Use emacs27 (27.0.99 aka pretest1) 🥚

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
modules/profiles/emacs.nix
 | 
2
+-
A
overlays/patches/.gitkeep
 | 
0

A
overlays/patches/clean-env.patch
 | 
16
++++++++++++++++
A
overlays/patches/tramp-detect-wrapped-gvfsd.patch
 | 
14
++++++++++++++
M
overlays/sbr.nix
 | 
14
++++++++++++++

5 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/modules/profiles/emacs.nix b/modules/profiles/emacs.nix
@@ -47,7 +47,7 @@ in
       };
       programs.emacs = {
         enable = true;
-        package = pkgs.emacs.override { inherit (pkgs) imagemagick; withXwidgets = cfg.withXwidgets; };
+        package = pkgs.emacs27.override { inherit (pkgs) imagemagick; withXwidgets = cfg.withXwidgets; };
         extraPackages = epkgs: with epkgs; [
           ace-window
           aggressive-indent
diff --git a/overlays/patches/.gitkeep b/overlays/patches/.gitkeep
diff --git a/overlays/patches/clean-env.patch b/overlays/patches/clean-env.patch
@@ -0,0 +1,16 @@
+Dump temacs in an empty environment to prevent -dev paths from ending
+up in the dumped image.
+
+diff --git a/src/Makefile.in b/src/Makefile.in
+index fd05a45df5..13f529c253 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -570,7 +570,7 @@ emacs$(EXEEXT): temacs$(EXEEXT) \
+                 lisp.mk $(etc)/DOC $(lisp) \
+                 $(lispsource)/international/charprop.el ${charsets}
+ ifeq ($(DUMPING),unexec)
+-	LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump
++	env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup --temacs=dump
+   ifneq ($(PAXCTL_dumped),)
+ 	      $(PAXCTL_dumped) emacs$(EXEEXT)
+   endif
diff --git a/overlays/patches/tramp-detect-wrapped-gvfsd.patch b/overlays/patches/tramp-detect-wrapped-gvfsd.patch
@@ -0,0 +1,14 @@
+diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
+index 3ce7bbbd4a..e31059da3f 100644
+--- a/lisp/net/tramp-gvfs.el
++++ b/lisp/net/tramp-gvfs.el
+@@ -125,7 +125,8 @@
+ 	 (autoload 'zeroconf-init "zeroconf")
+ 	 (tramp-compat-funcall 'dbus-get-unique-name :system)
+ 	 (tramp-compat-funcall 'dbus-get-unique-name :session)
+-	 (or (tramp-process-running-p "gvfs-fuse-daemon")
++	 (or (tramp-process-running-p ".gvfsd-fuse-wrapped")
++             (tramp-process-running-p "gvfs-fuse-daemon")
+ 	     (tramp-process-running-p "gvfsd-fuse"))))
+   "Non-nil when GVFS is available.")
+ 
diff --git a/overlays/sbr.nix b/overlays/sbr.nix
@@ -9,4 +9,18 @@ self: super:
   vscodeliveshare = import ../pkgs/vscodeliveshare {
     inherit (self) stdenv vscode-utils autoPatchelfHook xorg gnome3 utillinux openssl icu zlib curl lttng-ust libsecret libkrb5 gcc libunwind binutils;
   };
+  emacs27 = (self.emacs.override { srcRepo = true; }).overrideAttrs(old: {
+    name = "emacs-dev";
+    version = "27.0.99";
+    src = super.fetchFromGitHub {
+      owner = "emacs-mirror";
+      repo = "emacs";
+      rev = "emacs-27.0.90";
+      sha256 = "13n82lxbhmkcmlzbh0nml8ydxyfvz8g7wsdq7nszlwmq914gb5nk";
+    };
+    buildInputs = old.buildInputs ++ [ super.jansson ];
+    patches = [
+      ./patches/clean-env.patch
+    ];
+  });
 }