Merge staging-next into staging

2021-04-28 18:14:28 +00:00 · 2021-04-28 18:14:28 +00:00 · 9cf0393c37
commit 9cf0393c37
parent ce47d859f6 5288f79377
36 changed files with 602 additions and 537 deletions
--- a/.github/workflows/editorconfig.yml
+++ b/.github/workflows/editorconfig.yml
@ -1,7 +1,9 @@
 name: "Checking EditorConfig"

+permissions: read-all
+
 on:
-  pull_request:
+  pull_request_target:
    branches-ignore:
      - 'release-**'

@ -21,17 +23,19 @@ jobs:
          >> $GITHUB_ENV
        echo 'EOF' >> $GITHUB_ENV
    - uses: actions/checkout@v2
+      with:
+        # pull_request_target checks out the base branch by default
+        ref: refs/pull/${{ github.event.pull_request.number }}/merge
      if: env.PR_DIFF
-    - name: Fetch editorconfig-checker
+    - uses: cachix/install-nix-action@v13
      if: env.PR_DIFF
-      env:
-        ECC_VERSION: "2.3.5"
-        ECC_URL: "https://github.com/editorconfig-checker/editorconfig-checker/releases/download"
+    - name: install editorconfig-checker from unstable channel
      run: |
-        curl -sSf -O -L -C - "$ECC_URL/$ECC_VERSION/ec-linux-amd64.tar.gz" && \
-        tar xzf ec-linux-amd64.tar.gz && \
-        mv ./bin/ec-linux-amd64 ./bin/editorconfig-checker
+        nix-channel --add https://nixos.org/channels/nixpkgs-unstable
+        nix-channel --update
+        nix-env -iA nixpkgs.editorconfig-checker
+      if: env.PR_DIFF
    - name: Checking EditorConfig
      if: env.PR_DIFF
      run: |
-        echo "$PR_DIFF" | xargs ./bin/editorconfig-checker -disable-indent-size
+        echo "$PR_DIFF" | xargs editorconfig-checker -disable-indent-size
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@ -1,13 +1,13 @@
 {
-  "version": "13.10.2",
-  "repo_hash": "1q3qnfzhikbbsmzzbldwn6xvsyxr1jgv5lj7mgcji11j8qv1a625",
+  "version": "13.11.2",
+  "repo_hash": "0xian17q8h5qdcvndyd27w278zqi3455svwycqfcv830g27c0csh",
  "owner": "gitlab-org",
  "repo": "gitlab",
-  "rev": "v13.10.2-ee",
+  "rev": "v13.11.2-ee",
  "passthru": {
-    "GITALY_SERVER_VERSION": "13.10.2",
-    "GITLAB_PAGES_VERSION": "1.36.0",
+    "GITALY_SERVER_VERSION": "13.11.2",
+    "GITLAB_PAGES_VERSION": "1.38.0",
    "GITLAB_SHELL_VERSION": "13.17.0",
-    "GITLAB_WORKHORSE_VERSION": "13.10.2"
+    "GITLAB_WORKHORSE_VERSION": "13.11.2"
  }
 }
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@ -32,7 +32,7 @@ let
        openssl = x.openssl // {
          buildInputs = [ openssl ];
        };
-        ruby-magic-static = x.ruby-magic-static // {
+        ruby-magic = x.ruby-magic // {
          buildInputs = [ file ];
          buildFlags = [ "--enable-system-libraries" ];
        };
@ -131,8 +131,8 @@ stdenv.mkDerivation {
    # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53602
    (fetchpatch {
      name = "secrets_db_key_base_length.patch";
-      url = "https://gitlab.com/gitlab-org/gitlab/-/commit/dea620633d446ca0f53a75674454ff0dd4bd8f99.patch";
-      sha256 = "19m4z4np3sai9kqqqgabl44xv7p8lkcyqr6s5471axfxmf9m2023";
+      url = "https://gitlab.com/gitlab-org/gitlab/-/commit/a5c78650441c31a522b18e30177c717ffdd7f401.patch";
+      sha256 = "1qcxr5f59slgzmpcbiwabdhpz1lxnq98yngg1xkyihk2zhv0g1my";
    })
  ];

--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@ -3,23 +3,23 @@ source 'https://rubygems.org'
 gem 'rugged', '~> 1.1'
 gem 'github-linguist', '~> 7.12', require: 'linguist'
 gem 'gitlab-markup', '~> 1.7.1'
-gem 'activesupport', '~> 6.0.3.4'
+gem 'activesupport', '~> 6.0.3.6'
 gem 'rdoc', '~> 6.0'
 gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false
-gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.3.gitlab.1', require: false
+gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false
 gem 'grpc', '~> 1.30.2'
 gem 'sentry-raven', '~> 3.0', require: false
 gem 'faraday', '~> 1.0'
 gem 'rbtrace', require: false

 # Labkit provides observability functionality
-gem 'gitlab-labkit', '~> 0.15.0'
+gem 'gitlab-labkit', '~> 0.16.2'

 # Detects the open source license the repository includes
 # This version needs to be in sync with GitLab CE/EE
 gem 'licensee', '~> 9.14.1'

-gem 'google-protobuf', '~> 3.12'
+gem 'google-protobuf', '~> 3.14.0'

 group :development, :test do
  gem 'rubocop', '~> 0.69', require: false
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@ -2,20 +2,20 @@ GEM
  remote: https://rubygems.org/
  specs:
    abstract_type (0.0.7)
-    actionpack (6.0.3.4)
-      actionview (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actionpack (6.0.3.6)
+      actionview (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
      rack (~> 2.0, >= 2.0.8)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actionview (6.0.3.6)
+      activesupport (= 6.0.3.6)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.0.3.4)
+    activesupport (6.0.3.6)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
@ -34,7 +34,7 @@ GEM
    concord (0.1.5)
      adamantium (~> 0.2.0)
      equalizer (~> 0.0.9)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
    crass (1.0.6)
    diff-lcs (1.3)
    dotenv (2.7.6)
@ -62,10 +62,10 @@ GEM
      rouge (~> 3.1)
      sanitize (~> 4.6.4)
      stringex (~> 2.6)
-    gitlab-gollum-rugged_adapter (0.4.4.3.gitlab.1)
+    gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1)
      mime-types (>= 1.15)
      rugged (~> 1.0)
-    gitlab-labkit (0.15.0)
+    gitlab-labkit (0.16.2)
      actionpack (>= 5.0.0, < 7.0.0)
      activesupport (>= 5.0.0, < 7.0.0)
      grpc (~> 1.19)
@ -74,14 +74,14 @@ GEM
      pg_query (~> 1.3)
      redis (> 3.0.0, < 5.0.0)
    gitlab-markup (1.7.1)
-    google-protobuf (3.12.4)
+    google-protobuf (3.14.0)
    googleapis-common-protos-types (1.0.5)
      google-protobuf (~> 3.11)
    grpc (1.30.2)
      google-protobuf (~> 3.12)
      googleapis-common-protos-types (~> 1.0)
    grpc-tools (1.30.2)
-    i18n (1.8.5)
+    i18n (1.8.10)
      concurrent-ruby (~> 1.0)
    ice_nine (0.11.2)
    jaeger-client (1.1.0)
@ -94,7 +94,7 @@ GEM
      reverse_markdown (~> 1.0)
      rugged (>= 0.24, < 2.0)
      thor (>= 0.19, < 2.0)
-    loofah (2.9.0)
+    loofah (2.9.1)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    memoizable (0.4.2)
@ -196,7 +196,7 @@ GEM
    stringex (2.8.5)
    thor (1.1.0)
    thread_safe (0.3.6)
-    thrift (0.13.0)
+    thrift (0.14.1)
    timecop (0.9.1)
    tzinfo (1.2.9)
      thread_safe (~> 0.1)
@ -215,15 +215,15 @@ PLATFORMS
  ruby

 DEPENDENCIES
-  activesupport (~> 6.0.3.4)
+  activesupport (~> 6.0.3.6)
  factory_bot
  faraday (~> 1.0)
  github-linguist (~> 7.12)
  gitlab-gollum-lib (~> 4.2.7.10.gitlab.1)
-  gitlab-gollum-rugged_adapter (~> 0.4.4.3.gitlab.1)
-  gitlab-labkit (~> 0.15.0)
+  gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1)
+  gitlab-labkit (~> 0.16.2)
  gitlab-markup (~> 1.7.1)
-  google-protobuf (~> 3.12)
+  google-protobuf (~> 3.14.0)
  grpc (~> 1.30.2)
  grpc-tools (= 1.30.2)
  licensee (~> 9.14.1)
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@ -21,17 +21,17 @@ let
      };
  };
 in buildGoModule rec {
-  version = "13.10.2";
+  version = "13.11.2";
  pname = "gitaly";

  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitaly";
    rev = "v${version}";
-    sha256 = "sha256-5CjZs5tpEEsgQGBFa8BeZ7SDhIeGKqAHWwbR8hSoCPs=";
+    sha256 = "sha256-qcrvNmnlrdJYXAlt65bA0Ij7zuX7QwVukC3A4KGL3sk=";
  };

-  vendorSha256 = "sha256-8AopoiLmg6kfvYbZDOfFWBy1o5tbnxsKxSBX20OasIE=";
+  vendorSha256 = "sha256-VAXQPVyB+XdfOqGaT1H/83ed6xV+4Tr5fkBu1eyPe2k=";

  passthru = {
    inherit rubyEnv;
--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@ -13,10 +13,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0fbjpnh5hrihc9l35q9why6ip0hcdj42axzbp6b4j1xcy1v1bicj";
+      sha256 = "10rn7gmnnwpm593xv6lcf4qa72wmlbyjg4zmdc3lpb5596whd3yz";
      type = "gem";
    };
-    version = "6.0.3.4";
+    version = "6.0.3.6";
  };
  actionview = {
    dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -24,10 +24,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0gdz31cq08nrqq6bxqim2qcbzv0fr34z6ycl73dmawpafj33wdkj";
+      sha256 = "0ikqpxsrsb7xmq6ds5iq22nj2j3ai16z8z2j5r6lk8pzbi0wwsz5";
      type = "gem";
    };
-    version = "6.0.3.4";
+    version = "6.0.3.6";
  };
  activesupport = {
    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@ -35,10 +35,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1axidc4mikgi4yxs0ynw2c54jyrs5lxprxmzv6m3aayi9rg6rk5j";
+      sha256 = "0sls37x9pd2zmipn14c46gcjbfzlg269r413cvm0d58595qkiv7z";
      type = "gem";
    };
-    version = "6.0.3.4";
+    version = "6.0.3.6";
  };
  adamantium = {
    dependencies = ["ice_nine" "memoizable"];
@ -122,10 +122,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
+      sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
      type = "gem";
    };
-    version = "1.1.7";
+    version = "1.1.8";
  };
  crass = {
    groups = ["default"];
@ -258,10 +258,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0rqi9h6k32azljmx2q0zibvs1m59wgh879h04jflxkcqyzj6wyyj";
+      sha256 = "0gvgqfn05swsazfxdwmlqcq8v2pjyy7dmyl3bd8b8jrrxbpmpxxg";
      type = "gem";
    };
-    version = "0.4.4.3.gitlab.1";
+    version = "0.4.4.4.gitlab.1";
  };
  gitlab-labkit = {
    dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"];
@ -269,10 +269,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1l9bsjszp5zyzbdsr9ls09d4yr2sb0xjc40x4rv7fbzk19n9xs71";
+      sha256 = "0184rq6sal3xz4f0w5iaa5zf3q55i4dh0rlvr25l1g0s2imwr3fa";
      type = "gem";
    };
-    version = "0.15.0";
+    version = "0.16.2";
  };
  gitlab-markup = {
    groups = ["default"];
@ -289,10 +289,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1m3la0yid3bqx9b30raisqbp27d0q7vdrlslazrdasf8v1vhifxj";
+      sha256 = "0pbm2kjhxvazx9d5c071bxcjx5cbip6d2y36dii2a4558nqjd12p";
      type = "gem";
    };
-    version = "3.12.4";
+    version = "3.14.0";
  };
  googleapis-common-protos-types = {
    dependencies = ["google-protobuf"];
@ -332,10 +332,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
+      sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a";
      type = "gem";
    };
-    version = "1.8.5";
+    version = "1.8.10";
  };
  ice_nine = {
    source = {
@ -383,10 +383,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck";
+      sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7";
      type = "gem";
    };
-    version = "2.9.0";
+    version = "2.9.1";
  };
  memoizable = {
    dependencies = ["thread_safe"];
@ -898,10 +898,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "08076cmdx0g51yrkd7dlxlr45nflink3jhdiq7006ljc2pc3212q";
+      sha256 = "1sfa4120a7yl3gxjcx990gyawsshfr22gfv5rvgpk72l2p9j2420";
      type = "gem";
    };
