From c56fff34f9e28184c066447adcd272427013e041 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Wed, 22 Oct 2025 07:40:03 +0200 Subject: [PATCH] gitlab: 18.5.0 -> 18.5.1 https://about.gitlab.com/releases/2025/10/22/patch-release-gitlab-18-5-1-released/ --- pkgs/by-name/gi/gitaly/package.nix | 4 ++-- pkgs/by-name/gi/gitlab-pages/package.nix | 4 ++-- pkgs/by-name/gi/gitlab/data.json | 12 ++++++------ pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix | 2 +- pkgs/by-name/gi/gitlab/rubyEnv/Gemfile | 3 ++- pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock | 10 +++++----- pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix | 8 ++++---- 7 files changed, 22 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index c17b59e72158..f4860607a84e 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -7,7 +7,7 @@ }: let - version = "18.5.0"; + version = "18.5.1"; 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-kVFO8brtXWWGU2nWTtHR1q5RrTIXy2ssra9YjtWsglU="; + hash = "sha256-719FC9+OBX9Li9gkIpusFoZrpMyeDwCsoWxt9pfhI1A="; }; vendorHash = "sha256-I2YMn84wEAY+Z02bmkyP/b0eix7FW3hP/noyEKYsEaQ="; diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix index e9ebdcf15885..9f57f4318c51 100644 --- a/pkgs/by-name/gi/gitlab-pages/package.nix +++ b/pkgs/by-name/gi/gitlab-pages/package.nix @@ -6,14 +6,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "18.5.0"; + version = "18.5.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-7jMiKN2L4rF4YyqoJW8pzj5rP5g6ScwZ3qkY+OCZOZ8="; + hash = "sha256-UrVH5Ky5aiqquQ2o6bSkqLD4ULl9/vUViOoACantT1Q="; }; vendorHash = "sha256-VWD/AXqEVWo7G9p1q1BM2LUNwAFmkPm+Gm2s9EPu6nM="; diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json index 59c57336b8f2..a9150fdb3e22 100644 --- a/pkgs/by-name/gi/gitlab/data.json +++ b/pkgs/by-name/gi/gitlab/data.json @@ -1,16 +1,16 @@ { - "version": "18.5.0", - "repo_hash": "0r1q6byqv3zziwsw63z7km5jjap7q6222j91lnr048w6cf425n1w", + "version": "18.5.1", + "repo_hash": "0h80pzsfn6lb8mz8igbpkmazzj3kkdwhrqxazjq6g9zrsqsvydx5", "yarn_hash": "16f7r4v4mjjdsfbzy5vy1g18p0l3gnjvfvzrl2xrxdibx7a3b4xs", "frontend_islands_yarn_hash": "0kks9hzm5fq3fss9ys8zxls3d3860l1fvsfcrbhf9rccmwvmjn3l", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v18.5.0-ee", + "rev": "v18.5.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "18.5.0", - "GITLAB_PAGES_VERSION": "18.5.0", + "GITALY_SERVER_VERSION": "18.5.1", + "GITLAB_PAGES_VERSION": "18.5.1", "GITLAB_SHELL_VERSION": "14.45.3", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.9.4", - "GITLAB_WORKHORSE_VERSION": "18.5.0" + "GITLAB_WORKHORSE_VERSION": "18.5.1" } } diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix index 1e3add758495..a91f24c0e36c 100644 --- a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix @@ -10,7 +10,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "18.5.0"; + version = "18.5.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile index 49c314934630..868611f74092 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile +++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile @@ -331,7 +331,8 @@ gem 'js_regex', '~> 3.8', feature_category: :shared gem 'device_detector', feature_category: :shared # Redis -gem 'redis', '~> 5.4.0', feature_category: :redis +# Do NOT upgrade until Rails is upgraded with a version that contains https://github.com/rails/rails/pull/55359. +gem 'redis', '= 5.4.0', feature_category: :redis gem 'redis-client', '~> 0.25', feature_category: :redis gem 'redis-cluster-client', '~> 0.13', feature_category: :redis gem 'redis-clustering', '~> 5.4.0', feature_category: :redis diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock index cf4481484644..5bbab0aec3a3 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock @@ -1624,7 +1624,7 @@ GEM json recursive-open-struct (1.1.3) redcarpet (3.6.0) - redis (5.4.1) + redis (5.4.0) redis-client (>= 0.22.0) redis-actionpack (5.5.0) actionpack (>= 5) @@ -1634,8 +1634,8 @@ GEM connection_pool redis-cluster-client (0.13.5) redis-client (~> 0.24) - redis-clustering (5.4.1) - redis (= 5.4.1) + redis-clustering (5.4.0) + redis (= 5.4.0) redis-cluster-client (>= 0.10.0) redis-namespace (1.11.0) redis (>= 4) @@ -2364,7 +2364,7 @@ DEPENDENCIES rbtrace (~> 0.4) re2 (~> 2.15) recaptcha (~> 5.12) - redis (~> 5.4.0) + redis (= 5.4.0) redis-actionpack (~> 5.5.0) redis-client (~> 0.25) redis-cluster-client (~> 0.13) @@ -2452,4 +2452,4 @@ DEPENDENCIES yard (~> 0.9) BUNDLED WITH - 2.7.1 + 2.7.2 diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix index 1f5b15a95a5a..a109fcdc6d3f 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix +++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix @@ -7528,10 +7528,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bpsh5dbvybsa8qnv4dg11a6f2zn4sndarf7pk4iaayjgaspbrmm"; + sha256 = "0syhyw1bp9nbb0fvcmm58y1c6iav6xw6b4bzjz1rz2j1d7c012br"; type = "gem"; }; - version = "5.4.1"; + version = "5.4.0"; }; redis-actionpack = { dependencies = [ @@ -7579,10 +7579,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sj4b3j7i3rb5a276g7yyd95kji4j9sl6wmqfgpz39gx06qlni47"; + sha256 = "0fsnfi15xiy8sal6av11fqfjmdmjpy93amf790i0zwqcf1iq1qbw"; type = "gem"; }; - version = "5.4.1"; + version = "5.4.0"; }; redis-namespace = { dependencies = [ "redis" ];