about summary refs log tree commit diff
path: root/pkgs/applications/office
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2017-12-31 14:19:55 +0100
committerGitHub <noreply@github.com>2017-12-31 14:19:55 +0100
commita09a320e203d3e4fa7d5f74270fefe07dd882847 (patch)
tree5d5a877d1f8747694167100fd0dba3644fa11abb /pkgs/applications/office
parent1fcd92ce923d33ab3d8c0b6c6d42473b135f114b (diff)
parent3cf4d2365f62c9f857d5bdb5c91e21387c9be0d9 (diff)
downloadnixlib-a09a320e203d3e4fa7d5f74270fefe07dd882847.tar
nixlib-a09a320e203d3e4fa7d5f74270fefe07dd882847.tar.gz
nixlib-a09a320e203d3e4fa7d5f74270fefe07dd882847.tar.bz2
nixlib-a09a320e203d3e4fa7d5f74270fefe07dd882847.tar.lz
nixlib-a09a320e203d3e4fa7d5f74270fefe07dd882847.tar.xz
nixlib-a09a320e203d3e4fa7d5f74270fefe07dd882847.tar.zst
nixlib-a09a320e203d3e4fa7d5f74270fefe07dd882847.zip
Merge pull request #33204 from NixOS/python-unstable
Python: upgrade package set
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r--pkgs/applications/office/watson/default.nix27
1 files changed, 18 insertions, 9 deletions
diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix
index a1fcfd5de700..e0f0c58b4506 100644
--- a/pkgs/applications/office/watson/default.nix
+++ b/pkgs/applications/office/watson/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, pythonPackages }:
+{ stdenv, pythonPackages, fetchpatch }:
 
-pythonPackages.buildPythonApplication rec {
+with pythonPackages;
+
+buildPythonApplication rec {
   pname = "td-watson";
-  name = "${pname}-${version}";
-  version = "1.4.0";
+  version = "1.5.2";
 
-  src = pythonPackages.fetchPypi {
+  src = fetchPypi {
     inherit version pname;
-    sha256 = "1py0g4990jmvq0dn7jasda7f10kzr41bix46hnbyc1rshjzc17hq";
+    sha256 = "6e03d44a9278807fe5245e9ed0943f13ffb88e11249a02655c84cb86260b27c8";
   };
 
   # uses tox, test invocation fails
@@ -15,8 +16,16 @@ pythonPackages.buildPythonApplication rec {
   checkPhase = ''
     py.test -vs tests
  '';
-  checkInputs = with pythonPackages; [ py pytest pytest-datafiles mock pytest-mock pytestrunner ];
-  propagatedBuildInputs = with pythonPackages; [ requests click arrow ];
+
+  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 ];
 
   meta = with stdenv.lib; {
     homepage = https://tailordev.github.io/Watson/;
@@ -24,4 +33,4 @@ pythonPackages.buildPythonApplication rec {
     license = licenses.mit;
     maintainers = with maintainers; [ mguentner ] ;
   };
-}
\ No newline at end of file
+}