Leona Maroni
2025-11-12 21:46:38 +01:00
parent 0e9fe2ac17
commit 19378fc24e
9 changed files with 38 additions and 34 deletions
+2 -2
View File
@@ -7,7 +7,7 @@
}:
let
version = "18.5.1";
version = "18.5.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-719FC9+OBX9Li9gkIpusFoZrpMyeDwCsoWxt9pfhI1A=";
hash = "sha256-UOcO6iEFLSkQNU+UGWO6fQ67XmXisz6WRGXC8xNFmuM=";
};
vendorHash = "sha256-I2YMn84wEAY+Z02bmkyP/b0eix7FW3hP/noyEKYsEaQ=";
@@ -6,7 +6,7 @@
buildGo124Module rec {
pname = "gitlab-container-registry";
version = "4.29.0";
version = "4.31.0";
rev = "v${version}-gitlab";
# nixpkgs-update: no auto update
@@ -14,10 +14,10 @@ buildGo124Module rec {
owner = "gitlab-org";
repo = "container-registry";
inherit rev;
hash = "sha256-SUhlJi0LEDXl9pwnT2JATtEBIUnCA2yyEaMzDpL/QCM=";
hash = "sha256-Vy0YaH3GP/IY6UDMSedEzmvEbaOG6QLCFANvbtDRct0=";
};
vendorHash = "sha256-Ee9OmKkFrm00BN/V5kuLFbFV/6HkJ4hk7AAXMptTyxs=";
vendorHash = "sha256-xrp6qLU7KzTt001KmydCkirtpQJdIxM4AXgbIaBmJ/w=";
checkFlags =
let
+2 -2
View File
@@ -6,14 +6,14 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "18.5.1";
version = "18.5.2";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
hash = "sha256-UrVH5Ky5aiqquQ2o6bSkqLD4ULl9/vUViOoACantT1Q=";
hash = "sha256-KxlgJlRuy3q24NJ9kVfOJ3zG4k14wWPKYPTb6QfviHc=";
};
vendorHash = "sha256-VWD/AXqEVWo7G9p1q1BM2LUNwAFmkPm+Gm2s9EPu6nM=";
+6 -6
View File
@@ -1,16 +1,16 @@
{
"version": "18.5.1",
"repo_hash": "0h80pzsfn6lb8mz8igbpkmazzj3kkdwhrqxazjq6g9zrsqsvydx5",
"version": "18.5.2",
"repo_hash": "1gbhkg5m9gv8bj5nrppklajmxzmfq8r4sq4mxak8g2jsm7yxkhg1",
"yarn_hash": "16f7r4v4mjjdsfbzy5vy1g18p0l3gnjvfvzrl2xrxdibx7a3b4xs",
"frontend_islands_yarn_hash": "0kks9hzm5fq3fss9ys8zxls3d3860l1fvsfcrbhf9rccmwvmjn3l",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v18.5.1-ee",
"rev": "v18.5.2-ee",
"passthru": {
"GITALY_SERVER_VERSION": "18.5.1",
"GITLAB_PAGES_VERSION": "18.5.1",
"GITALY_SERVER_VERSION": "18.5.2",
"GITLAB_PAGES_VERSION": "18.5.2",
"GITLAB_SHELL_VERSION": "14.45.3",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.9.4",
"GITLAB_WORKHORSE_VERSION": "18.5.1"
"GITLAB_WORKHORSE_VERSION": "18.5.2"
}
}
@@ -10,7 +10,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "18.5.1";
version = "18.5.2";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
+1 -1
View File
@@ -83,7 +83,7 @@ let
cp Cargo.lock $out
'';
};
hash = "sha256-IPVpUj0ixYKQg8ZUKLGcS9RcR2zOWCrqkwJFUF1cmdI=";
hash = "sha256-f2a6/xPNGfiT4bbKAlHYYcqc0PkEkW+cpH7QbJMCY7c=";
};
dontBuild = false;
+5 -2
View File
@@ -31,6 +31,9 @@ else
gem 'rails', '~> 7.1.5.2', feature_category: :shared
end
# Pin Zeitwerk until https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/9408 is fixed
gem 'zeitwerk', '= 2.6.18', feature_category: :shared
gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab', feature_category: :shared
# This can be dropped after upgrading to Rails 7.2: https://github.com/rails/rails/pull/49674
gem 'mutex_m', '~> 0.3', feature_category: :shared
@@ -271,7 +274,7 @@ gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdow
gem 'rouge', '~> 4.6.1', feature_category: :shared
gem 'truncato', '~> 0.7.13', feature_category: :team_planning
gem 'nokogiri', '~> 1.18', feature_category: :shared
gem 'gitlab-glfm-markdown', '~> 0.0.36', feature_category: :markdown
gem 'gitlab-glfm-markdown', '~> 0.0.38', feature_category: :markdown
gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown
gem 'unicode-emoji', '~> 4.0', feature_category: :markdown
@@ -559,7 +562,7 @@ end
group :development, :test, :coverage do
gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling
gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling
gem 'simplecov-cobertura', '~> 2.1.0', require: false, feature_category: :tooling
gem 'simplecov-cobertura', '~> 3.1.0', require: false, feature_category: :tooling
gem 'undercover', '~> 0.7.0', require: false, feature_category: :tooling
end
+8 -7
View File
@@ -759,7 +759,7 @@ GEM
mime-types
net-http-persistent (~> 4.0)
nokogiri (~> 1, >= 1.10.8)
gitlab-glfm-markdown (0.0.36)
gitlab-glfm-markdown (0.0.38)
rb_sys (~> 0.9.109)
gitlab-kas-grpc (18.5.0.pre.rc4)
grpc (~> 1.0)
@@ -1335,7 +1335,7 @@ GEM
opensearch-ruby (3.4.0)
faraday (>= 1.0, < 3)
multi_json (>= 1.0)
openssl (3.3.1)
openssl (3.3.2)
openssl-signature_algorithm (1.3.0)
openssl (> 2.0)
opentelemetry-api (1.2.5)
@@ -1539,7 +1539,7 @@ GEM
pyu-ruby-sasl (0.0.3.3)
raabro (1.4.0)
racc (1.8.1)
rack (2.2.18)
rack (2.2.20)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (6.7.0)
@@ -1830,7 +1830,7 @@ GEM
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-cobertura (2.1.0)
simplecov-cobertura (3.1.0)
rexml
simplecov (~> 0.19)
simplecov-html (0.12.3)
@@ -2071,7 +2071,7 @@ GEM
yard (0.9.37)
yard-solargraph (0.1.0)
yard (~> 0.9)
zeitwerk (2.7.3)
zeitwerk (2.6.18)
PLATFORMS
ruby
@@ -2182,7 +2182,7 @@ DEPENDENCIES
gitlab-duo-workflow-service-client (~> 0.4)!
gitlab-experiment (~> 1.0.0)
gitlab-fog-azure-rm (~> 2.4.0)
gitlab-glfm-markdown (~> 0.0.36)
gitlab-glfm-markdown (~> 0.0.38)
gitlab-grape-openapi!
gitlab-housekeeper!
gitlab-http!
@@ -2404,7 +2404,7 @@ DEPENDENCIES
sigdump (~> 0.2.4)
simple_po_parser (~> 1.1.6)
simplecov (~> 0.22)
simplecov-cobertura (~> 2.1.0)
simplecov-cobertura (~> 3.1.0)
simplecov-lcov (~> 0.8.0)
slack-messenger (~> 2.3.5)
snowplow-tracker (~> 0.8.0)
@@ -2450,6 +2450,7 @@ DEPENDENCIES
wikicloth (= 0.8.1)
yajl-ruby (~> 1.4.3)
yard (~> 0.9)
zeitwerk (= 2.6.18)
BUNDLED WITH
2.7.2
+10 -10
View File
@@ -2973,10 +2973,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "12r3g7fb7wbhykmjn1n6b0jiyb26bma0x89wcm8ac4phz8aqhm6j";
sha256 = "1ihbyibcfsf9wcww2xw94808j20xixrc1ni0c47s8mfnhf9dsmwf";
type = "gem";
};
version = "0.0.36";
version = "0.0.38";
};
gitlab-grape-openapi = {
dependencies = [
@@ -6040,10 +6040,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0dzq3k5hmqlav2mwf7bc10mr1mlmlnpin498g7jhbhpdpa324s6n";
sha256 = "0v0grpg9gi59zr3imxy1745k9rp3dd095mkir8gvxi69blhh2kkz";
type = "gem";
};
version = "3.3.1";
version = "3.3.2";
};
openssl-signature_algorithm = {
dependencies = [ "openssl" ];
@@ -7080,10 +7080,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "0kvz20sxih8f976ry45b6c8srkh4km0cw4ilc5ynlmyk2nkywkya";
sha256 = "0w3iq14y3ldjq29qv2ll7y1dj7adxl9p9m0312h30ll4li3k9nl5";
type = "gem";
};
version = "2.2.18";
version = "2.2.20";
};
rack-accept = {
dependencies = [ "rack" ];
@@ -8659,10 +8659,10 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "00izmp202y48qvmvwrh5x56cc5ivbjhgkkkjklvqmqzj9pik4r9c";
sha256 = "1iaxj8lfcl5cfr4qa64mcapqw4qprf4bvrdjfhhwlrf96am3hzvd";
type = "gem";
};
version = "2.1.0";
version = "3.1.0";
};
simplecov-html = {
groups = [
@@ -10097,9 +10097,9 @@ src: {
platforms = [ ];
source = {
remotes = [ "https://rubygems.org" ];
sha256 = "119ypabas886gd0n9kiid3q41w76gz60s8qmiak6pljpkd56ps5j";
sha256 = "10cpfdswql21vildiin0q7drg5zfzf2sahnk9hv3nyzzjqwj2bdx";
type = "gem";
};
version = "2.7.3";
version = "2.6.18";
};
}