From c6b3be2e9a3af01ab3a8a8f9b4508e6a276ebcf9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 14:13:21 +0100 Subject: [PATCH] watson: 1.4.0 -> 1.5.2, fix build with patch --- pkgs/applications/office/watson/default.nix | 27 ++++++++++++++------- 1 file 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 +}