Merge pull request #144851 from c0deaddict/zhf/gitaly

This commit is contained in:
Sandro 2021-11-08 13:39:38 +01:00 committed by GitHub
commit 28f9677cec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions

View file

@ -20,6 +20,7 @@ let
};
};
};
version = "14.4.1";
gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}";
in

View file

@ -5681,7 +5681,9 @@ with pkgs;
gitleaks = callPackage ../tools/security/gitleaks { };
gitaly = callPackage ../applications/version-management/gitlab/gitaly { };
gitaly = callPackage ../applications/version-management/gitlab/gitaly {
libgit2 = libgit2_1_1; # git2go only supports v1.1.x
};
gitstats = callPackage ../applications/version-management/gitstats { };
@ -16309,6 +16311,16 @@ with pkgs;
];
});
libgit2_1_1 = libgit2.overrideAttrs (oldAttrs: rec {
version = "1.1.1";
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "sha256-SxceIxT0aeiiiZCeSIe6EOa+MyVpQVaiv/ZZn6fkwIc=";
};
});
libgit2-glib = callPackage ../development/libraries/libgit2-glib { };
libhsts = callPackage ../development/libraries/libhsts { };