diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2020-06-07 19:50:15 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-07 19:50:15 -0500 |
commit | e3a86263ad85742cd07b102537f0cab091545bc4 (patch) | |
tree | 8675d4b2a361aca792a55835f14b97179c92b4ca /pkgs/applications/office | |
parent | 524e24c9ff2920e3a0617a2fa38566bb79e147b3 (diff) | |
parent | 1e3559fe19039cdcd5cba8f5ead869ea14567a40 (diff) |
Merge pull request #89764 from geistesk/watson-1.9.0
watson: 1.8.0 -> 1.9.0
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/watson/default.nix | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index 52c94ce378e1f..5d4b915edfb5e 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -1,17 +1,27 @@ -{ stdenv, pythonPackages, fetchpatch, installShellFiles }: +{ stdenv, fetchFromGitHub, pythonPackages, fetchpatch, installShellFiles }: with pythonPackages; buildPythonApplication rec { pname = "watson"; - version = "1.8.0"; + version = "1.9.0"; - src = fetchPypi { - inherit version; - pname = "td-watson"; - sha256 = "1ip66jhbcqifdw1avbhngwym0vv7fsqxgbph11da5wlqwfwp060n"; + src = fetchFromGitHub { + owner = "TailorDev"; + repo = "Watson"; + rev = version; + sha256 = "0f0ldwadjf0xncx3m4w4wwqddd4wjwcsrbhby8vgsnqsn48dnfcx"; }; + patches = [ + # https://github.com/TailorDev/Watson/pull/380 + # The nixpkgs' arrow version is too new / not supported by Watson's latest release. + (fetchpatch { + url = "https://github.com/TailorDev/Watson/commit/69b9ad25551525d52060f7fb2eef3653e872a455.patch"; + sha256 = "0zrswgr0y219f92zi41m7cymfaspkhmlada4v9ijnsjjdb4bn2c9"; + }) + ]; + checkPhase = '' pytest -vs tests ''; @@ -21,8 +31,8 @@ buildPythonApplication rec { installShellCompletion --zsh --name _watson watson.zsh-completion ''; - checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ]; - propagatedBuildInputs = [ requests click arrow ]; + checkInputs = [ py pytest pytest-datafiles pytest-mock pytestrunner ]; + propagatedBuildInputs = [ arrow click click-didyoumean requests ]; nativeBuildInputs = [ installShellFiles ]; meta = with stdenv.lib; { |