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, 0 insertions, 38 deletions

diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/mu4e-patch/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/mu4e-patch/default.nix
deleted file mode 100644
index 4a436339ebc4..000000000000
--- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/mu4e-patch/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchFromGitHub, emacs, lib }:
-
-stdenv.mkDerivation {
-  pname = "mu4e-patch";
-  version = "2019-05-09";
-
-  src = fetchFromGitHub {
-    owner = "seanfarley";
-    repo = "mu4e-patch";
-    rev = "522da46c1653b1cacc79cde91d6534da7ae9517d";
-    sha256 = "sha256-1lV4dDuCdyCUXi/In2DzYJPEHuAc9Jfbz2ZecNZwn4I=";
-  };
-
-  buildInputs = [
-    emacs
-  ];
-
-  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
-  '';
-
-  meta = {
-    description = "Colorize patch emails in mu4e";
-    homepage = "https://github.com/seanfarley/mu4e-patch";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ leungbk ];
-    platforms = emacs.meta.platforms;
-  };
-}