From 99387372d5af951fa7ab1cad970b7bef83b6b91c Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 26 Aug 2021 17:45:01 +0200 Subject: gitlab: 14.1.2 -> 14.2.1 --- nixos/modules/services/misc/gitlab.nix | 3 +- nixos/tests/gitlab.nix | 3 +- .../version-management/gitlab/data.json | 12 +- .../version-management/gitlab/default.nix | 6 - .../version-management/gitlab/fix-grpc-ar.patch | 10 - .../version-management/gitlab/gitaly/Gemfile | 4 +- .../version-management/gitlab/gitaly/Gemfile.lock | 16 +- .../version-management/gitlab/gitaly/default.nix | 16 +- .../version-management/gitlab/gitaly/gemset.nix | 16 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../version-management/gitlab/rubyEnv/Gemfile | 24 +- .../version-management/gitlab/rubyEnv/Gemfile.lock | 122 +++++------ .../version-management/gitlab/rubyEnv/gemset.nix | 243 +++++++++------------ .../version-management/gitlab/yarnPkgs.nix | 104 +++++---- 14 files changed, 263 insertions(+), 320 deletions(-) delete mode 100644 pkgs/applications/version-management/gitlab/fix-grpc-ar.patch diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 1514cc0665d..dbcf531a69c 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -117,6 +117,7 @@ let shared.path = "${cfg.statePath}/shared"; gitaly.client_path = "${cfg.packages.gitaly}/bin"; backup = { + gitaly_backup_path = "${cfg.packages.gitaly}/bin/gitaly-backup"; path = cfg.backup.path; keep_time = cfg.backup.keepTime; } // (optionalAttrs (cfg.backup.uploadOptions != {}) { @@ -1299,7 +1300,7 @@ in { Restart = "on-failure"; WorkingDirectory = gitlabEnv.HOME; ExecStart = - "${cfg.packages.gitlab-workhorse}/bin/gitlab-workhorse " + "${cfg.packages.gitlab-workhorse}/bin/workhorse " + "-listenUmask 0 " + "-listenNetwork unix " + "-listenAddr /run/gitlab/gitlab-workhorse.socket " diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index fc153bb06ec..3e9feeb0769 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -145,7 +145,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; { ) gitlab.succeed("systemd-tmpfiles --create") gitlab.succeed("rm -rf ${nodes.gitlab.config.services.postgresql.dataDir}") - gitlab.systemctl("start gitlab-config.service gitlab-postgresql.service") + gitlab.systemctl("start gitlab-config.service gitaly.service gitlab-postgresql.service") + gitlab.wait_for_file("${nodes.gitlab.config.services.gitlab.statePath}/tmp/sockets/gitaly.socket") gitlab.succeed( "sudo -u gitlab -H gitlab-rake gitlab:backup:restore RAILS_ENV=production BACKUP=dump force=yes" ) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 9294700afed..9b58febf8bb 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "14.1.2", - "repo_hash": "1d28minrpgp8awcnx15bm7jv0k27i46wji3pc2d6wh1m0wk74b60", + "version": "14.2.1", + "repo_hash": "0ivymkqcwl2lrnv0lkcw2ch26iyz9ixklrkc2jq38pbwc0igf89z", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.1.2-ee", + "rev": "v14.2.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.1.2", - "GITLAB_PAGES_VERSION": "1.41.0", + "GITALY_SERVER_VERSION": "14.2.1", + "GITLAB_PAGES_VERSION": "1.42.0", "GITLAB_SHELL_VERSION": "13.19.1", - "GITLAB_WORKHORSE_VERSION": "14.1.2" + "GITLAB_WORKHORSE_VERSION": "14.2.1" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 26d8cb1732f..c8480fcc073 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -22,12 +22,6 @@ let gemset = let x = import (gemdir + "/gemset.nix"); in x // { - # grpc expects the AR environment variable to contain `ar rpc`. See the - # discussion in nixpkgs #63056. - grpc = x.grpc // { - patches = [ ./fix-grpc-ar.patch ]; - dontBuild = false; - }; # the openssl needs the openssl include files openssl = x.openssl // { buildInputs = [ openssl ]; diff --git a/pkgs/applications/version-management/gitlab/fix-grpc-ar.patch b/pkgs/applications/version-management/gitlab/fix-grpc-ar.patch deleted file mode 100644 index 9b95e668e04..00000000000 --- a/pkgs/applications/version-management/gitlab/fix-grpc-ar.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/ruby/ext/grpc/extconf.rb -+++ b/src/ruby/ext/grpc/extconf.rb -@@ -27,6 +27,7 @@ ENV['MACOSX_DEPLOYMENT_TARGET'] = '10.7' - if ENV['AR'].nil? || ENV['AR'].size == 0 - ENV['AR'] = RbConfig::CONFIG['AR'] + ' rcs' - end -+ENV['AR'] = ENV['AR'] + ' rcs' - if ENV['CC'].nil? || ENV['CC'].size == 0 - ENV['CC'] = RbConfig::CONFIG['CC'] - end diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 7eaf3c0f218..76c193ed06c 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -7,7 +7,7 @@ gem 'activesupport', '~> 6.1.3.2' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false -gem 'grpc', '~> 1.30.2' +gem 'grpc', '~> 1.38.0' gem 'sentry-raven', '~> 3.0', require: false gem 'faraday', '~> 1.0' gem 'rbtrace', require: false @@ -29,5 +29,5 @@ group :development, :test do gem 'factory_bot', require: false gem 'pry', '~> 0.12.2', require: false - gem 'grpc-tools', '= 1.30.2' + gem 'grpc-tools', '= 1.38.0' end diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index cab76b5c1e5..e87bd703acd 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -75,12 +75,12 @@ GEM redis (> 3.0.0, < 5.0.0) gitlab-markup (1.7.1) google-protobuf (3.17.3) - googleapis-common-protos-types (1.0.5) - google-protobuf (~> 3.11) - grpc (1.30.2) - google-protobuf (~> 3.12) + googleapis-common-protos-types (1.1.0) + google-protobuf (~> 3.14) + grpc (1.38.0) + google-protobuf (~> 3.15) googleapis-common-protos-types (~> 1.0) - grpc-tools (1.30.2) + grpc-tools (1.38.0) i18n (1.8.10) concurrent-ruby (~> 1.0) ice_nine (0.11.2) @@ -146,7 +146,7 @@ GEM ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) - rdoc (6.2.0) + rdoc (6.3.2) redis (4.2.5) regexp_parser (1.8.1) reverse_markdown (1.4.0) @@ -225,8 +225,8 @@ DEPENDENCIES gitlab-labkit (~> 0.20.0) gitlab-markup (~> 1.7.1) google-protobuf (~> 3.17.0) - grpc (~> 1.30.2) - grpc-tools (= 1.30.2) + grpc (~> 1.38.0) + grpc-tools (= 1.38.0) licensee (~> 9.14.1) pry (~> 0.12.2) rbtrace diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 13ed3db3a4b..ac3bc1653ab 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -9,29 +9,19 @@ let inherit ruby; copyGemFiles = true; gemdir = ./.; - gemset = - let x = import (gemdir + "/gemset.nix"); - in x // { - # grpc expects the AR environment variable to contain `ar rpc`. See the - # discussion in nixpkgs #63056. - grpc = x.grpc // { - patches = [ ../fix-grpc-ar.patch ]; - dontBuild = false; - }; - }; }; in buildGoModule rec { - version = "14.1.2"; + version = "14.2.1"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-7OqTOJDQJ/ojHevj/ld8VLjm5ZRQgCGZKchPrAlOSO8="; + sha256 = "sha256-B3NtdS1UcT+nYIdoXs+tW2gnXZ0ew+NiIcCNi5z5fOc="; }; - vendorSha256 = "sha256-/SZJGRUg0qV7RYCUSGDE/HL9CmzGVffhL6BmZ316tU0="; + vendorSha256 = "sha256-WhkNK+V7yXK+le1u8StAKajZIBzVKqV/WIau27oZBXE="; passthru = { inherit rubyEnv; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 9a3ea0a0b55..7f3ba7d5014 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -300,10 +300,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1aava1b75n056s24gn7ajrkmm6s3xa3swl62dl5q9apw4marghji"; + sha256 = "1949w1lcd3iyiy4n6zgnrhdp78k9khbh2pbkrpkv263bbpmw8llg"; type = "gem"; }; - version = "1.0.5"; + version = "1.1.0"; }; grpc = { dependencies = ["google-protobuf" "googleapis-common-protos-types"]; @@ -311,20 +311,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rsglf7ag17n465iff7vlw83pn2rpl4kv9sb1rpf17nx6xpi7yl5"; + sha256 = "16qxl287kkf34h71djlf9x3wxmd5ylcm83y2zhnrv81gbrhn8k12"; type = "gem"; }; - version = "1.30.2"; + version = "1.38.0"; }; grpc-tools = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k9zhsqhamp02ryzgfb4y2bbick151vlhrhj0kqbbz9lyhms0bd4"; + sha256 = "0sfbf5s19nfgznlb7m2sfw9l0ppvypj46ijjvq5p35fc6b8by5aq"; type = "gem"; }; - version = "1.30.2"; + version = "1.38.0"; }; i18n = { dependencies = ["concurrent-ruby"]; @@ -672,10 +672,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gh7sc3xd4rgl9z90181cq580r1xqn063mmv51wdrhhsrkkw2bi9"; + sha256 = "19h5g3g7k7wggy9amfx8b3m09ss7wrakbrva2xnda9sw4chagx6y"; type = "gem"; }; - version = "6.2.0"; + version = "6.3.2"; }; redis = { groups = ["default"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index ffd6ff7d16c..6edf8beb598 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 = "14.1.2"; + version = "14.2.1"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-gTObI0pmRUX6Eh5FVdt+5LbckyBuFq1Ly4oPZztazHQ="; + vendorSha256 = "sha256-q0LuXmjoO6mjVZpMRVVGL862mA+MaCejTCx99Zi5VEI="; buildInputs = [ git ]; buildFlagsArray = "-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 6657b6a1249..09122887efb 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -49,7 +49,7 @@ gem 'omniauth-shibboleth', '~> 1.3.0' gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.4.0' gem 'omniauth-authentiq', '~> 0.3.3' -gem 'gitlab-omniauth-openid-connect', '~> 0.4.0', require: 'omniauth_openid_connect' +gem 'gitlab-omniauth-openid-connect', '~> 0.8.0', require: 'omniauth_openid_connect' gem 'omniauth-salesforce', '~> 1.0.5' gem 'omniauth-atlassian-oauth2', '~> 0.2.0' gem 'rack-oauth2', '~> 1.16.0' @@ -223,7 +223,7 @@ gem 're2', '~> 1.2.0' gem 'version_sorter', '~> 2.2.4' # Export Ruby Regex to Javascript -gem 'js_regex', '~> 3.4' +gem 'js_regex', '~> 3.7' # User agent parsing gem 'device_detector' @@ -310,7 +310,7 @@ gem 'pg_query', '~> 2.1' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.20.0' +gem 'gitlab-labkit', '~> 0.21.0' # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 gem 'thrift', '>= 0.14.0' @@ -335,9 +335,11 @@ gem 'method_source', '~> 1.0', require: false gem 'webrick', '~> 1.6.1', require: false gem 'prometheus-client-mmap', '~> 0.12.0', require: 'prometheus/client' +gem 'warning', '~> 1.2.0' + group :development do gem 'lefthook', '~> 0.7.0', require: false - gem 'solargraph', '~> 0.42', require: false + gem 'solargraph', '~> 0.43', require: false gem 'letter_opener_web', '~> 1.4.0' @@ -358,7 +360,7 @@ group :development, :test do gem 'awesome_print', require: false gem 'database_cleaner', '~> 1.7.0' - gem 'factory_bot_rails', '~> 6.1.0' + gem 'factory_bot_rails', '~> 6.2.0' gem 'rspec-rails', '~> 5.0.1' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) @@ -394,7 +396,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 2.2.2', require: false + gem 'gitlab-dangerfiles', '~> 2.3.0', require: false end group :development, :test, :coverage do @@ -472,12 +474,12 @@ end gem 'spamcheck', '~> 0.1.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 14.1.0.pre.rc3' +gem 'gitaly', '~> 14.2.0.pre.rc2' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' -gem 'grpc', '~> 1.30.2' +gem 'grpc', '~> 1.38.0' gem 'google-protobuf', '~> 3.17.1' @@ -487,8 +489,8 @@ gem 'toml-rb', '~> 2.0' gem 'flipper', '~> 0.21.0' gem 'flipper-active_record', '~> 0.21.0' gem 'flipper-active_support_cache_store', '~> 0.21.0' -gem 'unleash', '~> 0.1.5' -gem 'gitlab-experiment', '~> 0.6.1' +gem 'unleash', '~> 3.2.2' +gem 'gitlab-experiment', '~> 0.6.4' # Structured logging gem 'lograge', '~> 0.5' @@ -521,7 +523,7 @@ gem 'valid_email', '~> 0.1' # JSON gem 'json', '~> 2.3.0' -gem 'json_schemer', '~> 0.2.12' +gem 'json_schemer', '~> 0.2.18' gem 'oj', '~> 3.10.6' gem 'multi_json', '~> 1.14.1' gem 'yajl-ruby', '~> 1.4.1', require: 'yajl' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index d1147c55c78..45fbaf778b1 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -2,7 +2,6 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.3.2) - abstract_type (0.0.7) acme-client (2.0.6) faraday (>= 0.17, < 2.0.0) actioncable (6.1.3.2) @@ -69,9 +68,6 @@ GEM zeitwerk (~> 2.3) acts-as-taggable-on (7.0.0) activerecord (>= 5.0, < 6.2) - adamantium (0.2.0) - ice_nine (~> 0.11.0) - memoizable (~> 0.4.0) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aes_key_wrap (1.1.0) @@ -176,7 +172,8 @@ GEM mime-types (>= 1.16) ssrf_filter (~> 1.0) cbor (0.5.9.6) - character_set (1.4.0) + character_set (1.4.1) + sorted_set (~> 1.0) charlock_holmes (0.7.7) chef-config (16.10.17) addressable @@ -198,10 +195,7 @@ GEM colored2 (3.1.2) commonmarker (0.21.0) ruby-enum (~> 0.5) - concord (0.1.5) - adamantium (~> 0.2.0) - equalizer (~> 0.0.9) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) connection_pool (2.2.2) contracts (0.11.0) cork (0.3.0) @@ -307,8 +301,8 @@ GEM dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 1.0, >= 1.0.2) e2mmap (0.1.0) - ecma-re-validator (0.2.1) - regexp_parser (~> 1.2) + ecma-re-validator (0.3.0) + regexp_parser (~> 2.0) ed25519 (1.2.4) elasticsearch (6.8.2) elasticsearch-api (= 6.8.2) @@ -329,7 +323,6 @@ GEM launchy (~> 2.1) mail (~> 2.7) encryptor (3.0.0) - equalizer (0.0.11) erubi (1.9.0) escape_utils (1.2.1) et-orbi (1.2.1) @@ -340,10 +333,10 @@ GEM expression_parser (0.9.0) extended-markdown-filter (0.6.0) html-pipeline (~> 2.0) - factory_bot (6.1.0) + factory_bot (6.2.0) activesupport (>= 5.0.0) - factory_bot_rails (6.1.0) - factory_bot (~> 6.1.0) + factory_bot_rails (6.2.0) + factory_bot (~> 6.2.0) railties (>= 5.0.0) faraday (1.4.2) faraday-em_http (~> 1.0) @@ -453,7 +446,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (14.1.0.pre.rc3) + gitaly (14.2.0.pre.rc2) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -461,10 +454,10 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (2.2.2) + gitlab-dangerfiles (2.3.0) danger (>= 8.3.1) danger-gitlab (>= 8.0.0) - gitlab-experiment (0.6.1) + gitlab-experiment (0.6.4) activesupport (>= 3.0) request_store (>= 1.0) scientist (~> 1.6, >= 1.6.0) @@ -475,10 +468,10 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.20.0) + gitlab-labkit (0.21.0) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) - grpc (~> 1.19) + grpc (~> 1.38) jaeger-client (~> 1.1) opentracing (~> 0.4) pg_query (~> 2.1) @@ -487,7 +480,7 @@ GEM gitlab-mail_room (0.0.9) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) - gitlab-omniauth-openid-connect (0.4.0) + gitlab-omniauth-openid-connect (0.8.0) addressable (~> 2.7) omniauth (~> 1.9) openid_connect (~> 1.2) @@ -524,8 +517,8 @@ GEM signet (~> 0.12) google-cloud-env (1.5.0) faraday (>= 0.17.3, < 2.0) - google-protobuf (3.17.1) - googleapis-common-protos-types (1.0.6) + google-protobuf (3.17.3) + googleapis-common-protos-types (1.1.0) google-protobuf (~> 3.14) googleauth (0.14.0) faraday (>= 0.17.3, < 2.0) @@ -573,8 +566,8 @@ GEM graphql (~> 1.6) html-pipeline (~> 2.8) sass (~> 3.4) - grpc (1.30.2) - google-protobuf (~> 3.12) + grpc (1.38.0) + google-protobuf (~> 3.15) googleapis-common-protos-types (~> 1.0) gssapi (1.2.0) ffi (>= 1.0.1) @@ -605,7 +598,7 @@ GEM temple (>= 0.8.2) thor tilt - hana (1.3.6) + hana (1.3.7) hangouts-chat (0.0.5) hashdiff (1.0.1) hashie (4.1.0) @@ -640,7 +633,6 @@ GEM concurrent-ruby (~> 1.0) i18n_data (0.8.0) icalendar (2.4.1) - ice_nine (0.11.2) invisible_captcha (1.1.0) rails (>= 4.2) ipaddress (0.8.3) @@ -654,19 +646,19 @@ GEM multipart-post oauth (~> 0.5, >= 0.5.0) jmespath (1.4.0) - js_regex (3.4.0) + js_regex (3.7.0) character_set (~> 1.4) - regexp_parser (~> 1.5) - regexp_property_values (~> 0.3) + regexp_parser (~> 2.1) + regexp_property_values (~> 1.0) json (2.3.0) json-jwt (1.13.0) activesupport (>= 4.2) aes_key_wrap bindata - json_schemer (0.2.12) - ecma-re-validator (~> 0.2) + json_schemer (0.2.18) + ecma-re-validator (~> 0.3) hana (~> 1.3) - regexp_parser (~> 1.5) + regexp_parser (~> 2.0) uri_template (~> 0.7) jsonpath (1.1.0) multi_json @@ -719,7 +711,7 @@ GEM reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - listen (3.2.1) + listen (3.6.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) locale (2.1.3) @@ -729,7 +721,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.9.1) + loofah (2.11.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) @@ -741,8 +733,6 @@ GEM actionpack (>= 2.3) activerecord (>= 2.3) memoist (0.16.2) - memoizable (0.4.2) - thread_safe (~> 0.3, >= 0.3.1) memory_profiler (0.9.14) method_source (1.0.0) mime-types (3.3.1) @@ -751,7 +741,7 @@ GEM mini_histogram (0.3.1) mini_magick (4.10.1) mini_mime (1.0.2) - mini_portile2 (2.5.1) + mini_portile2 (2.5.3) minitest (5.11.3) mixlib-cli (2.1.8) mixlib-config (3.0.9) @@ -789,7 +779,7 @@ GEM netrc (0.11.0) nio4r (2.5.4) no_proxy_fix (0.1.2) - nokogiri (1.11.5) + nokogiri (1.11.7) mini_portile2 (~> 2.5.0) racc (~> 1.4) nokogumbo (2.0.2) @@ -928,7 +918,6 @@ GEM coderay parser unparser - procto (0.0.3) prometheus-client-mmap (0.12.0) pry (0.13.1) coderay (~> 1.1) @@ -1005,7 +994,7 @@ GEM rake (>= 0.8.7) thor (~> 1.0) rainbow (3.0.0) - rake (13.0.3) + rake (13.0.6) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -1015,6 +1004,7 @@ GEM ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) + rbtree (0.4.4) rchardet (1.8.0) rdoc (6.3.2) re2 (1.2.0) @@ -1040,8 +1030,8 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.8.1) redis (>= 4, < 5) - regexp_parser (1.8.2) - regexp_property_values (0.3.5) + regexp_parser (2.1.1) + regexp_property_values (1.0.0) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -1079,7 +1069,7 @@ GEM rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-parameterized (0.4.2) + rspec-parameterized (0.5.0) binding_ninja (>= 0.2.3) parser proc_to_ast @@ -1179,6 +1169,7 @@ GEM rubyzip (>= 1.2.2) sentry-raven (3.1.2) faraday (>= 1.0) + set (1.0.1) settingslogic (2.0.9) sexp_processor (4.15.1) shellany (0.0.1) @@ -1203,12 +1194,12 @@ GEM simplecov-html (~> 0.11) simplecov-cobertura (1.3.1) simplecov (~> 0.8) - simplecov-html (0.12.2) + simplecov-html (0.12.3) sixarm_ruby_unaccent (1.2.0) slack-messenger (2.3.4) snowplow-tracker (0.6.1) contracts (~> 0.7, <= 0.11) - solargraph (0.42.3) + solargraph (0.43.0) backport (~> 1.2) benchmark bundler (>= 1.17.2) @@ -1223,6 +1214,9 @@ GEM thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) + sorted_set (1.0.3) + rbtree + set (~> 1.0) spamcheck (0.1.0) grpc (~> 1.0) spring (2.1.1) @@ -1272,7 +1266,6 @@ GEM eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) thor (1.1.0) - thread_safe (0.3.6) thrift (0.14.0) tilt (2.0.10) timecop (0.9.1) @@ -1323,16 +1316,11 @@ GEM unicode-display_width (1.7.0) unicode_utils (1.4.0) uniform_notifier (1.13.0) - unleash (0.1.5) + unleash (3.2.2) murmurhash3 (~> 0.1.6) - unparser (0.4.7) - abstract_type (~> 0.0.7) - adamantium (~> 0.2.0) - concord (~> 0.1.5) + unparser (0.6.0) diff-lcs (~> 1.3) - equalizer (~> 0.0.9) - parser (>= 2.6.5) - procto (~> 0.0.2) + parser (>= 3.0.0) uri_template (0.7.0) valid_email (0.1.3) activemodel @@ -1350,6 +1338,7 @@ GEM vmstat (2.3.0) warden (1.2.8) rack (>= 2.0.6) + warning (1.2.0) webauthn (2.3.0) android_key_attestation (~> 0.3.0) awrence (~> 1.1) @@ -1453,7 +1442,7 @@ DEPENDENCIES email_spec (~> 2.2.0) erubi (~> 1.9.0) escape_utils (~> 1.1) - factory_bot_rails (~> 6.1.0) + factory_bot_rails (~> 6.2.0) faraday (~> 1.0) faraday_middleware-aws-sigv4 (~> 0.3.0) fast_blank @@ -1475,18 +1464,18 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 14.1.0.pre.rc3) + gitaly (~> 14.2.0.pre.rc2) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 2.2.2) - gitlab-experiment (~> 0.6.1) + gitlab-dangerfiles (~> 2.3.0) + gitlab-experiment (~> 0.6.4) gitlab-fog-azure-rm (~> 1.1.1) - gitlab-labkit (~> 0.20.0) + gitlab-labkit (~> 0.21.0) gitlab-license (~> 2.0) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) - gitlab-omniauth-openid-connect (~> 0.4.0) + gitlab-omniauth-openid-connect (~> 0.8.0) gitlab-sidekiq-fetcher (= 0.5.6) gitlab-styles (~> 6.2.0) gitlab_chronic_duration (~> 0.10.6.2) @@ -1503,7 +1492,7 @@ DEPENDENCIES graphlient (~> 0.4.0) graphql (~> 1.11.8) graphql-docs (~> 1.6.0) - grpc (~> 1.30.2) + grpc (~> 1.38.0) gssapi guard-rspec haml_lint (~> 0.36.0) @@ -1519,9 +1508,9 @@ DEPENDENCIES invisible_captcha (~> 1.1.0) ipaddress (~> 0.8.3) jira-ruby (~> 2.1.4) - js_regex (~> 3.4) + js_regex (~> 3.7) json (~> 2.3.0) - json_schemer (~> 0.2.12) + json_schemer (~> 0.2.18) jwt (~> 2.1.0) kaminari (~> 1.0) kas-grpc (~> 0.0.2) @@ -1634,7 +1623,7 @@ DEPENDENCIES simplecov-cobertura (~> 1.3.1) slack-messenger (~> 2.3.4) snowplow-tracker (~> 0.6.1) - solargraph (~> 0.42) + solargraph (~> 0.43) spamcheck (~> 0.1.0) spring (~> 2.1.0) spring-commands-rspec (~> 1.0.4) @@ -1653,11 +1642,12 @@ DEPENDENCIES truncato (~> 0.7.11) u2f (~> 0.2.1) unf (~> 0.1.4) - unleash (~> 0.1.5) + unleash (~> 3.2.2) valid_email (~> 0.1) validates_hostname (~> 1.0.11) version_sorter (~> 2.2.4) vmstat (~> 2.3.0) + warning (~> 1.2.0) webauthn (~> 2.3) webmock (~> 3.9.1) webrick (~> 1.6.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 933776ace73..4d4e9292d39 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -1,14 +1,4 @@ { - abstract_type = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09330cmhrc2wmfhdj9zzg82sv6cdhm3qgdkva5ni5xfjril2pf14"; - type = "gem"; - }; - version = "0.0.7"; - }; acme-client = { dependencies = ["faraday"]; groups = ["default"]; @@ -163,17 +153,6 @@ }; version = "7.0.0"; }; - adamantium = { - dependencies = ["ice_nine" "memoizable"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0165r2ikgfwv2rm8dzyijkp74fvg0ni72hpdx8ay2v7cj08dqyak"; - type = "gem"; - }; - version = "0.2.0"; - }; addressable = { dependencies = ["public_suffix"]; groups = ["danger" "default" "development" "test"]; @@ -694,14 +673,15 @@ version = "0.5.9.6"; }; character_set = { + dependencies = ["sorted_set"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0affq9n77vwy897ri2zhmfinfagf37hcwwimrccy1bcxan9mj3h3"; + sha256 = "0ql0kxnpbblggyn8hx511pghpqf8xv3ng2kbybwwdi11bg1il6zp"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; charlock_holmes = { groups = ["default"]; @@ -820,26 +800,15 @@ }; version = "0.21.0"; }; - concord = { - dependencies = ["adamantium" "equalizer"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1b6cdn0fg4n9gzbdr7zyf4jq40y6h0c0g9cra7wk9hhmsylk91bg"; - type = "gem"; - }; - version = "0.1.5"; - }; concurrent-ruby = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; type = "gem"; }; - version = "1.1.8"; + version = "1.1.9"; }; connection_pool = { groups = ["default"]; @@ -1294,10 +1263,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hjnd6phkhwmd846hqkzbiiyf7n6v9s85agizkxrkha1z0g3q5fc"; + sha256 = "1mz0nsl2093jd94nygw8qs13rwfwl1ax76xz3ypinr5hqbc5pab6"; type = "gem"; }; - version = "0.2.1"; + version = "0.3.0"; }; ed25519 = { groups = ["ed25519"]; @@ -1394,16 +1363,6 @@ }; version = "3.0.0"; }; - equalizer = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4"; - type = "gem"; - }; - version = "0.0.11"; - }; erubi = { groups = ["default" "development" "test"]; platforms = []; @@ -1492,10 +1451,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11ij9s4hasy963qjqbrrf0m8lm9m9pxkh2vf4wrnafa6gw6r9qk8"; + sha256 = "04vxmjr200akcil9fqxc9ghbb9q0lyrh2q03xxncycd5vln910fi"; type = "gem"; }; - version = "6.1.0"; + version = "6.2.0"; }; factory_bot_rails = { dependencies = ["factory_bot" "railties"]; @@ -1503,10 +1462,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hfxkq6rarg0b8xfzqg200xyj176sn1xplqqqcrz5drhkqp30m14"; + sha256 = "18fhcihkc074gk62iwqgbdgc3ymim4fm0b4p3ipffy5hcsb9d2r7"; type = "gem"; }; - version = "6.1.0"; + version = "6.2.0"; }; faraday = { dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-net_http" "faraday-net_http_persistent" "multipart-post" "ruby2_keywords"]; @@ -1952,10 +1911,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kf335cnps9ix3jfnfq99zlp7wrf6p9lip7cxicxylvn682i7l4y"; + sha256 = "0y4zsl1s7ysb1z6piczfkscbjnx7hchda3jsdam42dmi40z654dp"; type = "gem"; }; - version = "14.1.0.pre.rc3"; + version = "14.2.0.pre.rc2"; }; github-markup = { groups = ["default"]; @@ -1995,10 +1954,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5qlncyc090vyvgpj5f186109gfyv4jcbyibbyq3mcd38brqgc2"; + sha256 = "07ckvf7vk0494s70ql7zp3ckn8q70mhwa0143hj6bjh0bpgmgsnw"; type = "gem"; }; - version = "2.2.2"; + version = "2.3.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store" "scientist"]; @@ -2006,10 +1965,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d1w5vd3001469bk5cqac5d9l44f6sbqbzw5z4xiflyi7fdad9jf"; + sha256 = "07b7fb8vkpwjf668mircz6lavr8yp5xc7f7yp1v1h7izhzhn7m8g"; type = "gem"; }; - version = "0.6.1"; + version = "0.6.4"; }; gitlab-fog-azure-rm = { dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; @@ -2028,10 +1987,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1krn6vi33i5vqbz3gmwzj9f9ifda41a3as3chpl899mrgni61q6r"; + sha256 = "0dzdxrn2ra21nyfnabj44fbwbccjkp3i7cjpym99pzbsx8dkna8z"; type = "gem"; }; - version = "0.20.0"; + version = "0.21.0"; }; gitlab-license = { groups = ["default"]; @@ -2079,10 +2038,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16vbdyp2ml2i59xnpk0w5grh441kxcdpr639yzv69brjnrf3h9di"; + sha256 = "0bzblypm1d5bxn8a15l90vx4ad099i5nhnislr7fhs2axy3ssfr1"; type = "gem"; }; - version = "0.4.0"; + version = "0.8.0"; }; gitlab-sidekiq-fetcher = { dependencies = ["sidekiq"]; @@ -2177,10 +2136,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00jm6b5gpzj99cngha3g70s0xnr0c58si7kx3g7jiaj9ipp26qj5"; + sha256 = "0vmll4nnkha3vsqj1g76pwni6x7mp2i81pka4wdwq8qfhn210108"; type = "gem"; }; - version = "3.17.1"; + version = "3.17.3"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -2188,10 +2147,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0074jk8fdl5rh7hfgx00n17sg493xrylkjkslx2d7cj5mk6hwn7d"; + sha256 = "1949w1lcd3iyiy4n6zgnrhdp78k9khbh2pbkrpkv263bbpmw8llg"; type = "gem"; }; - version = "1.0.6"; + version = "1.1.0"; }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; @@ -2319,10 +2278,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rsglf7ag17n465iff7vlw83pn2rpl4kv9sb1rpf17nx6xpi7yl5"; + sha256 = "16qxl287kkf34h71djlf9x3wxmd5ylcm83y2zhnrv81gbrhn8k12"; type = "gem"; }; - version = "1.30.2"; + version = "1.38.0"; }; gssapi = { dependencies = ["ffi"]; @@ -2405,10 +2364,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ij5clmkfl5ij9wdzr62b0w7j2qg7pb65mhvxa6mf1kv1xp6l585"; + sha256 = "03cvrv2wl25j9n4n509hjvqnmwa60k92j741b64a1zjisr1dn9al"; type = "gem"; }; - version = "1.3.6"; + version = "1.3.7"; }; hangouts-chat = { groups = ["default"]; @@ -2610,16 +2569,6 @@ }; version = "2.4.1"; }; - ice_nine = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x"; - type = "gem"; - }; - version = "0.11.2"; - }; invisible_captcha = { dependencies = ["rails"]; groups = ["default"]; @@ -2689,10 +2638,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zia0pxa2lrybwv51xzhj26rf3gx8zwg1cghbdk640rbsyr8sf9a"; + sha256 = "0xarq1fqjaz6v139zzy4nwjg8c253fkvifn345gilva1qilaqgxi"; type = "gem"; }; - version = "3.4.0"; + version = "3.7.0"; }; json = { groups = ["default"]; @@ -2721,10 +2670,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "194898b70ylkjqg7vhy4lps4a5g31n7xxb3vfacwfs40azkn83zm"; + sha256 = "1rkb7gz819g82n3xshb5g8kgv1nvgwg1lm2fk7715pggzcgc4qik"; type = "gem"; }; - version = "0.2.12"; + version = "0.2.18"; }; jsonpath = { dependencies = ["multi_json"]; @@ -2926,10 +2875,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi"; + sha256 = "1dq7yd4s9accpjiq0f92sgikw3whc5wnjn065laggkpqcqgx75gh"; type = "gem"; }; - version = "3.2.1"; + version = "3.6.0"; }; locale = { groups = ["default" "development"]; @@ -2968,10 +2917,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7"; + sha256 = "0pwik3x5fa92g6hbv4imz3n46nlkzgj69pkgql22ppmcr36knk6m"; type = "gem"; }; - version = "2.9.1"; + version = "2.11.0"; }; lru_redux = { groups = ["default"]; @@ -3035,17 +2984,6 @@ }; version = "0.16.2"; }; - memoizable = { - dependencies = ["thread_safe"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c"; - type = "gem"; - }; - version = "0.4.2"; - }; memory_profiler = { groups = ["default"]; platforms = []; @@ -3126,10 +3064,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2"; + sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k"; type = "gem"; }; - version = "2.5.1"; + version = "2.5.3"; }; minitest = { groups = ["development" "test"]; @@ -3385,10 +3323,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i80ny61maqzqr1fq5wgpkijmh5j8abisrmhn16kv7mzmxqg5w0m"; + sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; type = "gem"; }; - version = "1.11.5"; + version = "1.11.7"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -3936,16 +3874,6 @@ }; version = "0.1.0"; }; - procto = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13imvg1x50rz3r0yyfbhxwv72lbf7q28qx9l9nfbb91h2n9ch58c"; - type = "gem"; - }; - version = "0.0.3"; - }; prometheus-client-mmap = { groups = ["metrics"]; platforms = []; @@ -4244,10 +4172,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; type = "gem"; }; - version = "13.0.3"; + version = "13.0.6"; }; rb-fsevent = { groups = ["default" "development" "test"]; @@ -4296,6 +4224,16 @@ }; version = "0.4.14"; }; + rbtree = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0p0x2sxm0ar4ywsxp94yh3glawf83bdikdkccpc8zzln5987l9y1"; + type = "gem"; + }; + version = "0.4.4"; + }; rchardet = { groups = ["default" "development"]; platforms = []; @@ -4438,20 +4376,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x4s82lgf0l71y3xc9gp4qxkrgx1kv8f6avdqd68l46ijbyvicdm"; + sha256 = "0vg7imjnfcqjx7kw94ccj5r78j4g190cqzi1i59sh4a0l940b9cr"; type = "gem"; }; - version = "1.8.2"; + version = "2.1.1"; }; regexp_property_values = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iwapp91sbvafqp12cq834rgy1ydrmrsh5w1a0wfsk4scdxcdwlb"; + sha256 = "03q8dn4fg51mfk5d4sfcr0f9hqbs42ghafi76k9nc7ms1gf9j90n"; type = "gem"; }; - version = "0.3.5"; + version = "1.0.0"; }; representable = { dependencies = ["declarative" "declarative-option" "uber"]; @@ -4626,14 +4564,14 @@ }; rspec-parameterized = { dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"]; - groups = ["development" "test"]; + groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c0892jbaznnldk1wi24qxm70g4zhw2idqx516rhgdzgd7yh5j31"; + sha256 = "0m142sp884z3k3xd42ngf0n8a83hvcihcj1n66qyxlgdnl3sqqzi"; type = "gem"; }; - version = "0.4.2"; + version = "0.5.0"; }; rspec-rails = { dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; @@ -5030,6 +4968,16 @@ }; version = "3.1.2"; }; + set = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p8raic4vlif3r4crjm3x32hmkpikjd456c126hrv3kkyj6zwsfi"; + type = "gem"; + }; + version = "1.0.1"; + }; settingslogic = { groups = ["default"]; platforms = []; @@ -5137,14 +5085,14 @@ version = "1.3.1"; }; simplecov-html = { - groups = ["default" "development" "test"]; + groups = ["coverage" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v7b4mf7njw8kv4ghl4q7mwz3q0flbld7v8blp4m4m3n3aq11bn9"; + sha256 = "0yx01bxa8pbf9ip4hagqkp5m0mqfnwnw2xk8kjraiywz4lrss6jb"; type = "gem"; }; - version = "0.12.2"; + version = "0.12.3"; }; sixarm_ruby_unaccent = { groups = ["default"]; @@ -5183,10 +5131,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqmvwh6k638h6r13wsx1l0n0jvz07qys1lr7z8aaynscs0k6hyi"; + sha256 = "1i2prnczlg871l3kyqy08z8axsilgv3wm4zw061wjyzqglx7xghg"; type = "gem"; }; - version = "0.42.3"; + version = "0.43.0"; + }; + sorted_set = { + dependencies = ["rbtree" "set"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0brpwv68d7m9qbf5js4bg8bmg4v7h4ghz312jv9cnnccdvp8nasg"; + type = "gem"; + }; + version = "1.0.3"; }; spamcheck = { dependencies = ["grpc"]; @@ -5451,16 +5410,6 @@ }; version = "1.1.0"; }; - thread_safe = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; - type = "gem"; - }; - version = "0.3.6"; - }; thrift = { groups = ["default"]; platforms = []; @@ -5727,21 +5676,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xs2ml9cwskddsxick3a9wnasy7q6wmc0dbydfcaspfl2cjmp1rk"; + sha256 = "0fxr4q8bs5pbf3y57f3bckg3ls9k76wzzkhvl1kdw879im4mcvhg"; type = "gem"; }; - version = "0.1.5"; + version = "3.2.2"; }; unparser = { - dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"]; + dependencies = ["diff-lcs" "parser"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qg1apxlnf4kxfj9jpm6hhv73jsncbs4zpsgyan32p5r331q1gmx"; + sha256 = "0246c6j1lbi6jgga3n2br1nyvnwzh1bz0r9yca5d4cihb100byja"; type = "gem"; }; - version = "0.4.7"; + version = "0.6.0"; }; uri_template = { groups = ["default"]; @@ -5828,6 +5777,16 @@ }; version = "1.2.8"; }; + warning = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qhniramhgrcqhb905rkc82k29kgd6535jqf0aii5w3v6m2kn8qd"; + type = "gem"; + }; + version = "1.2.0"; + }; webauthn = { dependencies = ["android_key_attestation" "awrence" "bindata" "cbor" "cose" "openssl" "safety_net_attestation" "securecompare" "tpm-key_attestation"]; groups = ["default"]; diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index a7b91b7df53..8ec9091b970 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -818,11 +818,11 @@ }; } { - name = "_gitlab_svgs___svgs_1.202.0.tgz"; + name = "_gitlab_svgs___svgs_1.211.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.202.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.202.0.tgz"; - sha1 = "dbfad291fc5f597f0d31ca6a694fa8e78af57847"; + name = "_gitlab_svgs___svgs_1.211.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.211.0.tgz"; + sha1 = "0351fa4cc008c4830f366aede535df0a8e63dda6"; }; } { @@ -834,11 +834,11 @@ }; } { - name = "_gitlab_ui___ui_31.5.0.tgz"; + name = "_gitlab_ui___ui_32.2.1.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_31.5.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-31.5.0.tgz"; - sha1 = "45b7866b790e7d5a1b67b39000c047991036b437"; + name = "_gitlab_ui___ui_32.2.1.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-32.2.1.tgz"; + sha1 = "e019124af981e8ceffd39f30cf08d315c53d4ac8"; }; } { @@ -1122,11 +1122,11 @@ }; } { - name = "_sourcegraph_code_host_integration___code_host_integration_0.0.58.tgz"; + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.59.tgz"; path = fetchurl { - name = "_sourcegraph_code_host_integration___code_host_integration_0.0.58.tgz"; - url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.58.tgz"; - sha1 = "7adc78c0a420e7527c68782e2f0c9c62652df02d"; + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.59.tgz"; + url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.59.tgz"; + sha1 = "ac64a9f90ff48363334407d12622542d0faa7720"; }; } { @@ -1345,6 +1345,22 @@ sha1 = "cccce9713824e05ebde895f84f747b8bbed45f7d"; }; } + { + name = "_tiptap_extension_subscript___extension_subscript_2.0.0_beta.4.tgz"; + path = fetchurl { + name = "_tiptap_extension_subscript___extension_subscript_2.0.0_beta.4.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-subscript/-/extension-subscript-2.0.0-beta.4.tgz"; + sha1 = "07907df58695eb02bf6904d2c3635111003b30fd"; + }; + } + { + name = "_tiptap_extension_superscript___extension_superscript_2.0.0_beta.4.tgz"; + path = fetchurl { + name = "_tiptap_extension_superscript___extension_superscript_2.0.0_beta.4.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-superscript/-/extension-superscript-2.0.0-beta.4.tgz"; + sha1 = "16906d71dd8f9892101cf792f42005f8cd404516"; + }; + } { name = "_tiptap_extension_table_cell___extension_table_cell_2.0.0_beta.13.tgz"; path = fetchurl { @@ -1377,6 +1393,22 @@ sha1 = "57accf19c07e96bd0db868eb791da20bd423af36"; }; } + { + name = "_tiptap_extension_task_item___extension_task_item_2.0.0_beta.17.tgz"; + path = fetchurl { + name = "_tiptap_extension_task_item___extension_task_item_2.0.0_beta.17.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-task-item/-/extension-task-item-2.0.0-beta.17.tgz"; + sha1 = "e4e010c321b8f9aa5f49847c48e4e3a0695a47a9"; + }; + } + { + name = "_tiptap_extension_task_list___extension_task_list_2.0.0_beta.17.tgz"; + path = fetchurl { + name = "_tiptap_extension_task_list___extension_task_list_2.0.0_beta.17.tgz"; + url = "https://registry.yarnpkg.com/@tiptap/extension-task-list/-/extension-task-list-2.0.0-beta.17.tgz"; + sha1 = "c0f40325abf1b6a23868e72ab32f9724a8b42a7b"; + }; + } { name = "_tiptap_extension_text___extension_text_2.0.0_beta.12.tgz"; path = fetchurl { @@ -3474,11 +3506,11 @@ }; } { - name = "commander___commander_2.20.0.tgz"; + name = "commander___commander_2.20.3.tgz"; path = fetchurl { - name = "commander___commander_2.20.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz"; - sha1 = "d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"; + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; }; } { @@ -3754,11 +3786,11 @@ }; } { - name = "core_js___core_js_3.13.0.tgz"; + name = "core_js___core_js_3.16.2.tgz"; path = fetchurl { - name = "core_js___core_js_3.13.0.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.13.0.tgz"; - sha1 = "58ca436bf01d6903aee3d364089868d0d89fe58d"; + name = "core_js___core_js_3.16.2.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.16.2.tgz"; + sha1 = "3f485822889c7fc48ef463e35be5cc2a4a01a1f4"; }; } { @@ -4762,11 +4794,11 @@ }; } { - name = "dompurify___dompurify_2.3.0.tgz"; + name = "dompurify___dompurify_2.3.1.tgz"; path = fetchurl { - name = "dompurify___dompurify_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.0.tgz"; - sha1 = "07bb39515e491588e5756b1d3e8375b5964814e2"; + name = "dompurify___dompurify_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.1.tgz"; + sha1 = "a47059ca21fd1212d3c8f71fdea6943b8bfbdf6a"; }; } { @@ -9113,14 +9145,6 @@ sha1 = "95be3f48f4220999b909266a9997727f0deab947"; }; } - { - name = "monaco_editor___monaco_editor_0.24.0.tgz"; - path = fetchurl { - name = "monaco_editor___monaco_editor_0.24.0.tgz"; - url = "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.24.0.tgz"; - sha1 = "990b55096bcc95d08d8d28e55264c6eb17707269"; - }; - } { name = "monaco_editor___monaco_editor_0.25.2.tgz"; path = fetchurl { @@ -11097,14 +11121,6 @@ sha1 = "6943c3530c4d9a7e46f1cddd51c158fc670cdbde"; }; } - { - name = "resize_observer_polyfill___resize_observer_polyfill_1.5.1.tgz"; - path = fetchurl { - name = "resize_observer_polyfill___resize_observer_polyfill_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz"; - sha1 = "0e9020dd3d21024458d4ebd27e23e40269810464"; - }; - } { name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; path = fetchurl { @@ -13954,11 +13970,11 @@ }; } { - name = "yarn_deduplicate___yarn_deduplicate_1.1.1.tgz"; + name = "yarn_deduplicate___yarn_deduplicate_3.1.0.tgz"; path = fetchurl { - name = "yarn_deduplicate___yarn_deduplicate_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/yarn-deduplicate/-/yarn-deduplicate-1.1.1.tgz"; - sha1 = "19b4a87654b66f55bf3a4bd6b153b4e4ab1b6e6d"; + name = "yarn_deduplicate___yarn_deduplicate_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/yarn-deduplicate/-/yarn-deduplicate-3.1.0.tgz"; + sha1 = "3018d93e95f855f236a215b591fe8bc4bcabba3e"; }; } { -- cgit 1.4.1