-    version = "0.13.0";
+    version = "0.14.1";
  };
  timecop = {
    source = {
--- 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 = "13.10.2";
+  version = "13.11.2";

  src = fetchFromGitLab {
    owner = data.owner;
@ -16,7 +16,7 @@ buildGoModule rec {

  sourceRoot = "source/workhorse";

-  vendorSha256 = "sha256-UCkUSv1ZjDHmTFnETU8dz4moYRDCvy6AYTTfjHBGKeE=";
+  vendorSha256 = "sha256-m/Mx4Nr4tPK6yfcHxAFbjh9DI/1WnKReaaylWpNSrc8=";
  buildInputs = [ git ];
  buildFlagsArray = "-ldflags=-X main.Version=${version}";
  doCheck = false;
--- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
@ -1,8 +1,8 @@
 diff --git a/config/environments/production.rb b/config/environments/production.rb
-index d9b3ee354b0..1eb0507488b 100644
+index e1a7db8d860..5823f170410 100644
 --- a/config/environments/production.rb
 +++ b/config/environments/production.rb
-@@ -69,10 +69,10 @@
+@@ -71,10 +71,10 @@
 
   config.action_mailer.delivery_method = :sendmail
   # Defaults to:
@ -18,10 +18,10 @@ index d9b3ee354b0..1eb0507488b 100644
   config.action_mailer.raise_delivery_errors = true
 
 diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
-index 92e7501d49d..4ee5a1127df 100644
+index da1a15302da..c846db93e5c 100644
 --- a/config/gitlab.yml.example
 +++ b/config/gitlab.yml.example
-@@ -1168,7 +1168,7 @@ production: &base
+@@ -1191,7 +1191,7 @@ production: &base
   # CAUTION!
   # Use the default values unless you really know what you are doing
   git:
@ -31,19 +31,19 @@ index 92e7501d49d..4ee5a1127df 100644
   ## Webpack settings
   # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
 diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
-index bbed08f5044..2906e5c44af 100644
+index 99335321f28..9d9d1c48af4 100644
 --- a/config/initializers/1_settings.rb
 +++ b/config/initializers/1_settings.rb
-@@ -183,7 +183,7 @@
+@@ -185,7 +185,7 @@
 Settings.gitlab['user_home'] ||= begin
   Etc.getpwnam(Settings.gitlab['user']).dir
-                                  rescue ArgumentError # no user configured
-                                   '/home/' + Settings.gitlab['user']
-+                                   '/homeless-shelter'
+ rescue ArgumentError # no user configured
+-  '/home/' + Settings.gitlab['user']
+  '/homeless-shelter'
 end
 Settings.gitlab['time_zone'] ||= nil
 Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
-@@ -751,7 +751,7 @@
+@@ -794,7 +794,7 @@
 # Git
 #
 Settings['git'] ||= Settingslogic.new({})
@ -97,7 +97,7 @@ index 9fc354a8fe8..2352ca9b58c 100644
 json_formatter = Gitlab::PumaLogging::JSONFormatter.new
 log_formatter do |str|
 diff --git a/lib/api/api.rb b/lib/api/api.rb
-index ada0da28749..8a3f5824008 100644
+index a287ffbfcd8..1a5ca59183a 100644
 --- a/lib/api/api.rb
 +++ b/lib/api/api.rb
@@ -4,7 +4,7 @@ module API
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@ -2,7 +2,7 @@

 source 'https://rubygems.org'

-gem 'rails', '~> 6.0.3.1'
+gem 'rails', '~> 6.0.3.6'

 gem 'bootsnap', '~> 1.4.6'

@ -28,6 +28,8 @@ gem 'devise', '~> 4.7.2'
 gem 'bcrypt', '~> 3.1', '>= 3.1.14'
 gem 'doorkeeper', '~> 5.5.0.rc2'
 gem 'doorkeeper-openid_connect', '~> 1.7.5'
+gem 'rexml', '~> 3.2.5'
+gem 'ruby-saml', '~> 1.12.1'
 gem 'omniauth', '~> 1.8'
 gem 'omniauth-auth0', '~> 2.0.0'
 gem 'omniauth-azure-activedirectory-v2', '~> 0.1'
@ -59,7 +61,7 @@ gem 'akismet', '~> 3.0'
 gem 'invisible_captcha', '~> 1.1.0'

 # Two-factor authentication
-gem 'devise-two-factor', '~> 3.1.0'
+gem 'devise-two-factor', '~> 4.0.0'
 gem 'rqrcode-rails3', '~> 0.1.7'
 gem 'attr_encrypted', '~> 3.1.0'
 gem 'u2f', '~> 0.2.1'
@ -108,7 +110,7 @@ gem 'hashie-forbidden_attributes'
 gem 'kaminari', '~> 1.0'

 # HAML
-gem 'hamlit', '~> 2.14.4'
+gem 'hamlit', '~> 2.15.0'

 # Files attachments
 gem 'carrierwave', '~> 1.3'
@ -150,7 +152,7 @@ gem 'deckar01-task_list', '2.3.1'
 gem 'gitlab-markup', '~> 1.7.1'
 gem 'github-markup', '~> 1.7.0', require: 'github/markup'
 gem 'commonmarker', '~> 0.21'
-gem 'kramdown', '~> 2.3.0'
+gem 'kramdown', '~> 2.3.1'
 gem 'RedCloth', '~> 4.3.2'
 gem 'rdoc', '~> 6.1.2'
 gem 'org-ruby', '~> 0.9.12'
@ -198,7 +200,7 @@ gem 'acts-as-taggable-on', '~> 7.0'
 gem 'sidekiq', '~> 5.2.7'
 gem 'sidekiq-cron', '~> 1.0'
 gem 'redis-namespace', '~> 1.7.0'
-gem 'gitlab-sidekiq-fetcher', '0.5.5', require: 'sidekiq-reliable-fetch'
+gem 'gitlab-sidekiq-fetcher', '0.5.6', require: 'sidekiq-reliable-fetch'

 # Cron Parser
 gem 'fugit', '~> 1.2.1'
@ -274,10 +276,7 @@ gem 'licensee', '~> 9.14.1'
 gem 'charlock_holmes', '~> 0.7.7'

 # Detect mime content type from content
-gem 'ruby-magic-static', '~> 0.3.4'
-
-# Fake version of the gem to trick bundler
-gem 'mimemagic', '~> 0.3.10'
+gem 'ruby-magic', '~> 0.4'

 # Faster blank
 gem 'fast_blank'
@ -294,11 +293,11 @@ gem 'terser', '1.0.2'

 gem 'addressable', '~> 2.7'
 gem 'gemojione', '~> 3.3'
-gem 'gon', '~> 6.2'
+gem 'gon', '~> 6.4.0'
 gem 'request_store', '~> 1.5'
 gem 'base32', '~> 0.3.0'

-gem "gitlab-license", "~> 1.3"
+gem "gitlab-license", "~> 1.4"

 # Protect against bruteforcing
 gem 'rack-attack', '~> 6.3.0'
@ -312,7 +311,7 @@ gem 'pg_query', '~> 1.3.0'
 gem 'premailer-rails', '~> 1.10.3'

 # LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '~> 0.16.1'
+gem 'gitlab-labkit', '~> 0.16.2'
 # 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'
@ -343,13 +342,12 @@ group :metrics do
 end

 group :development do
-  gem 'brakeman', '~> 4.2', require: false
-  gem 'lefthook', '~> 0.7', require: false
+  gem 'lefthook', '~> 0.7.0', require: false

-  gem 'letter_opener_web', '~> 1.3.4'
+  gem 'letter_opener_web', '~> 1.4.0'

  # Better errors handler
-  gem 'better_errors', '~> 2.7.1'
+  gem 'better_errors', '~> 2.9.0'

  # thin instead webrick
  gem 'thin', '~> 1.8.0'
@ -366,7 +364,7 @@ group :development, :test do

  gem 'database_cleaner', '~> 1.7.0'
  gem 'factory_bot_rails', '~> 6.1.0'
-  gem 'rspec-rails', '~> 4.0.2'
+  gem 'rspec-rails', '~> 5.0.1'

  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
  gem 'minitest', '~> 5.11.0'
@ -377,14 +375,14 @@ group :development, :test do
  gem 'spring', '~> 2.1.0'
  gem 'spring-commands-rspec', '~> 1.0.4'

-  gem 'gitlab-styles', '~> 6.1.0', require: false
+  gem 'gitlab-styles', '~> 6.2.0', require: false

  gem 'haml_lint', '~> 0.36.0', require: false
  gem 'bundler-audit', '~> 0.7.0.1', require: false

  gem 'benchmark-ips', '~> 2.3.0', require: false

-  gem 'knapsack', '~> 1.17'
+  gem 'knapsack', '~> 1.21.1'
  gem 'crystalball', '~> 0.7.0', require: false

  gem 'simple_po_parser', '~> 1.1.2', require: false
@ -396,11 +394,12 @@ group :development, :test do
  gem 'parallel', '~> 1.19', require: false

  gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
+
+  gem 'test_file_finder', '~> 0.1.3'
 end

 group :development, :test, :danger do
-  gem 'danger-gitlab', '~> 8.0', require: false
-  gem 'gitlab-dangerfiles', '~> 0.8.0', require: false
+  gem 'gitlab-dangerfiles', '~> 1.1.1', require: false
 end

 group :development, :test, :coverage do
@ -414,6 +413,7 @@ group :development, :test, :omnibus do
 end

 group :test do
+  gem 'json-schema', '~> 2.8.0'
  gem 'fuubar', '~> 2.2.0'
  gem 'rspec-retry', '~> 0.6.1'
  gem 'rspec_profiling', '~> 0.0.6'
@ -475,11 +475,11 @@ group :ed25519 do
 end

 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 13.9.0.pre.rc1'
+gem 'gitaly', '~> 13.11.0.pre.rc1'

 gem 'grpc', '~> 1.30.2'

-gem 'google-protobuf', '~> 3.12'
+gem 'google-protobuf', '~> 3.14.0'

 gem 'toml-rb', '~> 1.0.0'

@ -488,7 +488,7 @@ gem 'flipper', '~> 0.17.1'
 gem 'flipper-active_record', '~> 0.17.1'
 gem 'flipper-active_support_cache_store', '~> 0.17.1'
 gem 'unleash', '~> 0.1.5'
-gem 'gitlab-experiment', '~> 0.5.0'
+gem 'gitlab-experiment', '~> 0.5.3'

 # Structured logging
 gem 'lograge', '~> 0.5'
@ -513,14 +513,13 @@ gem 'erubi', '~> 1.9.0'
 gem 'mail', '= 2.7.1'

 # File encryption
-gem 'lockbox', '~> 0.3.3'
+gem 'lockbox', '~> 0.6.2'

 # Email validation
 gem 'valid_email', '~> 0.1'

 # JSON
 gem 'json', '~> 2.3.0'
-gem 'json-schema', '~> 2.8.0'
 gem 'json_schemer', '~> 0.2.12'
 gem 'oj', '~> 3.10.6'
 gem 'multi_json', '~> 1.14.1'
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@ -5,59 +5,59 @@ GEM
    abstract_type (0.0.7)
    acme-client (2.0.6)
      faraday (>= 0.17, < 2.0.0)
-    actioncable (6.0.3.4)
-      actionpack (= 6.0.3.4)
+    actioncable (6.0.3.6)
+      actionpack (= 6.0.3.6)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activejob (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      activestorage (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actionmailbox (6.0.3.6)
+      actionpack (= 6.0.3.6)
+      activejob (= 6.0.3.6)
+      activerecord (= 6.0.3.6)
+      activestorage (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
      mail (>= 2.7.1)
-    actionmailer (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      actionview (= 6.0.3.4)
-      activejob (= 6.0.3.4)
+    actionmailer (6.0.3.6)
+      actionpack (= 6.0.3.6)
+      actionview (= 6.0.3.6)
+      activejob (= 6.0.3.6)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.4)
-      actionview (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actionpack (6.0.3.6)
+      actionview (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
      rack (~> 2.0, >= 2.0.8)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      activestorage (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actiontext (6.0.3.6)
+      actionpack (= 6.0.3.6)
+      activerecord (= 6.0.3.6)
+      activestorage (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
      nokogiri (>= 1.8.5)
-    actionview (6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actionview (6.0.3.6)
+      activesupport (= 6.0.3.6)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.4)
-      activesupport (= 6.0.3.4)
+    activejob (6.0.3.6)
+      activesupport (= 6.0.3.6)
      globalid (>= 0.3.6)
-    activemodel (6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activerecord (6.0.3.4)
-      activemodel (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    activemodel (6.0.3.6)
+      activesupport (= 6.0.3.6)
+    activerecord (6.0.3.6)
+      activemodel (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
    activerecord-explain-analyze (0.1.0)
      activerecord (>= 4)
      pg
-    activestorage (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activejob (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      marcel (~> 0.3.1)
-    activesupport (6.0.3.4)
+    activestorage (6.0.3.6)
+      actionpack (= 6.0.3.6)
+      activejob (= 6.0.3.6)
+      activerecord (= 6.0.3.6)
+      marcel (~> 1.0.0)
+    activesupport (6.0.3.6)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
@ -133,7 +133,7 @@ GEM
    benchmark-ips (2.3.0)
    benchmark-memory (0.1.2)
      memory_profiler (~> 0.9)
-    better_errors (2.7.1)
+    better_errors (2.9.1)
      coderay (>= 1.0.0)
      erubi (>= 1.0.0)
      rack (>= 0.9.0)
@ -144,7 +144,6 @@ GEM
    bootstrap_form (4.2.0)
      actionpack (>= 5.0)
      activemodel (>= 5.0)
-    brakeman (4.2.1)
    browser (4.2.0)
    builder (3.2.4)
    bullet (6.1.3)
@ -165,10 +164,11 @@ GEM
    capybara-screenshot (1.0.22)
      capybara (>= 1.0, < 4)
      launchy
-    carrierwave (1.3.1)
+    carrierwave (1.3.2)
      activemodel (>= 4.0.0)
      activesupport (>= 4.0.0)
      mime-types (>= 1.16)
+      ssrf_filter (~> 1.0)
    cbor (0.5.9.6)
    character_set (1.4.0)
    charlock_holmes (0.7.7)
@ -259,12 +259,12 @@ GEM
      railties (>= 4.1.0)
      responders
      warden (~> 1.2.3)
-    devise-two-factor (3.1.0)
-      activesupport (< 6.1)
+    devise-two-factor (4.0.0)
+      activesupport (< 6.2)
      attr_encrypted (>= 1.3, < 4, != 2)
      devise (~> 4.0)
-      railties (< 6.1)
-      rotp (~> 2.0)
+      railties (< 6.2)
+      rotp (~> 6.0)
    diff-lcs (1.4.4)
    diff_match_patch (0.1.0)
    diffy (3.3.0)
@ -428,7 +428,7 @@ GEM
      rails (>= 3.2.0)
    git (1.7.0)
      rchardet (~> 1.8)
-    gitaly (13.9.0.pre.rc1)
+    gitaly (13.11.0.pre.rc1)
      grpc (~> 1.0)
    github-markup (1.7.0)
    gitlab (4.16.1)
@ -436,11 +436,11 @@ GEM
      terminal-table (~> 1.5, >= 1.5.1)
    gitlab-chronic (0.10.5)
      numerizer (~> 0.2)
-    gitlab-dangerfiles (0.8.0)
-      danger
-    gitlab-experiment (0.5.0)
+    gitlab-dangerfiles (1.1.1)
+      danger-gitlab
+    gitlab-experiment (0.5.3)
      activesupport (>= 3.0)
-      scientist (~> 1.5, >= 1.5.0)
+      scientist (~> 1.6, >= 1.6.0)
    gitlab-fog-azure-rm (1.0.1)
      azure-storage-blob (~> 2.0)
      azure-storage-common (~> 2.0)
@ -455,7 +455,7 @@ GEM
      fog-xml (~> 0.1.0)
      google-api-client (>= 0.44.2, < 0.51)
      google-cloud-env (~> 1.2)
-    gitlab-labkit (0.16.1)
+    gitlab-labkit (0.16.2)
      actionpack (>= 5.0.0, < 7.0.0)
      activesupport (>= 5.0.0, < 7.0.0)
      grpc (~> 1.19)
@ -463,16 +463,16 @@ GEM
      opentracing (~> 0.4)
      pg_query (~> 1.3)
      redis (> 3.0.0, < 5.0.0)
-    gitlab-license (1.3.1)
+    gitlab-license (1.4.0)
    gitlab-mail_room (0.0.9)
    gitlab-markup (1.7.1)
    gitlab-net-dns (0.9.1)
    gitlab-pry-byebug (3.9.0)
      byebug (~> 11.0)
      pry (~> 0.13.0)
-    gitlab-sidekiq-fetcher (0.5.5)
+    gitlab-sidekiq-fetcher (0.5.6)
      sidekiq (~> 5)
-    gitlab-styles (6.1.0)
+    gitlab-styles (6.2.0)
      rubocop (~> 0.91, >= 0.91.1)
      rubocop-gitlab-security (~> 0.1.1)
      rubocop-performance (~> 1.9.2)
@ -487,8 +487,9 @@ GEM
      rubyntlm (~> 0.5)
    globalid (0.4.2)
      activesupport (>= 4.2.0)
-    gon (6.2.0)
-      actionpack (>= 3.0)
+    gon (6.4.0)
+      actionpack (>= 3.0.20)
+      i18n (>= 0.7)
      multi_json
      request_store (>= 1.0)
    google-api-client (0.50.0)
@ -502,7 +503,7 @@ GEM
      signet (~> 0.12)
    google-cloud-env (1.4.0)
      faraday (>= 0.17.3, < 2.0)
-    google-protobuf (3.12.4)
+    google-protobuf (3.14.0)
    googleapis-common-protos-types (1.0.5)
      google-protobuf (~> 3.11)
    googleauth (0.14.0)
@ -579,7 +580,7 @@ GEM
      rainbow
      rubocop (>= 0.50.0)
      sysexits (~> 1.1)
-    hamlit (2.14.4)
+    hamlit (2.15.0)
      temple (>= 0.8.2)
      thor
      tilt
@ -614,7 +615,7 @@ GEM
      mime-types (~> 3.0)
      multi_xml (>= 0.5.2)
    httpclient (2.8.3)
-    i18n (1.8.9)
+    i18n (1.8.10)
      concurrent-ruby (~> 1.0)
    i18n_data (0.8.0)
    icalendar (2.4.1)
@ -640,7 +641,7 @@ GEM
      activesupport (>= 4.2)
      aes_key_wrap
      bindata
-    json-schema (2.8.0)
+    json-schema (2.8.1)
      addressable (>= 2.4)
    json_schemer (0.2.12)
      ecma-re-validator (~> 0.2)
@ -664,9 +665,9 @@ GEM
      kaminari-core (= 1.2.1)
    kaminari-core (1.2.1)
    kgio (2.11.3)
-    knapsack (1.17.0)
+    knapsack (1.21.1)
      rake
-    kramdown (2.3.0)
+    kramdown (2.3.1)
      rexml
    kramdown-parser-gfm (1.1.0)
      kramdown (~> 2.0)
@ -675,12 +676,12 @@ GEM
      jsonpath (~> 1.0)
      recursive-open-struct (~> 1.1, >= 1.1.1)
      rest-client (~> 2.0)
-    launchy (2.4.3)
-      addressable (~> 2.3)
+    launchy (2.5.0)
+      addressable (~> 2.7)
    lefthook (0.7.2)
    letter_opener (1.7.0)
      launchy (~> 2.2)
-    letter_opener_web (1.3.4)
+    letter_opener_web (1.4.0)
      actionmailer (>= 3.2)
      letter_opener (~> 1.0)
      railties (>= 3.2)
@ -702,21 +703,20 @@ GEM
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
    locale (2.1.3)
-    lockbox (0.3.3)
+    lockbox (0.6.2)
    lograge (0.11.2)
      actionpack (>= 4)
      activesupport (>= 4)
      railties (>= 4)
      request_store (~> 1.0)
-    loofah (2.8.0)
+    loofah (2.9.1)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    lru_redux (1.1.0)
    lumberjack (1.2.7)
    mail (2.7.1)
      mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.1)
    marginalia (1.10.0)
      actionpack (>= 2.3)
      activerecord (>= 2.3)
@ -728,12 +728,9 @@ GEM
    mime-types (3.3.1)
      mime-types-data (~> 3.2015)
    mime-types-data (3.2020.0512)
-    mimemagic (0.3.10)
-      nokogiri (~> 1)
-      rake
    mini_histogram (0.3.1)
    mini_magick (4.10.1)
-    mini_mime (1.0.2)
+    mini_mime (1.1.0)
    mini_portile2 (2.5.0)
    minitest (5.11.3)
    mixlib-cli (2.1.8)
@ -772,7 +769,7 @@ GEM
    netrc (0.11.0)
    nio4r (2.5.4)
    no_proxy_fix (0.1.2)
-    nokogiri (1.11.1)
+    nokogiri (1.11.3)
      mini_portile2 (~> 2.5.0)
      racc (~> 1.4)
    nokogumbo (2.0.2)
@ -951,20 +948,20 @@ GEM
    rack-test (1.1.0)
      rack (>= 1.0, < 3)
    rack-timeout (0.5.2)
-    rails (6.0.3.4)
-      actioncable (= 6.0.3.4)
-      actionmailbox (= 6.0.3.4)
-      actionmailer (= 6.0.3.4)
-      actionpack (= 6.0.3.4)
-      actiontext (= 6.0.3.4)
-      actionview (= 6.0.3.4)
-      activejob (= 6.0.3.4)
-      activemodel (= 6.0.3.4)
-      activerecord (= 6.0.3.4)
-      activestorage (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    rails (6.0.3.6)
+      actioncable (= 6.0.3.6)
+      actionmailbox (= 6.0.3.6)
+      actionmailer (= 6.0.3.6)
+      actionpack (= 6.0.3.6)
+      actiontext (= 6.0.3.6)
+      actionview (= 6.0.3.6)
+      activejob (= 6.0.3.6)
+      activemodel (= 6.0.3.6)
+      activerecord (= 6.0.3.6)
+      activestorage (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
      bundler (>= 1.3.0)
-      railties (= 6.0.3.4)
+      railties (= 6.0.3.6)
      sprockets-rails (>= 2.0.0)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
@ -978,9 +975,9 @@ GEM
    rails-i18n (6.0.0)
      i18n (>= 0.7, < 2)
      railties (>= 6.0.0, < 7)
-    railties (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    railties (6.0.3.6)
+      actionpack (= 6.0.3.6)
+      activesupport (= 6.0.3.6)
      method_source
      rake (>= 0.8.7)
      thor (>= 0.20.3, < 2.0)
@ -1040,9 +1037,9 @@ GEM
    retriable (3.1.2)
    reverse_markdown (1.4.0)
      nokogiri
-    rexml (3.2.4)
+    rexml (3.2.5)
    rinku (2.0.0)
-    rotp (2.1.2)
+    rotp (6.2.0)
    rouge (3.26.0)
    rqrcode (0.7.0)
      chunky_png
@ -1066,10 +1063,10 @@ GEM
      proc_to_ast
      rspec (>= 2.13, < 4)
      unparser
-    rspec-rails (4.0.2)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
+    rspec-rails (5.0.1)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
      rspec-core (~> 3.10)
      rspec-expectations (~> 3.10)
      rspec-mocks (~> 3.10)
@ -1111,12 +1108,13 @@ GEM
      i18n
    ruby-fogbugz (0.2.1)
      crack (~> 0.4)
-    ruby-magic-static (0.3.5)
+    ruby-magic (0.4.0)
      mini_portile2 (~> 2.5.0)
    ruby-prof (1.3.1)
    ruby-progressbar (1.11.0)
-    ruby-saml (1.7.2)
-      nokogiri (>= 1.5.10)
+    ruby-saml (1.12.1)
+      nokogiri (>= 1.10.5)
+      rexml
    ruby-statistics (2.1.2)
    ruby2_keywords (0.0.2)
    ruby_parser (3.15.0)
@ -1201,6 +1199,7 @@ GEM
      sprockets (>= 3.0.0)
    sqlite3 (1.3.13)
    sshkey (2.0.0)
+    ssrf_filter (1.0.7)
    stackprof (0.2.15)
    state_machines (0.5.0)
    state_machines-activemodel (0.8.0)
@ -1222,6 +1221,8 @@ GEM
    terser (1.0.2)
      execjs (>= 0.3.0, < 3)
    test-prof (0.12.0)
+    test_file_finder (0.1.3)
+      faraday (~> 1.0.1)
    text (1.3.1)
    thin (1.8.0)
      daemons (~> 1.0, >= 1.0.9)
@ -1359,10 +1360,9 @@ DEPENDENCIES
  bcrypt_pbkdf (~> 1.0)
  benchmark-ips (~> 2.3.0)
  benchmark-memory (~> 0.1)
-  better_errors (~> 2.7.1)
+  better_errors (~> 2.9.0)
  bootsnap (~> 1.4.6)
  bootstrap_form (~> 4.2.0)
-  brakeman (~> 4.2)
  browser (~> 4.2)
  bullet (~> 6.1.3)
  bundler-audit (~> 0.7.0.1)
@ -1376,7 +1376,6 @@ DEPENDENCIES
  countries (~> 3.0)
  creole (~> 0.5.0)
  crystalball (~> 0.7.0)
-  danger-gitlab (~> 8.0)
  database_cleaner (~> 1.7.0)
  deckar01-task_list (= 2.3.1)
  default_value_for (~> 3.4.0)
@ -1384,7 +1383,7 @@ DEPENDENCIES
  derailed_benchmarks
  device_detector
  devise (~> 4.7.2)
-  devise-two-factor (~> 3.1.0)
+  devise-two-factor (~> 4.0.0)
  diff_match_patch (~> 0.1.0)
  diffy (~> 3.3)
  discordrb-webhooks (~> 3.4)
@ -1419,26 +1418,26 @@ DEPENDENCIES
  gettext (~> 3.3)
  gettext_i18n_rails (~> 1.8.0)
  gettext_i18n_rails_js (~> 1.3)
-  gitaly (~> 13.9.0.pre.rc1)
+  gitaly (~> 13.11.0.pre.rc1)
  github-markup (~> 1.7.0)
  gitlab-chronic (~> 0.10.5)
-  gitlab-dangerfiles (~> 0.8.0)
-  gitlab-experiment (~> 0.5.0)
+  gitlab-dangerfiles (~> 1.1.1)
+  gitlab-experiment (~> 0.5.3)
  gitlab-fog-azure-rm (~> 1.0.1)
  gitlab-fog-google (~> 1.13)
-  gitlab-labkit (~> 0.16.1)
-  gitlab-license (~> 1.3)
+  gitlab-labkit (~> 0.16.2)
+  gitlab-license (~> 1.4)
  gitlab-mail_room (~> 0.0.9)
  gitlab-markup (~> 1.7.1)
  gitlab-net-dns (~> 0.9.1)
  gitlab-pry-byebug
-  gitlab-sidekiq-fetcher (= 0.5.5)
-  gitlab-styles (~> 6.1.0)
+  gitlab-sidekiq-fetcher (= 0.5.6)
+  gitlab-styles (~> 6.2.0)
  gitlab_chronic_duration (~> 0.10.6.2)
  gitlab_omniauth-ldap (~> 2.1.1)
-  gon (~> 6.2)
+  gon (~> 6.4.0)
  google-api-client (~> 0.33)
-  google-protobuf (~> 3.12)
+  google-protobuf (~> 3.14.0)
  gpgme (~> 2.0.19)
  grape (~> 1.5.2)
  grape-entity (~> 0.7.1)
@ -1452,7 +1451,7 @@ DEPENDENCIES
  gssapi
  guard-rspec
  haml_lint (~> 0.36.0)
-  hamlit (~> 2.14.4)
+  hamlit (~> 2.15.0)
  hangouts-chat (~> 0.0.5)
  hashie
  hashie-forbidden_attributes
@ -1470,14 +1469,14 @@ DEPENDENCIES
  json_schemer (~> 0.2.12)
  jwt (~> 2.1.0)
  kaminari (~> 1.0)
-  knapsack (~> 1.17)
-  kramdown (~> 2.3.0)
+  knapsack (~> 1.21.1)
+  kramdown (~> 2.3.1)
  kubeclient (~> 4.9.1)
-  lefthook (~> 0.7)
-  letter_opener_web (~> 1.3.4)
+  lefthook (~> 0.7.0)
+  letter_opener_web (~> 1.4.0)
  license_finder (~> 6.0)
  licensee (~> 9.14.1)
-  lockbox (~> 0.3.3)
+  lockbox (~> 0.6.2)
  lograge (~> 0.5)
  loofah (~> 2.2)
  lru_redux
@ -1485,7 +1484,6 @@ DEPENDENCIES
  marginalia (~> 1.10.0)
  memory_profiler (~> 0.9)
  method_source (~> 1.0)
-  mimemagic (~> 0.3.10)
  mini_magick (~> 4.10.1)
  minitest (~> 5.11.0)
  multi_json (~> 1.14.1)
@ -1535,7 +1533,7 @@ DEPENDENCIES
  rack-oauth2 (~> 1.16.0)
  rack-proxy (~> 0.6.0)
  rack-timeout (~> 0.5.1)
-  rails (~> 6.0.3.1)
+  rails (~> 6.0.3.6)
  rails-controller-testing
  rails-i18n (~> 6.0)
  rainbow (~> 3.0)
@ -1551,17 +1549,19 @@ DEPENDENCIES
  request_store (~> 1.5)
  responders (~> 3.0)
  retriable (~> 3.1.2)
+  rexml (~> 3.2.5)
  rouge (~> 3.26.0)
  rqrcode-rails3 (~> 0.1.7)
  rspec-parameterized
-  rspec-rails (~> 4.0.2)
+  rspec-rails (~> 5.0.1)
  rspec-retry (~> 0.6.1)
  rspec_junit_formatter
  rspec_profiling (~> 0.0.6)
  ruby-fogbugz (~> 0.2.1)
-  ruby-magic-static (~> 0.3.4)
+  ruby-magic (~> 0.4)
  ruby-prof (~> 1.3.0)
  ruby-progressbar (~> 1.10)
+  ruby-saml (~> 1.12.1)
  ruby_parser (~> 3.15)
  rubyzip (~> 2.0.0)
  rugged (~> 1.1)
@ -1588,6 +1588,7 @@ DEPENDENCIES
  sys-filesystem (~> 1.1.6)
  terser (= 1.0.2)
  test-prof (~> 0.12.0)
+  test_file_finder (~> 0.1.3)
  thin (~> 1.8.0)
  thrift (>= 0.14.0)
  timecop (~> 0.9.1)
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@ -26,10 +26,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0y3aa0965cdsqamxk8ac6brcvijl1zv4pvqils6xy3pbcrv0ljid";
+      sha256 = "1543p34bfq7s4l83m0f84f0z5yr1ip1miyimv4gh2k136pgk23r9";
      type = "gem";
    };
-    version = "6.0.3.4";
+    version = "6.0.3.6";
  };
  actionmailbox = {
    dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];
@ -37,10 +37,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "10vb9s4frq22h5j6gyw2598k1jc29lg2czm95hf284l3mi4qly6a";
+      sha256 = "0dnx7mhhzwr45lsxkd7y9ld9vazcadxzs7813jp19hk3wra4jvs3";
      type = "gem";
    };
-    version = "6.0.3.4";
+    version = "6.0.3.6";
  };
  actionmailer = {
    dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
@ -48,10 +48,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1ykn5qkwdlcv5aa1gjhhmrxpjccwa7df6n4amvkmvxv5lggyma52";
+      sha256 = "1cnsv97qx7708wg00lxcl7a6h8amxn85h40s8ngszhknh8wpwj3f";
      type = "gem";
    };
-    version = "6.0.3.4";
+    version = "6.0.3.6";
  };
  actionpack = {
    dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@ -59,10 +59,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0fbjpnh5hrihc9l35q9why6ip0hcdj42axzbp6b4j1xcy1v1bicj";
+      sha256 = "10rn7gmnnwpm593xv6lcf4qa72wmlbyjg4zmdc3lpb5596whd3yz";
      type = "gem";
    };
-    version = "6.0.3.4";
+    version = "6.0.3.6";
  };
  actiontext = {
    dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"];
@ -70,10 +70,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0r0j0m76ynjspmvj5qbzl06kl9i920v269iz62y62009xydv6rqz";
+      sha256 = "13i7x4zp991sq3zsagpzs01bhm81zgy63lamqrpsp68nv584n5sx";
      type = "gem";
    };
-    version = "6.0.3.4";
+    version = "6.0.3.6";
  };
  actionview = {
    dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@ -81,10 +81,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0gdz31cq08nrqq6bxqim2qcbzv0fr34z6ycl73dmawpafj33wdkj";
+      sha256 = "0ikqpxsrsb7xmq6ds5iq22nj2j3ai16z8z2j5r6lk8pzbi0wwsz5";
      type = "gem";
    };
-    version = "6.0.3.4";
+    version = "6.0.3.6";
  };
  activejob = {
    dependencies = ["activesupport" "globalid"];
@ -92,10 +92,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0d0p8gjplrgym38dmchyzhv7lrrxngz0yrxl6xyvwxfxm1hgdk2k";
+      sha256 = "1sy9kyl7famlwrdw7gz6sy7azhkcsn1mjja44s44libcz3fl7jpc";
      type = "gem";
    };
-    version = "6.0.3.4";
+    version = "6.0.3.6";
  };
  activemodel = {
    dependencies = ["activesupport"];
@ -103,10 +103,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "00jj8namy5niq7grl5lrsr4y351rxpj1b69k1i9gvb1hnpghl099";
+      sha256 = "15kq8ghmkav331dz1pak1bc8q1v5xajw6pkj20hqr8m5zl6czcld";
      type = "gem";
    };
-    version = "6.0.3.4";
+    version = "6.0.3.6";
  };
  activerecord = {
    dependencies = ["activemodel" "activesupport"];
@ -114,10 +114,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "06qvvp73z8kq9sd2mhw6p9124q5pfkswjga2fidz4c73zbr79r3g";
+      sha256 = "1a3hc2rammy4mfrjwzc9rsn497yq9xc0x89c00niiq45q3qs44vz";
      type = "gem";
    };
-    version = "6.0.3.4";
+    version = "6.0.3.6";
  };
  activerecord-explain-analyze = {
    dependencies = ["activerecord" "pg"];
@ -136,10 +136,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0q734331wb7cfsh4jahj3lphpxvglzb17yvibwss1ml4g01xxm52";
+      sha256 = "1jwdfqn01g7v7ssrrf2q2pvc8k6rdqccp26qkyfxiraaz9d1la62";
      type = "gem";
    };
-    version = "6.0.3.4";
+    version = "6.0.3.6";
  };
  activesupport = {
    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];
@ -147,10 +147,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1axidc4mikgi4yxs0ynw2c54jyrs5lxprxmzv6m3aayi9rg6rk5j";
+      sha256 = "0sls37x9pd2zmipn14c46gcjbfzlg269r413cvm0d58595qkiv7z";
      type = "gem";
    };
-    version = "6.0.3.4";
+    version = "6.0.3.6";
  };
  acts-as-taggable-on = {
    dependencies = ["activerecord"];
@ -527,10 +527,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0kn7rv81i2r462k56v29i3s8abcmfcpfj9axia736mwjvv0app2k";
+      sha256 = "11220lfzhsyf5fcril3qd689kgg46qlpiiaj00hc9mh4mcbc3vrr";
      type = "gem";
    };
-    version = "2.7.1";
+    version = "2.9.1";
  };
  bindata = {
    groups = ["default"];
@ -574,16 +574,6 @@
    };
    version = "4.2.0";
  };
-  brakeman = {
-    groups = ["development"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "161l4ln7x1vnqrcvbvglznf46f0lvq305vq211xaxp4fv4wwv89v";
-      type = "gem";
-    };
-    version = "4.2.1";
-  };
  browser = {
    groups = ["default"];
    platforms = [];
@ -663,15 +653,15 @@
    version = "1.0.22";
  };
  carrierwave = {
-    dependencies = ["activemodel" "activesupport" "mime-types"];
+    dependencies = ["activemodel" "activesupport" "mime-types" "ssrf_filter"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "10rz94kajilffp83sb767lr62b5f8l4jzqq80cr92wqxdgbszdks";
+      sha256 = "055i3ybjv9n9hqaazxn3d9ibqhlwh93d4hdlwbpjjfy8qbrz6hiw";
      type = "gem";
    };
-    version = "1.3.1";
+    version = "1.3.2";
  };
  cbor = {
    groups = ["default"];
@ -1084,10 +1074,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0gzk7phrryxlq4k3jrcxm8faifmbqrbfxq7jx089ncsixwd69bn4";
+      sha256 = "148pfr6g8dwikdq3994gsid2a3n6p5h4z1a1dzh1898shr5f9znc";
      type = "gem";
    };
-    version = "3.1.0";
+    version = "4.0.0";
  };
  diff-lcs = {
    groups = ["default" "development" "test"];
@ -1861,10 +1851,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "137gr4nbxhcyh4s60r2z0js8q2bfnmxiggwnf122wp9csywlnyg2";
+      sha256 = "1hbc2frfyxxlar9ggpnl4x090nw1nlriazzkdgjz3r4mx4ihja1b";
      type = "gem";
    };
-    version = "13.9.0.pre.rc1";
+    version = "13.11.0.pre.rc1";
  };
  github-markup = {
    groups = ["default"];
@ -1899,15 +1889,15 @@
    version = "0.10.5";
  };
  gitlab-dangerfiles = {
-    dependencies = ["danger"];
+    dependencies = ["danger-gitlab"];
    groups = ["danger" "development" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "09ggs890b5gfphnz7ayavs55l6xhw323spfd22dg246g0rw9vliy";
+      sha256 = "0ivkbq50fhm39zwyfac4q3y0qkrsk3hmrk1ggyhz1yphkq38qvq7";
      type = "gem";
    };
-    version = "0.8.0";
+    version = "1.1.1";
  };
  gitlab-experiment = {
    dependencies = ["activesupport" "scientist"];
@ -1915,10 +1905,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0x4hyva7ypi2mx5jcyxac8w7ffai1pkkjc49fk3avqh4aimlibfr";
+      sha256 = "0ccjmm10pjvpzy5m7b86mxd2mg2x0k4y0c4cim0r4y7sy2c115mz";
      type = "gem";
    };
