Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a20d26806ffe
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 35aca2bada67
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Apr 8, 2021

  1. gitlab: add back GITLAB_WORKHORSE_VERSION 

    9b30cda#r49247855
    Milan Pässler committed Apr 8, 2021
    Copy the full SHA
    35aca2b View commit details
Showing with 6 additions and 2 deletions.
  1. +2 −1 pkgs/applications/version-management/gitlab/data.json
  2. +4 −1 pkgs/applications/version-management/gitlab/update.py
3 changes: 2 additions & 1 deletion pkgs/applications/version-management/gitlab/data.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
}
5 changes: 4 additions & 1 deletion pkgs/applications/version-management/gitlab/update.py
View file
Original file line number Diff line number Diff line change
@@ -69,6 +69,9 @@ def get_data(self, rev):

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)