diff options
| author | Yureka <yuka@yuka.dev> | 2021-11-29 18:37:36 +0100 |
|---|---|---|
| committer | Yureka <yuka@yuka.dev> | 2021-11-29 18:37:36 +0100 |
| commit | f146c92955309ecc4d8be5c29be6028b97557703 (patch) | |
| tree | ccc819369a3bc08645fde83b8233b7c64e5d7062 /pkgs | |
| parent | e2668f6a7b9ddf2852d85720ad78d019c7379c5c (diff) | |
| download | nixpkgs-f146c92955309ecc4d8be5c29be6028b97557703.tar nixpkgs-f146c92955309ecc4d8be5c29be6028b97557703.tar.gz nixpkgs-f146c92955309ecc4d8be5c29be6028b97557703.tar.bz2 nixpkgs-f146c92955309ecc4d8be5c29be6028b97557703.tar.lz nixpkgs-f146c92955309ecc4d8be5c29be6028b97557703.tar.xz nixpkgs-f146c92955309ecc4d8be5c29be6028b97557703.tar.zst nixpkgs-f146c92955309ecc4d8be5c29be6028b97557703.zip | |
gitaly: use custom libgit2 commit
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/version-management/gitlab/gitaly/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index c997bb01968..4dacc906a3a 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67756bb1451..989847dbe0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |