From 35aca2bada671d7ccfb7c9a37c5b59563e5cc680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 8 Apr 2021 09:54:56 +0200 Subject: [PATCH] gitlab: add back GITLAB_WORKHORSE_VERSION https://github.com/NixOS/nixpkgs/commit/9b30cda2f6e301abc6f39e01902330d981b12a80#r49247855 --- pkgs/applications/version-management/gitlab/data.json | 3 ++- pkgs/applications/version-management/gitlab/update.py | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index bd07773f0de6..aa5338ea7c6b 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -7,6 +7,7 @@ "passthru": { "GITALY_SERVER_VERSION": "13.10.2", "GITLAB_PAGES_VERSION": "1.36.0", - "GITLAB_SHELL_VERSION": "13.17.0" + "GITLAB_SHELL_VERSION": "13.17.0", + "GITLAB_WORKHORSE_VERSION": "13.10.2" } } diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index b84846c88abd..993dad08ec6e 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -69,6 +69,9 @@ class GitLabRepo: passthru = {v: self.get_file(v, rev).strip() for v in ['GITALY_SERVER_VERSION', 'GITLAB_PAGES_VERSION', 'GITLAB_SHELL_VERSION']} + + passthru["GITLAB_WORKHORSE_VERSION"] = version + return dict(version=self.rev2version(rev), repo_hash=self.get_git_hash(rev), owner=self.owner, @@ -186,7 +189,7 @@ def update_gitlab_shell(): def update_gitlab_workhorse(): """Update gitlab-workhorse""" data = _get_data_json() - gitlab_workhorse_version = data['version'] + gitlab_workhorse_version = data['passthru']['GITLAB_WORKHORSE_VERSION'] _call_nix_update('gitlab-workhorse', gitlab_workhorse_version)