-    version = "0.5.0";
+    version = "0.5.3";
  };
  gitlab-fog-azure-rm = {
    dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"];
@ -1948,20 +1938,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "03i8fc1yzm5yzqxb8bxhjkhqpj17fy71vg2z02bcj4mzbj0piflx";
+      sha256 = "0184rq6sal3xz4f0w5iaa5zf3q55i4dh0rlvr25l1g0s2imwr3fa";
      type = "gem";
    };
-    version = "0.16.1";
+    version = "0.16.2";
  };
  gitlab-license = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "01z5pb6fg1j83p73vys2fhj7qh60zkqbgiyp4nvw013a6hjlv3qk";
+      sha256 = "1rfyxchshl2h0c2dpsy1wa751l02i22nv5mkhygfwnbi0ndkzqmg";
      type = "gem";
    };
-    version = "1.3.1";
+    version = "1.4.0";
  };
  gitlab-mail_room = {
    groups = ["default"];
@ -2014,10 +2004,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "055v0cxvxgy12iwhqa2xbsxa9j6ww7p1f5jqwncwsnr7l6f1f4c9";
+      sha256 = "0838p0vnyl65571d8j5hljwyfyhsnfs6dlj6di57gpmwrbl9sdpr";
      type = "gem";
    };
-    version = "0.5.5";
+    version = "0.5.6";
  };
  gitlab-styles = {
    dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-performance" "rubocop-rails" "rubocop-rspec"];
@ -2025,10 +2015,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0y3livdpkdzp4cy47ycpwqa7nhrf6fb1ff2lwhh4l5n4dpqympwn";
+      sha256 = "1lgjp6cfb92z7i03f9k519bjabnnh1k0bgzmagp5x15iza73sz4v";
      type = "gem";
    };
-    version = "6.1.0";
+    version = "6.2.0";
  };
  gitlab_chronic_duration = {
    dependencies = ["numerizer"];
@ -2064,15 +2054,15 @@
    version = "0.4.2";
  };
  gon = {
-    dependencies = ["actionpack" "multi_json" "request_store"];
+    dependencies = ["actionpack" "i18n" "multi_json" "request_store"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0q9nvnw98mbb40h7mlzn1zk40r2l29yybhinmiqhrq8a6adsv806";
+      sha256 = "1w6ji15jrl4p6q0gxy5mmqspvzbmgkqj1d3xmbqr0a1rb7b1i9p3";
      type = "gem";
    };
-    version = "6.2.0";
+    version = "6.4.0";
  };
  google-api-client = {
    dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet"];
@ -2101,10 +2091,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1m3la0yid3bqx9b30raisqbp27d0q7vdrlslazrdasf8v1vhifxj";
+      sha256 = "0pbm2kjhxvazx9d5c071bxcjx5cbip6d2y36dii2a4558nqjd12p";
      type = "gem";
    };
-    version = "3.12.4";
+    version = "3.14.0";
  };
  googleapis-common-protos-types = {
    dependencies = ["google-protobuf"];
@ -2319,10 +2309,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1gjbdni9jdpsdahrx2q7cvrc6jkrzpf9rdi0rli8mdvwi9xjafz5";
+      sha256 = "13n3v9kbyrrm48hn1v0028cdrsq7pswb4s4w63x4b29kc99m1s6j";
      type = "gem";
    };
