b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Revert "nixos/gitlab: Use Git 2.35.x to work around git bug"

Browse source 
This reverts commit f94d14899d70150abcf2823e243524397b0c1806.

git 2.35.x became unsupported by gitaly and makes the gitaly systemd
service fail.
This commit is contained in:
M. A 2022-11-23 14:09:03 +00:00
parent ca5f7a9bba
commit 6b3629a3a2
1 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
nixos/modules/services/misc/gitlab.nix
View file

@ -16,22 +16,6 @@ let
else
pkgs.postgresql_12;
# Git 2.36.1 seemingly contains a commit-graph related bug which is
# easily triggered through GitLab, so we downgrade it to 2.35.x
# until this issue is solved. See
# https://gitlab.com/gitlab-org/gitlab/-/issues/360783#note_992870101.
gitPackage =
let
version = "2.35.4";
in
pkgs.git.overrideAttrs (oldAttrs: rec {
inherit version;
src = pkgs.fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "sha256-mv13OdNkXggeKQkJ+47QcJ6lYmcw6Qjri1ZJ2ETCTOk=";
};
});
gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket";
gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket";
pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url;
@ -60,7 +44,7 @@ let
prometheus_listen_addr = "localhost:9236"
[git]
bin_path = "${gitPackage}/bin/git"
bin_path = "${pkgs.git}/bin/git"
[gitaly-ruby]
dir = "${cfg.packages.gitaly.ruby}"
@ -157,7 +141,7 @@ let
};
workhorse.secret_file = "${cfg.statePath}/.gitlab_workhorse_secret";
gitlab_kas.secret_file = "${cfg.statePath}/.gitlab_kas_secret";
git.bin_path = "${gitPackage}/bin/git";
git.bin_path = "git";
monitoring = {
ip_whitelist = [ "127.0.0.0/8" "::1/128" ];
sidekiq_exporter = {
@ -1325,7 +1309,7 @@ in {
});
path = with pkgs; [
postgresqlPackage
gitPackage
git
ruby
openssh
nodejs
@ -1356,7 +1340,7 @@ in {
path = with pkgs; [
openssh
procps # See https://gitlab.com/gitlab-org/gitaly/issues/1562
gitPackage
git
cfg.packages.gitaly.rubyEnv
cfg.packages.gitaly.rubyEnv.wrappedRuby
gzip
@ -1402,7 +1386,7 @@ in {
path = with pkgs; [
remarshal
exiftool
gitPackage
git
gnutar
gzip
openssh
@ -1475,7 +1459,7 @@ in {
environment = gitlabEnv;
path = with pkgs; [
postgresqlPackage
gitPackage
git
openssh
nodejs
procps