public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-04-08 12:06:16 +00:00
committed by GitHub
parent 9f7f61b07f 5db7e33f1d
commit bf6abedefb
40 changed files with 508 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/gitkraken/default.nix
+2 -2
View File
@@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "gitkraken";
version = "7.5.3";
version = "7.5.4";
src = fetchzip {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
sha256 = "0vxvfq0dh6l1plqbq67gfydr8bh5w3q6d5y3bn3rdia10wa1dac6";
sha256 = "1laqki01zcmsl9s18dnwg3x3jbbs0xcipiyj2qlsb1sx9y4x05wm";
};
dontBuild = true;
pkgs/applications/version-management/gitlab/data.json
+2 -1
View File
@@ -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"
}
}
pkgs/applications/version-management/gitlab/update.py
+4 -1
View File
@@ -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)