-    version = "2.14.4";
+    version = "2.15.0";
  };
  hana = {
    groups = ["default"];
@ -2509,10 +2499,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32";
+      sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a";
      type = "gem";
    };
-    version = "1.8.9";
+    version = "1.8.10";
  };
  i18n_data = {
    groups = ["default"];
@ -2635,10 +2625,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "11di8qyam6bmqn0fvvvf3crgaqy4sil0d406ymx0jacn3ff98ymz";
+      sha256 = "1yv5lfmr2nzd14af498xqd5p89f3g080q8wk0klr3vxgypsikkb5";
      type = "gem";
    };
-    version = "2.8.0";
+    version = "2.8.1";
  };
  json_schemer = {
    dependencies = ["ecma-re-validator" "hana" "regexp_parser" "uri_template"];
@ -2731,21 +2721,21 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1c69rcwfrdrnx8ddl6k1qxhw9f2dj5x5bbddz435isl2hfr5zh92";
+      sha256 = "056g86ndhq51303k4g3fhdfwhpr6cpzypxhlnp0wxjpbmli09xw2";
      type = "gem";
    };
-    version = "1.17.0";
+    version = "1.21.1";
  };
  kramdown = {
    dependencies = ["rexml"];
-    groups = ["default" "development"];
+    groups = ["danger" "default" "development" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7";
+      sha256 = "0jdbcjv4v7sj888bv3vc6d1dg4ackkh7ywlmn9ln2g9alk7kisar";
      type = "gem";
    };
-    version = "2.3.0";
+    version = "2.3.1";
  };
  kramdown-parser-gfm = {
    dependencies = ["kramdown"];
@ -2775,10 +2765,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
+      sha256 = "1xdyvr5j0gjj7b10kgvh8ylxnwk3wx19my42wqn9h82r4p246hlm";
      type = "gem";
    };
-    version = "2.4.3";
+    version = "2.5.0";
  };
  lefthook = {
    groups = ["development"];
@ -2807,10 +2797,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "17qhwrkncrrp1bi2f7fbkm5lpnkdsiwy8jcvgr2wa97ck8y4x2bb";
+      sha256 = "0pianlrbf9n7jrqxpyxgsfk1j1d312d57d6gq7yxni6ax2q0293q";
      type = "gem";
    };
-    version = "1.3.4";
+    version = "1.4.0";
  };
  libyajl2 = {
    groups = ["default"];
@ -2870,10 +2860,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0sgbs0frk601yc7bb33pz5z9cyadvj077vwy9k5zapsbn2rxf5aj";
+      sha256 = "0g6w327y8d7dr0d7zw6p7hmlwh0hcvb7pkc7xxyf5mn3fmw6fdh1";
      type = "gem";
    };
-    version = "0.3.3";
+    version = "0.6.2";
  };
  lograge = {
    dependencies = ["actionpack" "activesupport" "railties" "request_store"];
@ -2892,10 +2882,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh";
+      sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7";
      type = "gem";
    };
-    version = "2.8.0";
+    version = "2.9.1";
  };
  lru_redux = {
    groups = ["default"];
@ -2929,15 +2919,14 @@
    version = "2.7.1";
  };
  marcel = {
-    dependencies = ["mimemagic"];
-    groups = ["default" "development" "test"];
+    groups = ["default" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx";
+      sha256 = "0bp001p687nsa4a8sp3q1iv8pfhs24w7s3avychjp64sdkg6jxq3";
      type = "gem";
    };
-    version = "0.3.3";
+    version = "1.0.1";
  };
  marginalia = {
    dependencies = ["actionpack" "activerecord"];
@ -3016,17 +3005,6 @@
    };
    version = "3.2020.0512";
  };
-  mimemagic = {
-    dependencies = ["nokogiri" "rake"];
-    groups = ["default" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0cqm9n9122qpksn9v6mp0gn3lrzxhh72lwl7yb6j75gykdan6h41";
-      type = "gem";
-    };
-    version = "0.3.10";
-  };
  mini_histogram = {
    groups = ["default" "test"];
    platforms = [];
@ -3052,10 +3030,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha";
+      sha256 = "0kb7jq3wjgckmkzna799y5qmvn6vg52878bkgw35qay6lflcrwih";
      type = "gem";
    };
-    version = "1.0.2";
+    version = "1.1.0";
  };
  mini_portile2 = {
    groups = ["default" "development" "test"];
@ -3321,10 +3299,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
+      sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0";
      type = "gem";
    };
-    version = "1.11.1";
+    version = "1.11.3";
  };
  nokogumbo = {
    dependencies = ["nokogiri"];
@ -4093,10 +4071,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0vs4kfgp5pr5032nnhdapq60ga6karann06ilq1yjx8qck87cfxg";
+      sha256 = "01mwx4q9yz792dbi61j378iz6p7q63sxj3267jwwccjqmn6hf2kr";
      type = "gem";
    };
-    version = "6.0.3.4";
+    version = "6.0.3.6";
  };
  rails-controller-testing = {
    dependencies = ["actionpack" "actionview" "activesupport"];
@ -4148,10 +4126,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0x28620cvfja8r06lk6f90pw5lvijz9qi4bjsa4z1d1rkr3v4r3w";
+      sha256 = "0i50vbscdk6wqxd2p0xwsyi07lwda612njqk8pn1f56snz5z0dcr";
      type = "gem";
    };
-    version = "6.0.3.4";
+    version = "6.0.3.6";
  };
  rainbow = {
    groups = ["default" "development" "test"];
@ -4453,14 +4431,14 @@
    version = "1.4.0";
  };
  rexml = {
-    groups = ["default" "development" "test"];
+    groups = ["danger" "default" "development" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3";
+      sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
      type = "gem";
    };
-    version = "3.2.4";
+    version = "3.2.5";
  };
  rinku = {
    groups = ["default"];
@ -4477,10 +4455,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1w8d6svhq3y9y952r8cqirxvdx12zlkb7zxjb44bcbidb2sisy4d";
+      sha256 = "11q7rkjx40yi6lpylgl2jkpy162mjw7mswrcgcax86vgpbpjx6i3";
      type = "gem";
    };
-    version = "2.1.2";
+    version = "6.2.0";
  };
  rouge = {
    groups = ["default"];
@ -4575,10 +4553,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0aw5knjij21kzwis3vkcmqc16p55lbig1wq0i37093qga7zfsdg1";
+      sha256 = "1pj2a9vrkp2xzlq0810q90sdc2zcqc7k92n57hxzhri2vcspy7n6";
      type = "gem";
    };
-    version = "4.0.2";
+    version = "5.0.1";
  };
  rspec-retry = {
    dependencies = ["rspec-core"];
@ -4711,16 +4689,16 @@
    };
    version = "0.2.1";
  };
-  ruby-magic-static = {
+  ruby-magic = {
    dependencies = ["mini_portile2"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0whs2i868g1bgglrxl6aba47h8n9zqglsipskk6l83rfkm85ik3g";
+      sha256 = "1mn1m682l6hv54afh1an5lh623zbllgl2aqjz2f62v892slzkq57";
      type = "gem";
    };
-    version = "0.3.5";
+    version = "0.4.0";
  };
  ruby-prof = {
    groups = ["default"];
@ -4743,15 +4721,15 @@
    version = "1.11.0";
  };
  ruby-saml = {
-    dependencies = ["nokogiri"];
+    dependencies = ["nokogiri" "rexml"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0k9d88fa8bp5szivbwq0qi960y3r2kp6jhnkmsp3n2rvwpn936i3";
+      sha256 = "0hczs2s490x6lj8z9xczlgi4c159nk9b10njsnl37nqbgjfkjgsw";
      type = "gem";
    };
-    version = "1.7.2";
+    version = "1.12.1";
  };
  ruby-statistics = {
    groups = ["default"];
@ -5184,6 +5162,16 @@
    };
    version = "2.0.0";
  };
+  ssrf_filter = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0flmg6f444liaxjgdwdrwcfwyyhc54a7wp26kqih2cklwll5gp40";
+      type = "gem";
+    };
+    version = "1.0.7";
+  };
  stackprof = {
    groups = ["default"];
    platforms = [];
@ -5300,6 +5288,17 @@
    };
    version = "0.12.0";
  };
