From 302d33f4d1cfb89ad9cc75cfa9d4247d79899dbb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 12 Oct 2021 00:47:44 +0000 Subject: [PATCH 1/2] git-machete: 3.3.0 -> 3.4.1 --- .../version-management/git-and-tools/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 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 fb5113dad089..edf9ef569f97 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 @@ -11,13 +11,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "0sx45y1d1v6y66msjc1lw9jhjppgbxqj145kivmd7lr6ccw68kav"; + sha256 = "sha256-drfMD9tQe1dc61MH3Cxu9oin137f4FsZJY3X2kDHdh4="; }; nativeBuildInputs = [ installShellFiles ]; From 4c7bf71d8e1d75e8ef1fef7de6b9317728eb105b Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 12 Oct 2021 22:33:23 -0400 Subject: [PATCH 2/2] git-machete: fix version checks --- .../git-and-tools/git-machete/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 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 edf9ef569f97..97b96f7461f6 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 @@ -33,16 +33,15 @@ buildPythonApplication rec { installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh ''; + postInstallCheck = '' + git init + test "$($out/bin/git-machete version)" = "git-machete version ${version}" + ''; + passthru = { updateScript = nix-update-script { attrPath = pname; }; - - tests = { - version = testVersion { - package = git-machete; - }; - }; }; meta = with lib; {