Merge release-24.11 into staging-next-24.11

2026-10-02 13:00:23 +00:00 · 2025-04-15 00:18:42 +00:00
parent 3df4364247 eff64d6c1a
commit d18add6197
19 changed files with 566 additions and 536 deletions
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,15 +1,15 @@
 {
-  "version": "17.9.3",
-  "repo_hash": "1g6j3yrb0hslz2p9fnby0801dn0nyi2mh6gygzkmrh5kj15vjbgd",
-  "yarn_hash": "1bvv79jr6d9p33h81mc0miwc7rw3irblmcqbig8ikpb589kr09yv",
+  "version": "17.10.1",
+  "repo_hash": "1bxkfn49dih3i3z6z1l5xx5hrvrxwwr1ag66aw4vmncw4vyxl2wj",
+  "yarn_hash": "0fw84hf9qswajmjhds59fn6l6xmyha6vja13dvb5slfw9cmbq9pi",
  "owner": "gitlab-org",
  "repo": "gitlab",
-  "rev": "v17.9.3-ee",
+  "rev": "v17.10.1-ee",
  "passthru": {
-    "GITALY_SERVER_VERSION": "17.9.3",
-    "GITLAB_PAGES_VERSION": "17.9.3",
-    "GITLAB_SHELL_VERSION": "14.40.0",
+    "GITALY_SERVER_VERSION": "17.10.1",
+    "GITLAB_PAGES_VERSION": "17.10.1",
+    "GITLAB_SHELL_VERSION": "14.41.0",
    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.4.0",
-    "GITLAB_WORKHORSE_VERSION": "17.9.3"
+    "GITLAB_WORKHORSE_VERSION": "17.10.1"
  }
 }
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -83,7 +83,7 @@ let
              cp Cargo.lock $out
            '';
          };
-          hash = "sha256-LpuQMV112Z5lspSK4M0IYdkxO8oVmucnJtqF2Y3+aNU=";
+          hash = "sha256-VJR3F+6l8nYj1ZCHOWxnX82C68giXX45RkhIVpZvRLo=";
        };

        dontBuild = false;
--- 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.9.3";
+  version = "17.10.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitLab {
@@ -22,7 +22,7 @@ buildGoModule rec {

  sourceRoot = "${src.name}/workhorse";

-  vendorHash = "sha256-nqsZ0ac5NG2hCXgaJKd9J3AphzCHxF1eJ9Iypda9Uh0=";
+  vendorHash = "sha256-b8HLad4oK5x7uzlr1SQAZt20+OhB3iswhpIQnk4VF/o=";
  buildInputs = [ git ];
  ldflags = [ "-X main.Version=${version}" ];
  doCheck = false;
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@@ -30,7 +30,7 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir
 # See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails

 if next?
-  gem 'rails', '~> 7.1.5', feature_category: :shared
+  gem 'rails', '~> 7.1.5.1', feature_category: :shared
 else
  gem 'rails', '~> 7.0.8.7', feature_category: :shared
 end
@@ -76,7 +76,7 @@ gem 'rugged', '~> 1.6', feature_category: :gitaly
 gem 'faraday', '~> 2', feature_category: :shared
 gem 'faraday-retry', '~> 2', feature_category: :shared
 # Logger is a dependency of Faraday, but Logger 1.6.0 does not work with Chef.
-gem 'logger', '~> 1.5.3', feature_category: :shared
+gem 'logger', '~> 1.6.0', feature_category: :shared

 gem 'marginalia', '~> 1.11.1', feature_category: :database

@@ -158,8 +158,8 @@ gem 'net-ldap', '~> 0.17.1', feature_category: :system_access
 # API
 gem 'grape', '~> 2.0.0', feature_category: :api
 gem 'grape-entity', '~> 1.0.1', feature_category: :api
-gem 'grape-swagger', '~> 2.1.0', group: [:development, :test], feature_category: :api
-gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test], feature_category: :api
+gem 'grape-swagger', '~> 2.1.2', group: [:development, :test], feature_category: :api
+gem 'grape-swagger-entity', '~> 0.5.5', 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', feature_category: :shared

@@ -253,7 +253,7 @@ gem 'gitlab-active-context', path: 'gems/gitlab-active-context', require: 'activ
 # Markdown and HTML processing
 gem 'html-pipeline', '~> 2.14.3', feature_category: :markdown
 gem 'deckar01-task_list', '2.3.4', feature_category: :markdown
-gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup', feature_category: :markdown
+gem 'gitlab-markup', '~> 2.0.0', require: 'github/markup', feature_category: :markdown
 gem 'commonmarker', '~> 0.23.10', feature_category: :markdown
 gem 'kramdown', '~> 2.5.0', feature_category: :markdown
 gem 'RedCloth', '~> 4.3.3', feature_category: :markdown
@@ -267,7 +267,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.21', feature_category: :markdown
+gem 'gitlab-glfm-markdown', '~> 0.0.27', feature_category: :markdown
 gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown
 gem 'unicode-emoji', '~> 4.0', feature_category: :markdown

@@ -303,7 +303,7 @@ gem 'gitlab-sidekiq-fetcher',
 gem 'fugit', '~> 1.11.1', feature_category: :continuous_integration

 # HTTP requests
-gem 'httparty', '~> 0.21.0', feature_category: :shared
+gem 'httparty', '~> 0.22.0', feature_category: :shared

 # Colored output to console
 gem 'rainbow', '~> 3.0', feature_category: :shared
@@ -327,8 +327,8 @@ gem 'js_regex', '~> 3.8', feature_category: :shared
 gem 'device_detector', feature_category: :shared

 # Redis
-gem 'redis', '~> 5.3.0', feature_category: :redis
-gem 'redis-clustering', '~> 5.3.0', feature_category: :redis
+gem 'redis', '~> 5.4.0', feature_category: :redis
+gem 'redis-clustering', '~> 5.4.0', feature_category: :redis
 gem 'connection_pool', '~> 2.4', feature_category: :shared

 # Redis session store
@@ -351,7 +351,6 @@ gem 'ruby-fogbugz', '~> 0.3.0', feature_category: :importers
 gem 'kubeclient', '~> 4.11.0', feature_category: :shared

 # AI
-gem 'ruby-openai', '~> 3.7', feature_category: :ai_abstraction_layer
 gem 'circuitbox', '2.0.0', feature_category: :ai_abstraction_layer

 # Sanitize user input
@@ -379,13 +378,13 @@ gem 'gitlab_chronic_duration', '~> 0.12', feature_category: :shared

 gem 'rack-proxy', '~> 0.7.7', feature_category: :shared

-gem 'cssbundling-rails', '1.4.1', feature_category: :shared
+gem 'cssbundling-rails', '1.4.2', 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
 gem 'addressable', '~> 2.8', feature_category: :shared
 gem 'gon', '~> 6.4.0', feature_category: :shared
-gem 'request_store', '~> 1.5.1', feature_category: :shared
+gem 'request_store', '~> 1.7.0', feature_category: :shared
 gem 'base32', '~> 0.3.0', feature_category: :shared
 gem 'gitlab-license', '~> 2.6', feature_category: :shared

@@ -436,7 +435,7 @@ gem 'prometheus-client-mmap', '~> 1.2.9', require: 'prometheus/client', feature_

 # Event-driven reactor for Ruby
 # Required manually in config/initializers/require_async_gem
-gem 'async', '~> 2.22.0', require: false, feature_category: :shared
+gem 'async', '~> 2.23.0', require: false, feature_category: :shared

 # Security report schemas used to validate CI job artifacts of security jobs
 gem 'gitlab-security_report_schemas', '0.1.2.min15.0.0.max15.2.1', feature_category: :vulnerability_management
@@ -471,10 +470,10 @@ group :opentelemetry do
  gem 'opentelemetry-instrumentation-sidekiq', feature_category: :observability
 end

-gem 'warning', '~> 1.3.0', feature_category: :shared
+gem 'warning', '~> 1.5.0', feature_category: :shared

 group :development do
-  gem 'lefthook', '~> 1.7.0', require: false, feature_category: :tooling
+  gem 'lefthook', '~> 1.11.0', require: false, feature_category: :tooling
  gem 'rubocop', feature_category: :tooling
  gem 'solargraph', '~> 0.47.2', require: false, feature_category: :shared

@@ -549,7 +548,7 @@ group :development, :test do
  # For now we only use vite in development / test, and not for production builds
  # See: https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/106
  gem 'vite_rails', '~> 3.0.17', feature_category: :shared