+  test_file_finder = {
+    dependencies = ["faraday"];
+    groups = ["development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mbhiz7g7nd3v1ai4cgwzp2zr34k1h5am0vn9bny5qqn1408rlgi";
+      type = "gem";
+    };
+    version = "0.1.3";
+  };
  text = {
    groups = ["default" "development"];
    platforms = [];
--- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix
+++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix
@ -794,11 +794,11 @@
      };
    }
    {
-      name = "_gitlab_eslint_plugin___eslint_plugin_8.1.0.tgz";
+      name = "_gitlab_eslint_plugin___eslint_plugin_8.2.0.tgz";
      path = fetchurl {
-        name = "_gitlab_eslint_plugin___eslint_plugin_8.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-8.1.0.tgz";
-        sha1 = "a98ac4219da3316d30ee717ef0603c8fa0c4d5d8";
+        name = "_gitlab_eslint_plugin___eslint_plugin_8.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-8.2.0.tgz";
+        sha1 = "caccf2777febd89420c0225e000a789376ecaba2";
      };
    }
    {
@ -818,11 +818,11 @@
      };
    }
    {
-      name = "_gitlab_svgs___svgs_1.185.0.tgz";
+      name = "_gitlab_svgs___svgs_1.189.0.tgz";
      path = fetchurl {
-        name = "_gitlab_svgs___svgs_1.185.0.tgz";
-        url  = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.185.0.tgz";
-        sha1 = "15b5c6d680b5fcfc2deb2a5decef427939e34ed7";
+        name = "_gitlab_svgs___svgs_1.189.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.189.0.tgz";
+        sha1 = "1ba972bfbcf46e52321c50fd57d00315535c3d1b";
      };
    }
    {
@ -834,11 +834,11 @@
      };
    }
    {
-      name = "_gitlab_ui___ui_28.9.1.tgz";
+      name = "_gitlab_ui___ui_29.6.0.tgz";
      path = fetchurl {
-        name = "_gitlab_ui___ui_28.9.1.tgz";
-        url  = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-28.9.1.tgz";
-        sha1 = "7d4d4502ff09fca19ab815504f80afbf03dd2fc1";
+        name = "_gitlab_ui___ui_29.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-29.6.0.tgz";
+        sha1 = "5e8369d7aeab56edab570ef148dbc289b51901fc";
      };
    }
    {
@ -1009,6 +1009,14 @@
        sha1 = "11d8944dcf2d526e31660bb69570be03f8fb72b7";
      };
    }
+    {
+      name = "_polka_url___url_1.0.0_next.12.tgz";
+      path = fetchurl {
+        name = "_polka_url___url_1.0.0_next.12.tgz";
+        url  = "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.12.tgz";
+        sha1 = "431ec342a7195622f86688bbda82e3166ce8cb28";
+      };
+    }
    {
      name = "_rails_actioncable___actioncable_6.1.0.tgz";
      path = fetchurl {
@ -1138,19 +1146,19 @@
      };
    }
    {
-      name = "_toast_ui_editor___editor_2.5.1.tgz";
+      name = "_toast_ui_editor___editor_2.5.2.tgz";
      path = fetchurl {
-        name = "_toast_ui_editor___editor_2.5.1.tgz";
-        url  = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.5.1.tgz";
-        sha1 = "42671c52ca4b97c84f684d09c2966711b36f41a7";
+        name = "_toast_ui_editor___editor_2.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.5.2.tgz";
+        sha1 = "0637e1bbdb205c1ab53b6d3722ced26399b2f0ca";
      };
    }
    {
-      name = "_toast_ui_vue_editor___vue_editor_2.5.1.tgz";
+      name = "_toast_ui_vue_editor___vue_editor_2.5.2.tgz";
      path = fetchurl {
-        name = "_toast_ui_vue_editor___vue_editor_2.5.1.tgz";
-        url  = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.5.1.tgz";
-        sha1 = "0a221d74d5305c8ca20cb11d9eb8ff9206455cfc";
+        name = "_toast_ui_vue_editor___vue_editor_2.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.5.2.tgz";
+        sha1 = "0b54107a196471eacb18aabb7100101606917b27";
      };
    }
    {
@ -1657,6 +1665,14 @@
        sha1 = "0de889a601203909b0fbe07b8938dc21d2e967bc";
      };
    }
+    {
+      name = "acorn_walk___acorn_walk_8.0.2.tgz";
+      path = fetchurl {
+        name = "acorn_walk___acorn_walk_8.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.0.2.tgz";
+        sha1 = "d4632bfc63fd93d0f15fd05ea0e984ffd3f5a8c3";
+      };
+    }
    {
      name = "acorn___acorn_6.4.2.tgz";
      path = fetchurl {
@ -1673,6 +1689,14 @@
        sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa";
      };
    }
+    {
+      name = "acorn___acorn_8.1.0.tgz";
+      path = fetchurl {
+        name = "acorn___acorn_8.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/acorn/-/acorn-8.1.0.tgz";
+        sha1 = "52311fd7037ae119cbb134309e901aa46295b3fe";
+      };
+    }
    {
      name = "after___after_0.8.2.tgz";
      path = fetchurl {
@ -2393,14 +2417,6 @@
        sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522";
      };
    }
-    {
-      name = "bfj___bfj_6.1.1.tgz";
-      path = fetchurl {
-        name = "bfj___bfj_6.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/bfj/-/bfj-6.1.1.tgz";
-        sha1 = "05a3b7784fbd72cfa3c22e56002ef99336516c48";
-      };
-    }
    {
      name = "big.js___big.js_5.2.2.tgz";
      path = fetchurl {
@ -2889,14 +2905,6 @@
        sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667";
      };
    }
-    {
-      name = "check_types___check_types_7.3.0.tgz";
-      path = fetchurl {
-        name = "check_types___check_types_7.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/check-types/-/check-types-7.3.0.tgz";
-        sha1 = "468f571a4435c24248f5fd0cb0e8d87c3c341e7d";
-      };
-    }
    {
      name = "chokidar___chokidar_3.4.0.tgz";
      path = fetchurl {
@ -3169,6 +3177,14 @@
        sha1 = "d58bb2b5c1ee8f87b0d340027e9e94e222c5a422";
      };
    }
+    {
+      name = "commander___commander_6.2.1.tgz";
+      path = fetchurl {
+        name = "commander___commander_6.2.1.tgz";
+        url  = "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz";
+        sha1 = "0792eb682dfbc325999bb2b84fddddba110ac73c";
+      };
+    }
    {
      name = "commander___commander_2.9.0.tgz";
      path = fetchurl {
@ -3450,11 +3466,11 @@
      };
    }
    {
-      name = "core_js___core_js_3.9.1.tgz";
+      name = "core_js___core_js_3.10.2.tgz";
      path = fetchurl {
-        name = "core_js___core_js_3.9.1.tgz";
-        url  = "https://registry.yarnpkg.com/core-js/-/core-js-3.9.1.tgz";
-        sha1 = "cec8de593db8eb2a85ffb0dbdeb312cb6e5460ae";
+        name = "core_js___core_js_3.10.2.tgz";
+        url  = "https://registry.yarnpkg.com/core-js/-/core-js-3.10.2.tgz";
+        sha1 = "17cb038ce084522a717d873b63f2b3ee532e2cd5";
      };
    }
    {
@ -4514,11 +4530,11 @@
      };
    }
    {
-      name = "duplexer___duplexer_0.1.1.tgz";
+      name = "duplexer___duplexer_0.1.2.tgz";
      path = fetchurl {
-        name = "duplexer___duplexer_0.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz";
-        sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
+        name = "duplexer___duplexer_0.1.2.tgz";
+        url  = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz";
+        sha1 = "3abe43aef3835f8ae077d136ddce0f276b0400e6";
      };
    }
    {
@ -4569,14 +4585,6 @@
        sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
      };
    }
-    {
-      name = "ejs___ejs_2.6.1.tgz";
-      path = fetchurl {
-        name = "ejs___ejs_2.6.1.tgz";
-        url  = "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz";
-        sha1 = "498ec0d495655abc6f23cd61868d926464071aa0";
-      };
-    }
    {
      name = "electron_to_chromium___electron_to_chromium_1.3.642.tgz";
      path = fetchurl {
@ -4930,11 +4938,11 @@
      };
    }
    {
-      name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.5.0.tgz";
+      name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.6.0.tgz";
      path = fetchurl {
-        name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.5.0.tgz";
-        url  = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.5.0.tgz";
-        sha1 = "6c12e3aae172bfd3363b7ac8c3f3e944704867f4";
+        name = "eslint_plugin_no_jquery___eslint_plugin_no_jquery_2.6.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint-plugin-no-jquery/-/eslint-plugin-no-jquery-2.6.0.tgz";
+        sha1 = "7892cb7c086f7813156bca6bc48429825428e9eb";
      };
    }
    {
@ -5002,11 +5010,11 @@
      };
    }
    {
-      name = "eslint___eslint_7.21.0.tgz";
+      name = "eslint___eslint_7.24.0.tgz";
      path = fetchurl {
-        name = "eslint___eslint_7.21.0.tgz";
-        url  = "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz";
-        sha1 = "4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83";
+        name = "eslint___eslint_7.24.0.tgz";
+        url  = "https://registry.yarnpkg.com/eslint/-/eslint-7.24.0.tgz";
+        sha1 = "2e44fa62d93892bfdb100521f17345ba54b8513a";
      };
    }
    {
@ -5370,11 +5378,11 @@
      };
    }
    {
-      name = "file_loader___file_loader_5.1.0.tgz";
+      name = "file_loader___file_loader_6.2.0.tgz";
      path = fetchurl {
-        name = "file_loader___file_loader_5.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/file-loader/-/file-loader-5.1.0.tgz";
-        sha1 = "cb56c070efc0e40666424309bd0d9e45ac6f2bb8";
+        name = "file_loader___file_loader_6.2.0.tgz";
+        url  = "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz";
+        sha1 = "baef7cf8e1840df325e4390b4484879480eebe4d";
      };
    }
    {
@ -5385,14 +5393,6 @@
        sha1 = "8e7548a96d3cc2327ee5e674168723a333bba2a0";
      };
    }
-    {
-      name = "filesize___filesize_3.6.1.tgz";
-      path = fetchurl {
-        name = "filesize___filesize_3.6.1.tgz";
-        url  = "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz";
-        sha1 = "090bb3ee01b6f801a8a8be99d31710b3422bb317";
-      };
-    }
    {
      name = "fill_range___fill_range_4.0.0.tgz";
      path = fetchurl {
@ -5889,6 +5889,14 @@
        sha1 = "1e564ee5c4dded2ab098b0f88f24702a3c56be13";
      };
    }
+    {
+      name = "globals___globals_13.8.0.tgz";
+      path = fetchurl {
+        name = "globals___globals_13.8.0.tgz";
+        url  = "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz";
+        sha1 = "3e20f504810ce87a8d72e55aecf8435b50f4c1b3";
+      };
+    }
    {
      name = "globby___globby_11.0.2.tgz";
      path = fetchurl {
@ -6002,11 +6010,11 @@
      };
    }
    {
-      name = "gzip_size___gzip_size_5.0.0.tgz";
+      name = "gzip_size___gzip_size_6.0.0.tgz";
      path = fetchurl {
-        name = "gzip_size___gzip_size_5.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.0.0.tgz";
-        sha1 = "a55ecd99222f4c48fd8c01c625ce3b349d0a0e80";
+        name = "gzip_size___gzip_size_6.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz";
+        sha1 = "065367fd50c239c0671cbcbad5be3e2eeb10e462";
      };
    }
    {
@ -6217,14 +6225,6 @@
        sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc";
      };
    }
-    {
-      name = "hoopy___hoopy_0.1.4.tgz";
-      path = fetchurl {
-        name = "hoopy___hoopy_0.1.4.tgz";
-        url  = "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz";
-        sha1 = "609207d661100033a9a9402ad3dea677381c1b1d";
-      };
-    }
    {
      name = "hosted_git_info___hosted_git_info_2.8.8.tgz";
      path = fetchurl {
@ -8354,11 +8354,11 @@
      };
    }
    {
-      name = "lodash___lodash_4.17.20.tgz";
+      name = "lodash___lodash_4.17.21.tgz";
      path = fetchurl {
-        name = "lodash___lodash_4.17.20.tgz";
-        url  = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz";
-        sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52";
+        name = "lodash___lodash_4.17.21.tgz";
+        url  = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz";
+        sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c";
      };
    }
    {
@ -8730,11 +8730,11 @@
      };
    }
    {
-      name = "mermaid___mermaid_8.9.0.tgz";
+      name = "mermaid___mermaid_8.9.2.tgz";
      path = fetchurl {
-        name = "mermaid___mermaid_8.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.9.0.tgz";
-        sha1 = "e569517863ab903aa5389cd746b68ca958a8ca7c";
+        name = "mermaid___mermaid_8.9.2.tgz";
+        url  = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.9.2.tgz";
+        sha1 = "40bb2052cc6c4feaf5d93a5e527a8d06d0bacea7";
      };
    }
    {
@ -8778,19 +8778,19 @@
      };
    }
    {
-      name = "mime_db___mime_db_1.44.0.tgz";
+      name = "mime_db___mime_db_1.47.0.tgz";
      path = fetchurl {
-        name = "mime_db___mime_db_1.44.0.tgz";
-        url  = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz";
-        sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92";
+        name = "mime_db___mime_db_1.47.0.tgz";
+        url  = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz";
+        sha1 = "8cb313e59965d3c05cfbf898915a267af46a335c";
      };
    }
    {
-      name = "mime_types___mime_types_2.1.27.tgz";
+      name = "mime_types___mime_types_2.1.30.tgz";
      path = fetchurl {
-        name = "mime_types___mime_types_2.1.27.tgz";
-        url  = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz";
-        sha1 = "47949f98e279ea53119f5722e0f34e529bec009f";
+        name = "mime_types___mime_types_2.1.30.tgz";
+        url  = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz";
+        sha1 = "6e7be8b4c479825f85ed6326695db73f9305d62d";
      };
    }
    {
@ -8994,11 +8994,11 @@
      };
    }
    {
-      name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.9.0.tgz";
+      name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.9.1.tgz";
      path = fetchurl {
-        name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.9.0.tgz";
-        sha1 = "5b547281b9f404057dc5d8c5722390df9ac90be6";
+        name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.9.1.tgz";
+        sha1 = "eb4bbb1c5e5bfb554541c1ae1542e74c2a9f43fd";
      };
    }
    {
@ -9474,11 +9474,11 @@
      };
    }
    {
-      name = "opener___opener_1.5.1.tgz";
+      name = "opener___opener_1.5.2.tgz";
      path = fetchurl {
-        name = "opener___opener_1.5.1.tgz";
-        url  = "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz";
-        sha1 = "6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed";
+        name = "opener___opener_1.5.2.tgz";
+        url  = "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz";
+        sha1 = "5d37e1f35077b9dcac4301372271afdeb2a13598";
      };
    }
    {
@ -11529,6 +11529,14 @@
        sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c";
      };
    }
