diff options
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
8 files changed, 85 insertions, 22 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix index 66dc5ece90a88..16c5b49406f67 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-googledrive/default.nix @@ -1,29 +1,38 @@ { lib -, buildPythonApplication -, fetchPypi , annexremote +, buildPythonApplication , drivelib -, GitPython -, tenacity +, fetchPypi +, gitpython , humanfriendly +, tenacity }: buildPythonApplication rec { pname = "git-annex-remote-googledrive"; version = "1.3.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "0rwjcdvfgzdlfgrn1rrqwwwiqqzyh114qddrbfwd46ld5spry6r1"; }; - propagatedBuildInputs = [ annexremote drivelib GitPython tenacity humanfriendly ]; + propagatedBuildInputs = [ + annexremote + drivelib + gitpython + tenacity + humanfriendly + ]; # while git-annex does come with a testremote command that *could* be used, # testing this special remote obviously depends on authenticating with google doCheck = false; - pythonImportsCheck = [ "git_annex_remote_googledrive" ]; + pythonImportsCheck = [ + "git_annex_remote_googledrive" + ]; meta = with lib; { description = "A git-annex special remote for Google Drive"; diff --git a/pkgs/applications/version-management/git-and-tools/git-privacy/default.nix b/pkgs/applications/version-management/git-and-tools/git-privacy/default.nix index c17654174382a..d162f9ce20ba5 100644 --- a/pkgs/applications/version-management/git-and-tools/git-privacy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-privacy/default.nix @@ -9,8 +9,6 @@ python3.pkgs.buildPythonApplication rec { version = "2.1.0"; format = "setuptools"; - disabled = python3.pythonOlder "3.6"; - src = fetchFromGitHub { owner = "EMPRI-DEVOPS"; repo = pname; @@ -21,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ click git-filter-repo - GitPython + gitpython pynacl setuptools ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-repo-updater/default.nix b/pkgs/applications/version-management/git-and-tools/git-repo-updater/default.nix index d78972aa07bdf..ebea57c1552a8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-repo-updater/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-repo-updater/default.nix @@ -1,5 +1,9 @@ -{ lib, buildPythonApplication, fetchPypi -, colorama, GitPython }: +{ lib +, buildPythonApplication +, colorama +, fetchPypi +, gitpython +}: buildPythonApplication rec { pname = "gitup"; @@ -10,7 +14,10 @@ buildPythonApplication rec { sha256 = "1pa612rcc94nc461zs9sag9p46sycc214622b06gdn35rmwp0y2g"; }; - propagatedBuildInputs = [ colorama GitPython ]; + propagatedBuildInputs = [ + colorama + gitpython + ]; # no tests doCheck = false; @@ -19,7 +26,6 @@ buildPythonApplication rec { description = "Easily update multiple Git repositories at once"; homepage = "https://github.com/earwig/git-repo-updater"; license = licenses.mit; - maintainers = [ maintainers.bdesham ]; - platforms = platforms.all; + maintainers = with maintainers; [bdesham ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-up/default.nix b/pkgs/applications/version-management/git-and-tools/git-up/default.nix index 0a366827e40d5..71ae40e25d35b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-up/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-up/default.nix @@ -1,4 +1,7 @@ -{ lib, pythonPackages, git }: +{ lib +, pythonPackages +, git +}: pythonPackages.buildPythonApplication rec { pname = "git-up"; @@ -10,7 +13,16 @@ pythonPackages.buildPythonApplication rec { }; # git should be on path for tool to work correctly - propagatedBuildInputs = [ git ] ++ (with pythonPackages; [ click colorama docopt GitPython six termcolor ]); + propagatedBuildInputs = [ + git + ] ++ (with pythonPackages; [ + click + colorama + docopt + gitpython + six + termcolor + ]); checkInputs = [ git pythonPackages.nose ]; # git needs to be on path # 1. git fails to run as it cannot detect the email address, so we set it diff --git a/pkgs/applications/version-management/git-and-tools/gitmux/default.nix b/pkgs/applications/version-management/git-and-tools/gitmux/default.nix new file mode 100644 index 0000000000000..7e66985bb8864 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitmux/default.nix @@ -0,0 +1,35 @@ +{ fetchFromGitHub, buildGoModule, lib, testers, gitmux }: + +buildGoModule rec { + pname = "gitmux"; + version = "0.7.10"; + + src = fetchFromGitHub { + owner = "arl"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-kBrE3jU7N8+kdT4tqC6gIGPz3soagStzLy5Iz4vNFI0="; + }; + + vendorSha256 = "sha256-V6xe+19NiHYIIN4rgkyzdP4eGnRXo0aW4fVbdlIcvig="; + + # GitHub source does contain a regression test for the module + # but it requires networking as it git clones a repo from github + doCheck = false; + + ldflags = [ "-X main.version=${version}" ]; + + passthru.tests.version = testers.testVersion { + package = gitmux; + command = "gitmux -V"; + }; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Git in your tmux status bar"; + homepage = "https://github.com/arl/gitmux"; + license = licenses.mit; + maintainers = with maintainers; [ nialov ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix index 6bfc8df1313c2..9d6bbbd13f67c 100644 --- a/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glab"; - version = "1.23.0"; + version = "1.24.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-NHBLaUEWurWnwbLiEsi3/pHqxKcgjjx+oRAGZXxni/Q="; + sha256 = "sha256-CUchYPMBTINkMJg8TC8rKMVkrcj/Gy+ZxV7jbtMFvpg="; }; vendorSha256 = "sha256-NuK63ibb1t+HnSR/gCFS7HWVtfGLazVx2M+qxRNCR1I="; diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index e73d4de6dc41c..38d6d740c83c1 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-tns/JUOYlgG+oiFACnXlCwHBF4enctV4GPlpEZCM/nM="; + sha256 = "sha256-Z6j/Y8b9lq2nYS5Ki8iJoDsG3l5M6RylfDqQL7WrwNg="; }; vendorSha256 = "sha256-sBcgt2YsV9RQhSjPN6N54tRk7nNvcOVhPEsEP+0Dtco="; diff --git a/pkgs/applications/version-management/git-and-tools/legit/default.nix b/pkgs/applications/version-management/git-and-tools/legit/default.nix index df2866527115b..33efad77f9089 100644 --- a/pkgs/applications/version-management/git-and-tools/legit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/legit/default.nix @@ -1,8 +1,11 @@ -{ lib, python3Packages }: +{ lib +, python3Packages +}: python3Packages.buildPythonApplication rec { pname = "legit"; version = "1.2.0"; + src = python3Packages.fetchPypi { inherit pname version; sha256 = "0ngh3ar6v15516f52j21k6qz7hykmxfjadhb2rakvl27b5xvjy1c"; @@ -12,7 +15,7 @@ python3Packages.buildPythonApplication rec { click clint crayons - GitPython + gitpython six ]; |