about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMartin Weinelt <mweinelt@users.noreply.github.com>2021-01-16 19:32:27 +0100
committerGitHub <noreply@github.com>2021-01-16 19:32:27 +0100
commitafc9b7bb5f3d75deaab5dbca7d95d2187f6ef14a (patch)
tree41cc1b6c82bd1a44e536ac2de83225ec578baeef /pkgs
parent95433ce96889f0efe60b30e075347958c6c0f9bd (diff)
parent8f3670754111aa97027385c4f714015b4c5c5733 (diff)
Merge pull request #109525 from dotlambda/fritzconnection-1.4.0
python3Packages.fritzconnection: 1.2.1 -> 1.4.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/fritzconnection/default.nix25
1 files changed, 7 insertions, 18 deletions
diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix
index 05999d8da79f6..571fba1a8acd5 100644
--- a/pkgs/development/python-modules/fritzconnection/default.nix
+++ b/pkgs/development/python-modules/fritzconnection/default.nix
@@ -1,37 +1,26 @@
-{ lib, stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pytest, requests }:
+{ lib, stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pytestCheckHook, requests }:
 
 buildPythonPackage rec {
   pname = "fritzconnection";
-  version = "1.2.1";
+  version = "1.4.0";
 
+  # no tests on PyPI
   src = fetchFromGitHub {
     owner = "kbr";
     repo = pname;
     rev = version;
-    sha256 = "17z4shs56ci9mxmilppv5xy9gbnbp6p1h2ms6x55nkvwndacrp7x";
+    sha256 = "1p8dqcc75xfhyvc9izjzz8c7qfrdkjkrkj36j7ms5fimn5bwk70q";
   };
 
-  disabled = pythonOlder "3.5";
-
-  # Exclude test files from build, which cause ImportMismtachErrors and
-  # otherwise missing resources during tests. This patch can be dropped once
-  # https://github.com/kbr/fritzconnection/pull/39 is merged.
-  prePatch = ''
-    substituteInPlace setup.py \
-      --replace 'find_packages()' 'find_packages(exclude=["*.tests"])'
-  '';
+  disabled = pythonOlder "3.6";
 
   propagatedBuildInputs = [ requests ];
 
-  checkInputs = [ pytest ];
-
-  checkPhase = ''
-    pytest
-  '';
+  checkInputs = [ pytestCheckHook ];
 
   meta = with lib; {
     description = "Python-Tool to communicate with the AVM FritzBox using the TR-064 protocol";
-    homepage = "https://bitbucket.org/kbr/fritzconnection";
+    homepage = "https://github.com/kbr/fritzconnection";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda valodim ];
   };