-  gem 'vite_ruby', '~> 3.8.0', feature_category: :shared
+  gem 'vite_ruby', '~> 3.9.0', feature_category: :shared

  gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling
 end
@@ -562,7 +561,7 @@ 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 'undercover', '~> 0.5.0', require: false, feature_category: :tooling
+  gem 'undercover', '~> 0.6.0', require: false, feature_category: :tooling
 end

 # Gems required in omnibus-gitlab pipeline
@@ -589,7 +588,7 @@ group :test do

  gem 'graphlyte', '~> 1.0.0', feature_category: :shared

-  gem 'shoulda-matchers', '~> 5.1.0', require: false, feature_category: :shared
+  gem 'shoulda-matchers', '~> 6.4.0', require: false, feature_category: :shared
  gem 'email_spec', '~> 2.3.0', feature_category: :shared
  gem 'webmock', '~> 3.25.0', feature_category: :shared
  gem 'rails-controller-testing', feature_category: :shared
@@ -597,12 +596,12 @@ group :test do
  gem 'test-prof', '~> 1.4.0', feature_category: :tooling
  gem 'rspec_junit_formatter', feature_category: :shared
  gem 'guard-rspec', feature_category: :shared
-  gem 'axe-core-rspec', '~> 4.9.0', feature_category: :tooling
+  gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling

  # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
  gem 'derailed_benchmarks', require: false, feature_category: :shared

-  gem 'gitlab_quality-test_tooling', '~> 2.4.0', require: false, feature_category: :tooling
+  gem 'gitlab_quality-test_tooling', '~> 2.8.0', require: false, feature_category: :tooling
 end

 gem 'octokit', '~> 9.0', feature_category: :importers
@@ -655,9 +654,9 @@ gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
 gem 'toml-rb', '~> 2.2.0', feature_category: :shared

 # Feature toggles
-gem 'flipper', '~> 0.26.2', feature_category: :shared
-gem 'flipper-active_record', '~> 0.26.2', feature_category: :shared
-gem 'flipper-active_support_cache_store', '~> 0.26.2', feature_category: :shared
+gem 'flipper', '~> 0.28.0', feature_category: :shared
+gem 'flipper-active_record', '~> 0.28.0', feature_category: :shared
+gem 'flipper-active_support_cache_store', '~> 0.28.0', feature_category: :shared
 gem 'unleash', '~> 3.2.2', feature_category: :shared
 gem 'gitlab-experiment', '~> 0.9.1', feature_category: :shared

@@ -696,10 +695,10 @@ gem 'valid_email', '~> 0.1', feature_category: :shared

 # JSON
 gem 'jsonb_accessor', '~> 1.4', feature_category: :shared
-gem 'json', '~> 2.7.2', feature_category: :shared
+gem 'json', '~> 2.10.0', feature_category: :shared
 gem 'json_schemer', '~> 2.3.0', feature_category: :shared
-gem 'oj', '~> 3.13.21', feature_category: :shared
-gem 'oj-introspect', '~> 0.7', feature_category: :shared
+gem 'oj', '~> 3.16.0', '>=3.16.10', feature_category: :shared
+gem 'oj-introspect', '~> 0.8', feature_category: :shared
 gem 'multi_json', '~> 1.14.1', feature_category: :shared
 gem 'yajl-ruby', '~> 1.4.3', require: 'yajl', feature_category: :shared

@@ -746,7 +745,7 @@ gem 'net-http', '= 0.6.0', feature_category: :shared
 # This is locked to 0.13.0 because the default parser changes from RFC2396 to RFC3986,
 # which can be removed after Rails 7.2 upgrade
 # See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173142#note_2277952450
-gem 'uri', '= 0.13.0', feature_category: :shared
+gem 'uri', '= 0.13.2', feature_category: :shared

 gem 'duo_api', '~> 1.3', feature_category: :system_access

--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@@ -10,7 +10,7 @@ PATH
    click_house-client (0.1.0)
      activesupport (< 8)
      addressable (~> 2.8)
-      json (~> 2.7.2)
+      json (~> 2.7)

 PATH
  remote: gems/csv_builder
@@ -48,9 +48,9 @@ PATH
      google-protobuf (~> 3.25, >= 3.25.3)
      googleauth (~> 1.8.1)
      grpc (= 1.63.0)
-      json (~> 2.7.2)
+      json (~> 2.7)
      jwt (~> 2.5)
-      logger (~> 1.5.3)
+      logger (~> 1.5)
      minitest (~> 5.11.0)
      parallel (~> 1.19)
      pg (~> 1.5.6)
@@ -74,7 +74,7 @@ PATH
    gitlab-http (0.1.0)
      activesupport (~> 7)
      concurrent-ruby (~> 1.2)
-      httparty (~> 0.21.0)
+      httparty (~> 0.21)
      ipaddress (~> 0.8.3)
      net-http (= 0.6.0)
      railties (~> 7)
@@ -122,7 +122,7 @@ PATH
  specs:
    ipynbdiff (0.4.8)
      diffy (~> 3.4)
-      oj (~> 3.13.16)
+      oj (~> 3.16, >= 3.16.10)

 PATH
  remote: vendor/gems/attr_encrypted
@@ -344,10 +344,10 @@ GEM
    asciidoctor-plantuml (0.0.16)
      asciidoctor (>= 2.0.17, < 3.0.0)
    ast (2.4.2)
-    async (2.22.0)
+    async (2.23.0)
      console (~> 1.29)
      fiber-annotation
-      io-event (~> 1.7)
+      io-event (~> 1.9)
      metrics (~> 0.12)
      traces (~> 0.15)
    atlassian-jwt (0.2.1)
@@ -374,12 +374,14 @@ GEM
      aws-sigv4 (~> 1.5)
    aws-sigv4 (1.9.1)
      aws-eventstream (~> 1, >= 1.0.2)
-    axe-core-api (4.9.1)
+    axe-core-api (4.10.2)
      dumb_delegator
+      ostruct
      virtus
-    axe-core-rspec (4.9.1)
-      axe-core-api (= 4.9.1)
+    axe-core-rspec (4.10.2)
+      axe-core-api (= 4.10.2)
      dumb_delegator
+      ostruct
      virtus
    axiom-types (0.1.1)
      descendants_tracker (~> 0.0.4)
@@ -480,7 +482,7 @@ GEM
      git
    css_parser (1.14.0)
      addressable
-    cssbundling-rails (1.4.1)
+    cssbundling-rails (1.4.2)
      railties (>= 6.0.0)
    csv (3.3.0)
    cvss-suite (3.3.0)
@@ -535,7 +537,7 @@ GEM
      thread_safe (~> 0.3, >= 0.3.1)
    devfile (0.1.1)
    device_detector (1.0.0)
-    devise (4.9.3)
+    devise (4.9.4)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 4.1.0)
@@ -582,7 +584,7 @@ GEM
      dry-logic (~> 1.4)
      zeitwerk (~> 2.6)
    dumb_delegator (1.0.0)
-    duo_api (1.3.0)
+    duo_api (1.4.0)
    e2mmap (0.1.0)
    ed25519 (1.3.0)
    elasticsearch (7.17.11)
@@ -662,14 +664,14 @@ GEM
      fiber-storage
    fiber-storage (0.1.2)
    find_a_port (1.0.1)
-    flipper (0.26.2)
+    flipper (0.28.3)
      concurrent-ruby (< 2)
-    flipper-active_record (0.26.2)
+    flipper-active_record (0.28.3)
      activerecord (>= 4.2, < 8)
-      flipper (~> 0.26.2)
-    flipper-active_support_cache_store (0.26.2)
+      flipper (~> 0.28.3)
+    flipper-active_support_cache_store (0.28.3)
      activesupport (>= 4.2, < 8)
-      flipper (~> 0.26.2)
+      flipper (~> 0.28.3)
    fog-aliyun (0.4.0)
      addressable (~> 2.8.0)
      aliyun-sdk (~> 0.8.0)
@@ -739,7 +741,7 @@ GEM
    git (1.19.1)
      addressable (~> 2.8)
      rchardet (~> 1.8)
-    gitaly (17.8.1)
+    gitaly (17.8.4)
      grpc (~> 1.0)
    gitlab (4.19.0)
      httparty (~> 0.20)
@@ -765,9 +767,9 @@ GEM
      mime-types
      net-http-persistent (~> 4.0)
      nokogiri (~> 1, >= 1.10.8)
-    gitlab-glfm-markdown (0.0.27)
+    gitlab-glfm-markdown (0.0.28)
      rb_sys (~> 0.9.109)
