nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #90102 from flokli/20.03-gitlab-12.10.11

Browse Source 
[20.03] gitlab: 12.10.9 -> 12.10.11
This commit is contained in:
Florian Klink
2020-06-11 20:52:19 +02:00
committed by GitHub
parent 8c521cb815 3748b5f204
commit 8b071be751
5 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/version-management/gitlab/data.json
View File

@@ -1,13 +1,13 @@
{
"version": "12.10.9",
"repo_hash": "0mhvw09rvvq4iq18s6xfnl17irg305pxkwjgrsn7k06k0zf4dx5l",
"version": "12.10.11",
"repo_hash": "058xnmmz4fnan85x0mw0s2i2lr9y7yx2hqxfcil1frj2rz7ralds",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v12.10.9-ee",
"rev": "v12.10.11-ee",
"passthru": {
"GITALY_SERVER_VERSION": "12.10.9",
"GITALY_SERVER_VERSION": "12.10.11",
"GITLAB_PAGES_VERSION": "1.17.0",
"GITLAB_SHELL_VERSION": "12.2.0",
"GITLAB_WORKHORSE_VERSION": "8.30.2"
"GITLAB_WORKHORSE_VERSION": "8.30.3"
}
}

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@@ -19,14 +19,14 @@ let
};
};
in buildGoPackage rec {
version = "12.10.9";
version = "12.10.11";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "0rcds6shwmqv2acjdj1i0jhjcp3ww8b1aysqqsyvsgfaa160n9s9";
sha256 = "1qzrfnihcx8ysy40z2sq5rgdgpp2gy5db8snlx7si2l9h6pjg7hz";
};
# Fix a check which assumes that hook files are writeable by their

13
pkgs/applications/version-management/gitlab/gitaly/deps.nix generated
View File

@@ -9,15 +9,6 @@
sha256 = "0pbz5migljd5whxh6z1w79cwx93n85mcs3x1bckl27yzaa4lvqsl";
};
}
{
goPackagePath = "dmitri.shuralyov.com/gpu/mtl";
fetch = {
type = "git";
url = "https://dmitri.shuralyov.com/gpu/mtl";
rev = "666a987793e9";
sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z";
};
}
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
@@ -1436,8 +1427,8 @@
fetch = {
type = "git";
url = "https://github.com/ugorji/go";
rev = "d75b2dcb6bc8";
sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps";
rev = "v1.1.4";
sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w";
};
}
{

4
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@@ -3,13 +3,13 @@
buildGoPackage rec {
pname = "gitlab-workhorse";
version = "8.30.2";
version = "8.30.3";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-workhorse";
rev = "v${version}";
sha256 = "1ws59ry16kx4nqp92xcqw3fri570pvpdgvy822ndi7rybw5xij7p";
sha256 = "13xnx04j8p31l1lslcixf3ihagz9brih9zvypwnjb76ipgcg431z";
};
goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse";

9
pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix generated
View File

@@ -9,15 +9,6 @@
sha256 = "0pbz5migljd5whxh6z1w79cwx93n85mcs3x1bckl27yzaa4lvqsl";
};
}
{
goPackagePath = "dmitri.shuralyov.com/gpu/mtl";
fetch = {
type = "git";
url = "https://dmitri.shuralyov.com/gpu/mtl";
rev = "666a987793e9";
sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z";
};
}
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {