From f030d5ece0863675f5e77428f11949cbeb1fe0b6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 12 Mar 2020 02:56:48 +0100 Subject: [PATCH 1/3] gitlab: update script: unset GOROOT or vgo2nix might not be able to resolve some dependencies. (cherry picked from commit d2061f024c5937ff11af454a4ae96688e74b1209) --- pkgs/applications/version-management/gitlab/update.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index efef677393dfd..e08586a281afa 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -175,6 +175,8 @@ def update_gitaly(): f.write(repo.get_file(fn, f"v{gitaly_server_version}")) subprocess.check_output(['bundix'], cwd=gitaly_dir) + + os.environ['GOROOT'] = "" subprocess.check_output(['vgo2nix'], cwd=gitaly_dir) for fn in ['go.mod', 'go.sum']: @@ -197,6 +199,7 @@ def update_gitlab_shell(): with open(gitlab_shell_dir / fn, 'w') as f: f.write(repo.get_file(fn, f"v{gitlab_shell_version}")) + os.environ['GOROOT'] = "" subprocess.check_output(['vgo2nix'], cwd=gitlab_shell_dir) for fn in ['go.mod', 'go.sum']: @@ -217,6 +220,7 @@ def update_gitlab_workhorse(): with open(gitlab_workhorse_dir / fn, 'w') as f: f.write(repo.get_file(fn, f"v{gitlab_workhorse_version}")) + os.environ['GOROOT'] = "" subprocess.check_output(['vgo2nix'], cwd=gitlab_workhorse_dir) for fn in ['go.mod', 'go.sum']: From a3c8911bd2df38d775500cc043366f9211c5c5f3 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 12 Mar 2020 02:57:39 +0100 Subject: [PATCH 2/3] gitlab: 12.8.5 -> 12.8.6 https://about.gitlab.com/releases/2020/03/11/critical-security-release-gitlab-12-dot-8-dot-6-released/ (cherry picked from commit ab3b8363501805be5dadf0fb95164073aa96f510) --- pkgs/applications/version-management/gitlab/data.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 07ec3a291447e..ddad51dfb636f 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,11 +1,11 @@ { - "version": "12.8.5", - "repo_hash": "1y5606p793w1js39420jcd2bj42cripczgrdxgg2cq0r2kq8axk8", + "version": "12.8.6", + "repo_hash": "0plcigppmg6ckmq8myj3m9adshdvqj7czx8fms71bsa9zx060wib", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.8.5-ee", + "rev": "v12.8.6-ee", "passthru": { - "GITALY_SERVER_VERSION": "12.8.5", + "GITALY_SERVER_VERSION": "12.8.6", "GITLAB_PAGES_VERSION": "1.16.0", "GITLAB_SHELL_VERSION": "11.0.0", "GITLAB_WORKHORSE_VERSION": "8.21.0" From d4148a7bfe53de862614969d24fad8ed2196688c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 12 Mar 2020 02:58:02 +0100 Subject: [PATCH 3/3] gitaly: 12.8.5 -> 12.8.6 (cherry picked from commit 281bd03242d5a07a68904a2e1a9498e513e5bd09) --- .../applications/version-management/gitlab/gitaly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 1f29f6479daa0..810be4e8062cf 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -19,14 +19,14 @@ let }; }; in buildGoPackage rec { - version = "12.8.5"; + version = "12.8.6"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "19pwffncihhywfac7ybry38vyj3pmdz66g5nqrvwn4xxw7ypvd24"; + sha256 = "1rf9qmyjllkwkyi7la1dzyjh0z9sw21zdzihd7v9ngwqssfk5zfk"; }; # Fix a check which assumes that hook files are writeable by their