alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #131952 from yu-re-ka/feature/gitlab-14-1-1

Browse source 
gitlab: 14.1.0 -> 14.1.1
This commit is contained in:
Florian Klink 2021-08-03 00:13:52 +02:00 committed by GitHub
parent 9986226d51 6b021012c5
commit 50e3b159e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
nixos/tests/gitlab.nix
View file

@ -51,10 +51,11 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
host = "localhost"; host = "localhost";
port = 143; port = 143;
}; };
pages = { # https://github.com/NixOS/nixpkgs/issues/132295
enabled = true; # pages = {
host = "localhost"; # enabled = true;
}; # host = "localhost";
# };
}; };
secrets = { secrets = {
secretFile = pkgs.writeText "secret" "Aig5zaic"; secretFile = pkgs.writeText "secret" "Aig5zaic";
@ -90,7 +91,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; {
waitForServices = '' waitForServices = ''
gitlab.wait_for_unit("gitaly.service") gitlab.wait_for_unit("gitaly.service")
gitlab.wait_for_unit("gitlab-workhorse.service") gitlab.wait_for_unit("gitlab-workhorse.service")
gitlab.wait_for_unit("gitlab-pages.service") # https://github.com/NixOS/nixpkgs/issues/132295
# gitlab.wait_for_unit("gitlab-pages.service")
gitlab.wait_for_unit("gitlab-mailroom.service") gitlab.wait_for_unit("gitlab-mailroom.service")
gitlab.wait_for_unit("gitlab.service") gitlab.wait_for_unit("gitlab.service")
gitlab.wait_for_unit("gitlab-sidekiq.service") gitlab.wait_for_unit("gitlab-sidekiq.service")

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

@ -1,13 +1,13 @@
{ {
"version": "14.1.0", "version": "14.1.1",
"repo_hash": "1a61jc8rsbdbyh891nwygl7qlsj0lm8v59s66hn22csg0dvn6qk6", "repo_hash": "1cygdllhqxah7d8lmx4hcx880wijwfvbbs6dfkdzcn0cd3czpcv8",
"owner": "gitlab-org", "owner": "gitlab-org",
"repo": "gitlab", "repo": "gitlab",
"rev": "v14.1.0-ee", "rev": "v14.1.1-ee",
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "14.1.0", "GITALY_SERVER_VERSION": "14.1.1",
"GITLAB_PAGES_VERSION": "1.41.0", "GITLAB_PAGES_VERSION": "1.41.0",
"GITLAB_SHELL_VERSION": "13.19.0", "GITLAB_SHELL_VERSION": "13.19.0",
"GITLAB_WORKHORSE_VERSION": "14.1.0" "GITLAB_WORKHORSE_VERSION": "14.1.1"
} }
} }

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

@ -21,14 +21,14 @@ let
}; };
}; };
in buildGoModule rec { in buildGoModule rec {
version = "14.1.0"; version = "14.1.1";
pname = "gitaly"; pname = "gitaly";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitaly"; repo = "gitaly";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-k9Vz/b5ZKz93/7nzEA5mnQI8U++CB3E9b8gJBefl2b0="; sha256 = "sha256-UCWN9TXbfysNLMOU8bDcjrwYtz7+kTCDQmRAl84ysWU=";
}; };
vendorSha256 = "sha256-/SZJGRUg0qV7RYCUSGDE/HL9CmzGVffhL6BmZ316tU0="; vendorSha256 = "sha256-/SZJGRUg0qV7RYCUSGDE/HL9CmzGVffhL6BmZ316tU0=";

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View file

@ -5,7 +5,7 @@ in
buildGoModule rec { buildGoModule rec {
pname = "gitlab-workhorse"; pname = "gitlab-workhorse";
version = "14.1.0"; version = "14.1.1";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = data.owner; owner = data.owner;