Merge staging-next into staging

2 files changed, 8 insertions, 4 deletions

diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el
index 34addc33a59c1..de4708b889089 100644
--- a/pkgs/applications/editors/emacs/site-start.el
+++ b/pkgs/applications/editors/emacs/site-start.el
@@ -1,6 +1,7 @@
+;; -*- lexical-binding: t; -*-
 (defun nix--profile-paths ()
-  "Returns a list of all paths in the NIX_PROFILES environment
-variable, ordered from more-specific (the user profile) to the
+  "Return a list of all paths in NIX_PROFILES.
+The list is ordered from more-specific (the user profile) to the
 least specific (the system profile)"
   (reverse (split-string (or (getenv "NIX_PROFILES") ""))))
 
@@ -23,6 +24,7 @@ least specific (the system profile)"
 
 
 ;;; Make `woman' find the man pages
+(defvar woman-manpath)
 (eval-after-load 'woman
   '(setq woman-manpath
          (append (mapcar (lambda (x) (concat x "/share/man/"))
@@ -30,6 +32,7 @@ least specific (the system profile)"
                  woman-manpath)))
 
 ;;; Make tramp work for remote NixOS machines
+(defvar tramp-remote-path)
 (eval-after-load 'tramp-sh
   ;; TODO: We should also add the other `NIX_PROFILES' to this path.
   ;; However, these are user-specific, so we would need to discover
@@ -42,6 +45,7 @@ least specific (the system profile)"
 ;;; the current file:
 ;;; from: /nix/store/<hash>-emacs-<version>/share/emacs/site-lisp/site-start.el
 ;;; to:   /nix/store/<hash>-emacs-<version>/share/emacs/<version>/src/
+(defvar find-function-C-source-directory)
 (let ((emacs
        (file-name-directory                      ; .../emacs/
         (directory-file-name                     ; .../emacs/site-lisp
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 353d383e017c2..0d0877015eee9 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -21,13 +21,13 @@ let
 in
   stdenv.mkDerivation rec {
     name = "neovim-unwrapped-${version}";
-    version = "0.3.7";
+    version = "0.3.8";
 
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "neovim";
       rev = "v${version}";
-      sha256 = "1j6w5jvq5v7kf7diad91qs1acr427nidnk9s24yyrz0hwdd1c2lh";
+      sha256 = "15flii3p4g9f65xy9jpkb8liajrvhm5ck4j39z6d6b1nkxr6ghwb";
     };
 
     patches = [