Revert "Merge branch 'master' into staging-next"

This reverts commit f19b7b03a0, reversing
changes made to 572a864d02.

Sorry. I pushed the wrong staging-next (the one that had my master
merged in). This was not intended.

pkgs/development/python-modules/keystone/default.nix

@@ -1,16 +0,0 @@
-{ lib
-, buildPythonPackage
-, keystone
-}:
-
-buildPythonPackage rec {
-  inherit (keystone) pname src version buildInputs nativeBuildInputs;
-
-  dontUseCmakeConfigure = 1;
-  preBuild = "cd bindings/python";
-
-  meta = with lib; {
-    inherit (keystone.meta) description license homepage;
-    maintainers = [ maintainers.mic92 ];
-  };
-}

pkgs/development/python-modules/pyworld/default.nix

@@ -1,31 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, numpy
-, cython
-}:
-
-buildPythonPackage rec {
-  pname = "pyworld";
-  version = "0.2.12";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "896c910696975855578d855f490f94d7a57119e0a75f7f15e11fdf58ba891627";
-  };
-
-  nativeBuildInputs = [
-    cython
-  ];
-
-  propagatedBuildInputs = [
-    numpy
-  ];
-
-  meta = with lib; {
-    description = "PyWorld is a Python wrapper for WORLD vocoder";
-    homepage = https://github.com/JeremyCCHsu/Python-Wrapper-for-World-Vocoder;
-    license = licenses.mit;
-    maintainers = [ maintainers.mic92 ];
-  };
-}