-    gitlab-kas-grpc (17.9.0.pre.rc2)
+    gitlab-kas-grpc (17.9.1)
      grpc (~> 1.0)
    gitlab-labkit (0.37.0)
      actionpack (>= 5.0.0, < 8.1.0)
@@ -784,13 +786,13 @@ GEM
      oauth2 (>= 1.4.4, < 3)
      redis (>= 5, < 6)
      redis-namespace (>= 1.8.2)
-    gitlab-markup (1.9.0)
+    gitlab-markup (2.0.0)
    gitlab-net-dns (0.10.0)
    gitlab-sdk (0.3.1)
      activesupport (>= 5.2.0)
      rake (~> 13.0)
      snowplow-tracker (~> 0.8.0)
-    gitlab-secret_detection (0.18.0)
+    gitlab-secret_detection (0.19.0)
      grpc (~> 1.63)
      grpc-tools (~> 1.63)
      grpc_reflection (~> 0.1)
@@ -816,7 +818,7 @@ GEM
      omniauth (>= 1.3, < 3)
      pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
      rubyntlm (~> 0.5)
-    gitlab_quality-test_tooling (2.4.0)
+    gitlab_quality-test_tooling (2.8.0)
      activesupport (>= 7.0, < 7.2)
      amatch (~> 0.4.1)
      fog-google (~> 1.24, >= 1.24.1)
@@ -994,7 +996,7 @@ GEM
    haml (5.2.2)
      temple (>= 0.8.0)
      tilt
-    haml_lint (0.60.0)
+    haml_lint (0.61.0)
      haml (>= 5.0)
      parallel (~> 1.10)
      rainbow
@@ -1027,18 +1029,20 @@ GEM
    http-cookie (1.0.5)
      domain_name (~> 0.5)
    http-form_data (2.3.0)
-    httparty (0.21.0)
+    httparty (0.22.0)
+      csv
      mini_mime (>= 1.0.0)
      multi_xml (>= 0.5.2)
    httpclient (2.8.3)
    i18n (1.14.4)
      concurrent-ruby (~> 1.0)
    i18n_data (0.13.1)
-    icalendar (2.10.2)
+    icalendar (2.10.3)
      ice_cube (~> 0.16)
+      ostruct
    ice_cube (0.16.4)
    ice_nine (0.11.2)
-    imagen (0.1.8)
+    imagen (0.2.0)
      parser (>= 2.5, != 2.5.1.1)
    influxdb-client (3.2.0)
      csv
@@ -1060,7 +1064,7 @@ GEM
      character_set (~> 1.4)
      regexp_parser (~> 2.5)
      regexp_property_values (~> 1.0)
-    json (2.7.3)
+    json (2.10.1)
    json-jwt (1.16.6)
      activesupport (>= 4.2)
      aes_key_wrap
@@ -1107,7 +1111,7 @@ GEM
    language_server-protocol (3.17.0.3)
    launchy (2.5.2)
      addressable (~> 2.8)
-    lefthook (1.7.18)
+    lefthook (1.11.2)
    letter_opener (1.10.0)
      launchy (>= 2.2, < 4)
    letter_opener_web (3.0.0)
@@ -1137,7 +1141,7 @@ GEM
      rake (~> 13.0)
    locale (2.1.4)
    lockbox (1.3.0)
-    logger (1.5.3)
+    logger (1.6.6)
    lograge (0.11.2)
      actionpack (>= 4)
      activesupport (>= 4)
@@ -1253,9 +1257,11 @@ GEM
      plist (~> 3.1)
      train-core
      wmi-lite (~> 1.0)
-    oj (3.13.23)
-    oj-introspect (0.7.2)
-      oj (>= 3.13.23)
+    oj (3.16.10)
+      bigdecimal (>= 3.0)
+      ostruct (>= 0.2)
+    oj-introspect (0.8.0)
+      oj (>= 3.16.10)
    omniauth (2.1.2)
      hashie (>= 3.4.6)
      rack (>= 2.2.3)
@@ -1284,7 +1290,7 @@ GEM
    omniauth-oauth2-generic (0.2.8)
      omniauth-oauth2 (~> 1.0)
      rake
-    omniauth-saml (2.2.1)
+    omniauth-saml (2.2.2)
      omniauth (~> 2.1)
      ruby-saml (~> 1.17)
    omniauth-shibboleth-redux (2.0.0)
@@ -1315,7 +1321,7 @@ GEM
    opentelemetry-api (1.2.5)
    opentelemetry-common (0.21.0)
      opentelemetry-api (~> 1.0)
-    opentelemetry-exporter-otlp (0.29.0)
+    opentelemetry-exporter-otlp (0.29.1)
      google-protobuf (>= 3.18)
      googleapis-common-protos-types (~> 1.3)
      opentelemetry-api (~> 1.1)
@@ -1354,13 +1360,13 @@ GEM
    opentelemetry-instrumentation-concurrent_ruby (0.21.4)
      opentelemetry-api (~> 1.0)
      opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-ethon (0.21.8)
+    opentelemetry-instrumentation-ethon (0.21.9)
      opentelemetry-api (~> 1.0)
      opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-excon (0.22.4)
+    opentelemetry-instrumentation-excon (0.22.5)
      opentelemetry-api (~> 1.0)
      opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-faraday (0.24.6)
+    opentelemetry-instrumentation-faraday (0.24.7)
      opentelemetry-api (~> 1.0)
      opentelemetry-instrumentation-base (~> 0.22.1)
    opentelemetry-instrumentation-grape (0.2.0)
@@ -1370,23 +1376,23 @@ GEM
    opentelemetry-instrumentation-graphql (0.28.4)
      opentelemetry-api (~> 1.0)
      opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-http (0.23.4)
+    opentelemetry-instrumentation-http (0.23.5)
      opentelemetry-api (~> 1.0)
      opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-http_client (0.22.7)
+    opentelemetry-instrumentation-http_client (0.22.8)
      opentelemetry-api (~> 1.0)
      opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-net_http (0.22.7)
+    opentelemetry-instrumentation-net_http (0.22.8)
      opentelemetry-api (~> 1.0)
      opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-pg (0.29.0)
+    opentelemetry-instrumentation-pg (0.29.1)
      opentelemetry-api (~> 1.0)
      opentelemetry-helpers-sql-obfuscation
      opentelemetry-instrumentation-base (~> 0.22.1)
    opentelemetry-instrumentation-rack (0.25.0)
      opentelemetry-api (~> 1.0)
      opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-rails (0.33.0)
+    opentelemetry-instrumentation-rails (0.33.1)
      opentelemetry-api (~> 1.0)
      opentelemetry-instrumentation-action_mailer (~> 0.2.0)
      opentelemetry-instrumentation-action_pack (~> 0.10.0)
@@ -1406,7 +1412,7 @@ GEM
      opentelemetry-instrumentation-base (~> 0.22.1)
    opentelemetry-registry (0.3.0)
      opentelemetry-api (~> 1.1)
-    opentelemetry-sdk (1.5.0)
+    opentelemetry-sdk (1.6.0)
      opentelemetry-api (~> 1.1)
      opentelemetry-common (~> 0.20)
      opentelemetry-registry (~> 0.2)
@@ -1497,7 +1503,7 @@ GEM
    pyu-ruby-sasl (0.0.3.3)
    raabro (1.4.0)
    racc (1.8.1)
-    rack (2.2.10)
+    rack (2.2.11)
    rack-accept (0.4.5)
      rack (>= 0.4)
    rack-attack (6.7.0)
@@ -1575,7 +1581,7 @@ GEM
      json
    recursive-open-struct (1.1.3)
    redcarpet (3.6.0)
-    redis (5.3.0)
+    redis (5.4.0)
      redis-client (>= 0.22.0)
    redis-actionpack (5.5.0)
      actionpack (>= 5)
@@ -1585,8 +1591,8 @@ GEM
      connection_pool
    redis-cluster-client (0.11.0)
      redis-client (~> 0.22)
-    redis-clustering (5.3.0)
-      redis (= 5.3.0)
+    redis-clustering (5.4.0)
+      redis (= 5.4.0)
      redis-cluster-client (>= 0.10.0)
    redis-namespace (1.11.0)
      redis (>= 4)
@@ -1601,7 +1607,7 @@ GEM
      declarative (< 0.1.0)
      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
-    request_store (1.5.1)
+    request_store (1.7.0)
      rack (>= 1.4)
    responders (3.0.1)
      actionpack (>= 5.0)
