From 91afa81d15260b29a34e806b1cf657ba1fca6d44 Mon Sep 17 00:00:00 2001 From: Yaya Date: Wed, 16 Apr 2025 10:35:11 +0200 Subject: [PATCH] gitlab: 17.10.4 -> 17.11.1 - https://about.gitlab.com/releases/2025/04/17/gitlab-17-11-released/ - https://about.gitlab.com/releases/2025/04/23/patch-release-gitlab-17-11-1-released/ - https://gitlab.com/gitlab-org/gitlab/-/blob/v17.11.1-ee/CHANGELOG.md --- .../version-management/gitlab/data.json | 16 +-- .../version-management/gitlab/default.nix | 2 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../version-management/gitlab/rubyEnv/Gemfile | 29 +++-- .../gitlab/rubyEnv/Gemfile.lock | 95 +++++++-------- .../gitlab/rubyEnv/gemset.nix | 113 +++++++----------- .../version-management/gitlab/update.py | 2 +- pkgs/by-name/gi/gitaly/git.nix | 4 +- pkgs/by-name/gi/gitaly/package.nix | 6 +- .../gitlab-elasticsearch-indexer/package.nix | 6 +- pkgs/by-name/gi/gitlab-pages/package.nix | 6 +- 11 files changed, 129 insertions(+), 154 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index e9a2ea12859b..1b75ed42beab 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.10.4", - "repo_hash": "1ppfg904q1ikl21k21iyzknpd7l51zxpi144416myr5m1a6a3kza", - "yarn_hash": "0fw84hf9qswajmjhds59fn6l6xmyha6vja13dvb5slfw9cmbq9pi", + "version": "17.11.1", + "repo_hash": "1sw1qw1fsxvdyzc48f03p89njklm3zn7fd090jjryr881fpcvgcd", + "yarn_hash": "0z06jaxqbg2wnq7yhpkba0cpxp4w4iy2cxla8nhc6kgx49xk179v", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.10.4-ee", + "rev": "v17.11.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.10.4", - "GITLAB_PAGES_VERSION": "17.10.4", + "GITALY_SERVER_VERSION": "17.11.1", + "GITLAB_PAGES_VERSION": "17.11.1", "GITLAB_SHELL_VERSION": "14.41.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.4.0", - "GITLAB_WORKHORSE_VERSION": "17.10.4" + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.5.0", + "GITLAB_WORKHORSE_VERSION": "17.11.1" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 04027bd1297e..5e494dafd276 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -82,7 +82,7 @@ let cp Cargo.lock $out ''; }; - hash = "sha256-VJR3F+6l8nYj1ZCHOWxnX82C68giXX45RkhIVpZvRLo="; + hash = "sha256-Jr3lS3gQI/jojWIUxEBp7a950mcOvnbjlRIFXvfGays="; }; dontBuild = false; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 45ab20ae40f6..348740ffbed6 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -10,7 +10,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "17.10.4"; + version = "17.11.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { @@ -22,7 +22,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-rPTFHQ7b3l9wPURu50sur+PsxKYI4xiRs5uHNab9YUg="; + vendorHash = "sha256-76JO/oayqhv36WM7zC/a85l8CK1orsMuMksBYbmDN1o="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 3ba591d2b175..6274999381c3 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -45,7 +45,11 @@ gem 'bootsnap', '~> 1.18.3', require: false, feature_category: :shared # Avoid the precompiled native gems because Omnibus needs to build this to ensure # LD_LIBRARY_PATH is correct: https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7730 -gem 'ffi', '~> 1.17', force_ruby_platform: true, feature_category: :shared +if RUBY_PLATFORM.include?('darwin') + gem 'ffi', '~> 1.17', feature_category: :shared +else + gem 'ffi', '~> 1.17', force_ruby_platform: true, feature_category: :shared +end gem 'openssl', '~> 3.0', feature_category: :shared @@ -95,7 +99,8 @@ gem 'doorkeeper', '~> 5.8', '>= 5.8.1', feature_category: :system_access gem 'doorkeeper-openid_connect', '~> 1.8.10', feature_category: :system_access gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access gem 'rexml', '~> 3.4.0', feature_category: :shared -gem 'ruby-saml', '~> 1.18.0', path: 'vendor/gems/ruby-saml', feature_category: :system_access +gem 'ruby-saml', '~> 1.18', feature_category: :system_access +gem 'omniauth-saml', '~> 2.2.1', feature_category: :system_access gem 'omniauth', '~> 2.1.0', feature_category: :system_access gem 'omniauth-auth0', '~> 3.1', feature_category: :system_access gem 'omniauth-azure-activedirectory-v2', '~> 2.0', feature_category: :system_access @@ -105,7 +110,6 @@ gem 'omniauth-github', '2.0.1', feature_category: :system_access gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab', feature_category: :system_access gem 'omniauth-google-oauth2', '~> 1.1', feature_category: :system_access gem 'omniauth-oauth2-generic', '~> 0.2.2', feature_category: :system_access -gem 'omniauth-saml', '~> 2.2.1', feature_category: :system_access gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth', feature_category: :system_access # See vendor/gems/omniauth_crowd/README.md gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd', feature_category: :system_access @@ -167,7 +171,6 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared gem 'graphql', '2.4.11', path: 'vendor/gems/graphql', feature_category: :api gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api -gem 'graphlient', '~> 0.8.0', feature_category: :importers # Used by BulkImport feature (group::import) # Cells gem 'gitlab-topology-service-client', '~> 0.1', @@ -267,7 +270,7 @@ gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdow gem 'rouge', '~> 4.5.0', 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.27', feature_category: :markdown +gem 'gitlab-glfm-markdown', '~> 0.0.29', feature_category: :markdown gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown gem 'unicode-emoji', '~> 4.0', feature_category: :markdown @@ -292,7 +295,7 @@ end gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared # Background jobs -gem 'sidekiq', path: 'vendor/gems/sidekiq-7.2.4', require: 'sidekiq', feature_category: :scalability +gem 'sidekiq', '~> 7.3.9', feature_category: :scalability gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', @@ -378,7 +381,7 @@ gem 'gitlab_chronic_duration', '~> 0.12', feature_category: :shared gem 'rack-proxy', '~> 0.7.7', feature_category: :shared -gem 'cssbundling-rails', '1.4.2', feature_category: :shared +gem 'cssbundling-rails', '1.4.3', feature_category: :shared gem 'terser', '1.0.2', feature_category: :shared gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client', feature_category: :database @@ -398,7 +401,7 @@ gem 'sentry-sidekiq', '~> 5.22.0', feature_category: :observability # PostgreSQL query parsing # -gem 'pg_query', '~> 6.0.0', feature_category: :database +gem 'pg_query', '~> 6.1.0', feature_category: :database gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_category: :shared gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared @@ -518,11 +521,11 @@ group :development, :test do # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.11.0', feature_category: :shared - gem 'spring', '~> 4.1.0', feature_category: :shared + gem 'spring', '~> 4.3.0', feature_category: :shared gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared gem 'gitlab-styles', '~> 13.1.0', feature_category: :tooling, require: false - gem 'haml_lint', '~> 0.58', feature_category: :tooling + gem 'haml_lint', '~> 0.58', feature_category: :tooling, require: false # Benchmarking & profiling gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared @@ -551,6 +554,8 @@ group :development, :test do gem 'vite_ruby', '~> 3.9.0', feature_category: :shared gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling + + gem 'yard', '~> 0.9', require: false, feature_category: :tooling end group :development, :test, :danger do @@ -724,7 +729,7 @@ gem 'cvss-suite', '~> 3.3.0', require: 'cvss_suite', feature_category: :software gem 'arr-pm', '~> 0.0.12', feature_category: :package_registry # Remote Development -gem 'devfile', '~> 0.1.1', feature_category: :workspaces +gem 'devfile', '~> 0.4.0', feature_category: :workspaces # Apple plist parsing gem 'CFPropertyList', '~> 3.0.0', feature_category: :mobile_devops @@ -755,4 +760,4 @@ gem 'paper_trail', '~> 15.0', feature_category: :shared gem "i18n_data", "~> 0.13.1", feature_category: :system_access -gem "gitlab-cloud-connector", "~> 1.0.0", require: 'gitlab/cloud_connector', feature_category: :cloud_connector +gem "gitlab-cloud-connector", "~> 1.5", require: 'gitlab/cloud_connector', feature_category: :cloud_connector diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 5e2151533927..2c630de53cd2 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -214,26 +214,10 @@ PATH nokogiri (>= 1.4.4) omniauth (~> 2.0) -PATH - remote: vendor/gems/ruby-saml - specs: - ruby-saml (1.18.0) - nokogiri (>= 1.13.10) - rexml - -PATH - remote: vendor/gems/sidekiq-7.2.4 - specs: - sidekiq (7.2.4) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.19.0) - PATH remote: vendor/gems/sidekiq-reliable-fetch specs: - gitlab-sidekiq-fetcher (0.12.0) + gitlab-sidekiq-fetcher (0.12.1) json (>= 2.5) sidekiq (~> 7.0) @@ -245,7 +229,7 @@ GEM nkf rexml RedCloth (4.3.4) - acme-client (2.0.20) + acme-client (2.0.21) base64 (~> 0.2.0) faraday (>= 1.0, < 3.0.0) faraday-retry (>= 1.0, < 3.0.0) @@ -344,7 +328,7 @@ GEM asciidoctor-plantuml (0.0.16) asciidoctor (>= 2.0.17, < 3.0.0) ast (2.4.2) - async (2.23.0) + async (2.23.1) console (~> 1.29) fiber-annotation io-event (~> 1.9) @@ -482,7 +466,7 @@ GEM git css_parser (1.14.0) addressable - cssbundling-rails (1.4.2) + cssbundling-rails (1.4.3) railties (>= 6.0.0) csv (3.3.0) cvss-suite (3.3.0) @@ -535,7 +519,7 @@ GEM thor (>= 0.19, < 2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devfile (0.1.1) + devfile (0.4.0) device_detector (1.0.0) devise (4.9.4) bcrypt (~> 3.0) @@ -748,7 +732,7 @@ GEM terminal-table (>= 1.5.1) gitlab-chronic (0.10.6) numerizer (~> 0.2) - gitlab-cloud-connector (1.0.0) + gitlab-cloud-connector (1.6.0) activesupport (~> 7.0) jwt (~> 2.9.3) gitlab-dangerfiles (4.8.1) @@ -767,7 +751,7 @@ GEM mime-types net-http-persistent (~> 4.0) nokogiri (~> 1, >= 1.10.8) - gitlab-glfm-markdown (0.0.28) + gitlab-glfm-markdown (0.0.29) rb_sys (~> 0.9.109) gitlab-kas-grpc (17.9.1) grpc (~> 1.0) @@ -792,12 +776,14 @@ GEM activesupport (>= 5.2.0) rake (~> 13.0) snowplow-tracker (~> 0.8.0) - gitlab-secret_detection (0.19.0) - grpc (~> 1.63) + gitlab-secret_detection (0.23.0) + grpc (~> 1.63.0) grpc-tools (~> 1.63) grpc_reflection (~> 0.1) parallel (~> 1) re2 (~> 2.7) + sentry-ruby (~> 5.22) + stackprof (~> 0.2.27) toml-rb (~> 2.2) gitlab-security_report_schemas (0.1.2.min15.0.0.max15.2.1) activesupport (>= 6, < 8) @@ -952,13 +938,7 @@ GEM grape_logging (1.8.4) grape rack - graphlient (0.8.0) - faraday (~> 2.0) - graphql-client graphlyte (1.0.0) - graphql-client (0.23.0) - activesupport (>= 3.0) - graphql (>= 1.13.0) graphql-docs (5.0.0) commonmarker (~> 0.23, >= 0.23.6) escape_utils (~> 1.2) @@ -1064,7 +1044,7 @@ GEM character_set (~> 1.4) regexp_parser (~> 2.5) regexp_property_values (~> 1.0) - json (2.10.1) + json (2.10.2) json-jwt (1.16.6) activesupport (>= 4.2) aes_key_wrap @@ -1120,8 +1100,9 @@ GEM railties (>= 6.1) rexml libyajl2 (2.1.0) - license_finder (7.1.0) + license_finder (7.2.1) bundler + csv (~> 3.2) rubyzip (>= 1, < 3) thor (~> 1.2) tomlrb (>= 1.3, < 2.1) @@ -1226,7 +1207,7 @@ GEM nio4r (2.7.0) nkf (0.2.0) no_proxy_fix (0.1.2) - nokogiri (1.18.3) + nokogiri (1.18.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) notiffany (0.1.3) @@ -1290,9 +1271,9 @@ GEM omniauth-oauth2-generic (0.2.8) omniauth-oauth2 (~> 1.0) rake - omniauth-saml (2.2.2) + omniauth-saml (2.2.3) omniauth (~> 2.1) - ruby-saml (~> 1.17) + ruby-saml (~> 1.18) omniauth-shibboleth-redux (2.0.0) omniauth (>= 2.0.0) omniauth_openid_connect (0.8.0) @@ -1460,7 +1441,7 @@ GEM peek (1.1.0) railties (>= 4.0.0) pg (1.5.9) - pg_query (6.0.0) + pg_query (6.1.0) google-protobuf (>= 3.25.3) plist (3.7.0) png_quantizator (0.2.1) @@ -1503,7 +1484,7 @@ GEM pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) racc (1.8.1) - rack (2.2.11) + rack (2.2.13) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.7.0) @@ -1707,7 +1688,7 @@ GEM ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) - ruby-lsp (0.23.10) + ruby-lsp (0.23.13) language_server-protocol (~> 3.17.0) prism (>= 1.2, < 2.0) rbs (>= 3, < 4) @@ -1719,6 +1700,9 @@ GEM ruby-magic (0.6.0) mini_portile2 (~> 2.8) ruby-progressbar (1.11.0) + ruby-saml (1.18.0) + nokogiri (>= 1.13.10) + rexml ruby-statistics (4.1.0) ruby2_keywords (0.0.5) rubyntlm (0.6.3) @@ -1764,6 +1748,12 @@ GEM shellany (0.0.1) shoulda-matchers (6.4.0) activesupport (>= 5.2.0) + sidekiq (7.3.9) + base64 + connection_pool (>= 2.3.0) + logger + rack (>= 2.2.4) + redis-client (>= 0.22.2) sidekiq-cron (1.12.0) fugit (~> 1.8) globalid (>= 1.0.1) @@ -1812,7 +1802,7 @@ GEM sorbet-runtime (0.5.11647) spamcheck (1.3.3) grpc (~> 1.63) - spring (4.1.0) + spring (4.3.0) spring-commands-rspec (1.0.4) spring (>= 0.9.1) sprite-factory (1.7.1) @@ -1916,11 +1906,12 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) - undercover (0.6.3) + undercover (0.6.4) + base64 bigdecimal imagen (>= 0.2.0) rainbow (>= 2.1, < 4.0) - rugged (>= 0.27, < 1.8) + rugged (>= 0.27, < 1.10) unf (0.1.4) unf_ext unf_ext (0.0.8.2) @@ -2054,7 +2045,7 @@ DEPENDENCIES coverband (= 6.1.4) creole (~> 0.5.0) crystalball (~> 0.7.0) - cssbundling-rails (= 1.4.2) + cssbundling-rails (= 1.4.3) csv_builder! cvss-suite (~> 3.3.0) database_cleaner-active_record (~> 2.2.0) @@ -2062,7 +2053,7 @@ DEPENDENCIES declarative_policy (~> 1.1.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks - devfile (~> 0.1.1) + devfile (~> 0.4.0) device_detector devise (~> 4.9.3) devise-pbkdf2-encryptable (~> 0.0.0)! @@ -2108,12 +2099,12 @@ DEPENDENCIES gitlab-active-context! gitlab-backup-cli! gitlab-chronic (~> 0.10.5) - gitlab-cloud-connector (~> 1.0.0) + gitlab-cloud-connector (~> 1.5) gitlab-dangerfiles (~> 4.8.0) gitlab-duo-workflow-service-client (~> 0.1)! gitlab-experiment (~> 0.9.1) gitlab-fog-azure-rm (~> 2.2.0) - gitlab-glfm-markdown (~> 0.0.27) + gitlab-glfm-markdown (~> 0.0.29) gitlab-housekeeper! gitlab-http! gitlab-kas-grpc (~> 17.9.0.pre.rc2) @@ -2160,7 +2151,6 @@ DEPENDENCIES grape-swagger (~> 2.1.2) grape-swagger-entity (~> 0.5.5) grape_logging (~> 1.8, >= 1.8.4) - graphlient (~> 0.8.0) graphlyte (~> 1.0.0) graphql (= 2.4.11)! graphql-docs (~> 5.0.0) @@ -2269,7 +2259,7 @@ DEPENDENCIES parslet (~> 1.8) peek (~> 1.1) pg (~> 1.5.6) - pg_query (~> 6.0.0) + pg_query (~> 6.1.0) png_quantizator (~> 0.2.1) premailer-rails (~> 1.12.0) prometheus-client-mmap (~> 1.2.9) @@ -2312,7 +2302,7 @@ DEPENDENCIES ruby-lsp-rspec (~> 0.1.10) ruby-magic (~> 0.6) ruby-progressbar (~> 1.10) - ruby-saml (~> 1.18.0)! + ruby-saml (~> 1.18) rubyzip (~> 2.3.2) rugged (~> 1.6) sanitize (~> 6.0.2) @@ -2324,7 +2314,7 @@ DEPENDENCIES sentry-ruby (~> 5.22.0) sentry-sidekiq (~> 5.22.0) shoulda-matchers (~> 6.4.0) - sidekiq! + sidekiq (~> 7.3.9) sidekiq-cron (~> 1.12.0) sigdump (~> 0.2.4) simple_po_parser (~> 1.1.6) @@ -2335,7 +2325,7 @@ DEPENDENCIES snowplow-tracker (~> 0.8.0) solargraph (~> 0.47.2) spamcheck (~> 1.3.0) - spring (~> 4.1.0) + spring (~> 4.3.0) spring-commands-rspec (~> 1.0.4) sprite-factory (~> 1.7) sprockets (~> 3.7.0) @@ -2372,6 +2362,7 @@ DEPENDENCIES webrick (~> 1.8.1) wikicloth (= 0.8.1) yajl-ruby (~> 1.4.3) + yard (~> 0.9) BUNDLED WITH - 2.6.2 + 2.6.6 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 082de649e331..3e7fa71bfc8d 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -9,10 +9,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bixpb7sp6m7wp56icrs5094f0lvr2di1yspfwcmz6373d3ba2v5"; + sha256 = "0hbn563v0rc85md0fcx3z968dvq7n2ra64wbgyxg09ndjgwl9870"; type = "gem"; }; - version = "2.0.20"; + version = "2.0.21"; }; actioncable = { dependencies = [ @@ -456,10 +456,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0p29xccd3y96m7yb15yr96j362cz855ramn2x83g5z2642ag68w3"; + sha256 = "01jh5b1wh9gvgrkl2bgc93pimc0ncjbi5vsadgxxp9a8d4s9fb31"; type = "gem"; }; - version = "2.23.0"; + version = "2.23.1"; }; atlassian-jwt = { dependencies = [ "jwt" ]; @@ -1377,10 +1377,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1kscxk81incimp3y9dkaqbn8d1awzm2nn7dx24lq1nbs15l5fp18"; + sha256 = "0hbfji8lddlvsk9x70s5xvafl3w31v6mm5wjrn7rrb14gmdcvbjk"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.3"; }; csv = { groups = [ @@ -1623,10 +1623,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0yf8ckwr0pkzbdhs4y57gv9a80hvasdjv815fn67yhs4zpphqs5f"; + sha256 = "1yca2rd1xb9h3his5kpnawjgki2rpgslchrn44imhig9v8l7fnw8"; type = "gem"; }; - version = "0.1.1"; + version = "0.4.0"; }; device_detector = { groups = [ "default" ]; @@ -2868,10 +2868,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bsis23gkm8p2q7p24l2si3iw3r329ygmklahakbh7lfd4yd3wpd"; + sha256 = "0karz59rpw7vz4ckxc37gjs7lgb6zsa1pvsr57wzqfbpppgx5swa"; type = "gem"; }; - version = "1.0.0"; + version = "1.6.0"; }; gitlab-dangerfiles = { dependencies = [ @@ -2942,10 +2942,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "188laljplhci8pr8crxi3b0sj9501zya74ipqyg33gkv0cf4h3ln"; + sha256 = "09mjdrgjyad1l2lcaiy62486hnajpv9mgyxcv6vrhga0dncqm6m1"; type = "gem"; }; - version = "0.0.28"; + version = "0.0.29"; }; gitlab-housekeeper = { dependencies = [ @@ -3142,16 +3142,18 @@ src: { "grpc_reflection" "parallel" "re2" + "sentry-ruby" + "stackprof" "toml-rb" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "04sn44br9qcv5s4p2z0sjv402nlpiw0ial5gx0np9v1dcppqfpcr"; + sha256 = "1rv3r1wj5pnwjbkw3333y7kxj1hzzq0vnf6xdjj95n8m5b9krpck"; type = "gem"; }; - version = "0.19.0"; + version = "0.23.0"; }; gitlab-security_report_schemas = { dependencies = [ @@ -3178,7 +3180,7 @@ src: { path = "${src}/vendor/gems/sidekiq-reliable-fetch"; type = "path"; }; - version = "0.12.0"; + version = "0.12.1"; }; gitlab-styles = { dependencies = [ @@ -3818,20 +3820,6 @@ src: { }; version = "1.8.4"; }; - graphlient = { - dependencies = [ - "faraday" - "graphql-client" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1cbwirpx8hclxyrxfbjz5c62l7i6nsqg6x72yplm8d083pd0ii4q"; - type = "gem"; - }; - version = "0.8.0"; - }; graphlyte = { groups = [ "test" ]; platforms = [ ]; @@ -3860,20 +3848,6 @@ src: { }; version = "2.4.11"; }; - graphql-client = { - dependencies = [ - "activesupport" - "graphql" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1hdb5fd1vd1zs7kc84ng7lj95081dqwrapyidg8alsv7a7jbhf7j"; - type = "gem"; - }; - version = "0.23.0"; - }; graphql-docs = { dependencies = [ "commonmarker" @@ -4466,10 +4440,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1p4l5ycdxfsr8b51gnvlvhq6s21vmx9z4x617003zbqv3bcqmj6x"; + sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l"; type = "gem"; }; - version = "2.10.1"; + version = "2.10.2"; }; json-jwt = { dependencies = [ @@ -4740,6 +4714,7 @@ src: { }; license_finder = { dependencies = [ + "csv" "rubyzip" "thor" "tomlrb" @@ -4754,10 +4729,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0v66fb85majc816qip42kbwcn41lr6rm5w6zim4a2kgp74v0n0kd"; + sha256 = "057ghx449d70bakmn3fjr4x6f4rq4cj61l9gnww0c5sbnqcsv7hp"; type = "gem"; }; - version = "7.1.0"; + version = "7.2.1"; }; licensee = { dependencies = [ @@ -5513,10 +5488,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0npx535cs8qc33n0lpbbwl0p9fi3a5bczn6ayqhxvknh9yqw77vb"; + sha256 = "0cgv8vzp7kl20ip8qdzmrbr1vaaw4mjjy4mksg8k13z4xxfzyqvb"; type = "gem"; }; - version = "1.18.3"; + version = "1.18.7"; }; notiffany = { dependencies = [ @@ -5799,10 +5774,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1czvs3nj1d8pmf39vgghpbp7g1hgzbxlv8d563agr16nq856bk44"; + sha256 = "1c2i8yry06qpqg4k8xps5aj0hfw7l7m5vdqf85sbpr04ngfdpq6l"; type = "gem"; }; - version = "2.2.2"; + version = "2.2.3"; }; omniauth-shibboleth-redux = { dependencies = [ "omniauth" ]; @@ -6588,10 +6563,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "012w1ypcbzy6w4dsxiziqn1vqddwzpza3zdvw9hivvhcj179mw7v"; + sha256 = "07j86a2mf90dhjlm6ns7p59ij91axg860k63hxc2rw89w8lm404b"; type = "gem"; }; - version = "6.0.0"; + version = "6.1.0"; }; plist = { groups = [ "default" ]; @@ -6851,10 +6826,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12mv97fz3jp6nl4bc36wiqwdiivv5lgqcpfnan91w20rzapljk22"; + sha256 = "1yzhcwvfkrlb8l79w24yjclv636jn6rnznp95shmssk934bi1vnc"; type = "gem"; }; - version = "2.2.11"; + version = "2.2.13"; }; rack-accept = { dependencies = [ "rack" ]; @@ -7925,10 +7900,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0v2dag8wl2zpd51qml5w0icb4wp77z7gfjcfq696zimxyf7v1pvi"; + sha256 = "0j4zcp7nncrr6sn0m3scnqsxcf7j2v82pxcd7p3436m70ncmm1x1"; type = "gem"; }; - version = "0.23.10"; + version = "0.23.13"; }; ruby-lsp-rails = { dependencies = [ "ruby-lsp" ]; @@ -7985,8 +7960,9 @@ src: { groups = [ "default" ]; platforms = [ ]; source = { - path = "${src}/vendor/gems/ruby-saml"; - type = "path"; + remotes = [ "https://rubygems.org" ]; + sha256 = "0vgsvdaglz1spx9gxrr6xh7qqhi4qd8jd06h2ihwxmazj9ajld6y"; + type = "gem"; }; version = "1.18.0"; }; @@ -8268,18 +8244,20 @@ src: { }; sidekiq = { dependencies = [ - "concurrent-ruby" + "base64" "connection_pool" + "logger" "rack" "redis-client" ]; groups = [ "default" ]; platforms = [ ]; source = { - path = "${src}/vendor/gems/sidekiq-7.2.4"; - type = "path"; + remotes = [ "https://rubygems.org" ]; + sha256 = "19xm4s49hq0kpfbmvhnjskzmfjjxw5d5sm7350mh12gg3lp7220i"; + type = "gem"; }; - version = "7.2.4"; + version = "7.3.9"; }; sidekiq-cron = { dependencies = [ @@ -8545,10 +8523,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jx3y1krmx7flrp8fldb354cap1xxlln4yl97ik8smfzn07hhzzi"; + sha256 = "08kizsvrb7a19aps7a8rpmndfq16jb8q2j45fn155s1qrsyg7aha"; type = "gem"; }; - version = "4.1.0"; + version = "4.3.0"; }; spring-commands-rspec = { dependencies = [ "spring" ]; @@ -9234,6 +9212,7 @@ src: { }; undercover = { dependencies = [ + "base64" "bigdecimal" "imagen" "rainbow" @@ -9247,10 +9226,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1yk5rgr82zl0k1vjpfs42lpw2lzk5hgc970zd03abl1ypi344k57"; + sha256 = "06pc56qly4c8ygwg9hyay1vmxq75clm62ljw0s9ljamm57qzqd1w"; type = "gem"; }; - version = "0.6.3"; + version = "0.6.4"; }; unf = { dependencies = [ "unf_ext" ]; diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 230e2f4f75ca..1fd0cba1c643 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -191,7 +191,7 @@ def update_rubyenv(): # [comment]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435#note_1979750600 # [upstream issue]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435 subprocess.check_output( - ["sed", "-i", "s|gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq'|gem 'sidekiq', '~> 7.1.6'|g", "Gemfile"], + ["sed", "-i", "s|gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq'|gem 'sidekiq', '~> 7.3.9'|g", "Gemfile"], cwd=rubyenv_dir, ) diff --git a/pkgs/by-name/gi/gitaly/git.nix b/pkgs/by-name/gi/gitaly/git.nix index 03f5377faced..b9cdeb21cdc0 100644 --- a/pkgs/by-name/gi/gitaly/git.nix +++ b/pkgs/by-name/gi/gitaly/git.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "gitaly-git"; - version = "2.47.2"; + version = "2.48.1.gl1"; # `src` attribute for nix-update src = fetchFromGitLab { owner = "gitlab-org"; repo = "git"; rev = "v${version}"; - hash = "sha256-6KI8V6TDh8DYizvHFeaXBz5HlEPLNQzEZAEplVsvZUc="; + hash = "sha256-j7yKImeRerdsYtSMrAU4y5vAJ2BT5wnJxURbDIwVot4="; }; # we actually use the gitaly build system diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index cf7ef674ace1..f47cf1d6ecd9 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -7,7 +7,7 @@ }: let - version = "17.10.4"; + version = "17.11.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -21,10 +21,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-NUTo5JVolc4WUinyCn4BKDqJPn3KWXOnBs6MRj7178o="; + hash = "sha256-8PDCHAZrFs+4G4K0wAgE0AsOp4hlL+5uGb7qVJjuzqg="; }; - vendorHash = "sha256-umtSuLQiohSarzZDU7tHEYI6t8B7MlkaDu8//fnr1Ms="; + vendorHash = "sha256-ExqgxukFKXq/Z//hGSoDevfpJiNbVHhind63os1/3Fk="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix index 744fc4dd5361..994984265e53 100644 --- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix +++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "gitlab-elasticsearch-indexer"; - version = "5.4.0"; + version = "5.5.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - hash = "sha256-jrUNOxqc/k4a/34nHEatGnBorTlh/EuHnEs/GfFRUcI="; + hash = "sha256-b2kXp77pb9MXMRJsbDdNOXub8eZbZkHRwu/Ru0Voi60="; }; - vendorHash = "sha256-iL8QowfX0OpU9irUP4MJXhGVim7GU2fTMLgJSTAfh9w="; + vendorHash = "sha256-9T8LbMROLcQYm9cT32Uc6Cuxwt9OYj3WzSYFgSQg1HQ="; buildInputs = [ icu ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix index 2c7cc930f1d2..2e7a860f56e4 100644 --- a/pkgs/by-name/gi/gitlab-pages/package.nix +++ b/pkgs/by-name/gi/gitlab-pages/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.10.4"; + version = "17.11.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-kvmM8cWAAlDT+FJBVUiZD9h/qT6iAaz+gOncvyCsvtY="; + hash = "sha256-rXIHRIFbgK7VLgZ7DjR+kmP6WnYCROSbxzx12KUjXLE="; }; - vendorHash = "sha256-o2DgP2YP2aejtuQ4NC90kysvwDy0XvSb4CW5oE2x2qQ="; + vendorHash = "sha256-jCuLRXr7WHGxbXVg2JB1vp9WiNaLgsIJ6GJSS4QrlwY="; subPackages = [ "." ]; meta = with lib; {