Merge commit 'beff2f8d75ef2c65017fb25e251337c6bb2e950d'

v#	modified:   nixpkgs/pkgs/tools/networking/dhcpcd/default.nix

1 files changed, 7 insertions, 15 deletions

diff --git a/nixpkgs/pkgs/applications/office/watson/default.nix b/nixpkgs/pkgs/applications/office/watson/default.nix
index e0f0c58b4506..16df0b294c16 100644
--- a/nixpkgs/pkgs/applications/office/watson/default.nix
+++ b/nixpkgs/pkgs/applications/office/watson/default.nix
@@ -3,27 +3,19 @@
 with pythonPackages;
 
 buildPythonApplication rec {
-  pname = "td-watson";
-  version = "1.5.2";
+  pname = "watson";
+  version = "1.7.0";
 
   src = fetchPypi {
-    inherit version pname;
-    sha256 = "6e03d44a9278807fe5245e9ed0943f13ffb88e11249a02655c84cb86260b27c8";
+    inherit version;
+    pname = "td-watson";
+    sha256 = "249313996751f32f38817d424cbf8d74956461df1439f0ee3a962fcc3c77225d";
   };
 
-  # uses tox, test invocation fails
-  doCheck = true;
   checkPhase = ''
-    py.test -vs tests
+    pytest -vs tests
  '';
 
-  patches = [
-    (fetchpatch {
-      url = https://github.com/TailorDev/Watson/commit/f5760c71cbc22de4e12ede8f6f7257515a9064d3.patch;
-      sha256 = "0s9h26915ilpbd0qhmvk77r3gmrsdrl5l7dqxj0l5q66fp0z6b0g";
-    })
-  ];
-
   checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ];
   propagatedBuildInputs = [ requests click arrow ];
 
@@ -31,6 +23,6 @@ buildPythonApplication rec {
     homepage = https://tailordev.github.io/Watson/;
     description = "A wonderful CLI to track your time!";
     license = licenses.mit;
-    maintainers = with maintainers; [ mguentner ] ;
+    maintainers = with maintainers; [ mguentner nathyong ] ;
   };
 }