@@ -1712,8 +1718,6 @@ GEM
      ruby-lsp (~> 0.23.0)
    ruby-magic (0.6.0)
      mini_portile2 (~> 2.8)
-    ruby-openai (3.7.0)
-      httparty (>= 0.18.1)
    ruby-progressbar (1.11.0)
    ruby-statistics (4.1.0)
    ruby2_keywords (0.0.5)
@@ -1758,7 +1762,7 @@ GEM
      sentry-ruby (~> 5.22.1)
      sidekiq (>= 3.0)
    shellany (0.0.1)
-    shoulda-matchers (5.1.0)
+    shoulda-matchers (6.4.0)
      activesupport (>= 5.2.0)
    sidekiq-cron (1.12.0)
      fugit (~> 1.8)
@@ -1806,8 +1810,8 @@ GEM
      tilt (~> 2.0)
      yard (~> 0.9, >= 0.9.24)
    sorbet-runtime (0.5.11647)
-    spamcheck (1.3.0)
-      grpc (~> 1.0)
+    spamcheck (1.3.3)
+      grpc (~> 1.63)
    spring (4.1.0)
    spring-commands-rspec (1.0.4)
      spring (>= 0.9.1)
@@ -1815,7 +1819,7 @@ GEM
    sprockets (3.7.2)
      concurrent-ruby (~> 1.0)
      rack (> 1, < 3)
-    sprockets-rails (3.5.1)
+    sprockets-rails (3.5.2)
      actionpack (>= 6.1)
      activesupport (>= 6.1)
      sprockets (>= 3.0.0)
@@ -1912,9 +1916,9 @@ GEM
    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
    uber (0.1.0)
-    undercover (0.5.0)
+    undercover (0.6.3)
      bigdecimal
-      imagen (>= 0.1.8)
+      imagen (>= 0.2.0)
      rainbow (>= 2.1, < 4.0)
      rugged (>= 0.27, < 1.8)
    unf (0.1.4)
@@ -1929,7 +1933,7 @@ GEM
    unparser (0.6.7)
      diff-lcs (~> 1.3)
      parser (>= 3.2.0)
-    uri (0.13.0)
+    uri (0.13.2)
    valid_email (0.1.3)
      activemodel
      mail (>= 2.6.1)
@@ -1952,14 +1956,16 @@ GEM
    vite_rails (3.0.19)
      railties (>= 5.1, < 9)
      vite_ruby (~> 3.0, >= 3.2.2)
-    vite_ruby (3.8.2)
+    vite_ruby (3.9.1)
      dry-cli (>= 0.7, < 2)
+      logger (~> 1.6)
+      mutex_m
      rack-proxy (~> 0.6, >= 0.6.1)
      zeitwerk (~> 2.2)
    vmstat (2.3.1)
    warden (1.2.9)
      rack (>= 2.0.9)
-    warning (1.3.0)
+    warning (1.5.0)
    webauthn (3.0.0)
      android_key_attestation (~> 0.3.0)
      awrence (~> 1.1)
@@ -2015,14 +2021,14 @@ DEPENDENCIES
  asciidoctor-include-ext (~> 0.4.0)
  asciidoctor-kroki (~> 0.10.0)
  asciidoctor-plantuml (~> 0.0.16)
-  async (~> 2.22.0)
+  async (~> 2.23.0)
  atlassian-jwt (~> 0.2.1)
  attr_encrypted (~> 3.2.4)!
  awesome_print
  aws-sdk-cloudformation (~> 1)
  aws-sdk-core (~> 3.215.0)
  aws-sdk-s3 (~> 1.177.0)
-  axe-core-rspec (~> 4.9.0)
+  axe-core-rspec (~> 4.10.0)
  babosa (~> 2.0)
  base32 (~> 0.3.0)
  batch-loader (~> 2.0.5)
@@ -2048,7 +2054,7 @@ DEPENDENCIES
  coverband (= 6.1.4)
  creole (~> 0.5.0)
  crystalball (~> 0.7.0)
-  cssbundling-rails (= 1.4.1)
+  cssbundling-rails (= 1.4.2)
  csv_builder!
  cvss-suite (~> 3.3.0)
  database_cleaner-active_record (~> 2.2.0)
@@ -2085,9 +2091,9 @@ DEPENDENCIES
  fast_blank (~> 1.0.1)
  ffaker (~> 2.24)
  ffi (~> 1.17)
-  flipper (~> 0.26.2)
-  flipper-active_record (~> 0.26.2)
-  flipper-active_support_cache_store (~> 0.26.2)
+  flipper (~> 0.28.0)
+  flipper-active_record (~> 0.28.0)
+  flipper-active_support_cache_store (~> 0.28.0)
  fog-aliyun (~> 0.4)
  fog-aws (~> 3.26)
  fog-core (= 2.1.0)
@@ -2107,14 +2113,14 @@ DEPENDENCIES
  gitlab-duo-workflow-service-client (~> 0.1)!
  gitlab-experiment (~> 0.9.1)
  gitlab-fog-azure-rm (~> 2.2.0)
-  gitlab-glfm-markdown (~> 0.0.21)
+  gitlab-glfm-markdown (~> 0.0.27)
  gitlab-housekeeper!
  gitlab-http!
  gitlab-kas-grpc (~> 17.9.0.pre.rc2)
  gitlab-labkit (~> 0.37.0)
  gitlab-license (~> 2.6)
  gitlab-mail_room (~> 0.0.24)
-  gitlab-markup (~> 1.9.0)
+  gitlab-markup (~> 2.0.0)
  gitlab-net-dns (~> 0.10.0)
  gitlab-rspec!
  gitlab-rspec_flaky!
@@ -2129,7 +2135,7 @@ DEPENDENCIES
  gitlab-utils!
  gitlab_chronic_duration (~> 0.12)
  gitlab_omniauth-ldap (~> 2.2.0)
-  gitlab_quality-test_tooling (~> 2.4.0)
+  gitlab_quality-test_tooling (~> 2.8.0)
  gon (~> 6.4.0)
  google-apis-androidpublisher_v3 (~> 0.34.0)
  google-apis-cloudbilling_v1 (~> 0.22.0)
@@ -2151,8 +2157,8 @@ DEPENDENCIES
  grape (~> 2.0.0)
  grape-entity (~> 1.0.1)
  grape-path-helpers (~> 2.0.1)
-  grape-swagger (~> 2.1.0)
-  grape-swagger-entity (~> 0.5.1)
+  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)
@@ -2167,7 +2173,7 @@ DEPENDENCIES
  health_check (~> 3.0)
  html-pipeline (~> 2.14.3)
  html2text
-  httparty (~> 0.21.0)
+  httparty (~> 0.22.0)
  i18n_data (~> 0.13.1)
  icalendar (~> 2.10.1)
  influxdb-client (~> 3.1)
@@ -2176,7 +2182,7 @@ DEPENDENCIES
  ipynbdiff!
  jira-ruby (~> 2.3.0)
  js_regex (~> 3.8)
-  json (~> 2.7.2)
+  json (~> 2.10.0)
  json_schemer (~> 2.3.0)
  jsonb_accessor (~> 1.4)
  jwt (~> 2.9.3)
@@ -2184,13 +2190,13 @@ DEPENDENCIES
  knapsack (~> 4.0.0)
  kramdown (~> 2.5.0)
  kubeclient (~> 4.11.0)
-  lefthook (~> 1.7.0)
+  lefthook (~> 1.11.0)
  letter_opener_web (~> 3.0.0)
  license_finder (~> 7.0)
  licensee (~> 9.16)
  listen (~> 3.7)
  lockbox (~> 1.3.0)
-  logger (~> 1.5.3)
+  logger (~> 1.6.0)
  lograge (~> 0.5)
  loofah (~> 2.24.0)
  lookbook (~> 2.3)
@@ -2213,8 +2219,8 @@ DEPENDENCIES
  oauth2 (~> 2.0)
  octokit (~> 9.0)
  ohai (~> 18.1)
-  oj (~> 3.13.21)
-  oj-introspect (~> 0.7)
+  oj (~> 3.16.0, >= 3.16.10)
+  oj-introspect (~> 0.8)
  omniauth (~> 2.1.0)
  omniauth-alicloud (~> 3.0.0)
  omniauth-atlassian-oauth2 (~> 0.2.0)
@@ -2284,10 +2290,10 @@ DEPENDENCIES
  rbtrace (~> 0.4)
  re2 (~> 2.15)
  recaptcha (~> 5.12)
