From d2061f024c5937ff11af454a4ae96688e74b1209 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 12 Mar 2020 02:56:48 +0100 Subject: gitlab: update script: unset GOROOT or vgo2nix might not be able to resolve some dependencies. --- pkgs/applications/version-management/gitlab/update.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkgs/applications/version-management/gitlab') diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index dc2d1e29719d..a2a3a6d05b7e 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']: -- cgit 1.4.1