JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gitaly: use custom libgit2 commit

Browse Source
This commit is contained in:
Yureka 2021-11-29 18:37:36 +01:00
parent e2668f6a7b
commit f146c92955
No known key found for this signature in database
GPG Key ID: B95AE06334AFF6BA
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@ -4,6 +4,18 @@
, libgit2, openssl, zlib, pcre, http-parser }:
let
# git2go 32.0.5 does not support libgit2 1.2.0 or 1.3.0.
# It needs a specific commit in between those two releases.
libgit2_custom = libgit2.overrideAttrs (oldAttrs: rec {
version = "1.2.0";
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "109b4c887ffb63962c7017a66fc4a1f48becb48e";
sha256 = "sha256-w029FHpOv5K49wE1OJMOlkTe+2cv+ORYqEHxs59GDBI=";
};
});
rubyEnv = bundlerEnv rec {
name = "gitaly-env";
inherit ruby;
@ -46,7 +58,7 @@ buildGoModule {
tags = [ "static,system_libgit2" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ];
buildInputs = [ rubyEnv.wrappedRuby libgit2_custom openssl zlib pcre http-parser ];
doCheck = false;
postInstall = ''

4
pkgs/top-level/all-packages.nix
View File

@ -5753,9 +5753,7 @@ with pkgs;
gitleaks = callPackage ../tools/security/gitleaks { };
gitaly = callPackage ../applications/version-management/gitlab/gitaly {
libgit2 = libgit2_1_1; # git2go only supports v1.1.x
};
gitaly = callPackage ../applications/version-management/gitlab/gitaly { };
gitstats = callPackage ../applications/version-management/gitstats { };