From 7c1859020820152c7d5292e2bec78cc1dd3e7034 Mon Sep 17 00:00:00 2001 From: paumr Date: Tue, 28 Apr 2020 08:40:36 +0200 Subject: [PATCH 1/2] watson: format with nixpkgs-fmt --- pkgs/applications/office/watson/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index 160e82100836..e18756d8d172 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -1,4 +1,3 @@ -{ stdenv, pythonPackages, fetchpatch }: with pythonPackages; @@ -14,7 +13,7 @@ buildPythonApplication rec { checkPhase = '' pytest -vs tests - ''; + ''; checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ]; propagatedBuildInputs = [ requests click arrow ]; @@ -23,6 +22,6 @@ buildPythonApplication rec { homepage = "https://tailordev.github.io/Watson/"; description = "A wonderful CLI to track your time!"; license = licenses.mit; - maintainers = with maintainers; [ mguentner nathyong ] ; + maintainers = with maintainers; [ mguentner nathyong ]; }; } From 2d0a06377ad2fda40c62fd2f5885328ea7a54281 Mon Sep 17 00:00:00 2001 From: paumr Date: Tue, 28 Apr 2020 08:46:48 +0200 Subject: [PATCH 2/2] watson: added bash/zsh completions --- pkgs/applications/office/watson/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index e18756d8d172..52c94ce378e1 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -1,3 +1,4 @@ +{ stdenv, pythonPackages, fetchpatch, installShellFiles }: with pythonPackages; @@ -15,8 +16,14 @@ buildPythonApplication rec { pytest -vs tests ''; + postInstall = '' + installShellCompletion --bash --name watson watson.completion + installShellCompletion --zsh --name _watson watson.zsh-completion + ''; + checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ]; propagatedBuildInputs = [ requests click arrow ]; + nativeBuildInputs = [ installShellFiles ]; meta = with stdenv.lib; { homepage = "https://tailordev.github.io/Watson/";