Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'

1 files changed, 29 insertions, 8 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix b/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix
index 8445f6d7e89e..67344d8a5744 100644
--- a/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix
@@ -1,22 +1,43 @@
-{ lib, fetchPypi, buildPythonPackage, pythonOlder, aiohttp }:
+{ lib
+, aiohttp
+, buildPythonPackage
+, fetchFromGitHub
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+}:
 
 buildPythonPackage rec {
   pname = "pysqueezebox";
-  version = "0.5.5";
+  version = "0.6.0";
+  format = "setuptools";
+
   disabled = pythonOlder "3.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "93e6a3824b560d4ea2b2e5f0a67fdf3b309b6194fbf9927e44fc0d12c7fdc6c0";
+  src = fetchFromGitHub {
+    owner = "rajlaud";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-0ArKVRy4H0NWShlQMziKvbHp9OjpAkEKp4zrvpVlXOk=";
   };
 
   propagatedBuildInputs = [
     aiohttp
   ];
 
-  # No tests in the Pypi distribution
-  doCheck = false;
-  pythonImportsCheck = [ "pysqueezebox" ];
+  checkInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "pysqueezebox"
+  ];
+
+  disabledTestPaths = [
+    # Tests require network access
+    "tests/test_integration.py"
+  ];
 
   meta = with lib; {
     description = "Asynchronous library to control Logitech Media Server";