From 69b52d2bdf66c90554ea7a6acc2c22d226244190 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 22 Sep 2021 17:45:01 -0400 Subject: [PATCH] git-machete: switch to github version to enable tests --- .../git-and-tools/git-machete/default.nix | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 34a1c2528df2..fb5113dad089 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -1,26 +1,36 @@ -{ lib, buildPythonApplication, fetchPypi -, installShellFiles, pbr -, flake8, mock, pycodestyle, pylint, stestr, tox +{ lib +, buildPythonApplication +, fetchFromGitHub +, installShellFiles +, git +, stestr , nix-update-script -, testVersion, git-machete +, testVersion +, git-machete }: buildPythonApplication rec { pname = "git-machete"; version = "3.3.0"; - src = fetchPypi { - inherit pname version; - sha256 = "0mq6hmb3wvj0ash27h4zyl46l3fikpf0mv3ng330lcy6v7bhy5b8"; + src = fetchFromGitHub { + owner = "virtuslab"; + repo = pname; + rev = "v${version}"; + sha256 = "0sx45y1d1v6y66msjc1lw9jhjppgbxqj145kivmd7lr6ccw68kav"; }; - nativeBuildInputs = [ installShellFiles pbr ]; + nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ flake8 mock pycodestyle pylint stestr tox ]; + checkInputs = [ git stestr ]; + + postCheck = '' + stestr run + ''; postInstall = '' - installShellCompletion --bash --name git-machete completion/git-machete.completion.bash - installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh + installShellCompletion --bash --name git-machete completion/git-machete.completion.bash + installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh ''; passthru = { @@ -39,7 +49,6 @@ buildPythonApplication rec { homepage = "https://github.com/VirtusLab/git-machete"; description = "Git repository organizer and rebase/merge workflow automation tool"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ blitz ]; }; }