-  redis (~> 5.3.0)
+  redis (~> 5.4.0)
  redis-actionpack (~> 5.5.0)
-  redis-clustering (~> 5.3.0)
-  request_store (~> 1.5.1)
+  redis-clustering (~> 5.4.0)
+  request_store (~> 1.7.0)
  responders (~> 3.0)
  retriable (~> 3.1.2)
  rexml (~> 3.4.0)
@@ -2305,7 +2311,6 @@ DEPENDENCIES
  ruby-lsp-rails (~> 0.3.6)
  ruby-lsp-rspec (~> 0.1.10)
  ruby-magic (~> 0.6)
-  ruby-openai (~> 3.7)
  ruby-progressbar (~> 1.10)
  ruby-saml (~> 1.18.0)!
  rubyzip (~> 2.3.2)
@@ -2318,7 +2323,7 @@ DEPENDENCIES
  sentry-rails (~> 5.22.0)
  sentry-ruby (~> 5.22.0)
  sentry-sidekiq (~> 5.22.0)
-  shoulda-matchers (~> 5.1.0)
+  shoulda-matchers (~> 6.4.0)
  sidekiq!
  sidekiq-cron (~> 1.12.0)
  sigdump (~> 0.2.4)
@@ -2350,18 +2355,18 @@ DEPENDENCIES
  truncato (~> 0.7.13)
  tty-prompt (~> 0.23)
  typhoeus (~> 1.4.0)
-  undercover (~> 0.5.0)
+  undercover (~> 0.6.0)
  unicode-emoji (~> 4.0)
  unleash (~> 3.2.2)
-  uri (= 0.13.0)
+  uri (= 0.13.2)
  valid_email (~> 0.1)
  validates_hostname (~> 1.0.13)
  version_sorter (~> 2.3)
  view_component (~> 3.21.0)
  vite_rails (~> 3.0.17)
-  vite_ruby (~> 3.8.0)
+  vite_ruby (~> 3.9.0)
  vmstat (~> 2.3.0)
-  warning (~> 1.3.0)
+  warning (~> 1.5.0)
  webauthn (~> 3.0)
  webmock (~> 3.25.0)
  webrick (~> 1.8.1)
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@@ -456,10 +456,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0bfca5pjrnigc4ksx1bs2c47kgr6xyhyxqg0whqzmh2yc62bmav3";
+      sha256 = "0p29xccd3y96m7yb15yr96j362cz855ramn2x83g5z2642ag68w3";
      type = "gem";
    };
-    version = "2.22.0";
+    version = "2.23.0";
  };
  atlassian-jwt = {
    dependencies = [ "jwt" ];
@@ -608,6 +608,7 @@ src: {
  axe-core-api = {
    dependencies = [
      "dumb_delegator"
+      "ostruct"
      "virtus"
    ];
    groups = [
@@ -617,25 +618,26 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1n7yv7s9mdxa3zz00gj93fsczk58ia3i1lj5adab677fpwbar9wy";
+      sha256 = "12djmxdbmbwk3r3ni8r73945plsr6wmw7yzw72gk42iq86ha0kn8";
      type = "gem";
    };
-    version = "4.9.1";
+    version = "4.10.2";
  };
  axe-core-rspec = {
    dependencies = [
      "axe-core-api"
      "dumb_delegator"
+      "ostruct"
      "virtus"
    ];
    groups = [ "test" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1zbf7rd353i6y1rr9ysk18kj3ivazfi3ma2ny6ryzminxrxhdvri";
+      sha256 = "0xgp28gk45v25l6l1d4clm1gq7brcwh9nma51wbsl3p40xcbw0p3";
      type = "gem";
    };
-    version = "4.9.1";
+    version = "4.10.2";
  };
  axiom-types = {
    dependencies = [
@@ -1375,10 +1377,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1qbwdksjq9lw2h4xs2lb7lvp94pwgv38hp0mm46qj8bvc8yjf8ab";
+      sha256 = "1kscxk81incimp3y9dkaqbn8d1awzm2nn7dx24lq1nbs15l5fp18";
      type = "gem";
    };
-    version = "1.4.1";
+    version = "1.4.2";
  };
  csv = {
    groups = [
@@ -1648,10 +1650,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "121ljaaapil79dcsl5mkh5k613hv58z4z3g2lrnzb5qvqpb3h1j8";
+      sha256 = "1y57fpcvy1kjd4nb7zk7mvzq62wqcpfynrgblj558k3hbvz4404j";
      type = "gem";
    };
-    version = "4.9.3";
+    version = "4.9.4";
  };
  devise-pbkdf2-encryptable = {
    dependencies = [
@@ -1924,10 +1926,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0xk1437b5vrjg8prk2khsva5rkx3apsj7c46n3yk5b8g34787jc7";
+      sha256 = "0xq8ikcphbxgwdyvmzm1162znrz6j0wsr2bkmwa4nvjf303b99h6";
      type = "gem";
    };
-    version = "1.3.0";
+    version = "1.4.0";
  };
  e2mmap = {
    groups = [
@@ -2463,10 +2465,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "127ryr9107719rfk9k638fxk2p38cnbz23h9ghxxbckiv4474mvd";
+      sha256 = "0sgqc90fs9bmphaaphr7366ngy9wj2g4513dfdc36r1ljij4lp7x";
      type = "gem";
    };
-    version = "0.26.2";
+    version = "0.28.3";
  };
  flipper-active_record = {
    dependencies = [
@@ -2477,10 +2479,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1g10lck7p3776r2dshz185rd1hjzv47z95bhgpk7bxz2ikpsxpk1";
+      sha256 = "080rmmhz9kf4m3z845gqwm4f4cdr4pihhmsprxsjn1m8blk1raf6";
      type = "gem";
    };
-    version = "0.26.2";
+    version = "0.28.3";
  };
  flipper-active_support_cache_store = {
    dependencies = [
@@ -2491,10 +2493,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1c6j2frspzafqmha5wlkpv05n5vfzrglbprpgj1dxiz5s4x8ily2";
+      sha256 = "1zfrzfbbr7kc2g5bdvlvf0yd43vpjsfkmcyl07q0c0ljg42y46hi";
      type = "gem";
    };
-    version = "0.26.2";
+    version = "0.28.3";
  };
  fog-aliyun = {
    dependencies = [
@@ -2774,10 +2776,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1vfnjwkhglhjz3z0qjm08niys9m6xkddl5kg27580x2ax93zys32";
+      sha256 = "0kvv1idqscqh03wp6xcb5mi03j5hksbnn8dadcwpv2izm0srfv8r";
      type = "gem";
    };
-    version = "17.8.1";
+    version = "17.8.4";
  };
  gitlab = {
    dependencies = [
@@ -2940,10 +2942,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "03rwnm2cbvqi1i58dcn1mi0s3933ifp1v2mjgvhz2b094by8zkw2";
+      sha256 = "188laljplhci8pr8crxi3b0sj9501zya74ipqyg33gkv0cf4h3ln";
      type = "gem";
    };
-    version = "0.0.27";
+    version = "0.0.28";
  };
  gitlab-housekeeper = {
    dependencies = [
@@ -2986,10 +2988,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "10j4x9201lkjbywqqfq7xm0fmswnl523v97pm33m2zl0s13jwmxl";
+      sha256 = "0n59m8jy9nl2adr27dgqbbrg8w9bwgjvg1jzinmwwhf7d4b0qj7x";
      type = "gem";
    };
-    version = "17.9.0.pre.rc2";
+    version = "17.9.1";
  };
  gitlab-labkit = {
    dependencies = [
@@ -3042,10 +3044,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1m3ypny84jyvlxf060p3q3d8pb4yihxa2br5hh012bgc11d09nky";
+      sha256 = "0bm0zccj88aavy23vqy1pkz4gmbw6gdb40n0wqlz7a332j3iq6lm";
      type = "gem";
    };
-    version = "1.9.0";
+    version = "2.0.0";
  };
  gitlab-net-dns = {
    groups = [ "default" ];
@@ -3146,10 +3148,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1rlag6myzkqygh8h3kd5aif86987fky31m8x2h8qp2bhi8nc4hy1";
+      sha256 = "04sn44br9qcv5s4p2z0sjv402nlpiw0ial5gx0np9v1dcppqfpcr";
      type = "gem";
    };
-    version = "0.18.0";
+    version = "0.19.0";
  };
  gitlab-security_report_schemas = {
    dependencies = [
@@ -3275,10 +3277,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "181nzcn5ny8wc4vs737j9fwsmm25yps4kvwwkhdky985id914k1f";
+      sha256 = "1c9wdinaf1z4qdynighcxxpkfarkizzh9slg2y77240mdsrgkyr9";
      type = "gem";
    };
-    version = "2.4.0";
+    version = "2.8.0";
  };
  globalid = {
    dependencies = [ "activesupport" ];
@@ -4039,10 +4041,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1xic3akbr3skvrhldckg2c277yl52xj1hz8ynhiprfwjzsvcawdz";
+      sha256 = "08yn3z438hgh186iyvkqrhcy0fzzaky8j4h1hlbzzlfam49ckmx8";
      type = "gem";
    };
-    version = "0.60.0";
+    version = "0.61.0";
  };
  hamlit = {
    dependencies = [
@@ -4221,6 +4223,7 @@ src: {
  };
  httparty = {
    dependencies = [
+      "csv"
      "mini_mime"
      "multi_xml"
    ];
@@ -4233,10 +4236,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "050jzsa6fbfvy2rldhk7mf1sigildaqvbplfz2zs6c0zlzwppvq0";
+      sha256 = "0v7s60abgwkahkqi4lf68hmz3j69jli3q25jsf9h1kvijif2lrbq";
      type = "gem";
    };
-    version = "0.21.0";
+    version = "0.22.0";
  };
  httpclient = {
    groups = [ "default" ];
@@ -4275,15 +4278,18 @@ src: {
    version = "0.13.1";
  };
  icalendar = {
-    dependencies = [ "ice_cube" ];
+    dependencies = [
+      "ice_cube"
+      "ostruct"
+    ];
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "022nal50cxz0y3ylbgjndqf97wbhh6knmjyq43r6mb8r8b5cs3np";
+      sha256 = "11fl1kfqvgnh0vnryc9kbbaal693kdgf5h6qnj37p9wz5xkw5gqf";
      type = "gem";
    };
-    version = "2.10.2";
+    version = "2.10.3";
  };
  ice_cube = {
    groups = [ "default" ];
@@ -4319,10 +4325,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0qm1jcprs0xys8m72kgm9pasd1xzhiqiyv64baxwcygyshkvgrzx";
+      sha256 = "0jz2750ildym7bfppx143zik7n576mpzrsqm4slxnxw80w9fk7rn";
      type = "gem";
    };
-    version = "0.1.8";
+    version = "0.2.0";
  };
  influxdb-client = {
    dependencies = [ "csv" ];
@@ -4460,10 +4466,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1prbjd8r4rq6hjc6d5hn8hlpf4g9h62swxj7absjac7qqnzwrhvw";
+      sha256 = "1p4l5ycdxfsr8b51gnvlvhq6s21vmx9z4x617003zbqv3bcqmj6x";
      type = "gem";
    };
