git.iko.soy/typeable/nixpkgs
on master help sign in
gitlab: add back GITLAB_WORKHORSE_VERSION

https://github.com/NixOS/nixpkgs/commit/9b30cda2f6e301abc6f39e01902330d981b12a80#r49247855

commit35aca2bada671d7ccfb7c9a37c5b59563e5cc680 authorMilan Pässler <milan@petabyte.dev> dateThu 8 Apr 2021, 09:54 (6 years ago) parenta20d268
2 files changed+6−2
pkgs/applications/version-management/gitlab/data.json+2−1 pkgs/applications/version-management/gitlab/update.py+4−1
pkgs/applications/version-management/gitlab/data.json+2−1
@@ -7,6 +7,7 @@
77 "passthru": {
88 "GITALY_SERVER_VERSION": "13.10.2",
99 "GITLAB_PAGES_VERSION": "1.36.0",
10− "GITLAB_SHELL_VERSION": "13.17.0"
10+ "GITLAB_SHELL_VERSION": "13.17.0",
11+ "GITLAB_WORKHORSE_VERSION": "13.10.2"
1112 }
1213}
pkgs/applications/version-management/gitlab/update.py+4−1
@@ -69,6 +69,9 @@ class GitLabRepo:
6969
7070 passthru = {v: self.get_file(v, rev).strip() for v in ['GITALY_SERVER_VERSION', 'GITLAB_PAGES_VERSION',
7171 'GITLAB_SHELL_VERSION']}
72+
73+ passthru["GITLAB_WORKHORSE_VERSION"] = version
74+
7275 return dict(version=self.rev2version(rev),
7376 repo_hash=self.get_git_hash(rev),
7477 owner=self.owner,
@@ -186,7 +189,7 @@ def update_gitlab_shell():
186189def update_gitlab_workhorse():
187190 """Update gitlab-workhorse"""
188191 data = _get_data_json()
189− gitlab_workhorse_version = data['version']
192+ gitlab_workhorse_version = data['passthru']['GITLAB_WORKHORSE_VERSION']
190193 _call_nix_update('gitlab-workhorse', gitlab_workhorse_version)
191194
192195