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, 3 insertions, 20 deletions

diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix
index 1c11a2abff57..c28a17743421 100644
--- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix
+++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix
@@ -1,10 +1,10 @@
 { lib
-, stdenv
+, trivialBuild
 , fetchFromGitHub
 , emacs
 }:
 
-stdenv.mkDerivation {
+trivialBuild {
   pname = "isearch-plus";
   version = "3434+unstable=2021-08-23";
 
@@ -15,28 +15,11 @@ stdenv.mkDerivation {
     hash = "sha256-kD+Fyps3fc5YK6ATU1nrkKHazGMYJnU2gRcpQZf6A1E=";
   };
 
-  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 = with lib; {
     homepage = "https://www.emacswiki.org/emacs/IsearchPlus";
     description = "Extensions to isearch";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ leungbk AndersonTorres ];
-    platforms = emacs.meta.platforms;
+    inherit (emacs.meta) platforms;
   };
 }