+    {
+      name = "sirv___sirv_1.0.11.tgz";
+      path = fetchurl {
+        name = "sirv___sirv_1.0.11.tgz";
+        url  = "https://registry.yarnpkg.com/sirv/-/sirv-1.0.11.tgz";
+        sha1 = "81c19a29202048507d6ec0d8ba8910fda52eb5a4";
+      };
+    }
    {
      name = "sisteransi___sisteransi_1.0.5.tgz";
      path = fetchurl {
@ -12537,6 +12545,14 @@
        sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553";
      };
    }
+    {
+      name = "totalist___totalist_1.1.0.tgz";
+      path = fetchurl {
+        name = "totalist___totalist_1.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz";
+        sha1 = "a4d65a3e546517701e3e5c37a47a70ac97fe56df";
+      };
+    }
    {
      name = "touch___touch_3.1.0.tgz";
      path = fetchurl {
@ -12617,14 +12633,6 @@
        sha1 = "770162dd13b9a0e55da04db5b7f888956072038a";
      };
    }
-    {
-      name = "tryer___tryer_1.0.0.tgz";
-      path = fetchurl {
-        name = "tryer___tryer_1.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/tryer/-/tryer-1.0.0.tgz";
-        sha1 = "027b69fa823225e551cace3ef03b11f6ab37c1d7";
-      };
-    }
    {
      name = "ts_invariant___ts_invariant_0.4.4.tgz";
      path = fetchurl {
@ -12713,6 +12721,14 @@
        sha1 = "db4bc151a4a2cf4eebf9add5db75508db6cc841f";
      };
    }
+    {
+      name = "type_fest___type_fest_0.20.2.tgz";
+      path = fetchurl {
+        name = "type_fest___type_fest_0.20.2.tgz";
+        url  = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz";
+        sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4";
+      };
+    }
    {
      name = "type_fest___type_fest_0.6.0.tgz";
      path = fetchurl {
@ -12978,11 +12994,11 @@
      };
    }
    {
-      name = "url_loader___url_loader_3.0.0.tgz";
+      name = "url_loader___url_loader_4.1.1.tgz";
      path = fetchurl {
-        name = "url_loader___url_loader_3.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/url-loader/-/url-loader-3.0.0.tgz";
-        sha1 = "9f1f11b371acf6e51ed15a50db635e02eec18368";
+        name = "url_loader___url_loader_4.1.1.tgz";
+        url  = "https://registry.yarnpkg.com/url-loader/-/url-loader-4.1.1.tgz";
+        sha1 = "28505e905cae158cf07c92ca622d7f237e70a4e2";
      };
    }
    {
@ -13370,11 +13386,11 @@
      };
    }
    {
-      name = "vue_virtual_scroll_list___vue_virtual_scroll_list_1.4.4.tgz";
+      name = "vue_virtual_scroll_list___vue_virtual_scroll_list_1.4.7.tgz";
      path = fetchurl {
-        name = "vue_virtual_scroll_list___vue_virtual_scroll_list_1.4.4.tgz";
-        url  = "https://registry.yarnpkg.com/vue-virtual-scroll-list/-/vue-virtual-scroll-list-1.4.4.tgz";
-        sha1 = "5fca7a13f785899bbfb70471ec4fe222437d8495";
+        name = "vue_virtual_scroll_list___vue_virtual_scroll_list_1.4.7.tgz";
+        url  = "https://registry.yarnpkg.com/vue-virtual-scroll-list/-/vue-virtual-scroll-list-1.4.7.tgz";
+        sha1 = "12ee26833885f5bb4d37dc058085ccf3ce5b5a74";
      };
    }
    {
@ -13482,11 +13498,11 @@
      };
    }
    {
-      name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.9.0.tgz";
+      name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.4.1.tgz";
      path = fetchurl {
-        name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.9.0.tgz";
-        url  = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz";
-        sha1 = "f6f94db108fb574e415ad313de41a2707d33ef3c";
+        name = "webpack_bundle_analyzer___webpack_bundle_analyzer_4.4.1.tgz";
+        url  = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.1.tgz";
+        sha1 = "c71fb2eaffc10a4754d7303b224adb2342069da1";
      };
    }
    {
@ -13698,11 +13714,11 @@
      };
    }
    {
-      name = "ws___ws_7.3.0.tgz";
+      name = "ws___ws_7.4.4.tgz";
      path = fetchurl {
-        name = "ws___ws_7.3.0.tgz";
-        url  = "https://registry.yarnpkg.com/ws/-/ws-7.3.0.tgz";
-        sha1 = "4b2f7f219b3d3737bc1a2fbf145d825b94d38ffd";
+        name = "ws___ws_7.4.4.tgz";
+        url  = "https://registry.yarnpkg.com/ws/-/ws-7.4.4.tgz";
+        sha1 = "383bc9742cb202292c9077ceab6f6047b17f2d59";
      };
    }
    {
--- a/pkgs/desktops/enlightenment/evisum/default.nix
+++ b/pkgs/desktops/enlightenment/evisum/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "evisum";
-  version = "0.5.11";
+  version = "0.5.13";

  src = fetchurl {
    url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-jCOYnG/+xz9qK6npOPT+tw1tp/K0QaFCmsBRO9J4bjE=";
+    sha256 = "sha256-TMVxx7D9wdujyN6PcbIxC8M6zby5myvxO9AqolrcWOY=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@ -15,6 +15,8 @@
 # Select a specific optimization target (other than the default)
 # See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt
 , target ? null
+# Select whether DYNAMIC_ARCH is enabled or not.
+, dynamicArch ? null
 , enableStatic ? stdenv.hostPlatform.isStatic
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
@ -25,27 +27,28 @@ let blas64_ = blas64; in

 let
  setTarget = x: if target == null then x else target;
+  setDynamicArch = x: if dynamicArch == null then x else dynamicArch;

  # To add support for a new platform, add an element to this set.
  configs = {
    armv6l-linux = {
      BINARY = 32;
      TARGET = setTarget "ARMV6";
-      DYNAMIC_ARCH = false;
+      DYNAMIC_ARCH = setDynamicArch false;
      USE_OPENMP = true;
    };

    armv7l-linux = {
      BINARY = 32;
      TARGET = setTarget "ARMV7";
-      DYNAMIC_ARCH = false;
+      DYNAMIC_ARCH = setDynamicArch false;
      USE_OPENMP = true;
    };

    aarch64-darwin = {
      BINARY = 64;
      TARGET = setTarget "VORTEX";
-      DYNAMIC_ARCH = true;
+      DYNAMIC_ARCH = setDynamicArch true;
      USE_OPENMP = false;
      MACOSX_DEPLOYMENT_TARGET = "11.0";
    };
@ -53,21 +56,21 @@ let
    aarch64-linux = {
      BINARY = 64;
      TARGET = setTarget "ARMV8";
-      DYNAMIC_ARCH = true;
+      DYNAMIC_ARCH = setDynamicArch true;
      USE_OPENMP = true;
    };

    i686-linux = {
      BINARY = 32;
      TARGET = setTarget "P2";
-      DYNAMIC_ARCH = true;
+      DYNAMIC_ARCH = setDynamicArch true;
      USE_OPENMP = true;
    };

    x86_64-darwin = {
      BINARY = 64;
      TARGET = setTarget "ATHLON";
-      DYNAMIC_ARCH = true;
+      DYNAMIC_ARCH = setDynamicArch true;
      USE_OPENMP = false;
      MACOSX_DEPLOYMENT_TARGET = "10.7";
    };
@ -75,14 +78,14 @@ let
    x86_64-linux = {
      BINARY = 64;
      TARGET = setTarget "ATHLON";
-      DYNAMIC_ARCH = true;
+      DYNAMIC_ARCH = setDynamicArch true;
      USE_OPENMP = !stdenv.hostPlatform.isMusl;
    };

    powerpc64le-linux = {
      BINARY = 64;
      TARGET = setTarget "POWER5";
-      DYNAMIC_ARCH = true;
+      DYNAMIC_ARCH = setDynamicArch true;
      USE_OPENMP = !stdenv.hostPlatform.isMusl;
    };
  };
--- a/pkgs/development/python-modules/signedjson/default.nix
+++ b/pkgs/development/python-modules/signedjson/default.nix
@ -1,24 +1,36 @@
 { lib
 , buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
+, fetchpatch
 , canonicaljson
 , unpaddedbase64
 , pynacl
 , typing-extensions
+, setuptools-scm
+, importlib-metadata
+, pythonOlder
 }:

 buildPythonPackage rec {
  pname = "signedjson";
  version = "1.1.1";

-  src = fetchFromGitHub {
-    owner = "matrix-org";
-    repo = "python-${pname}";
-    rev = "v${version}";
-    sha256 = "0y5c9v4vx9hqpnca892gc9b4xgs4gp5xk6l1wma5ciz8zswp9yfs";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0280f8zyycsmd7iy65bs438flm7m8ffs1kcxfbvhi8hbazkqc19m";
  };

-  propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl typing-extensions ];
+  patches = [
+    # Do not require importlib_metadata on python 3.8
+    (fetchpatch {
+      url = "https://github.com/matrix-org/python-signedjson/commit/c40c83f844fee3c1c7b0c5d1508f87052334b4e5.patch";
+      sha256 = "109f135zn9azg5h1ljw3v94kpvnzmlqz1aiknpl5hsqfa3imjca1";
+    })
+  ];
+
+  nativeBuildInputs = [ setuptools-scm ];
+  propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl typing-extensions ]
+    ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];

  meta = with lib; {
    homepage = "https://pypi.org/project/signedjson/";
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@ -1,32 +1,32 @@
 {
    "4.14": {
        "extra": "-hardened1",
-        "name": "linux-hardened-4.14.230-hardened1.patch",
-        "sha256": "1nhaqhjga042b69969f0jy680xlrgnms1178ni6c6xhxy6n7y4pq",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.230-hardened1/linux-hardened-4.14.230-hardened1.patch"
+        "name": "linux-hardened-4.14.231-hardened1.patch",
+        "sha256": "0camacpjlix1ajx2z1krsv7j5m9g7vaikp2qsa43w3xxgms1slp6",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.231-hardened1/linux-hardened-4.14.231-hardened1.patch"
    },
    "4.19": {
        "extra": "-hardened1",
-        "name": "linux-hardened-4.19.187-hardened1.patch",
-        "sha256": "1vw05qff7hvzl7krcf5kh0ynyy5gljps8qahr4jm0hsd69lmn0qk",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.187-hardened1/linux-hardened-4.19.187-hardened1.patch"
+        "name": "linux-hardened-4.19.188-hardened1.patch",
+        "sha256": "1l5hmfzkp9aajj48xny2khrg54501m57llykp6p3vpg9hwh19j1q",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.188-hardened1/linux-hardened-4.19.188-hardened1.patch"
    },
    "5.10": {
        "extra": "-hardened1",
-        "name": "linux-hardened-5.10.30-hardened1.patch",
-        "sha256": "0sxxzrhj41pxk01s2bcfwb47aab2by1zc7yyx9859rslq7dg5aly",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.30-hardened1/linux-hardened-5.10.30-hardened1.patch"
+        "name": "linux-hardened-5.10.32-hardened1.patch",
+        "sha256": "0vl01f6kpb38qv9855x1c4fzih1xmfb1xby70dzfkp5bg53ms5r3",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.32-hardened1/linux-hardened-5.10.32-hardened1.patch"
    },
    "5.11": {
        "extra": "-hardened1",
-        "name": "linux-hardened-5.11.14-hardened1.patch",
-        "sha256": "1j8saj1dyflah3mjs07rvxfhhpwhxk65r1y2bd228gp5nm6305px",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.14-hardened1/linux-hardened-5.11.14-hardened1.patch"
+        "name": "linux-hardened-5.11.16-hardened1.patch",
+        "sha256": "1fxf1qcqrvgywxnyywsbav80ys0y4c9qg6s8ygmplyjvncd9005l",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.16-hardened1/linux-hardened-5.11.16-hardened1.patch"
    },
    "5.4": {
        "extra": "-hardened1",
-        "name": "linux-hardened-5.4.112-hardened1.patch",
-        "sha256": "1l9igc68dq22nlnlls4x3zfz1h2hb6dqy7vr5r4jvbk22330m12j",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.112-hardened1/linux-hardened-5.4.112-hardened1.patch"
+        "name": "linux-hardened-5.4.114-hardened1.patch",
+        "sha256": "0zbn9x59m6b62c9hjp47xkg1qk8a489nd99px2g4i24mnhgan0kf",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.114-hardened1/linux-hardened-5.4.114-hardened1.patch"
    }
 }
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@ -3,7 +3,7 @@
 with lib;

 buildLinux (args // rec {
-  version = "4.14.230";
+  version = "4.14.231";

  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1gn5cs1ss4bfsnnv0b2s4g5ibiigpzsx0i3qfswchdbxvdag75cw";
+    sha256 = "10k63vwibygdd6gzs4r6rncqqa0qf8cbnqznhbfsi41lxsnpjfsp";
  };

  kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ];
