From 7e9c87c67b97efa5c174fde31426a5df2369ab72 Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 13 Jun 2024 07:18:57 +0200 Subject: [PATCH 1/2] gitlab: 16.10.6 -> 16.11.4 https://gitlab.com/gitlab-org/gitlab/-/blob/v16.11.4-ee/CHANGELOG.md --- .../version-management/gitlab/data.json | 16 +- .../gitlab/gitaly/default.nix | 6 +- .../gitlab/gitlab-pages/default.nix | 4 +- .../gitlab/gitlab-shell/default.nix | 11 +- .../gitlab/gitlab-shell/go-mod-tidy.patch | 12 ++ .../gitlab/gitlab-workhorse/default.nix | 5 +- .../version-management/gitlab/rubyEnv/Gemfile | 58 +++---- .../gitlab/rubyEnv/Gemfile.lock | 121 ++++++++------- .../gitlab/rubyEnv/gemset.nix | 141 ++++++++++-------- 9 files changed, 206 insertions(+), 168 deletions(-) create mode 100644 pkgs/applications/version-management/gitlab/gitlab-shell/go-mod-tidy.patch diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index bedc561743e70..382038ac99a5b 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.10.6", - "repo_hash": "sha256-+nEUyD+ryZicH7suh4MnQRDKMC3M3VWRdO4nZCi2LGs=", - "yarn_hash": "0yzywfg4lqxjwm5cqsm4bn97zcrfvpnrs8rjrv9wv3xqvi9h9skd", + "version": "16.11.4", + "repo_hash": "sha256-VtjGV/0Xtmwqu/YZa6P6jUvlTYj9FNKALcJ3ZvMUJBw=", + "yarn_hash": "03q7h8dyssvsr91klr1jk65f5jz1ac71lx0114zq9c7awxrgp6kq", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.10.6-ee", + "rev": "v16.11.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.10.6", - "GITLAB_PAGES_VERSION": "16.10.6", - "GITLAB_SHELL_VERSION": "14.34.0", + "GITALY_SERVER_VERSION": "16.11.4", + "GITLAB_PAGES_VERSION": "16.11.4", + "GITLAB_SHELL_VERSION": "14.35.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0", - "GITLAB_WORKHORSE_VERSION": "16.10.6" + "GITLAB_WORKHORSE_VERSION": "16.11.4" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 828fc9a2eb2ce..fb175aad462a6 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -5,7 +5,7 @@ }: let - version = "16.10.6"; + version = "16.11.4"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -17,10 +17,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-C57p3H1L6ZQfjipGoQJup8u6ofir3rrxORtzUA1afL0="; + hash = "sha256-sdRKKOWoX0yyqUGpu/mqDdTq2nLZ2Gr5GNV9x99rdeU="; }; - vendorHash = "sha256-6gZr0/0ZGcFwwAY4IuW2puL/7akMZvaU0ONJGYyyJas="; + vendorHash = "sha256-WCZF7XVW6J1zyPx8e/Mcn+HmHElAUGcEICxiF5HLzBg="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 115810433df89..480d9921f9c7f 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.10.6"; + version = "16.11.4"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-30ojS+TBIJ4Qzg1jh2Bpdd2s2Yo2S+UqxRRdvNBvB/k="; + hash = "sha256-6Fh1IKCs2Bg7Eg44kbCMM8YhLmwWvdZnXp39fphLzcE="; }; vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 2b99cc36ba7ec..e5c669ba3e648 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,21 +2,24 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.34.0"; + version = "14.35.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-0LzZZn4kS5uRcj/uJgHvLvd6ZOLi1l4yaSqqRhmTYZs="; + sha256 = "sha256-WyIUdDKPKQE1Ddz40WaMA5lDs37OyDuZl/6/nKDYY/8="; }; buildInputs = [ ruby libkrb5 ]; - patches = [ ./remove-hardcoded-locations.patch ]; + patches = [ + ./remove-hardcoded-locations.patch + ./go-mod-tidy.patch + ]; - vendorHash = "sha256-RtZ9d3cempY8PxaCPFJ2uEEorem6NDURHZPirr0SUjU="; + vendorHash = "sha256-7TUHD14/aCs3lkpTy5CH9WYUc1Ud6rDFCx+JgsINvxU="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/go-mod-tidy.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/go-mod-tidy.patch new file mode 100644 index 0000000000000..f7ce8cf0575e5 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/go-mod-tidy.patch @@ -0,0 +1,12 @@ +diff --git a/go.mod b/go.mod +index 513ccc40..30ba0f6e 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,6 +1,6 @@ + module gitlab.com/gitlab-org/gitlab-shell/v14 + +-go 1.20 ++go 1.21 + + require ( + github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20240402115927-f0b226fa61cc diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 1e251e8058267..d01deb57b2006 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.10.6"; + version = "16.11.4"; # nixpkgs-update: no auto update src = fetchFromGitLab { @@ -17,10 +17,11 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-bbKX22Tb2pM+Wnyl1ojdA1nmT40Z5R99mDP1hLD+lco="; + vendorHash = "sha256-44EtpjYsxYqDH035/ruPfshfejiO011HybKD2inp8bU="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; + prodyVendor = true; meta = with lib; { homepage = "http://www.gitlab.com/"; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index dccd147ca501d..dacf2473597cb 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -107,7 +107,7 @@ gem 'invisible_captcha', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategor # Two-factor authentication gem 'devise-two-factor', '~> 4.1.1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'rqrcode', '~> 2.0', feature_category: :system_access +gem 'rqrcode', '~> 2.2', feature_category: :system_access gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' # rubocop:todo Gemfile/MissingFeatureCategory @@ -135,7 +135,7 @@ gem 'net-ldap', '~> 0.17.1' # rubocop:todo Gemfile/MissingFeatureCategory # API gem 'grape', '~> 2.0.0', feature_category: :api gem 'grape-entity', '~> 0.10.2', feature_category: :api -gem 'grape-swagger', '~> 2.0.1', group: [:development, :test], feature_category: :api +gem 'grape-swagger', '~> 2.0.2', group: [:development, :test], feature_category: :api gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test], feature_category: :api gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/MissingFeatureCategory @@ -160,7 +160,7 @@ gem 'hamlit', '~> 2.15.0' # rubocop:todo Gemfile/MissingFeatureCategory # Files attachments gem 'carrierwave', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'mini_magick', '~> 4.10.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'mini_magick', '~> 4.12' # rubocop:todo Gemfile/MissingFeatureCategory # for backups gem 'fog-aws', '~> 3.18' # rubocop:todo Gemfile/MissingFeatureCategory @@ -176,7 +176,7 @@ gem 'fog-local', '~> 0.8' # rubocop:todo Gemfile/MissingFeatureCategory # We may want to update this dependency if this is ever addressed upstream, e.g. via # https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93 gem 'fog-aliyun', '~> 0.4' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/azurerm' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'gitlab-fog-azure-rm', '~> 1.9.1', require: 'fog/azurerm' # rubocop:todo Gemfile/MissingFeatureCategory # for Google storage @@ -207,9 +207,9 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-core', '~> 3.191.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-core', '~> 3.191.6' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-s3', '~> 1.144.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-s3', '~> 1.146.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory @@ -230,7 +230,7 @@ gem 'asciidoctor-kroki', '~> 0.8.0', require: false # rubocop:todo Gemfile/Missi gem 'rouge', '~> 4.2.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'truncato', '~> 0.7.12' # rubocop:todo Gemfile/MissingFeatureCategory gem 'nokogiri', '~> 1.16' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-glfm-markdown', '~> 0.0.13', feature_category: :team_planning +gem 'gitlab-glfm-markdown', '~> 0.0.14', feature_category: :team_planning # Calendar rendering gem 'icalendar' # rubocop:todo Gemfile/MissingFeatureCategory @@ -277,7 +277,7 @@ gem 're2', '2.7.0' # rubocop:todo Gemfile/MissingFeatureCategory # Misc -gem 'semver_dialects', '~> 2.0', feature_category: :static_application_security_testing +gem 'semver_dialects', '~> 2.0', '>= 2.0.2', feature_category: :static_application_security_testing gem 'version_sorter', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'csv_builder', path: 'gems/csv_builder' # rubocop:todo Gemfile/MissingFeatureCategory @@ -327,7 +327,9 @@ gem 'loofah', '~> 2.22.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'licensee', '~> 9.16' # rubocop:todo Gemfile/MissingFeatureCategory # Detect and convert string character encoding -gem 'charlock_holmes', '~> 0.7.7' # rubocop:todo Gemfile/MissingFeatureCategory +# We forked charlock_holmes at https://gitlab.com/gitlab-org/ruby/gems/charlock_holmes +# but changed it's name to 'static_holmes' in the gemspec file. +gem 'static_holmes', '~> 0.7.7', require: 'charlock_holmes' # rubocop:todo Gemfile/MissingFeatureCategory # Detect mime content type from content gem 'ruby-magic', '~> 0.6' # rubocop:todo Gemfile/MissingFeatureCategory @@ -376,7 +378,7 @@ gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory # I18n gem 'rails-i18n', '~> 7.0', feature_category: :internationalization -gem 'gettext_i18n_rails', '~> 1.11.0', feature_category: :internationalization +gem 'gettext_i18n_rails', '~> 1.12.0', feature_category: :internationalization gem 'gettext', '~> 3.4', '>= 3.4.9', require: false, group: [:development, :test], @@ -400,12 +402,12 @@ gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client' gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory group :development do - gem 'lefthook', '~> 1.5.6', require: false, feature_category: :tooling + gem 'lefthook', '~> 1.6.8', require: false, feature_category: :tooling gem 'rubocop', feature_category: :tooling gem 'solargraph', '~> 0.47.2', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'letter_opener_web', '~> 2.0.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'lookbook', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'lookbook', '~> 2.2', '>= 2.2.2' # rubocop:todo Gemfile/MissingFeatureCategory # Better errors handler gem 'better_errors', '~> 2.10.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -414,17 +416,19 @@ group :development do gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'ruby-lsp', "~> 0.14.4", require: false, feature_category: :tooling + gem 'ruby-lsp', "~> 0.14.6", require: false, feature_category: :tooling - gem 'ruby-lsp-rails', "~> 0.3.0", feature_category: :tooling + gem 'ruby-lsp-rails', "~> 0.3.3", feature_category: :tooling gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling + + gem 'gdk-toogle', '~> 0.9', require: 'toogle', feature_category: :tooling end group :development, :test do gem 'deprecation_toolkit', '~> 1.5.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'bullet', '~> 7.1.2' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'parser', '~> 3.3', '>= 3.3.0.2' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'parser', '~> 3.3', '>= 3.3.0.5' # rubocop:todo Gemfile/MissingFeatureCategory gem 'pry-byebug' # rubocop:todo Gemfile/MissingFeatureCategory gem 'pry-rails', '~> 0.3.9' # rubocop:todo Gemfile/MissingFeatureCategory gem 'pry-shell', '~> 0.6.4' # rubocop:todo Gemfile/MissingFeatureCategory @@ -441,9 +445,9 @@ group :development, :test do gem 'spring', '~> 4.1.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab-styles', '~> 11.0.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'gitlab-styles', '~> 11.0.0', feature_category: :tooling + gem 'haml_lint', '~> 0.53', feature_category: :tooling - gem 'haml_lint', '~> 0.53', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory # Benchmarking & profiling @@ -455,7 +459,7 @@ group :development, :test do gem 'knapsack', '~> 1.22.0', feature_category: :tooling gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling - gem 'test_file_finder', '~> 0.2.1', feature_category: :tooling + gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling gem 'simple_po_parser', '~> 1.1.6', require: false # rubocop:todo Gemfile/MissingFeatureCategory @@ -500,34 +504,34 @@ end group :test do gem 'fuubar', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling - gem 'rspec_profiling', '~> 0.0.8', feature_category: :tooling + gem 'rspec_profiling', '~> 0.0.9', feature_category: :tooling gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling gem 'rspec-parameterized', '~> 1.0', require: false, feature_category: :tooling gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling gem 'capybara', '~> 3.40' # rubocop:todo Gemfile/MissingFeatureCategory gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'selenium-webdriver', '~> 4.18', '>= 4.18.1' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'selenium-webdriver', '~> 4.19' # rubocop:todo Gemfile/MissingFeatureCategory gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'shoulda-matchers', '~> 5.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'email_spec', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'webmock', '~> 3.22.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'webmock', '~> 3.23.0', feature_category: :shared gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'test-prof', '~> 1.3.1' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'test-prof', '~> 1.3.2', feature_category: :tooling gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'axe-core-rspec', '~> 4.8.2', feature_category: :tooling + gem 'axe-core-rspec', '~> 4.9.0', feature_category: :tooling # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab_quality-test_tooling', '~> 1.17.0', require: false, feature_category: :tooling + gem 'gitlab_quality-test_tooling', '~> 1.21.1', require: false, feature_category: :tooling end -gem 'octokit', '~> 8.0', feature_category: :importers +gem 'octokit', '~> 8.1', feature_category: :importers gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared @@ -559,7 +563,7 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 16.10.0-rc1', feature_category: :gitaly +gem 'gitaly', '~> 16.11.0.pre.rc1', feature_category: :gitaly # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.4.0', feature_category: :deployment_management @@ -641,7 +645,7 @@ gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' # rubocop:todo Gemfile/Missi gem 'arr-pm', '~> 0.0.12' # rubocop:todo Gemfile/MissingFeatureCategory # Remote Development -gem 'devfile', '~> 0.0.25.pre.alpha1', feature_category: :remote_development +gem 'devfile', '~> 0.0.26.pre.alpha1', feature_category: :remote_development # Apple plist parsing gem 'CFPropertyList', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index e00e49f2f69e8..bb661693ff498 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -27,6 +27,8 @@ PATH remote: gems/gitlab-backup-cli specs: gitlab-backup-cli (0.0.1) + activesupport (~> 7.0.8) + rainbow (~> 3.0) thor (~> 1.3) PATH @@ -309,7 +311,7 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.191.3) + aws-sdk-core (3.191.6) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -317,7 +319,7 @@ GEM aws-sdk-kms (1.76.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.144.0) + aws-sdk-s3 (1.146.1) aws-sdk-core (~> 3, >= 3.191.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) @@ -326,7 +328,7 @@ GEM axe-core-api (4.8.0) dumb_delegator virtus - axe-core-rspec (4.8.2) + axe-core-rspec (4.9.0) axe-core-api dumb_delegator virtus @@ -392,7 +394,6 @@ GEM ssrf_filter (~> 1.0, < 1.1.0) cbor (0.5.9.8) character_set (1.8.0) - charlock_holmes (0.7.7) chef-config (18.3.0) addressable chef-utils (= 18.3.0) @@ -415,7 +416,7 @@ GEM descendants_tracker (~> 0.0.1) colored2 (3.1.2) commonmarker (0.23.10) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) connection_pool (2.4.1) cork (0.3.0) colored2 (~> 3.1) @@ -481,7 +482,7 @@ GEM thor (>= 0.19, < 2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devfile (0.0.25.pre.alpha1) + devfile (0.0.26.pre.alpha1) device_detector (1.0.0) devise (4.9.3) bcrypt (~> 3.0) @@ -669,6 +670,9 @@ GEM googleapis-common-protos-types (>= 1.3.1, < 2.a) googleauth (~> 1.0) grpc (~> 1.36) + gdk-toogle (0.9.3) + haml + rails (>= 7.0.4.2) gemoji (3.0.1) get_process_mem (0.2.7) ffi (~> 1.0) @@ -678,12 +682,12 @@ GEM prime racc text (>= 1.3.0) - gettext_i18n_rails (1.11.0) + gettext_i18n_rails (1.12.0) fast_gettext (>= 0.9.0) git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (16.10.0.pre.rc1) + gitaly (16.11.0.pre.rc1) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) @@ -697,13 +701,13 @@ GEM gitlab-experiment (0.9.1) activesupport (>= 3.0) request_store (>= 1.0) - gitlab-fog-azure-rm (1.8.0) + gitlab-fog-azure-rm (1.9.1) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) - fog-core (= 2.1.0) - fog-json (~> 1.2.0) + fog-core (~> 2.1) + fog-json (~> 1.2) mime-types - gitlab-glfm-markdown (0.0.13) + gitlab-glfm-markdown (0.0.14) rb_sys (~> 0.9.86) gitlab-labkit (0.35.1) actionpack (>= 5.0.0, < 8.0.0) @@ -739,8 +743,8 @@ GEM omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (1.17.0) - activesupport (>= 6.1, < 7.1) + gitlab_quality-test_tooling (1.21.1) + activesupport (>= 6.1, < 7.2) amatch (~> 0.4.1) gitlab (~> 4.19) http (~> 5.0) @@ -856,7 +860,7 @@ GEM grape (~> 2.0) rake (> 12) ruby2_keywords (~> 0.0.2) - grape-swagger (2.0.1) + grape-swagger (2.0.2) grape (>= 1.7, < 3.0) rack-test (~> 2) grape-swagger-entity (0.5.1) @@ -923,7 +927,7 @@ GEM thor tilt hana (1.3.7) - hashdiff (1.0.1) + hashdiff (1.1.0) hashie (5.0.0) health_check (3.1.0) railties (>= 5.0) @@ -949,7 +953,7 @@ GEM mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) i18n_data (0.13.1) icalendar (2.8.0) @@ -1023,7 +1027,7 @@ GEM language_server-protocol (3.17.0.3) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.5.6) + lefthook (1.6.8) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -1061,7 +1065,7 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - lookbook (2.2.0) + lookbook (2.2.2) activemodel css_parser htmlbeautifier (~> 1.3) @@ -1071,7 +1075,7 @@ GEM redcarpet (~> 3.5) rouge (>= 3.26, < 5.0) view_component (>= 2.0) - yard (~> 0.9.25) + yard (~> 0.9) zeitwerk (~> 2.5) lru_redux (1.1.0) lumberjack (1.2.7) @@ -1091,7 +1095,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2023.1003) mini_histogram (0.3.1) - mini_magick (4.10.1) + mini_magick (4.12.0) mini_mime (1.1.2) mini_portile2 (2.8.5) minitest (5.11.3) @@ -1153,7 +1157,8 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0) version_gem (~> 1.1) - octokit (8.0.0) + octokit (8.1.0) + base64 faraday (>= 1, < 3) sawyer (~> 0.9) ohai (18.1.3) @@ -1260,7 +1265,7 @@ GEM expgen (~> 0.1) rainbow (~> 3.1.1) parallel (1.22.1) - parser (3.3.0.2) + parser (3.3.0.5) ast (~> 2.4.1) racc parslet (1.8.2) @@ -1471,7 +1476,7 @@ GEM rspec-support (3.12.0) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rspec_profiling (0.0.8) + rspec_profiling (0.0.9) activerecord get_process_mem rails @@ -1508,11 +1513,11 @@ GEM ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) - ruby-lsp (0.14.4) + ruby-lsp (0.14.6) language_server-protocol (~> 3.17.0) prism (>= 0.22.0, < 0.25) sorbet-runtime (>= 0.5.10782) - ruby-lsp-rails (0.3.1) + ruby-lsp-rails (0.3.3) actionpack (>= 6.0) activerecord (>= 6.0) railties (>= 6.0) @@ -1550,12 +1555,12 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - selenium-webdriver (4.18.1) + selenium-webdriver (4.19.0) base64 (~> 0.2) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - semver_dialects (2.0.0) + semver_dialects (2.0.2) deb_version (~> 1.0.1) pastel (~> 0.8.0) thor (~> 1.3) @@ -1641,6 +1646,7 @@ GEM state_machines-activerecord (0.8.0) activerecord (>= 5.1) state_machines-activemodel (>= 0.8.0) + static_holmes (0.7.7) strings (0.2.1) strings-ansi (~> 0.2) unicode-display_width (>= 1.5, < 3.0) @@ -1667,8 +1673,8 @@ GEM unicode-display_width (>= 1.1.1, < 3) terser (1.0.2) execjs (>= 0.3.0, < 3) - test-prof (1.3.1) - test_file_finder (0.2.1) + test-prof (1.3.2) + test_file_finder (0.3.1) faraday (>= 1.0, < 3.0, != 2.0.0) text (1.3.1) thor (1.3.1) @@ -1783,7 +1789,7 @@ GEM webfinger (1.2.0) activesupport httpclient (>= 2.4) - webmock (3.22.0) + webmock (3.23.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -1830,9 +1836,9 @@ DEPENDENCIES attr_encrypted (~> 3.2.4)! awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.191.3) - aws-sdk-s3 (~> 1.144.0) - axe-core-rspec (~> 4.8.2) + aws-sdk-core (~> 3.191.6) + aws-sdk-s3 (~> 1.146.1) + axe-core-rspec (~> 4.9.0) babosa (~> 2.0) base32 (~> 0.3.0) batch-loader (~> 2.0.1) @@ -1848,7 +1854,6 @@ DEPENDENCIES capybara (~> 3.40) capybara-screenshot (~> 1.0.26) carrierwave (~> 1.3) - charlock_holmes (~> 0.7.7) circuitbox (= 2.0.0) click_house-client! cloud_profiler_agent (~> 0.0.0)! @@ -1866,7 +1871,7 @@ DEPENDENCIES declarative_policy (~> 1.1.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks - devfile (~> 0.0.25.pre.alpha1) + devfile (~> 0.0.26.pre.alpha1) device_detector devise (~> 4.9.3) devise-pbkdf2-encryptable (~> 0.0.0)! @@ -1899,15 +1904,16 @@ DEPENDENCIES fog-local (~> 0.8) fugit (~> 1.8.1) fuubar (~> 2.2.0) + gdk-toogle (~> 0.9) gettext (~> 3.4, >= 3.4.9) - gettext_i18n_rails (~> 1.11.0) - gitaly (~> 16.10.0.pre.rc1) + gettext_i18n_rails (~> 1.12.0) + gitaly (~> 16.11.0.pre.rc1) gitlab-backup-cli! gitlab-chronic (~> 0.10.5) gitlab-dangerfiles (~> 4.7.0) gitlab-experiment (~> 0.9.1) - gitlab-fog-azure-rm (~> 1.8.0) - gitlab-glfm-markdown (~> 0.0.13) + gitlab-fog-azure-rm (~> 1.9.1) + gitlab-glfm-markdown (~> 0.0.14) gitlab-housekeeper! gitlab-http! gitlab-labkit (~> 0.35.1) @@ -1926,7 +1932,7 @@ DEPENDENCIES gitlab-utils! gitlab_chronic_duration (~> 0.12) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 1.17.0) + gitlab_quality-test_tooling (~> 1.21.1) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) @@ -1948,7 +1954,7 @@ DEPENDENCIES grape (~> 2.0.0) grape-entity (~> 0.10.2) grape-path-helpers (~> 2.0.1) - grape-swagger (~> 2.0.1) + grape-swagger (~> 2.0.2) grape-swagger-entity (~> 0.5.1) grape_logging (~> 1.8, >= 1.8.4) graphiql-rails (~> 1.8.0) @@ -1983,7 +1989,7 @@ DEPENDENCIES knapsack (~> 1.22.0) kramdown (~> 2.3.1) kubeclient (~> 4.11.0) - lefthook (~> 1.5.6) + lefthook (~> 1.6.8) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) licensee (~> 9.16) @@ -1991,14 +1997,14 @@ DEPENDENCIES lockbox (~> 1.3.0) lograge (~> 0.5) loofah (~> 2.22.0) - lookbook (~> 2.2) + lookbook (~> 2.2, >= 2.2.2) lru_redux mail (= 2.8.1) mail-smtp_pool (~> 0.1.0)! marginalia (~> 1.11.1) memory_profiler (~> 1.0) microsoft_graph_mailer (~> 0.1.0)! - mini_magick (~> 4.10.1) + mini_magick (~> 4.12) minitest (~> 5.11.0) multi_json (~> 1.14.1) neighbor (~> 0.2.3) @@ -2008,7 +2014,7 @@ DEPENDENCIES net-protocol (~> 0.1.3) nokogiri (~> 1.16) oauth2 (~> 2.0) - octokit (~> 8.0) + octokit (~> 8.1) ohai (~> 18.1) oj (~> 3.13.21) oj-introspect (~> 0.7) @@ -2036,7 +2042,7 @@ DEPENDENCIES os (~> 1.1, >= 1.1.4) pact (~> 1.64) parallel (~> 1.19) - parser (~> 3.3, >= 3.3.0.2) + parser (~> 3.3, >= 3.3.0.5) parslet (~> 1.8) peek (~> 1.1) pg (~> 1.5.6) @@ -2070,17 +2076,17 @@ DEPENDENCIES retriable (~> 3.1.2) rexml (~> 3.2.6) rouge (~> 4.2.0) - rqrcode (~> 2.0) + rqrcode (~> 2.2) rspec-benchmark (~> 0.6.0) rspec-parameterized (~> 1.0) rspec-rails (~> 6.1.1) rspec-retry (~> 0.6.2) rspec_junit_formatter - rspec_profiling (~> 0.0.8) + rspec_profiling (~> 0.0.9) rubocop ruby-fogbugz (~> 0.3.0) - ruby-lsp (~> 0.14.4) - ruby-lsp-rails (~> 0.3.0) + ruby-lsp (~> 0.14.6) + ruby-lsp-rails (~> 0.3.3) ruby-lsp-rspec (~> 0.1.10) ruby-magic (~> 0.6) ruby-openai (~> 3.7) @@ -2091,8 +2097,8 @@ DEPENDENCIES sanitize (~> 6.0.2) sd_notify (~> 0.1.0) seed-fu (~> 2.3.7) - selenium-webdriver (~> 4.18, >= 4.18.1) - semver_dialects (~> 2.0) + selenium-webdriver (~> 4.19) + semver_dialects (~> 2.0, >= 2.0.2) sentry-rails (~> 5.10.0) sentry-raven (~> 3.1) sentry-ruby (~> 5.10.0) @@ -2116,12 +2122,13 @@ DEPENDENCIES ssh_data (~> 1.3) stackprof (~> 0.2.25) state_machines-activerecord (~> 0.8.0) + static_holmes (~> 0.7.7) sys-filesystem (~> 1.4.3) tanuki_emoji (~> 0.9) telesignenterprise (~> 2.2) terser (= 1.0.2) - test-prof (~> 1.3.1) - test_file_finder (~> 0.2.1) + test-prof (~> 1.3.2) + test_file_finder (~> 0.3.1) thrift (>= 0.16.0) timfel-krb5-auth (~> 0.8) toml-rb (~> 2.2.0) @@ -2138,10 +2145,10 @@ DEPENDENCIES vmstat (~> 2.3.0) warning (~> 1.3.0) webauthn (~> 3.0) - webmock (~> 3.22.0) + webmock (~> 3.23.0) webrick (~> 1.8.1) wikicloth (= 0.8.1) yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.5.6 + 2.5.8 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 2520955593dee..dff2917092d8b 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -400,10 +400,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "088nq8yz9n4p7pnhjwp9nbxlkj7jwchpkzvnl4nybfb1dkvk4dns"; + sha256 = "08h9apxdn2aflkg751j4i56ks4750znfbj56w4zlxf4jk7jxkbyk"; type = "gem"; }; - version = "3.191.3"; + version = "3.191.6"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -422,10 +422,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ypg31pfzbd43n1m20cyf6gyrlv6m0c8hmk2p5hidy1y4pi34f6g"; + sha256 = "1al80phz4x9wwfnr07q1l8h5f0qxgfrrycbg8jvznhxm3zhrakrq"; type = "gem"; }; - version = "1.144.0"; + version = "1.146.1"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -455,10 +455,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14h4abf5h242a0vn2r05pkr8311qbxgkl63py7vbhx8bfpk1kq3i"; + sha256 = "0fnzb49lmxs18lc6z6araqy1j7jiqh8naiwq9hjj3i7hbajizy75"; type = "gem"; }; - version = "4.8.2"; + version = "4.9.0"; }; axiom-types = { dependencies = ["descendants_tracker" "ice_nine" "thread_safe"]; @@ -787,16 +787,6 @@ src: }; version = "1.8.0"; }; - charlock_holmes = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p"; - type = "gem"; - }; - version = "0.7.7"; - }; chef-config = { dependencies = ["addressable" "chef-utils" "fuzzyurl" "mixlib-config" "mixlib-shellout" "tomlrb"]; groups = ["default"]; @@ -936,14 +926,14 @@ src: version = "0.23.10"; }; concurrent-ruby = { - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; + sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; connection_pool = { groups = ["default"]; @@ -1233,10 +1223,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p11hv0a2s4m29vvyr7z22wjr9f4cfmdjnqidrv62rfcg9r73w0g"; + sha256 = "1r69vrhh72j6fq41ii99n4ncf0kgb82nhb7j8ia1pr94m4prc4i0"; type = "gem"; }; - version = "0.0.25.pre.alpha1"; + version = "0.0.26.pre.alpha1"; }; device_detector = { groups = ["default"]; @@ -2089,6 +2079,17 @@ src: }; version = "0.20.0"; }; + gdk-toogle = { + dependencies = ["haml" "rails"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gzf4b6y5v0d5pbc0lq33383m3c8y8kq5yy57124lb9bblymszw9"; + type = "gem"; + }; + version = "0.9.3"; + }; gemoji = { groups = ["default" "development" "test"]; platforms = []; @@ -2127,10 +2128,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gibn9j4k9ck54v7rxbqwa587fc2l92clv9r71zhyl3c4m57x771"; + sha256 = "1gn1mzqx49i5zfmal499piij457r6jn82cz8w53wxqm965vq3i3a"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; git = { dependencies = ["addressable" "rchardet"]; @@ -2149,10 +2150,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nwc8mlpznq9b7rgcbxwzaj936pn0syjasxdhplpiz3iqbr64ca8"; + sha256 = "1bp7lsqhcmb1fi1wsij1gbl0ip9jcwmzxagfg39c7dnm7xglycr4"; type = "gem"; }; - version = "16.10.0.pre.rc1"; + version = "16.11.0.pre.rc1"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2166,7 +2167,7 @@ src: version = "4.19.0"; }; gitlab-backup-cli = { - dependencies = ["thor"]; + dependencies = ["activesupport" "rainbow" "thor"]; groups = ["default"]; platforms = []; source = { @@ -2214,10 +2215,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a3c3slg1iqlhyci9mnbasgw1qcsnznczyqjkn28hfr79cblpwp4"; + sha256 = "0dsg53f6gfhf9rs6wslragagl3ysi429p45iy4dkq664i8c8wsq2"; type = "gem"; }; - version = "1.8.0"; + version = "1.9.1"; }; gitlab-glfm-markdown = { dependencies = ["rb_sys"]; @@ -2225,10 +2226,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nk9kp3zb2x1hpqirq7x2qqpmfsqq4izprbicxjb20bqvm4mvvdb"; + sha256 = "0finxlax2pgxw85qnyz3p4pmi8dz6qj8bsjkrkrnkd93k41lyfcn"; type = "gem"; }; - version = "0.0.13"; + version = "0.0.14"; }; gitlab-housekeeper = { dependencies = ["activesupport" "awesome_print" "httparty" "rubocop"]; @@ -2422,10 +2423,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d59k5c0y8vkmz7fjh7x455d4d19fpw4r9agv02vqyvp7glrbm34"; + sha256 = "1g4fsldxs63ds31sni422xk0g3yrr9jpga0bah5ip4hys8as3wl3"; type = "gem"; }; - version = "1.17.0"; + version = "1.21.1"; }; globalid = { dependencies = ["activesupport"]; @@ -2805,10 +2806,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1467ni6f0yy4z3qldjs8x0h50n9ym6zyjbx5gqqzbq6zhvgbx40g"; + sha256 = "018843mknkjs1ybazs7b8k7k0g67m1ldc42z8vlb5yinp9b9l4x7"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.2"; }; grape-swagger-entity = { dependencies = ["grape-entity" "grape-swagger"]; @@ -3010,10 +3011,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nynpl0xbj0nphqx1qlmyggq58ms1phf5i03hk64wcc0a17x1m1c"; + sha256 = "1jf9dxgjz6z7fvymyz2acyvn9iyvwkn6d9sk7y4fxwbmfc75yimm"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; hashie = { groups = ["default"]; @@ -3158,10 +3159,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; + sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.4"; }; i18n_data = { groups = ["default"]; @@ -3507,10 +3508,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rc7fzg4rjchyv7rd6vlz35hg5n8k5625s78hj12zji0xhg1jznc"; + sha256 = "08y6f6f4nhg4dc96rbawhjjalxn0chzvvza5d8qfzsac6zl83094"; type = "gem"; }; - version = "1.5.6"; + version = "1.6.8"; }; letter_opener = { dependencies = ["launchy"]; @@ -3636,10 +3637,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nd26yk8fwhb7lf7knzl6pf93v2spyf90gz4c6f8xfzq9hv6kj17"; + sha256 = "0kxnshqv3xv3hprnn4rsqq0djrqpmfcr7x8qmwy6p91g7yqhkhx5"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.2"; }; lru_redux = { groups = ["default"]; @@ -3783,10 +3784,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lpq12z70n10c1qshcddd5nib2pkcbkwzvmiqqzj60l01k3x4fg9"; + sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37"; type = "gem"; }; - version = "4.10.1"; + version = "4.12.0"; }; mini_mime = { groups = ["default" "development" "test"]; @@ -4165,15 +4166,15 @@ src: version = "2.0.9"; }; octokit = { - dependencies = ["faraday" "sawyer"]; + dependencies = ["base64" "faraday" "sawyer"]; groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11fhv1a43c51jkgmqf62aypf9yw74lc6ph4qmzsh2bydwwzbwqn3"; + sha256 = "1kgqga0ycrlrk586gw2s7f8p4w699gjj3zvmmqkhx4afnplrq8l2"; type = "gem"; }; - version = "8.0.0"; + version = "8.1.0"; }; ohai = { dependencies = ["chef-config" "chef-utils" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "train-core" "wmi-lite"]; @@ -4565,10 +4566,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "181faqz59p2mbfab5q4l1r298pq0nxl0k85rjcb58g0lardmv321"; + sha256 = "11r6kp8wam0nkfvnwyc1fmvky102r1vcfr84vi2p1a2wa0z32j3p"; type = "gem"; }; - version = "3.3.0.2"; + version = "3.3.0.5"; }; parslet = { groups = ["default" "development" "test"]; @@ -5483,10 +5484,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0icl94f0mmw7g4h1qnsil0cw6zw7b5wv0ilxda01928vh5bf87mk"; + sha256 = "143m9yiawqrjc02wack30k7m5w4d1axlsw0ds71vl55amqnvx6b1"; type = "gem"; }; - version = "0.0.8"; + version = "0.0.9"; }; rubocop = { dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; @@ -5593,10 +5594,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v0dwirw4mq7qkf5a7wvagil4ppvk4dw4ln8hs6rmf2xrf56ga5f"; + sha256 = "0ja3ag2q0w8xsbf25sf2x98gvdia534ld2m8hn1bfwzhwb5ysfsl"; type = "gem"; }; - version = "0.14.4"; + version = "0.14.6"; }; ruby-lsp-rails = { dependencies = ["actionpack" "activerecord" "railties" "ruby-lsp" "sorbet-runtime"]; @@ -5604,10 +5605,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "033kxj55pywnc4cjqcfb2jvn96nsa93m93qd2p636jf5hkqazq41"; + sha256 = "1hrb39svnd8v6vnd3vyzsby6qr0z28cj0v9r02hcjvadm2p67g03"; type = "gem"; }; - version = "0.3.1"; + version = "0.3.3"; }; ruby-lsp-rspec = { dependencies = ["ruby-lsp"]; @@ -5804,10 +5805,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1asysih4l1mv24wqxrbnz0c0454kw3dhqaj6nsa8pyn9fjjdms5b"; + sha256 = "0rjh9s5x7jqaxjfcz2m3hphhlajk9nxs6wdsnia62iba07bd32sc"; type = "gem"; }; - version = "4.18.1"; + version = "4.19.0"; }; semver_dialects = { dependencies = ["deb_version" "pastel" "thor" "tty-command"]; @@ -5815,10 +5816,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11s5nr5v81qjlf2glgqjisvnv12vmwsmi9abbzqkb1nqjhw43691"; + sha256 = "1zhnq4wkcy8vv6qazfg0p3zrlswxhz9glqnq2991p4vg86grq1b0"; type = "gem"; }; - version = "2.0.0"; + version = "2.0.2"; }; sentry-rails = { dependencies = ["railties" "sentry-ruby"]; @@ -6197,6 +6198,16 @@ src: }; version = "0.8.0"; }; + static_holmes = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01w2vjm0sssiw3j38jhgkqsqn1wdqnm2ld24hi8ib2bj47c2di47"; + type = "gem"; + }; + version = "0.7.7"; + }; strings = { dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"]; groups = ["default" "development" "test"]; @@ -6350,10 +6361,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08vm33d51zdan4zj4cccw3lx06p6flc1h40kgdfm9rp4x83csdda"; + sha256 = "09zw1y52yhzw2z01za87dglpfpdrm1dma00629wpq6462nxq9574"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; test_file_finder = { dependencies = ["faraday"]; @@ -6361,10 +6372,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cyd1wpi280w4v6f6panbvrli8493phzbb09nvxswxhcv1lv7sd5"; + sha256 = "16bi2x6n8vwpinlm3n7j666ryq06zndhp4cj32sq89vbl240byw3"; type = "gem"; }; - version = "0.2.1"; + version = "0.3.1"; }; text = { groups = ["default" "development"]; @@ -6888,10 +6899,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13jb9q0qv9ajw1ajr4cawnqj4h0dws3w5j4v5n6v3xk7a8rnjzr7"; + sha256 = "07zk8ljq5kyd1mm9qw3452fcnf7frg3irh9ql8ln2m8zbi1qf1qh"; type = "gem"; }; - version = "3.22.0"; + version = "3.23.0"; }; webrick = { groups = ["default" "development" "test"]; From e34d62d869c3fbd23ab7440628bfea28b1e176c2 Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 13 Jun 2024 07:19:28 +0200 Subject: [PATCH 2/2] gitlab-container-registry: 4.1.0 -> 4.5.0 https://gitlab.com/gitlab-org/container-registry/-/blob/v4.5.0-gitlab/CHANGELOG.md Fixes CVE-2024-1495 Fixes CVE-2024-1963 Fixes CVE-2024-4201 Fixes CVE-2024-5469 --- pkgs/applications/version-management/gitlab/default.nix | 6 +++++- .../gitlab/gitlab-container-registry/default.nix | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index d37604612bdf3..144fd40edd9c6 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -4,6 +4,7 @@ , gitlabEnterprise ? false, callPackage, yarn , fixup-yarn-lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config , cargo, rustc, rustPlatform +, icu, zlib, which }: let @@ -49,7 +50,7 @@ let cp Cargo.lock $out ''; }; - hash = "sha256-7q2xWAsFkXHxkYNzIjPwJRy72xMXF278cpVzqGLt/9Y="; + hash = "sha256-SncgYYnoSaWA4kQWonoXXbSMu1mnwTyhdLXFagqgH+o="; }; dontBuild = false; @@ -74,6 +75,9 @@ let find $out -type f -name .rustc_info.json -delete ''; }; + static_holmes = attrs: { + buildInputs = [ which icu zlib ]; + }; }; groups = [ "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos" diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index d14246d7a6b44..d84947908c721 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "4.1.0"; + version = "4.5.0"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -10,7 +10,7 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-t+i9IuBH94PpfriIAaqqWYZHxKJJDOedJ3BQXGEPp0A="; + hash = "sha256-dCDybwIfzC79Mobejz/5XbEMQXkPuO8HejjannA6k/M="; }; vendorHash = "sha256-sybppXCoTrc196xLBW1+sUg9Y5uA0GAptlJ7RjhzuGc=";