-    version = "2.7.3";
+    version = "2.10.1";
  };
  json-jwt = {
    dependencies = [
@@ -4687,10 +4693,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1bswnpka6w3ph2v3bv1ixmxbszank2a0hkpg4d3qdai2vmnyy9qc";
+      sha256 = "1hnx5s38myd0dgs7frm75ikvyl0g14pg1z7zjryp55j9p9dkrkab";
      type = "gem";
    };
-    version = "1.7.18";
+    version = "1.11.2";
  };
  letter_opener = {
    dependencies = [ "launchy" ];
@@ -4836,10 +4842,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0yyn64c92wx8c37dqh1b080rqc80idq56g2plfqls9f9q8l32i7d";
+      sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx";
      type = "gem";
    };
-    version = "1.5.3";
+    version = "1.6.6";
  };
  lograge = {
    dependencies = [
@@ -5611,14 +5617,18 @@ src: {
    version = "18.1.18";
  };
  oj = {
+    dependencies = [
+      "bigdecimal"
+      "ostruct"
+    ];
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0lggrhlihxyfgiqqr9b2fqdxc4d2zff2czq30m3rgn8a0b2gsv90";
+      sha256 = "0z1xw7xm7xkxnslhxqvfzvv5f1q1cl40niwvaxny2cg3fkcvw9kz";
      type = "gem";
    };
-    version = "3.13.23";
+    version = "3.16.10";
  };
  oj-introspect = {
    dependencies = [ "oj" ];
@@ -5626,10 +5636,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0g9ksljmlkg56xz8ddzsjkhjh89jv4hr99k3x7c70a7dcx2s85f4";
+      sha256 = "0r4jgnw44qvswidfd8fh4s7pkdg34bmmrxn2wn0lhab0klq1bfsw";
      type = "gem";
    };
-    version = "0.7.2";
+    version = "0.8.0";
  };
  omniauth = {
    dependencies = [
@@ -5789,10 +5799,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "00nn24s74miy7p65y8lwpjfwgcn7fwld61f9ghngal4asgw6pfwa";
+      sha256 = "1czvs3nj1d8pmf39vgghpbp7g1hgzbxlv8d563agr16nq856bk44";
      type = "gem";
    };
-    version = "2.2.1";
+    version = "2.2.2";
  };
  omniauth-shibboleth-redux = {
    dependencies = [ "omniauth" ];
@@ -5945,10 +5955,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1yl10v1vvb9krvvks0si5nbjpknz8lcbbcryqkf2g0db3kha072d";
+      sha256 = "1c0f345cpcqz3p6salmag9vhr7flirga35xivc01kvpli7scai1j";
      type = "gem";
    };
-    version = "0.29.0";
+    version = "0.29.1";
  };
  opentelemetry-helpers-sql-obfuscation = {
    dependencies = [ "opentelemetry-common" ];
@@ -6108,10 +6118,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1s6ya4sr4w492qbd16b33qpk52wf3903l2ns6camv79kq1h7vahr";
+      sha256 = "0p23m08mylzzkh6v3397a5v27wg4f8vs5jifrh3025lfg1rh9wr0";
      type = "gem";
    };
-    version = "0.21.8";
+    version = "0.21.9";
  };
  opentelemetry-instrumentation-excon = {
    dependencies = [
@@ -6122,10 +6132,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "14g6dvk31kz9v9qbr2w6ggxk96v3kaadm8wvnw3qsrsc4pd9ycns";
+      sha256 = "1x49m71zz8vbvv39gfbfvllnrflf2284r4f3bgbnb3l0b9din3zc";
      type = "gem";
    };
-    version = "0.22.4";
+    version = "0.22.5";
  };
  opentelemetry-instrumentation-faraday = {
    dependencies = [
@@ -6136,10 +6146,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0np6wnckn12df6mwcr695fvjy3x2s6541ywr7ahw8a8dszs0qjsh";
+      sha256 = "1azbnb3f6lbmjciqdy5awyv6lhnkcyd4wqr6ayj8glj4v7b8bprn";
      type = "gem";
    };
-    version = "0.24.6";
+    version = "0.24.7";
  };
  opentelemetry-instrumentation-grape = {
    dependencies = [
@@ -6179,10 +6189,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "05mrlg8msp59bagpc18ycr9333760kqp780gw8fgqn1798dl02qr";
+      sha256 = "07jycg8iicrcadhnpg1zd2fp6di5hddq6cdpfmz499r2lzwv9wbi";
      type = "gem";
    };
-    version = "0.23.4";
+    version = "0.23.5";
  };
  opentelemetry-instrumentation-http_client = {
    dependencies = [
@@ -6193,10 +6203,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0g6f5zv0bq585ppgzhm6acrpkz32j1h7zyrcy1r8n3ha41daip1z";
+      sha256 = "0ss5izgcj2874df0yl4akcjvgsg2wyflvbq43aic2zw93dw4a7s1";
      type = "gem";
    };
-    version = "0.22.7";
+    version = "0.22.8";
  };
  opentelemetry-instrumentation-net_http = {
    dependencies = [
@@ -6207,10 +6217,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1l26f8sqsjjcc72a5xr9as3gibm4sgj8n004y15i5vbvdgzjfx60";
+      sha256 = "0bh462bpf9m1vg512y9dmjaj7hrlyy04qpwhrzjzmf14d25xcfq2";
      type = "gem";
    };
-    version = "0.22.7";
+    version = "0.22.8";
  };
  opentelemetry-instrumentation-pg = {
    dependencies = [
@@ -6222,10 +6232,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1lgkjp0h0hf51n6afgafqaswvm06ybsvj3yf7dxxkzjpnzgxvjvg";
+      sha256 = "0ll2ka487ybsisk7c46lrag18nsfp9gbzrzmiyjjslnpiirc3gwc";
      type = "gem";
    };
-    version = "0.29.0";
+    version = "0.29.1";
  };
  opentelemetry-instrumentation-rack = {
    dependencies = [
@@ -6256,10 +6266,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0v9021ixcfs9shwf2c130gd0xxpwz8p1d5r7bci15mmrzq7wj37h";
+      sha256 = "15kd44ilp029vadv0yyjnajwv7mn2f29647xxd0svqyd1bf9j1ji";
      type = "gem";
    };
-    version = "0.33.0";
+    version = "0.33.1";
  };
  opentelemetry-instrumentation-rake = {
    dependencies = [
@@ -6328,10 +6338,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0div7n5wac7x1l9fwdpb3bllw18cns93c7xccy27r4gmvv02f46s";
+      sha256 = "14n49y6yq48jnbfms2razv7vm1lkdxwh5cd63cm9x8as9ksn1ndj";
      type = "gem";
    };
-    version = "1.5.0";
+    version = "1.6.0";
  };
  opentelemetry-semantic_conventions = {
    dependencies = [ "opentelemetry-api" ];
@@ -6841,10 +6851,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0ax778fsfvlhj7c11n0d1wdcb8bxvkb190a9lha5d91biwzyx9g4";
+      sha256 = "12mv97fz3jp6nl4bc36wiqwdiivv5lgqcpfnan91w20rzapljk22";
      type = "gem";
    };
