talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

gitlab: 18.2.1 -> 18.2.2

Browse Source 
https://about.gitlab.com/releases/2025/08/13/patch-release-gitlab-18-2-2-released/

Also includes yet another bug fix for a gitlab-container-registry test.
This commit is contained in:
Leona Maroni 2025-08-13 14:00:38 +02:00
parent 5630170d78
commit 7f43376cee
No known key found for this signature in database
GPG Key ID: 818A0628A98C1DE8
6 changed files with 43 additions and 15 deletions
Show Stats 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.1";
version = "18.2.2";
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-h4JklXImKwudJT3pb/UhHwQHKd87c5aSH1xYC0lRWKo=";
hash = "sha256-+OmduG9neb15m3i57qPfE42HI4w/zgmA5T6bhlwzrT0=";
};
vendorHash = "sha256-RjDV4NGmmdT9STQBHiYf3UUYwPmuSg6970/W/ekxin0=";

22
pkgs/by-name/gi/gitlab-container-registry/fix-broken-urlcache-tests.diff Normal file
View File

@ -0,0 +1,22 @@
diff --git a/registry/storage/driver/middleware/urlcache/urlcache_test.go b/registry/storage/driver/middleware/urlcache/urlcache_test.go
index 67ef4abc0e..6644c80837 100644
--- a/registry/storage/driver/middleware/urlcache/urlcache_test.go
+++ b/registry/storage/driver/middleware/urlcache/urlcache_test.go
@@ -37,7 +37,7 @@
name: "missing redis cache",
options: make(map[string]any),
wantErr: true,
- errContains: "urlcache middleware requires `cache` Redis configured",
+ errContains: "`_redisCache` key has not been passed to urlcache middleware",
},
{
name: "default configuration with redis",
@@ -231,7 +231,7 @@
"_redisCache": "not a redis cache",
},
wantErr: true,
- errContains: "unusable redis cache object",
+ errContains: "redis cache passed to the middleware cannot be used as the type is wrong",
},
}

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

@ -6,7 +6,7 @@
buildGoModule rec {
pname = "gitlab-container-registry";
version = "4.25.0";
version = "4.26.0";
rev = "v${version}-gitlab";
# nixpkgs-update: no auto update
@ -14,10 +14,16 @@ buildGoModule rec {
owner = "gitlab-org";
repo = "container-registry";
inherit rev;
hash = "sha256-7jzKFC29NAHi5iag6aA/5LzH6IyqMa3yAxtzV9OsBnQ=";
hash = "sha256-XACKJW5sRXNM4Q24DXEVtjzhVfxoBd+JWHJr1s01ocA=";
};
vendorHash = "sha256-z9IlfyJ48FQzhbY38GbZaeQjg3cMDU8tLCXKhazP64A=";
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=";
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.1";
version = "18.2.2";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
hash = "sha256-z1Pl3xeaoqeF/9qOVcuCpuciu1r6NQ4UhlLe9gy9+nE=";
hash = "sha256-PPa9SYyE3G+peP2xSpNw7WDDO7WiWKSRpd5tBODkA0g=";
};
vendorHash = "sha256-OubXCpvGtGqegQmdb6R1zw/0DfQ4FdbJGt7qYYRnWnA=";

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

@ -1,15 +1,15 @@
{
"version": "18.2.1",
"repo_hash": "1i0y46w18476gn98fmkixdjiyrwajz2347p57dg2ijch4ivzpmlv",
"yarn_hash": "04mqinnbhr6zgab2p1bq6y6b20bf4c4cynkgfc67mzm9xhybr3fk",
"version": "18.2.2",
"repo_hash": "0fqpfprxmgxaz5g0d5z4gsir1zj9fkhli7iq1ahx413ymsiqrxd0",
"yarn_hash": "0c6njrciqcjaswh784yxly4qza6k2ghq1ljbdkcn65cna4f4hwgk",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v18.2.1-ee",
"rev": "v18.2.2-ee",
"passthru": {
"GITALY_SERVER_VERSION": "18.2.1",
"GITLAB_PAGES_VERSION": "18.2.1",
"GITALY_SERVER_VERSION": "18.2.2",
"GITLAB_PAGES_VERSION": "18.2.2",
"GITLAB_SHELL_VERSION": "14.43.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.7.0",
"GITLAB_WORKHORSE_VERSION": "18.2.1"
"GITLAB_WORKHORSE_VERSION": "18.2.2"
}
}

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.1";
version = "18.2.2";
# nixpkgs-update: no auto update
src = fetchFromGitLab {