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

Merge pull request #82374 from flokli/gitlab-12.8.6

Browse Source 
gitlab: 12.8.5 -> 12.8.6
This commit is contained in:
Florian Klink 2020-03-12 06:01:44 -07:00 committed by GitHub
commit 54597496b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/version-management/gitlab/data.json
View File

@ -1,11 +1,11 @@
{ {
"version": "12.8.5", "version": "12.8.6",
"repo_hash": "1y5606p793w1js39420jcd2bj42cripczgrdxgg2cq0r2kq8axk8", "repo_hash": "0plcigppmg6ckmq8myj3m9adshdvqj7czx8fms71bsa9zx060wib",
"owner": "gitlab-org", "owner": "gitlab-org",
"repo": "gitlab", "repo": "gitlab",
"rev": "v12.8.5-ee", "rev": "v12.8.6-ee",
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "12.8.5", "GITALY_SERVER_VERSION": "12.8.6",
"GITLAB_PAGES_VERSION": "1.16.0", "GITLAB_PAGES_VERSION": "1.16.0",
"GITLAB_SHELL_VERSION": "11.0.0", "GITLAB_SHELL_VERSION": "11.0.0",
"GITLAB_WORKHORSE_VERSION": "8.21.0" "GITLAB_WORKHORSE_VERSION": "8.21.0"

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

@ -28,14 +28,14 @@ let
}; };
}); });
in buildGoPackage rec { in buildGoPackage rec {
version = "12.8.5"; version = "12.8.6";
pname = "gitaly"; pname = "gitaly";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitaly"; repo = "gitaly";
rev = "v${version}"; rev = "v${version}";
sha256 = "19pwffncihhywfac7ybry38vyj3pmdz66g5nqrvwn4xxw7ypvd24"; sha256 = "1rf9qmyjllkwkyi7la1dzyjh0z9sw21zdzihd7v9ngwqssfk5zfk";
}; };
# Fix a check which assumes that hook files are writeable by their # Fix a check which assumes that hook files are writeable by their

4
pkgs/applications/version-management/gitlab/update.py
View File

@ -175,6 +175,8 @@ def update_gitaly():
f.write(repo.get_file(fn, f"v{gitaly_server_version}")) f.write(repo.get_file(fn, f"v{gitaly_server_version}"))
subprocess.check_output(['bundix'], cwd=gitaly_dir) subprocess.check_output(['bundix'], cwd=gitaly_dir)
os.environ['GOROOT'] = ""
subprocess.check_output(['vgo2nix'], cwd=gitaly_dir) subprocess.check_output(['vgo2nix'], cwd=gitaly_dir)
for fn in ['go.mod', 'go.sum']: for fn in ['go.mod', 'go.sum']:
@ -197,6 +199,7 @@ def update_gitlab_shell():
with open(gitlab_shell_dir / fn, 'w') as f: with open(gitlab_shell_dir / fn, 'w') as f:
f.write(repo.get_file(fn, f"v{gitlab_shell_version}")) f.write(repo.get_file(fn, f"v{gitlab_shell_version}"))
os.environ['GOROOT'] = ""
subprocess.check_output(['vgo2nix'], cwd=gitlab_shell_dir) subprocess.check_output(['vgo2nix'], cwd=gitlab_shell_dir)
for fn in ['go.mod', 'go.sum']: for fn in ['go.mod', 'go.sum']:
@ -217,6 +220,7 @@ def update_gitlab_workhorse():
with open(gitlab_workhorse_dir / fn, 'w') as f: with open(gitlab_workhorse_dir / fn, 'w') as f:
f.write(repo.get_file(fn, f"v{gitlab_workhorse_version}")) f.write(repo.get_file(fn, f"v{gitlab_workhorse_version}"))
os.environ['GOROOT'] = ""
subprocess.check_output(['vgo2nix'], cwd=gitlab_workhorse_dir) subprocess.check_output(['vgo2nix'], cwd=gitlab_workhorse_dir)
for fn in ['go.mod', 'go.sum']: for fn in ['go.mod', 'go.sum']: