From 039e37580aa9e64424028d0c943697b343149f9b Mon Sep 17 00:00:00 2001
From: legendofmiracles <legendofmiracles@protonmail.com>
Date: Fri, 5 Nov 2021 16:41:28 -0600
Subject: [PATCH] git-aggregator: 1.8.1 -> 2.10, fixes build

---
 pkgs/development/tools/git-aggregator/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/git-aggregator/default.nix b/pkgs/development/tools/git-aggregator/default.nix
index a6599c667c8..9b2465366f6 100644
--- a/pkgs/development/tools/git-aggregator/default.nix
+++ b/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 ];