Merge staging-next into staging

2018-12-07 15:31:52 +01:00
parent 4deb04a97a 12e8ec041a
commit 747aa4cc93
225 changed files with 5366 additions and 4074 deletions
--- a/pkgs/development/python-modules/whisper/default.nix
+++ b/pkgs/development/python-modules/whisper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, six, mock }:
+{ stdenv, buildPythonPackage, fetchPypi, mock, six }:

 buildPythonPackage rec {
  pname = "whisper";
@@ -10,7 +10,6 @@ buildPythonPackage rec {
  };

  propagatedBuildInputs = [ six ];
-
  checkInputs = [ mock ];

  meta = with stdenv.lib; {