From 880c9a85191fc1b33058b374fa5b87851fea8060 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 28 May 2020 09:49:32 +0300 Subject: [PATCH 1/3] gitAndTools.gita: 0.10.5 -> 0.10.9 --- .../version-management/git-and-tools/gita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/pkgs/applications/version-management/git-and-tools/gita/default.nix index c9d188e10e5..38ca3e13d6a 100644 --- a/pkgs/applications/version-management/git-and-tools/gita/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gita/default.nix @@ -6,12 +6,12 @@ }: buildPythonApplication rec { - version = "0.10.5"; + version = "0.10.9"; pname = "gita"; src = fetchPypi { inherit pname version; - sha256 = "1xggslmrrfszpl190klkc97fnl88gml1bnkmkzp6aimdch66g4jg"; + sha256 = "0fbzk9rj895s5fpbnsyy3gxwbf5spqycisx5cqwzxgm0n5qkz9dk"; }; propagatedBuildInputs = [ From abf309e005f3df1a19aa697bf3b5607e81c05a77 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Thu, 28 May 2020 09:56:10 +0300 Subject: [PATCH 2/3] gitAndTools.gita: add bash completion --- .../git-and-tools/gita/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/pkgs/applications/version-management/git-and-tools/gita/default.nix index 38ca3e13d6a..d1a948f44e0 100644 --- a/pkgs/applications/version-management/git-and-tools/gita/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gita/default.nix @@ -1,17 +1,20 @@ { lib , buildPythonApplication -, fetchPypi +, fetchFromGitHub , pyyaml , setuptools +, installShellFiles }: buildPythonApplication rec { version = "0.10.9"; pname = "gita"; - src = fetchPypi { - inherit pname version; - sha256 = "0fbzk9rj895s5fpbnsyy3gxwbf5spqycisx5cqwzxgm0n5qkz9dk"; + src = fetchFromGitHub { + sha256 = "0wilyf4nnn2jyxrfqs8krya3zvhj6x36szsp9xhb6h08g1ihzp5i"; + rev = "v${version}"; + repo = "gita"; + owner = "nosarthur"; }; propagatedBuildInputs = [ @@ -19,6 +22,12 @@ buildPythonApplication rec { setuptools ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --bash --name gita ${src}/.gita-completion.bash + ''; + meta = with lib; { description = "A command-line tool to manage multiple git repos"; homepage = "https://github.com/nosarthur/gita"; From a34547730f65dc0f9e2199a354a6ed2350ef0aba Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 2 Jun 2020 23:35:03 +0300 Subject: [PATCH 3/3] gitAndTools.gita: enable tests --- .../git-and-tools/gita/default.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/gita/default.nix b/pkgs/applications/version-management/git-and-tools/gita/default.nix index d1a948f44e0..5fe6b34fd3b 100644 --- a/pkgs/applications/version-management/git-and-tools/gita/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gita/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonApplication , fetchFromGitHub +, git +, pytest , pyyaml , setuptools , installShellFiles @@ -24,6 +26,23 @@ buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; + postUnpack = '' + for case in "\n" ""; do + substituteInPlace source/tests/test_main.py \ + --replace "'gita$case'" "'source$case'" + done + ''; + + checkInputs = [ + git + pytest + ]; + + checkPhase = '' + git init + pytest tests + ''; + postInstall = '' installShellCompletion --bash --name gita ${src}/.gita-completion.bash '';