-    version = "2.2.10";
+    version = "2.2.11";
  };
  rack-accept = {
    dependencies = [ "rack" ];
@@ -7253,10 +7263,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1cbjvb61kx2p1mjg2z55mw80760h6d8dnxszqkq8g4c8mv2i1y3b";
+      sha256 = "0syhyw1bp9nbb0fvcmm58y1c6iav6xw6b4bzjz1rz2j1d7c012br";
      type = "gem";
    };
-    version = "5.3.0";
+    version = "5.4.0";
  };
  redis-actionpack = {
    dependencies = [
@@ -7304,10 +7314,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0ncqm43bcxwll4lkdw5fp34m8pc0fp9lqzhq4qcgn7ax68a90gvp";
+      sha256 = "0fsnfi15xiy8sal6av11fqfjmdmjpy93amf790i0zwqcf1iq1qbw";
      type = "gem";
    };
-    version = "5.3.0";
+    version = "5.4.0";
  };
  redis-namespace = {
    dependencies = [ "redis" ];
@@ -7390,10 +7400,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "13ppgmsbrqah08j06bybd3cddv6dml79yzyjn7r8j1src78h98h7";
+      sha256 = "1jw89j9s5p5cq2k7ffj5p4av4j4fxwvwjs1a4i9g85d38r9mvdz1";
      type = "gem";
    };
