chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

gitlab: 18.2.2 -> 18.2.5

Browse Source 
https://about.gitlab.com/releases/2025/08/27/patch-release-gitlab-18-3-1-released/
(cherry picked from commit a481b62120)
This commit is contained in:
Leona Maroni
2025-08-28 09:25:15 +02:00
committed by github-actions[bot]
parent 38e76a3eb9
commit 9dcb2d494f
8 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/by-name/gi/gitaly/package.nix
View File

@@ -7,7 +7,7 @@
}:
let
version = "18.2.2";
version = "18.2.5";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -21,7 +21,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
hash = "sha256-+OmduG9neb15m3i57qPfE42HI4w/zgmA5T6bhlwzrT0=";
hash = "sha256-/AyWxFUyNC0RCM4WMSlPrlh9okyZBacR2sPyzl9y4D0=";
};
vendorHash = "sha256-RjDV4NGmmdT9STQBHiYf3UUYwPmuSg6970/W/ekxin0=";

14
pkgs/by-name/gi/gitlab-container-registry/package.nix
View File

@@ -6,24 +6,18 @@
buildGoModule rec {
pname = "gitlab-container-registry";
version = "4.26.0";
rev = "v${version}-gitlab";
version = "4.27.0";
rev = "v${version}-gitlab-ahmed-master-test";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "container-registry";
inherit rev;
hash = "sha256-XACKJW5sRXNM4Q24DXEVtjzhVfxoBd+JWHJr1s01ocA=";
hash = "sha256-lcM0HjseQ4N7rndDx95aC6MWb+Ggwz3UIhSvbC8oxus=";
};
patches = [
# https://gitlab.com/gitlab-org/container-registry/-/merge_requests/2447
# Can be removed with next released when merged
./fix-broken-urlcache-tests.diff
];
vendorHash = "sha256-J4p3vXLmDFYl/z6crqanlmG1FB4Dq04HLx9IhC3usQ4=";
vendorHash = "sha256-ALPK9h5Isniis7QPz9DXokeBd+hWMDJ7ts9/sGNrFMk=";
checkFlags =
let

4
pkgs/by-name/gi/gitlab-pages/package.nix
View File

@@ -6,14 +6,14 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "18.2.2";
version = "18.2.5";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
hash = "sha256-PPa9SYyE3G+peP2xSpNw7WDDO7WiWKSRpd5tBODkA0g=";
hash = "sha256-21IsNcVkhtncum2miTOjuCcM681qYa+8e/5CCEiqz/Q=";
};
vendorHash = "sha256-OubXCpvGtGqegQmdb6R1zw/0DfQ4FdbJGt7qYYRnWnA=";

6
pkgs/by-name/gi/gitlab-shell/package.nix
View File

@@ -8,14 +8,14 @@
buildGoModule rec {
pname = "gitlab-shell";
version = "14.43.0";
version = "14.44.0";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
hash = "sha256-JBcfsOLutxHUk5z+vXP8CnVSmJazhqJk4fZ0vONIswo=";
hash = "sha256-y3CTfYN2QCWm2n534Bb8uS0Bzn4BsBuMtxAyuU3f+oI=";
};
buildInputs = [
@@ -27,7 +27,7 @@ buildGoModule rec {
./remove-hardcoded-locations.patch
];
vendorHash = "sha256-zuxgWBrrftkNjMhAXs8cAcQmb8RLQqvnFhU0HnUUcTA=";
vendorHash = "sha256-flLt2LdcSDIuoUr4mwfv6LOV9GPewf+o0rb8kyBsgSk=";
subPackages = [
"cmd/gitlab-shell"

14
pkgs/by-name/gi/gitlab/data.json
View File

@@ -1,15 +1,15 @@
{
"version": "18.2.2",
"repo_hash": "0fqpfprxmgxaz5g0d5z4gsir1zj9fkhli7iq1ahx413ymsiqrxd0",
"version": "18.2.5",
"repo_hash": "1q9scfy1r9570gvm3dyrsg2cmpyx94a33w6418q1gy0msiqncnqd",
"yarn_hash": "0c6njrciqcjaswh784yxly4qza6k2ghq1ljbdkcn65cna4f4hwgk",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v18.2.2-ee",
"rev": "v18.2.5-ee",
"passthru": {
"GITALY_SERVER_VERSION": "18.2.2",
"GITLAB_PAGES_VERSION": "18.2.2",
"GITLAB_SHELL_VERSION": "14.43.0",
"GITALY_SERVER_VERSION": "18.2.5",
"GITLAB_PAGES_VERSION": "18.2.5",
"GITLAB_SHELL_VERSION": "14.44.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.7.0",
"GITLAB_WORKHORSE_VERSION": "18.2.2"
"GITLAB_WORKHORSE_VERSION": "18.2.5"
}
}

2
pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
View File

@@ -10,7 +10,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "18.2.2";
version = "18.2.5";
# nixpkgs-update: no auto update
src = fetchFromGitLab {

2
pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
View File

@@ -2415,4 +2415,4 @@ DEPENDENCIES
yard (~> 0.9)
BUNDLED WITH
2.6.9
2.7.1

2
pkgs/by-name/gi/gitlab/update.py
View File

@@ -44,7 +44,7 @@ class GitLabRepo:
# sort, but ignore v, -ee and -gitlab for sorting comparisons
versions.sort(
key=lambda x: Version(
x.replace("v", "").replace("-ee", "").replace("-gitlab", "")
x.replace("v", "").replace("-ee", "").replace("-gitlab", "").replace("-ahmed-master-test", "")
),
reverse=True,
)