diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/git-aggregator/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/git-aggregator/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/tools/git-aggregator/default.nix b/nixpkgs/pkgs/development/tools/git-aggregator/default.nix index a6599c667c86..9b2465366f67 100644 --- a/nixpkgs/pkgs/development/tools/git-aggregator/default.nix +++ b/nixpkgs/pkgs/development/tools/git-aggregator/default.nix @@ -1,17 +1,18 @@ -{ git, lib, python3Packages }: +{ lib, git, python3Packages }: python3Packages.buildPythonApplication rec { pname = "git-aggregator"; - version = "1.8.1"; + version = "2.1.0"; src = python3Packages.fetchPypi { inherit pname version; - hash = "sha256-LLsyhyhPmOOvPzwEEJwkhrDfBMFueA7kuDlnrqwr08k="; + sha256 = "sha256-79xNPzYP1j71sU5wZM5e2xTqQExqQEdxXPxbk4T/Scw="; }; nativeBuildInputs = with python3Packages; [ setuptools-scm ]; + propagatedBuildInputs = with python3Packages; [ argcomplete colorama @@ -25,13 +26,15 @@ python3Packages.buildPythonApplication rec { ]; preCheck = '' - export HOME=`mktemp -d` + export HOME="$(mktemp -d)" git config --global user.name John git config --global user.email john@localhost + git config --global init.defaultBranch master + git config --global pull.rebase false ''; meta = with lib; { - description = "Manage the aggregation of git branches from different remotes to build a consolidated one."; + description = "Manage the aggregation of git branches from different remotes to build a consolidated one"; homepage = "https://github.com/acsone/git-aggregator"; license = licenses.agpl3Plus; maintainers = with maintainers; [ lourkeur ]; |