Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'

Conflicts:
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix
	nixpkgs/pkgs/development/node-packages/default.nix
	nixpkgs/pkgs/development/python-modules/priority/deadline.patch

1 files changed, 19 insertions, 31 deletions

diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix
index 74fc1a179219..58c542a57f4f 100644
--- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix
@@ -1,46 +1,34 @@
-{ stdenv, fetchFromGitHub, emacs, emacsPackages, lib }:
+{ lib
+, trivialBuild
+, fetchFromGitHub
+, emacs
+}:
 
-let
-  runtimeDeps = with emacsPackages; [
-    evil
-    markdown-mode
-  ];
-in
-stdenv.mkDerivation {
+trivialBuild rec {
   pname = "evil-markdown";
-  version = "2020-06-01";
+  version = "0.0.0+unstable=2021-07-21";
 
   src = fetchFromGitHub {
     owner = "Somelauw";
     repo = "evil-markdown";
-    rev = "064fe9b4767470472356d20bdd08e2f30ebbc9ac";
-    sha256 = "sha256-Kt2wxG1XCFowavVWtj0urM/yURKegonpZcxTy/+CrJY=";
+    rev = "8e6cc68af83914b2fa9fd3a3b8472573dbcef477";
+    hash = "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=";
   };
 
   buildInputs = [
     emacs
-  ] ++ runtimeDeps;
-
-  propagatedUserEnvPkgs = runtimeDeps;
+  ] ++ propagatedUserEnvPkgs;
 
-  buildPhase = ''
-    runHook preBuild
-    emacs -L . --batch -f batch-byte-compile *.el
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    install -d $out/share/emacs/site-lisp
-    install *.el *.elc $out/share/emacs/site-lisp
-    runHook postInstall
-  '';
+  propagatedUserEnvPkgs = with emacs.pkgs; [
+    evil
+    markdown-mode
+  ];
 
-  meta = {
-    description = "Vim-like keybindings for markdown-mode";
+  meta = with lib; {
     homepage = "https://github.com/Somelauw/evil-markdown";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ leungbk ];
-    platforms = emacs.meta.platforms;
+    description = "Integrates Emacs evil and markdown";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ leungbk ];
+    inherit (emacs.meta) platforms;
   };
 }