summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaya <mak@nyantec.com>2023-06-29 13:18:41 +0200
committerGitHub <noreply@github.com>2023-06-29 13:18:41 +0200
commit43ca47571ee64ecbd6894049dc9df1aedcf3de4c (patch)
treee5c07b7e032481731599fa58922d1dc14f8a8810
parentMerge pull request #240513 from NixOS/backport-235003-to-release-22.11 (diff)
downloadnixpkgs-43ca47571ee64ecbd6894049dc9df1aedcf3de4c.tar.gz
gitlab: 15.11.9 -> 15.11.10 (#240505)
https://gitlab.com/gitlab-org/gitlab/-/blob/v15.11.10-ee/CHANGELOG.md
-rw-r--r--pkgs/applications/version-management/gitlab/data.json12
-rw-r--r--pkgs/applications/version-management/gitlab/gitaly/default.nix4
-rw-r--r--pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix2
3 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index ebce8f0e5f92..4dfe25589bee 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,14 +1,14 @@
{
- "version": "15.11.9",
- "repo_hash": "sha256-G8Z8EYEtsSg3MH4ILeX9m/WLmE+XbcgZsPMORcyIKKw=",
+ "version": "15.11.10",
+ "repo_hash": "sha256-9s9RlUFI70UoJWKRTSf4bcR0ZPix5MqgGSraJCjQoNU=",
"yarn_hash": "02ipm7agjy3c75df76c00k3qq5gpw3d876f6x91xnwizswsv9agb",
"owner": "gitlab-org",
"repo": "gitlab",
- "rev": "v15.11.9-ee",
+ "rev": "v15.11.10-ee",
"passthru": {
- "GITALY_SERVER_VERSION": "15.11.9",
- "GITLAB_PAGES_VERSION": "15.11.9",
+ "GITALY_SERVER_VERSION": "15.11.10",
+ "GITLAB_PAGES_VERSION": "15.11.10",
"GITLAB_SHELL_VERSION": "14.18.0",
- "GITLAB_WORKHORSE_VERSION": "15.11.9"
+ "GITLAB_WORKHORSE_VERSION": "15.11.10"
}
}
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 229a7f7e5c10..279563661de4 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -11,7 +11,7 @@ let
gemdir = ./.;
};
- version = "15.11.9";
+ version = "15.11.10";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -22,7 +22,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
- sha256 = "sha256-ISrSU2r+IUDBSdMhfbpO08fqhdlEtliyU6UHTkQ+koE=";
+ sha256 = "sha256-iIaLxvGz+VFOdCzrNbp1RuY1OW/TYOSAeLk4HVavBUI=";
};
vendorSha256 = "sha256-gJelagGPogeCdJtRpj4RaYlqzZRhtU0EIhmj1aK4ZOk=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index 79eb0d4dd574..b2ed3d411666 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
- version = "15.11.9";
+ version = "15.11.10";
src = fetchFromGitLab {
owner = data.owner;