Merge pull request #144042 from SuperSandro2000/cleanup

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

@@ -2,29 +2,32 @@
 , buildPythonPackage
 , fetchFromGitHub
 , stdenv
-, darwin
+, AudioToolbox
+, AudioUnit
+, CoreServices
 }:
 
 buildPythonPackage rec {
   pname = "audiotools";
   version = "3.1.1";
 
-  buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+  buildInputs = lib.optionals stdenv.isDarwin [
     AudioToolbox
     AudioUnit
     CoreServices
-  ]);
+  ];
 
   src = fetchFromGitHub {
     owner = "tuffy";
     repo = "python-audio-tools";
-    rev = "v3.1.1";
+    rev = "v${version}";
     sha256 = "sha256-y+EiK9BktyTWowOiJvOb2YjtbPa7R62Wb5zinkyt1OM=";
   };
 
-  meta = {
+  meta = with lib; {
     description = "Utilities and Python modules for handling audio";
     homepage = "http://audiotools.sourceforge.net/";
-    license = lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ ];
   };
 }

pkgs/development/python-modules/livestreamer-curses/default.nix

@@ -6,14 +6,14 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.5.2";
   pname = "livestreamer-curses";
+  version = "1.5.2";
   disabled = isPyPy;
 
   src = fetchFromGitHub {
     owner = "gapato";
     repo = "livestreamer-curses";
-    rev = "v1.5.2";
+    rev = "v${version}";
     sha256 = "sha256-Pi0PIOUhMMAWft9ackB04IgF6DyPrXppNqyVjozIjN4=";
   };
 
@@ -23,6 +23,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/gapato/livestreamer-curses";
     description = "Curses frontend for livestreamer";
     license = licenses.mit;
+    maintainers = with maintainers; [ ];
   };
-
 }

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

@@ -1,42 +1,37 @@
 { lib
 , buildPythonPackage
-, pkgs
 , fetchFromGitHub
 , isPyPy
+, makeWrapper
+, rtmpdump
 , pycrypto
 , requests
-, singledispatch ? null
-, futures ? null
 , isPy27
 }:
 
 buildPythonPackage rec {
-  version = "1.12.2";
   pname = "livestreamer";
+  version = "1.12.2";
   disabled = isPyPy;
 
   src = fetchFromGitHub {
     owner = "chrippa";
     repo = "livestreamer";
-    rev = "v1.12.2";
+    rev = "v${version}";
     sha256 = "sha256-PqqyBh+oMmu7Ynly3fqx/+6mQYX+6SpI0Okj2O+YLz0=";
   };
 
-  nativeBuildInputs = [ pkgs.makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
-  propagatedBuildInputs = [ pkgs.rtmpdump pycrypto requests ]
-    ++ lib.optionals isPy27 [ singledispatch futures ];
+  propagatedBuildInputs = [ rtmpdump pycrypto requests ];
 
   postInstall = ''
-    wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin
+    wrapProgram $out/bin/livestreamer --prefix PATH : ${lib.makeBinPath [ rtmpdump ]}
   '';
 
   meta = with lib; {
     homepage = "http://livestreamer.tanuki.se";
-    description = ''
-      Livestreamer is CLI program that extracts streams from various
-      services and pipes them into a video player of choice.
-    '';
+    description = "Livestreamer is CLI program that extracts streams from various services and pipes them into a video player of choice";
     license = licenses.bsd2;
     maintainers = with maintainers; [ ];
   };

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

@@ -1,4 +1,5 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pytest, mock }:
+{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, mock }:
+
 buildPythonPackage rec {
   pname = "pep257";
   version = "0.7.0";
@@ -6,20 +7,17 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "GreenSteam";
     repo = "pep257";
-    rev = "0.7.0";
+    rev = version;
     sha256 = "sha256-RkE9kkNkRTmZ8zJVwQzMsxU1hcjlxX6UA+ehnareynQ=";
   };
 
-  checkInputs = [ pytest mock ];
-
-  checkPhase = ''
-    py.test
-  '';
+  checkInputs = [ pytestCheckHook mock ];
 
   meta = with lib; {
     homepage = "https://github.com/GreenSteam/pep257/";
     description = "Python docstring style checker";
     longDescription = "Static analysis tool for checking compliance with Python PEP 257.";
     license = licenses.mit;
+    maintainers = with maintainers; [ ];
   };
 }

pkgs/top-level/python-packages.nix

@@ -695,7 +695,9 @@ in {
 
   audioread = callPackage ../development/python-modules/audioread { };
 
-  audiotools = callPackage ../development/python-modules/audiotools { };
+  audiotools = callPackage ../development/python-modules/audiotools {
+    inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox AudioUnit CoreServices;
+  };
 
   augeas = callPackage ../development/python-modules/augeas {
     inherit (pkgs) augeas;