--- a/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix
@ -3,7 +3,7 @@
 with lib;

 buildLinux (args // rec {
-  version = "4.19.187";
+  version = "4.19.188";

  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1hx0jw11xmj57v9a8w34729vgrandaing2n9qkhx5dq4mhy04k50";
+    sha256 = "0xq00mwgclk89bk5jpmncjnz7vsq353qrnc0cjp0n9mi4vqg375h";
  };

  kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ];
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@ -1,12 +1,12 @@
 { buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:

 buildLinux (args // rec {
-  version = "4.4.266";
+  version = "4.4.267";
  extraMeta.branch = "4.4";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "00x2dmjiiv9zpc0vih9xqmf78kynqzj9q9v1chc2q2hcjpqfj31c";
+    sha256 = "1qk629fsl1glr0h1hxami3f4ivgl58iqsnw43slvn1yc91cb7ws4";
  };

  kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@ -1,12 +1,12 @@
 { buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:

 buildLinux (args // rec {
-  version = "4.9.266";
+  version = "4.9.267";
  extraMeta.branch = "4.9";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0qzigcslfp714vaswwlw93xj0h2f8laikppw6krrhfnh5wwrp5dr";
+    sha256 = "0q0a49b3wsxk9mqyy8b55lr1gmiqxjpqh2nlhj4xwcfzd7z9lfwq";
  };

  kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ];
--- a/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix
@ -3,7 +3,7 @@
 with lib;

 buildLinux (args // rec {
-  version = "5.10.30";
+  version = "5.10.32";

  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0h06lavcbbj9a4dfzca9sprghiq9z33q8i4gh3n2912wmjsnj0nl";
+    sha256 = "1fnp0wyiswg8q4w89ssm1fz1ryfc1567fx08bz3fmf2cdqr8wkv4";
  };

  kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];
--- a/pkgs/os-specific/linux/kernel/linux-5.11.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.11.nix
@ -3,7 +3,7 @@
 with lib;

 buildLinux (args // rec {
-  version = "5.11.14";
+  version = "5.11.16";

  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1ia4wzh44lkvrbvnhdnnjcdyvqx2ihpbwkih7wqm1n5prhq38ql7";
+    sha256 = "0hqgai4r40xxlfqp1paxhn2g4i4yqvi1k473dddcxjrhs60kc5i1";
  };

  kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ];
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@ -3,7 +3,7 @@
 with lib;

 buildLinux (args // rec {
-  version = "5.4.112";
+  version = "5.4.114";

  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
  modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "190cq97pm0r6s115ay66rjra7fnyn7m4rak89inwhm223931sdmq";
+    sha256 = "0mwmvvz817zgxalb2xcx0i49smjag6j81vmqxp2kpwjqrf3z165y";
  };

  kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
@ -6,7 +6,7 @@
 , ... } @ args:

 let
-  version = "5.10.27-rt36"; # updated by ./update-rt.sh
+  version = "5.10.30-rt37"; # updated by ./update-rt.sh
  branch = lib.versions.majorMinor version;
  kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@ -18,14 +18,14 @@ in buildLinux (args // {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-    sha256 = "1nb95ll66kxiz702gs903n3gy5ialz8cin58l19rqaai55kck7fr";
+    sha256 = "0h06lavcbbj9a4dfzca9sprghiq9z33q8i4gh3n2912wmjsnj0nl";
  };

  kernelPatches = let rt-patch = {
    name = "rt";
    patch = fetchurl {
      url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "1bx023ibav6n2di3i2m8i6n4hp7h6zmz9bva7nqxdflbdwfsma1c";
+      sha256 = "1jibjfmjyn90n5jz5vq056n9xfzn9p8g9fsv7nmj5mfxxm4qhjal";
    };
  }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

--- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
@ -6,7 +6,7 @@
 , ... } @ args:

 let
-  version = "5.4.106-rt54"; # updated by ./update-rt.sh
+  version = "5.4.109-rt56"; # updated by ./update-rt.sh
  branch = lib.versions.majorMinor version;
  kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@ -14,14 +14,14 @@ in buildLinux (args // {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-    sha256 = "1ny8b69ngydh0iw53jwlmqlgv31wjhkybkgnqi5kv0n174n3p1yc";
+    sha256 = "1vmpc6yrr2zm4m3naflwik5111jr8hy0mnyddwk31l0p4xbg8smc";
  };

  kernelPatches = let rt-patch = {
    name = "rt";
    patch = fetchurl {
      url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "0xwbpn1k1b4bxq15sw7gicrzkfg32nkja308a5pcwx1ihv9khchf";
+      sha256 = "08cg8b7mwihs8zgdh0jwi8hrn3hnf9j0jyplsyc7644wd6mqby4a";
    };
  }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;

--- a/pkgs/os-specific/linux/kernel/update-rt.sh
+++ b/pkgs/os-specific/linux/kernel/update-rt.sh
@ -37,6 +37,7 @@ latest-rt-version() {
    branch="$1" # e.g. 5.4
    curl -sL "$mirror/projects/rt/$branch/sha256sums.asc" |
        sed -ne '/.patch.xz/ { s/.*patch-\(.*\).patch.xz/\1/p}' |
+        grep -v '\-rc' |
        tail -n 1
 }

--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
    "--with-auth-pam"
    "--without-auth-bsdauth"
    "--with-path-socket=/run"
+    "--with-path-pidfile=/run"
    "--with-user-smtpd=smtpd"
    "--with-user-queue=smtpq"
    "--with-group-queue=smtpq"
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@ -40,7 +40,7 @@ in rec {
    stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
  '';

-  bootstrapTools = derivation {
+  bootstrapTools = derivation ({
    inherit system;

    name    = "bootstrap-tools";
@ -50,7 +50,11 @@ in rec {
    inherit (bootstrapFiles) mkdir bzip2 cpio tarball;

    __impureHostDeps = commonImpureHostDeps;
-  };
+  } // lib.optionalAttrs (config.contentAddressedByDefault or false) {
+    __contentAddressed = true;
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+  });

  stageFun = step: last: {shell             ? "${bootstrapTools}/bin/bash",
                          overrides         ? (self: super: {}),
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@ -170,7 +170,7 @@ in
  ({}: {
    __raw = true;

-    bootstrapTools = derivation {
+    bootstrapTools = derivation ({
      inherit system;
      inherit make bash coreutils findutils
        diffutils grep patch gawk cpio sed
@ -182,7 +182,11 @@ in
      buildInputs = [ make ];
      mkdir = "/bin/mkdir";
      ln = "/bin/ln";
-    };
+    } // lib.optionalAttrs (config.contentAddressedByDefault or false) {
+      __contentAddressed = true;
+      outputHashAlgo = "sha256";
+      outputHashMode = "recursive";
+    });
  })

  ({ bootstrapTools, ... }: rec {
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@ -84,6 +84,11 @@ let
      allowedRequisites = allowedRequisites
        ++ defaultNativeBuildInputs ++ defaultBuildInputs;
    }
+    // lib.optionalAttrs (config.contentAddressedByDefault or false) {
+      __contentAddressed = true;
+      outputHashAlgo = "sha256";
+      outputHashMode = "recursive";
+    }
    // {
      inherit name;

--- a/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix
+++ b/pkgs/stdenv/linux/bootstrap-tools-musl/default.nix
@ -1,6 +1,6 @@
-{ system, bootstrapFiles }:
+{ system, bootstrapFiles, extraAttrs }:

-derivation {
+derivation ({
  name = "bootstrap-tools";

  builder = bootstrapFiles.busybox;
@ -15,4 +15,4 @@ derivation {
  langC = true;
  langCC = true;
  isGNU = true;
-}
+} // extraAttrs)
--- a/pkgs/stdenv/linux/bootstrap-tools/default.nix
+++ b/pkgs/stdenv/linux/bootstrap-tools/default.nix
@ -1,6 +1,6 @@
-{ system, bootstrapFiles }:
+{ system, bootstrapFiles, extraAttrs }:

-derivation {
+derivation ({
  name = "bootstrap-tools";

  builder = bootstrapFiles.busybox;
@ -15,4 +15,4 @@ derivation {
  langC = true;
  langCC = true;
  isGNU = true;
-}
+} // extraAttrs)
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@ -61,7 +61,16 @@ let


  # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...).
-  bootstrapTools = import (if localSystem.libc == "musl" then ./bootstrap-tools-musl else ./bootstrap-tools) { inherit system bootstrapFiles; };
+  bootstrapTools = import (if localSystem.libc == "musl" then ./bootstrap-tools-musl else ./bootstrap-tools) {
+    inherit system bootstrapFiles;
+    extraAttrs = lib.optionalAttrs
+      (config.contentAddressedByDefault or false)
+      {
+        __contentAddressed = true;
+        outputHashAlgo = "sha256";
+        outputHashMode = "recursive";
+      };
+  };

  getLibc = stage: stage.${localSystem.libc};

--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@ -224,15 +224,24 @@ in with pkgs; rec {
    bootstrapTools = runCommand "bootstrap-tools.tar.xz" {} "cp ${build}/on-server/bootstrap-tools.tar.xz $out";
  };

-  bootstrapTools = if (stdenv.hostPlatform.libc == "glibc") then
+  bootstrapTools =
+    let extraAttrs = lib.optionalAttrs
+      (config.contentAddressedByDefault or false)
+      {
+        __contentAddressed = true;
+        outputHashAlgo = "sha256";
+        outputHashMode = "recursive";
+      };
+    in
+    if (stdenv.hostPlatform.libc == "glibc") then
    import ./bootstrap-tools {
      inherit (stdenv.buildPlatform) system; # Used to determine where to build
-      inherit bootstrapFiles;
+      inherit bootstrapFiles extraAttrs;
    }
    else if (stdenv.hostPlatform.libc == "musl") then
    import ./bootstrap-tools-musl {
      inherit (stdenv.buildPlatform) system; # Used to determine where to build
-      inherit bootstrapFiles;
+      inherit bootstrapFiles extraAttrs;
    }
    else throw "unsupported libc";

--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@ -12,14 +12,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "broot";
-  version = "1.2.9";
+  version = "1.3.0";

  src = fetchCrate {
    inherit pname version;
-    sha256 = "sha256-5tM8ywLBPPjCKEfXIfUZ5aF4t9YpYA3tzERxC1NEsso=";
+    sha256 = "sha256-2FF/oB341PPGfSlXpLEs4mswjVk+3ty/jNsVJKu+fhs=";
  };

-  cargoHash = "sha256-P5ukwtRUpIJIqJjwTXIB2xRnpyLkzMeBMHmUz4Ery3s=";
+  cargoHash = "sha256-+UT9cz8OPA1jpFv7HafabxJ3NmLl57K1ODydfcV1FUM";

  nativeBuildInputs = [
    makeWrapper
@ -33,8 +33,6 @@ rustPlatform.buildRustPackage rec {
  ];

  postPatch = ''
-    substituteInPlace src/verb/builtin.rs --replace '"/bin/' '"${coreutils}/bin/'
-
    # Fill the version stub in the man page. We can't fill the date
    # stub reproducibly.
    substitute man/page man/broot.1 \