From 2349bafd63e649fcfef0906ab5d392b77af12c5c Mon Sep 17 00:00:00 2001 From: yaya Date: Wed, 8 Apr 2026 14:25:03 +0200 Subject: [PATCH] gitlab: 18.10.1 -> 18.10.3 https://gitlab.com/gitlab-org/gitlab/-/blob/v18.10.3-ee/CHANGELOG.md --- pkgs/by-name/gi/gitaly/package.nix | 4 ++-- pkgs/by-name/gi/gitlab-pages/package.nix | 4 ++-- pkgs/by-name/gi/gitlab/data.json | 14 ++++++------ .../gi/gitlab/gitlab-workhorse/default.nix | 2 +- pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock | 6 ++--- pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix | 22 ++++++++++++++----- 6 files changed, 31 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index 5b0780194cfa..3c9b730ea3f5 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -7,7 +7,7 @@ }: let - version = "18.10.1"; + version = "18.10.3"; 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-s9nDqhtNmLpUHRJ+jJvu9WikPbQLUwEum6TGV3PvG8Y="; + hash = "sha256-edILaF/dW7yOm5W9nV9d7Cj4+W9kshagkOb/2mfIOtQ="; }; vendorHash = "sha256-W7ZI8IOaW/88zWrVymDkRQqzk+aLgvdO+rPycK70Bb0="; diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix index 2e4206a736e6..fa1c02e8d9d9 100644 --- a/pkgs/by-name/gi/gitlab-pages/package.nix +++ b/pkgs/by-name/gi/gitlab-pages/package.nix @@ -6,14 +6,14 @@ buildGoModule (finalAttrs: { pname = "gitlab-pages"; - version = "18.10.1"; + version = "18.10.3"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${finalAttrs.version}"; - hash = "sha256-B/6BJaH2xge9/3HrI0yMIMtw4TeC+/bNqLFmKbZ2Ubw="; + hash = "sha256-TsImrWD6cLvVoasatQpWVFCAuQw3/38EfFC+igikhVo="; }; vendorHash = "sha256-EaTYw8ydHMA3Rmr8YJvUxWBIkPhyKLc8zNUsJRTlMmE="; diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json index 612d0ce02701..4686c8e42a08 100644 --- a/pkgs/by-name/gi/gitlab/data.json +++ b/pkgs/by-name/gi/gitlab/data.json @@ -1,17 +1,17 @@ { - "version": "18.10.1", - "repo_hash": "sha256-z4MRfgqGOBxAE4EzqhIKosMLOZXDuiH88wSxkwUpV5E=", + "version": "18.10.3", + "repo_hash": "sha256-x8nmMKbL8hnmQfIrnAhbQHu6Mg2PnjMJeRXUBiI7QFA=", "yarn_hash": "sha256-tWpPN//SdgnRONVa1ykagVHCNs7TCboTnQLQ5Sx0DQs=", "frontend_islands_yarn_hash": "sha256-OkCoiyL9FFJcWcNUbeRSBGGSauYIm7l+yxNfA0CsNEQ=", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v18.10.1-ee", + "rev": "v18.10.3-ee", "passthru": { - "GITALY_SERVER_VERSION": "18.10.1", - "GITLAB_KAS_VERSION": "18.10.1", - "GITLAB_PAGES_VERSION": "18.10.1", + "GITALY_SERVER_VERSION": "18.10.3", + "GITLAB_KAS_VERSION": "18.10.3", + "GITLAB_PAGES_VERSION": "18.10.3", "GITLAB_SHELL_VERSION": "14.47.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.14.1", - "GITLAB_WORKHORSE_VERSION": "18.10.1" + "GITLAB_WORKHORSE_VERSION": "18.10.3" } } diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix index 88ec396c3ffc..ec2932e97170 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 (finalAttrs: { pname = "gitlab-workhorse"; - version = "18.10.1"; + version = "18.10.3"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock index 745424da4379..a428217abd97 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock @@ -1051,11 +1051,11 @@ GEM nokogiri (>= 1.0, < 2.0) htmlbeautifier (1.4.2) htmlentities (4.3.4) - http (5.1.1) + http (5.3.1) addressable (~> 2.8) http-cookie (~> 1.0) http-form_data (~> 2.2) - llhttp-ffi (~> 0.4.0) + llhttp-ffi (~> 0.5.0) http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) @@ -1171,7 +1171,7 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - llhttp-ffi (0.4.0) + llhttp-ffi (0.5.1) ffi-compiler (~> 1.0) rake (~> 13.0) locale (2.1.4) diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix index ada970fef11e..68009ec2ebd0 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix +++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix @@ -4309,14 +4309,19 @@ src: { "http-form_data" "llhttp-ffi" ]; - groups = [ "default" ]; + groups = [ + "default" + "development" + "monorepo" + "test" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bzb8p31kzv6q5p4z5xq88mnqk414rrw0y5rkhpnvpl29x5c3bpw"; + sha256 = "0z8x4c2bcg05x7ffrjy47cwarfqzlg8kcfxchk5jcfdyx7c04265"; type = "gem"; }; - version = "5.1.1"; + version = "5.3.1"; }; http-accept = { groups = [ "default" ]; @@ -4948,14 +4953,19 @@ src: { "ffi-compiler" "rake" ]; - groups = [ "default" ]; + groups = [ + "default" + "development" + "monorepo" + "test" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "00dh6zmqdj59rhcya0l4b9aaxq6n8xizfbil93k0g06gndyk5xz5"; + sha256 = "1g57iw0l3y7x50132x6a1jyssxa6pw7srh69g0d6j7ri37yaf9cs"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.1"; }; locale = { groups = [