-    version = "1.5.1";
+    version = "1.7.0";
  };
  responders = {
    dependencies = [
@@ -7953,17 +7963,6 @@ src: {
    };
    version = "0.6.0";
  };
-  ruby-openai = {
-    dependencies = [ "httparty" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0l0q3f2sks2i0mdd9p8c1shsh1acjij9iasc4vg2la2y0m65swzv";
-      type = "gem";
-    };
-    version = "3.7.0";
-  };
  ruby-progressbar = {
    groups = [
      "default"
@@ -8262,10 +8261,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "01svmyma958sbqfz0v29lbqbr0ibvgcng352nhx6bsc9k5c207d0";
+      sha256 = "1c082vpfdf3865xq6xayxw2hwqswhnc9g030p1gi4hmk9dzvnmch";
      type = "gem";
    };
-    version = "5.1.0";
+    version = "6.4.0";
  };
  sidekiq = {
    dependencies = [
@@ -8533,10 +8532,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1xclr7qk6fwpbwx2hlfcbpw9ki4y61p76i68hj28v0sp49sq4q54";
+      sha256 = "1iqfsnz0ls27ml4dyqyp8k7sdq3rgxjqrlslh3c475fmzjfvla9s";
      type = "gem";
    };
-    version = "1.3.0";
+    version = "1.3.3";
  };
  spring = {
    groups = [
@@ -8603,10 +8602,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0j7gwm749b3ff6544wxa878fpd1kvf2qc9fafassi8c7735jcin4";
+      sha256 = "17hiqkdpcjyyhlm997mgdcr45v35j5802m5a979i5jgqx5n8xs59";
      type = "gem";
    };
-    version = "3.5.1";
+    version = "3.5.2";
  };
  ssh_data = {
    groups = [ "default" ];
@@ -9248,10 +9247,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1blz21yzd3s2ax75lnhlf4gvh273k9jry6fd7yqnyip5id3si6gg";
+      sha256 = "1yk5rgr82zl0k1vjpfs42lpw2lzk5hgc970zd03abl1ypi344k57";
      type = "gem";
    };
-    version = "0.5.0";
+    version = "0.6.3";
  };
  unf = {
    dependencies = [ "unf_ext" ];
@@ -9352,14 +9351,19 @@ src: {
    version = "0.6.7";
  };
  uri = {
-    groups = [ "default" ];
+    groups = [
+      "danger"
+      "default"
+      "development"
+      "test"
+    ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96";
+      sha256 = "0mz4hxi8lxh8rs6aph1mrihczvvz8ag9zlin1gzvq490cmp1jmx5";
      type = "gem";
    };
-    version = "0.13.0";
+    version = "0.13.2";
  };
  valid_email = {
    dependencies = [
@@ -9479,6 +9483,8 @@ src: {
  vite_ruby = {
    dependencies = [
      "dry-cli"
+      "logger"
+      "mutex_m"
      "rack-proxy"
      "zeitwerk"
    ];
@@ -9489,10 +9495,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1fcharh45xwi2cx96m695v9gccny3hgvdkkhcbkhplk1bc6ldwgk";
+      sha256 = "1i2ckb29ffjj431amnk0sr5h9vbs00139irs7bqh51jpl55lln74";
      type = "gem";
    };
-    version = "3.8.2";
+    version = "3.9.1";
  };
  vmstat = {
    groups = [ "default" ];
@@ -9520,10 +9526,10 @@ src: {
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "17h6x3fh0y46gpkzpknbh94qxcp0pqlvacc90r35rgahirfmls93";
+      sha256 = "0lwcf7fsz1sda1fdbqq1i4q9kzg4f5vwrzgfg1vpa1hcxagw84hg";
      type = "gem";
    };
-    version = "1.3.0";
+    version = "1.5.0";
  };
  webauthn = {
    dependencies = [
--- a/pkgs/by-name/bu/buildbox/package.nix
+++ b/pkgs/by-name/bu/buildbox/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  postFixup = ''
-    makeWrapper $out/bin/buildbox-run-bubblewrap $out/bin/buildbox-run --prefix PATH : ${lib.makeBinPath [ bubblewrap ]}
+    wrapProgram $out/bin/buildbox-run --prefix PATH : ${lib.makeBinPath [ bubblewrap ]}
  '';

  meta = {
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -7,7 +7,7 @@
 }:

 let
-  version = "17.9.3";
+  version = "17.10.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-Xr5gZFPBmd64mfWsQM107jbCw43MOG1K7nN42TDTNHU=";
+      hash = "sha256-uyXxNuHQUlXCNQcrEIoaJXpatfM5fcIk5MCNYt8QW9A=";
    };

-    vendorHash = "sha256-ZPxlv8jc3VWS1XzIyXs3W3aCxdTiDl8+Wx82exuYBDY=";
+    vendorHash = "sha256-umtSuLQiohSarzZDU7tHEYI6t8B7MlkaDu8//fnr1Ms=";

    ldflags = [
      "-X ${gitaly_package}/internal/version.version=${version}"
--- 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.9.3";
+  version = "17.10.1";

  # nixpkgs-update: no auto update
  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitlab-pages";
    rev = "v${version}";
-    hash = "sha256-3lpwTGsLhFdfIjkFxRl+ed/yltmR/sjhXl7hAb8EGOs=";
+    hash = "sha256-B/v0jj5hoNmF9cygvi9eLQ4pLuZ1+wIyNnJN2uCAXdE=";
  };

-  vendorHash = "sha256-2UtdooVoyoWr4yOPCRBAjkftn29DhJonpJSguHwfHNE=";
+  vendorHash = "sha256-o2DgP2YP2aejtuQ4NC90kysvwDy0XvSb4CW5oE2x2qQ=";
  subPackages = [ "." ];

  meta = with lib; {
--- a/pkgs/by-name/gi/gitlab-shell/package.nix
+++ b/pkgs/by-name/gi/gitlab-shell/package.nix
@@ -8,14 +8,14 @@

 buildGoModule rec {
  pname = "gitlab-shell";
-  version = "14.40.0";
+  version = "14.41.0";

  # nixpkgs-update: no auto update
  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitlab-shell";
    rev = "v${version}";
-    hash = "sha256-SVu+2OG5GBeD8nF9ws3M0bpm03HVxA4RTDWAT8NYjgQ=";
+    hash = "sha256-6bRiw8TC7E/eUc0Zwp46kLbe5QzZ+nXL6YY2u+mjFRw=";
  };

  buildInputs = [
@@ -27,7 +27,7 @@ buildGoModule rec {
    ./remove-hardcoded-locations.patch
  ];

-  vendorHash = "sha256-r+IKMaEy+5hRkjfYPfaHVNgsd8yT13v04oKJ16ZPhD0=";
+  vendorHash = "sha256-Xz6l0gvjS2nPt/mpOvZDJlnfEmIWPXc/RwBntzfLc1Y=";

  subPackages = [
    "cmd/gitlab-shell"
--- a/pkgs/by-name/ki/kismet/package.nix
+++ b/pkgs/by-name/ki/kismet/package.nix
@@ -4,7 +4,7 @@
  autoreconfHook,
  binutils,
  elfutils,
-  fetchurl,
+  fetchFromGitHub,
  glib,
  libcap,
  libmicrohttpd,
@@ -14,7 +14,8 @@
  libwebsockets,
  lm_sensors,
  networkmanager,
-  pcre,
+  nix-update-script,
+  pcre2,
  pkg-config,
  openssl,
  protobuf,
@@ -27,20 +28,22 @@
  zlib,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalPackage: {
  pname = "kismet";
-  version = "2023-07-R1";
+  version = "2023-07-R2";

-  src = fetchurl {
-    url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz";
-    hash = "sha256-8IVI4mymX6HlZ7Heu+ocpNDnIGvduWpPY5yQFxhz6Pc=";
+  src = fetchFromGitHub {
+    owner = "kismetwireless";
+    repo = "kismet";
+    tag = "kismet-${finalPackage.version}";
+    hash = "sha256-QwTjjZHnrlATFvHK9PLDTt76UjfZdzCmV6uXVgIMIYg=";
  };

  postPatch = ''
    substituteInPlace Makefile.in \
-      --replace "-m 4550" ""
+      --replace-fail "-m 4550" ""
    substituteInPlace configure.ac \
-      --replace "pkg-config" "$PKG_CONFIG"
+      --replace-fail "pkg-config" "$PKG_CONFIG"
  '';

  postConfigure = ''
@@ -81,7 +84,7 @@ stdenv.mkDerivation rec {
      openssl
      libusb1
      libwebsockets
-      pcre
+      pcre2
      protobuf
      protobufc
      sqlite
@@ -111,10 +114,20 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

-  meta = with lib; {
+  passthru = {
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "^kismet-(\\d+-\\d+-.+)$"
+      ];
+    };
+  };
+
+  meta = {
    description = "Wireless network sniffer";
    homepage = "https://www.kismetwireless.net/";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ numinit ];
  };
-}
+})
--- a/pkgs/by-name/nm/nm-file-secret-agent/package.nix
+++ b/pkgs/by-name/nm/nm-file-secret-agent/package.nix
@@ -1,6 +1,6 @@
 {
  lib,
-  fetchFromGitHub,
+  fetchFromGitea,
  rustPlatform,
  dbus,
  networkmanager,
@@ -9,16 +9,17 @@
 }:
 rustPlatform.buildRustPackage rec {
  name = "nm-file-secret-agent";
-  version = "1.0.1";
+  version = "1.1.0";

-  src = fetchFromGitHub {
-    owner = "lilioid";
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "lilly";
    repo = "nm-file-secret-agent";
    rev = "v${version}";
-    hash = "sha256-xQWgNxrbpHOfnKXa57cV1F3JmtJcvQsqUfgwfWg5Ni4=";
+    hash = "sha256-FZef9qMJeQkoLvCHcsGMqr0riC98WVXntQtbt76Iev4=";
  };
  useFetchCargoVendor = true;
-  cargoHash = "sha256-Q2RQ6pWYKOr/6nD7PLpTonVldOfyUu2lvwNRAc8zkLg=";
+  cargoHash = "sha256-HYyL0r9YrDL22uQdypJQ7Xep9Uqt4b16bhl0D9kRByU=";
  buildInputs = [ dbus ];
  nativeBuildInputs = [ pkg-config ];

@@ -27,7 +28,7 @@ rustPlatform.buildRustPackage rec {
  meta = {
    description = "NetworkManager secret agent that responds with the content of preconfigured files";
    mainProgram = "nm-file-secret-agent";
-    homepage = "https://github.com/lilioid/nm-file-secret-agent/";
+    homepage = "https://codeberg.org/lilly/nm-file-secret-agent";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ lilioid ];
    platforms = lib.lists.intersectLists dbus.meta.platforms networkmanager.meta.platforms;
--- a/pkgs/by-name/op/opencore-amr/package.nix
+++ b/pkgs/by-name/op/opencore-amr/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  };

  meta = {
-    homepage = "https://opencore-amr.sourceforge.io/";
+    homepage = "https://sourceforge.net/projects/opencore-amr/";
    description = "Library of OpenCORE Framework implementation of Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec.
    Library of VisualOn implementation of Adaptive Multi Rate Wideband (AMR-WB)";
    license = lib.licenses.asl20;
--- a/pkgs/by-name/ph/phpunit/package.nix
+++ b/pkgs/by-name/ph/phpunit/package.nix
@@ -10,16 +10,16 @@

 php.buildComposerProject2 (finalAttrs: {
  pname = "phpunit";
-  version = "12.0.10";
+  version = "12.1.2";

  src = fetchFromGitHub {
    owner = "sebastianbergmann";
    repo = "phpunit";
    tag = finalAttrs.version;
-    hash = "sha256-JFJauSTUOZzUbpvKx6IrD3QDum/rNa+5JZZsoThA4TM=";
+    hash = "sha256-ug4fi+PJbtwbxL3qS2dzaVTdKr0o4hwFA3+Us7JCFIY=";
  };

-  vendorHash = "sha256-fjed7Zm/Iq1VS7eakvrvZs1Yy1t3it3p5U61FKUB2zI=";
+  vendorHash = "sha256-EN9iYbFht77/N5Ull/+TS3BjzMR7YCujz9p5Rgqos6g=";

  passthru = {
    updateScript = nix-update-script { };
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -15,13 +15,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "vencord";
-  version = "1.11.8";
+  version = "1.11.9";

  src = fetchFromGitHub {
    owner = "Vendicated";
    repo = "Vencord";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-Ej04ONaeNt55mbQ5RTKM4MySYsw3UJky9ZK9h1gMEzo=";
+    hash = "sha256-/CJt4CZ9R1xB72Zwc76te51Fb3q4KHuzDxP3jWGzW8E=";
  };

  pnpmDeps = pnpm_10.fetchDeps {
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -22,11 +22,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "openvpn";
-  version = "2.6.12";
+  version = "2.6.14";

  src = fetchurl {
    url = "https://swupdate.openvpn.net/community/releases/openvpn-${finalAttrs.version}.tar.gz";
-    hash = "sha256-HGEP3etobjTxNnw0fgJ+QY4HUjoQ9NjOSiwq8vYaGSk=";
+    hash = "sha256-nramYYNS+ee3canTiuFjG17f7tbUAjPiQ+YC3fIZXno=";
  };

  nativeBuildInputs = [ pkg-config ];
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -293,7 +293,7 @@ lib.makeExtensible (
        ) (lib.range 4 17)
      )
      // {
-        nixComponents_2_27 = throw "nixComponents_2_27 has been removed. use nixComponents_2_28.";
+        nixComponents_2_27 = throw "nixComponents_2_27 has been removed. use nixComponents_git.";
        nix_2_27 = throw "nix_2_27 has been removed. use nix_2_28.";

        unstable = throw "nixVersions.unstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest.";
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -420,7 +420,13 @@ lib.makeScope pkgs.newScope (
                configureFlags = [ "--with-bz2=${bzip2.dev}" ];
              }
              { name = "calendar"; }
-              { name = "ctype"; }
+              {
+                name = "ctype";
+                postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+                  # Broken test on aarch64-darwin
+                  rm ext/ctype/tests/lc_ctype_inheritance.phpt
+                '';
+              }
              {
                name = "curl";
                buildInputs = [ curl ];