Merge staging-next into staging

5 files changed, 9 insertions, 14 deletions

diff --git a/pkgs/tools/audio/botamusique/default.nix b/pkgs/tools/audio/botamusique/default.nix
index 5eaaa9c873e37..02460f61d93ba 100644
--- a/pkgs/tools/audio/botamusique/default.nix
+++ b/pkgs/tools/audio/botamusique/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , python3Packages
 , ffmpeg
 , makeWrapper
diff --git a/pkgs/tools/audio/isrcsubmit/default.nix b/pkgs/tools/audio/isrcsubmit/default.nix
index fa01756f89825..f135cccbc6cda 100644
--- a/pkgs/tools/audio/isrcsubmit/default.nix
+++ b/pkgs/tools/audio/isrcsubmit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python3Packages }:
+{ lib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
   pname = "isrcsubmit";
diff --git a/pkgs/tools/audio/kaldi/default.nix b/pkgs/tools/audio/kaldi/default.nix
index 777a7535a10c2..7ea5cf622b57e 100644
--- a/pkgs/tools/audio/kaldi/default.nix
+++ b/pkgs/tools/audio/kaldi/default.nix
@@ -7,7 +7,6 @@
 , cmake
 , pkg-config
 , fetchFromGitHub
-, git
 , python3
 , Accelerate
 , _experimental-update-script-combinators
@@ -88,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
         updateSource
         updateOpenfst
       ];
-    };
+  };
 
   meta = with lib; {
     description = "Speech Recognition Toolkit";
diff --git a/pkgs/tools/audio/midimonster/default.nix b/pkgs/tools/audio/midimonster/default.nix
index 841704427c2b4..ec55367474f5f 100644
--- a/pkgs/tools/audio/midimonster/default.nix
+++ b/pkgs/tools/audio/midimonster/default.nix
@@ -1,7 +1,5 @@
 { lib
 , stdenv
-, fetchurl
-, zlib
 , fetchFromGitHub
 , gnumake
 , gcc
@@ -15,7 +13,7 @@
 , libevdev
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "midimonster";
   version = "0.6.0";
 
@@ -27,7 +25,7 @@ stdenv.mkDerivation rec {
     owner = "cbdevnet";
     rev = "f16f7db86662fcdbf45b6373257c90c824b0b4b0";
     sha256 = "131zs4j9asq9xl72cbyi463xpkj064ca1s7i77q5jrwqysgy52sp";
-};
+  };
 
   doCheck = true;
   enableParallelBuilding = true;
diff --git a/pkgs/tools/audio/mpd-notification/default.nix b/pkgs/tools/audio/mpd-notification/default.nix
index 66f6d1880a613..03b632ae7e0ef 100644
--- a/pkgs/tools/audio/mpd-notification/default.nix
+++ b/pkgs/tools/audio/mpd-notification/default.nix
@@ -2,7 +2,6 @@
 , stdenv
 , pkg-config
 , fetchFromGitHub
-, systemd
 , file
 , iniparser
 , ffmpeg
@@ -33,9 +32,9 @@ stdenv.mkDerivation rec {
     ffmpeg
     libmpdclient
     discount
-   ];
+  ];
 
-   installPhase = ''
+  installPhase = ''
     runHook preInstall
 
     mkdir -p $out/bin
@@ -48,10 +47,10 @@ stdenv.mkDerivation rec {
   '';
 
   postPatch = ''
-   substituteInPlace systemd/mpd-notification.service --replace /usr $out
- '';
+    substituteInPlace systemd/mpd-notification.service --replace /usr $out
+  '';
 
-   meta = with lib; {
+  meta = with lib; {
     description = "Notifications for mpd";
     homepage = "https://github.com/eworm-de/mpd-notification";
     license = licenses.gpl3Plus;