Merge master into staging-next

2021-03-20 18:19:30 +00:00 · 2021-03-20 18:19:30 +00:00 · 933682b533
parent 83fa5d2017 76b34118a9
commit 933682b533
43 changed files with 1426 additions and 1103 deletions
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@ -196,6 +196,7 @@ let
        domain: "${cfg.smtp.domain}",
        ${optionalString (cfg.smtp.authentication != null) "authentication: :${cfg.smtp.authentication},"}
        enable_starttls_auto: ${boolToString cfg.smtp.enableStartTLSAuto},
+        tls: ${boolToString cfg.smtp.tls},
        ca_file: "/etc/ssl/certs/ca-certificates.crt",
        openssl_verify_mode: '${cfg.smtp.opensslVerifyMode}'
      }
@ -463,6 +464,12 @@ in {
          description = "Whether to try to use StartTLS.";
        };

+        tls = mkOption {
+          type = types.bool;
+          default = false;
+          description = "Whether to use TLS wrapper-mode.";
+        };
+
        opensslVerifyMode = mkOption {
          type = types.str;
          default = "peer";
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
@ -15,12 +15,15 @@ import re
 import datetime
 import glob
 import os.path
+from typing import Tuple, List, Optional

-def copy_if_not_exists(source, dest):
+
+def copy_if_not_exists(source: str, dest: str) -> None:
    if not os.path.exists(dest):
        shutil.copyfile(source, dest)

-def system_dir(profile, generation):
+
+def system_dir(profile: Optional[str], generation: int) -> str:
    if profile:
        return "/nix/var/nix/profiles/system-profiles/%s-%d-link" % (profile, generation)
    else:
@ -42,7 +45,8 @@ MEMTEST_BOOT_ENTRY = """title MemTest86
 efi /efi/memtest86/BOOTX64.efi
 """

-def write_loader_conf(profile, generation):
+
+def write_loader_conf(profile: Optional[str], generation: int) -> None:
    with open("@efiSysMountPoint@/loader/loader.conf.tmp", 'w') as f:
        if "@timeout@" != "":
            f.write("timeout @timeout@\n")
@ -55,10 +59,12 @@ def write_loader_conf(profile, generation):
        f.write("console-mode @consoleMode@\n");
    os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf")

-def profile_path(profile, generation, name):
+
+def profile_path(profile: Optional[str], generation: int, name: str) -> str:
    return os.readlink("%s/%s" % (system_dir(profile, generation), name))

-def copy_from_profile(profile, generation, name, dry_run=False):
+
+def copy_from_profile(profile: Optional[str], generation: int, name: str, dry_run: bool = False) -> str:
    store_file_path = profile_path(profile, generation, name)
    suffix = os.path.basename(store_file_path)
    store_dir = os.path.basename(os.path.dirname(store_file_path))
@ -67,7 +73,8 @@ def copy_from_profile(profile, generation, name, dry_run=False):
        copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path))
    return efi_file_path

-def describe_generation(generation_dir):
+
+def describe_generation(generation_dir: str) -> str:
    try:
        with open("%s/nixos-version" % generation_dir) as f:
            nixos_version = f.read()
@ -87,7 +94,8 @@ def describe_generation(generation_dir):

    return description

-def write_entry(profile, generation, machine_id):
+
+def write_entry(profile: Optional[str], generation: int, machine_id: str) -> None:
    kernel = copy_from_profile(profile, generation, "kernel")
    initrd = copy_from_profile(profile, generation, "initrd")
    try:
@ -116,14 +124,16 @@ def write_entry(profile, generation, machine_id):
            f.write("machine-id %s\n" % machine_id)
    os.rename(tmp_path, entry_file)

-def mkdir_p(path):
+
+def mkdir_p(path: str) -> None:
    try:
        os.makedirs(path)
    except OSError as e:
        if e.errno != errno.EEXIST or not os.path.isdir(path):
            raise

-def get_generations(profile=None):
+
+def get_generations(profile: Optional[str] = None) -> List[Tuple[Optional[str], int]]:
    gen_list = subprocess.check_output([
        "@nix@/bin/nix-env",
        "--list-generations",
@ -137,7 +147,8 @@ def get_generations(profile=None):
    configurationLimit = @configurationLimit@
    return [ (profile, int(line.split()[0])) for line in gen_lines ][-configurationLimit:]

-def remove_old_entries(gens):
+
+def remove_old_entries(gens: List[Tuple[Optional[str], int]]) -> None:
    rex_profile = re.compile("^@efiSysMountPoint@/loader/entries/nixos-(.*)-generation-.*\.conf$")
    rex_generation = re.compile("^@efiSysMountPoint@/loader/entries/nixos.*-generation-(.*)\.conf$")
    known_paths = []
@ -150,8 +161,8 @@ def remove_old_entries(gens):
                prof = rex_profile.sub(r"\1", path)
            else:
                prof = "system"
-            gen = int(rex_generation.sub(r"\1", path))
-            if not (prof, gen) in gens:
+            gen_number = int(rex_generation.sub(r"\1", path))
+            if not (prof, gen_number) in gens:
                os.unlink(path)
        except ValueError:
            pass
@ -159,7 +170,8 @@ def remove_old_entries(gens):
        if not path in known_paths and not os.path.isdir(path):
            os.unlink(path)

-def get_profiles():
+
+def get_profiles() -> List[str]:
    if os.path.isdir("/nix/var/nix/profiles/system-profiles/"):
        return [x
            for x in os.listdir("/nix/var/nix/profiles/system-profiles/")
@ -167,7 +179,8 @@ def get_profiles():
    else:
        return []

-def main():
+
+def main() -> None:
    parser = argparse.ArgumentParser(description='Update NixOS-related systemd-boot files')
    parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default NixOS config to boot')
    args = parser.parse_args()
@ -182,7 +195,9 @@ def main():
        # be there on newly installed systems, so let's generate one so that
        # bootctl can find it and we can also pass it to write_entry() later.
        cmd = ["@systemd@/bin/systemd-machine-id-setup", "--print"]
-        machine_id = subprocess.check_output(cmd).rstrip()
+        machine_id = subprocess.run(
+          cmd, text=True, check=True, stdout=subprocess.PIPE
+        ).stdout.rstrip()

    if os.getenv("NIXOS_INSTALL_GRUB") == "1":
        warnings.warn("NIXOS_INSTALL_GRUB env var deprecated, use NIXOS_INSTALL_BOOTLOADER", DeprecationWarning)
@ -213,7 +228,6 @@ def main():
                print("updating systemd-boot from %s to %s" % (sdboot_version, systemd_version))
                subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "update"])

-
    mkdir_p("@efiSysMountPoint@/efi/nixos")
    mkdir_p("@efiSysMountPoint@/loader/entries")

@ -252,5 +266,6 @@ def main():
    if rc != 0:
        print("could not sync @efiSysMountPoint@: {}".format(os.strerror(rc)), file=sys.stderr)

+
 if __name__ == '__main__':
    main()
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
@ -7,7 +7,7 @@ let

  efi = config.boot.loader.efi;

-  gummibootBuilder = pkgs.substituteAll {
+  systemdBootBuilder = pkgs.substituteAll {
    src = ./systemd-boot-builder.py;

    isExecutable = true;
@ -30,6 +30,17 @@ let

    memtest86 = if cfg.memtest86.enable then pkgs.memtest86-efi else "";
  };
+
+  checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" {
+    nativeBuildInputs = [ pkgs.mypy ];
+  } ''
+    install -m755 ${systemdBootBuilder} $out
+    mypy \
+      --no-implicit-optional \
+      --disallow-untyped-calls \
+      --disallow-untyped-defs \
+      $out
+  '';
 in {

  imports =
@ -131,7 +142,7 @@ in {
    boot.loader.supportsInitrdSecrets = true;

    system = {
-      build.installBootLoader = gummibootBuilder;
+      build.installBootLoader = checkedSystemdBootBuilder;

      boot.loader.id = "systemd-boot";

--- a/pkgs/applications/audio/bambootracker/default.nix
+++ b/pkgs/applications/audio/bambootracker/default.nix
@ -1,4 +1,5 @@
 { mkDerivation
+, stdenv
 , lib
 , fetchFromGitHub
 , fetchpatch
@ -39,6 +40,14 @@ mkDerivation rec {

  postConfigure = "make qmake_all";

+  # installs app bundle on darwin, re-extract the binary
+  # wrapQtAppsHook fails to wrap mach-o binaries, manually call wrapper (https://github.com/NixOS/nixpkgs/issues/102044)
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mv $out/bin/BambooTracker{.app/Contents/MacOS/BambooTracker,}
+    rm -r $out/bin/BambooTracker.app
+    wrapQtApp $out/bin/BambooTracker
+  '';
+
  meta = with lib; {
    description = "A tracker for YM2608 (OPNA) which was used in NEC PC-8801/9801 series computers";
    homepage = "https://rerrahkr.github.io/BambooTracker";
--- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
  pname = "MBdistortion";
  version = "1.1.1";
@ -10,6 +10,13 @@ stdenv.mkDerivation rec {
    sha256 = "0mdzaqmxzgspfgx9w1hdip18y17hwpdcgjyq1rrfm843vkascwip";
  };

+  patches = [
+    (fetchpatch {
+      url = "https://github.com/magnetophon/MBdistortion/commit/10e35084b88c559f1b63760cf40fd5ef5a6745a5.patch";
+      sha256 = "0hwjl3rzvn3id0sr0qs8f37jdmr915mdan8miaf78ra0ir3wnk76";
+    })
+  ];
+
  buildInputs = [ faust2jaqt faust2lv2 ];

  buildPhase = ''
--- a/pkgs/applications/editors/poke/default.nix
+++ b/pkgs/applications/editors/poke/default.nix
@ -10,7 +10,7 @@
 , readline
 , guiSupport ? false, tcl, tcllib, tk
 , miSupport ? true, json_c
-, nbdSupport ? true, libnbd
+, nbdSupport ? !stdenv.isDarwin, libnbd
 , textStylingSupport ? true
 , dejagnu
 }:
--- a/pkgs/applications/misc/crow-translate/default.nix
+++ b/pkgs/applications/misc/crow-translate/default.nix
@ -46,13 +46,13 @@ let
 in
 mkDerivation rec {
  pname = "crow-translate";
-  version = "2.8.0";
+  version = "2.8.1";

  src = fetchFromGitHub {
    owner = "crow-translate";
    repo = "crow-translate";
    rev = version;
-    sha256 = "sha256-kpr3Xn1ZLBS1fVhhJ/sxo8UgB4M+SdOVhddnU8pNUfA=";
+    sha256 = "sha256-fmlNUhNorV/MUdfdDXM6puAblTTa6p2slVT/EKy5THg=";
  };

  patches = [
--- a/pkgs/applications/misc/sunwait/default.nix
+++ b/pkgs/applications/misc/sunwait/default.nix
@ -0,0 +1,25 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  pname = "sunwait";
+  version = "2020-10-26";
+
+  src = fetchFromGitHub {
+    owner = "risacher";
+    repo = "sunwait";
+    rev = "102cb417ecbb7a3757ba9ee4b94d6db3225124c4";
+    sha256 = "0cs8rdcnzsl10zia2k49a6c2z6gvp5rnf31sgn3hn5c7kgy7l3ax";
+  };
+
+  installPhase = ''
+    install -Dm755 sunwait -t $out/bin
+  '';
+
+  meta = with lib; {
+    description = "Calculates sunrise or sunset times with civil, nautical, astronomical and custom twilights";
+    homepage = "https://github.com/risacher/sunwait";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ etu ];
+    platforms = platforms.all;
+  };
+}
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@ -1,13 +1,13 @@
 { lib, stdenv, fetchurl, dpkg
 , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome3
 , gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg
-, at-spi2-atk, libuuid, at-spi2-core }:
+, at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon }:

 let

  # Please keep the version x.y.0.z and do not update to x.y.76.z because the
  # source of the latter disappears much faster.
-  version = "8.68.0.100";
+  version = "8.69.0.77";

  rpath = lib.makeLibraryPath [
    alsaLib
@ -40,8 +40,11 @@ let
    pango
    stdenv.cc.cc
    systemd
-    libv4l

+    libv4l
+    libdrm
+    mesa
+    libxkbcommon
    xorg.libxkbfile
    xorg.libX11
    xorg.libXcomposite
@ -65,7 +68,7 @@ let
          "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
          "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
        ];
-        sha256 = "gHjgQRdNABO+R+fcDurHDAQtZpckIxLbODM6Txz+LH4=";
+        sha256 = "PaqlPp+BRS0cH7XI4x1/5HqYti63rQThmTtPaghIQH0=";
      }
    else
      throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
--- a/pkgs/applications/science/math/sage/sagelib.nix
+++ b/pkgs/applications/science/math/sage/sagelib.nix
@ -32,6 +32,7 @@
 , ntl
 , numpy
 , pari
+, pkgconfig # the python module, not the pkg-config alias
 , pkg-config
 , planarity
 , ppl
@ -85,6 +86,7 @@ buildPythonPackage rec {
    cypari2
    jinja2
    numpy
+    pkgconfig
    boost
    arb
    brial
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@ -1,13 +1,13 @@
 {
-  "version": "13.8.6",
-  "repo_hash": "0izzvr4bw86nbrqkf44gkcf63ham10cw4vp5yk0ylgm7w0kimv8v",
+  "version": "13.9.4",
+  "repo_hash": "0gwxjmph3ac5v0h5zz8664412yq09cka5p4amdbxk7hna24igksz",
  "owner": "gitlab-org",
  "repo": "gitlab",
-  "rev": "v13.8.6-ee",
+  "rev": "v13.9.4-ee",
  "passthru": {
-    "GITALY_SERVER_VERSION": "13.8.6",
-    "GITLAB_PAGES_VERSION": "1.34.0",
-    "GITLAB_SHELL_VERSION": "13.15.1",
-    "GITLAB_WORKHORSE_VERSION": "8.59.2"
+    "GITALY_SERVER_VERSION": "13.9.4",
+    "GITLAB_PAGES_VERSION": "1.35.0",
+    "GITLAB_SHELL_VERSION": "13.17.0",
+    "GITLAB_WORKHORSE_VERSION": "8.63.2"
  }
 }
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@ -1,23 +1,23 @@
 source 'https://rubygems.org'

-gem 'rugged', '~> 0.28'
+gem 'rugged', '~> 1.0.1'
 gem 'github-linguist', '~> 7.12', require: 'linguist'
 gem 'gitlab-markup', '~> 1.7.1'
 gem 'activesupport', '~> 6.0.3.4'
 gem 'rdoc', '~> 6.0'
-gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false
-gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
+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 '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.13.2'
+gem 'gitlab-labkit', '~> 0.15.0'

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

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

--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@ -24,6 +24,8 @@ GEM
    adamantium (0.2.0)
      ice_nine (~> 0.11.0)
      memoizable (~> 0.4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
    ast (2.4.1)
    binding_ninja (0.2.3)
    builder (3.2.4)
@ -35,8 +37,9 @@ GEM
    concurrent-ruby (1.1.7)
    crass (1.0.6)
    diff-lcs (1.3)
+    dotenv (2.7.6)
    equalizer (0.0.11)
-    erubi (1.9.0)
+    erubi (1.10.0)
    escape_utils (1.2.1)
    factory_bot (5.0.2)
      activesupport (>= 4.2.0)
@ -51,23 +54,24 @@ GEM
      mini_mime (~> 1.0)
      rugged (>= 0.25.1)
    github-markup (1.7.0)
-    gitlab-gollum-lib (4.2.7.9)
+    gitlab-gollum-lib (4.2.7.10.gitlab.1)
      gemojione (~> 3.2)
      github-markup (~> 1.6)
-      gitlab-gollum-rugged_adapter (~> 0.4.4.2)
+      gitlab-gollum-rugged_adapter (~> 0.4.4.3.gitlab.1)
      nokogiri (>= 1.6.1, < 2.0)
      rouge (~> 3.1)
      sanitize (~> 4.6.4)
      stringex (~> 2.6)
-    gitlab-gollum-rugged_adapter (0.4.4.2)
+    gitlab-gollum-rugged_adapter (0.4.4.3.gitlab.1)
      mime-types (>= 1.15)
-      rugged (~> 0.25)
-    gitlab-labkit (0.13.2)
-      actionpack (>= 5.0.0, < 6.1.0)
-      activesupport (>= 5.0.0, < 6.1.0)
+      rugged (~> 1.0)
+    gitlab-labkit (0.15.0)
+      actionpack (>= 5.0.0, < 7.0.0)
+      activesupport (>= 5.0.0, < 7.0.0)
      grpc (~> 1.19)
      jaeger-client (~> 1.1)
      opentracing (~> 0.4)
+      pg_query (~> 1.3)
      redis (> 3.0.0, < 5.0.0)
    gitlab-markup (1.7.1)
    google-protobuf (3.12.4)
@ -83,10 +87,14 @@ GEM
    jaeger-client (1.1.0)
      opentracing (~> 0.3)
      thrift
-    json (2.3.1)
-    licensee (8.9.2)
-      rugged (~> 0.24)
-    loofah (2.8.0)
+    json (2.5.1)
+    licensee (9.14.1)
+      dotenv (~> 2.0)
+      octokit (~> 4.17)
+      reverse_markdown (~> 1.0)
+      rugged (>= 0.24, < 2.0)
+      thor (>= 0.19, < 2.0)
+    loofah (2.9.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    memoizable (0.4.2)
@ -94,7 +102,7 @@ GEM
    method_source (0.9.2)
    mime-types (3.3.1)
      mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
+    mime-types-data (3.2020.1104)
    mini_mime (1.0.2)
    mini_portile2 (2.5.0)
    minitest (5.14.2)
@ -105,11 +113,15 @@ GEM
      racc (~> 1.4)
    nokogumbo (1.5.0)
      nokogiri
+    octokit (4.20.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
    opentracing (0.5.0)
    optimist (3.0.1)
    parallel (1.19.2)
    parser (2.7.2.0)
      ast (~> 2.4.1)
+    pg_query (1.3.0)
    proc_to_ast (0.1.0)
      coderay
      parser
@ -118,6 +130,7 @@ GEM
    pry (0.12.2)
      coderay (~> 1.1.0)
      method_source (~> 0.9.0)
+    public_suffix (4.0.6)
    racc (1.5.2)
    rack (2.2.3)
    rack-test (1.1.0)
@ -133,8 +146,10 @@ GEM
      msgpack (>= 0.4.3)
      optimist (>= 3.0.0)
    rdoc (6.2.0)
-    redis (4.1.3)
+    redis (4.2.5)
    regexp_parser (1.8.1)
+    reverse_markdown (1.4.0)
+      nokogiri
    rexml (3.2.4)
    rouge (3.26.0)
    rspec (3.8.0)
@ -168,16 +183,20 @@ GEM
    rubocop-ast (0.2.0)
      parser (>= 2.7.0.1)
    ruby-progressbar (1.10.1)
-    rugged (0.28.4.1)
+    rugged (1.0.1)
    sanitize (4.6.6)
      crass (~> 1.0.2)
      nokogiri (>= 1.4.4)
      nokogumbo (~> 1.4)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
    sentry-raven (3.0.4)
      faraday (>= 1.0)
    stringex (2.8.5)
+    thor (1.1.0)
    thread_safe (0.3.6)
-    thrift (0.11.0.0)
+    thrift (0.13.0)
    timecop (0.9.1)
    tzinfo (1.2.9)
      thread_safe (~> 0.1)
@ -200,21 +219,21 @@ DEPENDENCIES
  factory_bot
  faraday (~> 1.0)
  github-linguist (~> 7.12)
-  gitlab-gollum-lib (~> 4.2.7.9)
-  gitlab-gollum-rugged_adapter (~> 0.4.4.2)
-  gitlab-labkit (~> 0.13.2)
+  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-markup (~> 1.7.1)
  google-protobuf (~> 3.12)
  grpc (~> 1.30.2)
  grpc-tools (= 1.30.2)
-  licensee (~> 8.9.0)
+  licensee (~> 9.14.1)
  pry (~> 0.12.2)
  rbtrace
  rdoc (~> 6.0)
  rspec
  rspec-parameterized
  rubocop (~> 0.69)
-  rugged (~> 0.28)
+  rugged (~> 1.0.1)
  sentry-raven (~> 3.0)
  timecop

--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@ -33,7 +33,7 @@ let
      };
  };
 in buildGoModule rec {
-  version = "13.8.6";
+  version = "13.9.4";
  pname = "gitaly";

  src = fetchFromGitLab {
@ -43,7 +43,7 @@ in buildGoModule rec {
    sha256 = "sha256-6ocP4SMafvLI2jfvcB8jk1AemAI/TiBQ1iaVxK7I54A=";
  };

-  vendorSha256 = "sha256-oVw6vXI3CyOn4l02PkYx3HVpZfzQPi3yBuf9tRvoWoM=";
+  vendorSha256 = "10ssx0dvbzg70vr2sgnhzijnjxfw6533wdjxwakj62rpfayklp51";

  passthru = {
    inherit rubyEnv;
--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@ -49,6 +49,17 @@
    };
    version = "0.2.0";
  };
+  addressable = {
+    dependencies = ["public_suffix"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy";
+      type = "gem";
+    };
+    version = "2.7.0";
+  };
  ast = {
    groups = ["default" "development" "test"];
    platforms = [];
@ -134,6 +145,16 @@
    };
    version = "1.3";
  };
+  dotenv = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94";
+      type = "gem";
+    };
+    version = "2.7.6";
+  };
  equalizer = {
    source = {
      remotes = ["https://rubygems.org"];
@ -147,10 +168,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x";
+      sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l";
      type = "gem";
    };
-    version = "1.9.0";
+    version = "1.10.0";
  };
  escape_utils = {
    source = {
@ -226,10 +247,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0y21k8bix3h2qdys2kz2z831cclmx3zc15x67cp8s945dkmh39sj";
+      sha256 = "0r6smbqnh0m84fxwb2g11qjfbcsljfin4vhnf43nmmbql2l1i3ah";
      type = "gem";
    };
-    version = "4.2.7.9";
+    version = "4.2.7.10.gitlab.1";
  };
  gitlab-gollum-rugged_adapter = {
    dependencies = ["mime-types" "rugged"];
@ -237,21 +258,21 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1d32d3yfadzwrarv0biwbfbkz2bqcc0dc3q0imnk962jaay19gc4";
+      sha256 = "0rqi9h6k32azljmx2q0zibvs1m59wgh879h04jflxkcqyzj6wyyj";
      type = "gem";
    };
-    version = "0.4.4.2";
+    version = "0.4.4.3.gitlab.1";
  };
  gitlab-labkit = {
-    dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"];
+    dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0vgd61xdclihifcdivddfs1gipxy1ql0kf9q47k9h0xisscyjhd2";
+      sha256 = "1l9bsjszp5zyzbdsr9ls09d4yr2sb0xjc40x4rv7fbzk19n9xs71";
      type = "gem";
    };
-    version = "0.13.2";
+    version = "0.15.0";
  };
  gitlab-markup = {
    groups = ["default"];
@ -336,23 +357,25 @@
    version = "1.1.0";
  };
  json = {
-    groups = ["default" "development" "test"];
+    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz";
+      sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
      type = "gem";
    };
-    version = "2.3.1";
+    version = "2.5.1";
  };
  licensee = {
-    dependencies = ["rugged"];
+    dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"];
+    groups = ["default"];
+    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0w6d2smhg3kzcx4m2ii06akakypwhiglansk51bpx290hhc8h3pc";
+      sha256 = "0c551j4qy773d79hgypjaz43h5wjn08mnxnxy9s2vdjc40qm95k5";
      type = "gem";
    };
-    version = "8.9.2";
+    version = "9.14.1";
  };
  loofah = {
    dependencies = ["crass" "nokogiri"];
@ -360,10 +383,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh";
+      sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck";
      type = "gem";
    };
-    version = "2.8.0";
+    version = "2.9.0";
  };
  memoizable = {
    dependencies = ["thread_safe"];
@ -398,10 +421,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753";
+      sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag";
      type = "gem";
    };
-    version = "3.2020.0512";
+    version = "3.2020.1104";
  };
  mini_mime = {
    groups = ["default"];
@ -473,6 +496,17 @@
    };
    version = "1.5.0";
  };
+  octokit = {
+    dependencies = ["faraday" "sawyer"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq";
+      type = "gem";
+    };
+    version = "4.20.0";
+  };
  opentracing = {
    groups = ["default"];
    platforms = [];
@ -514,6 +548,16 @@
    };
    version = "2.7.2.0";
  };
+  pg_query = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1i9l3y502ddm2lq3ajhxhqq17vs9hgxkxm443yw221ccibcfh6qf";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
  proc_to_ast = {
    dependencies = ["coderay" "parser" "unparser"];
    source = {
@ -540,6 +584,16 @@
    };
    version = "0.12.2";
  };
+  public_suffix = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
+      type = "gem";
+    };
+    version = "4.0.6";
+  };
  racc = {
    groups = ["default"];
    platforms = [];
@ -627,10 +681,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "08v2y91q1pmv12g9zsvwj66w3s8j9d82yrmxgyv4y4gz380j3wyh";
+      sha256 = "15x2sr6h094rjbvg8pkq6m3lcd5abpyx93aifvfdz3wv6x55xa48";
      type = "gem";
    };
-    version = "4.1.3";
+    version = "4.2.5";
  };
  regexp_parser = {
    groups = ["default" "development" "test"];
@ -642,6 +696,17 @@
    };
    version = "1.8.1";
  };
+  reverse_markdown = {
+    dependencies = ["nokogiri"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0w786j869fjhjf72waj0hc9i4ghi45b78a2am27kij4sa2hmsc53";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
  rexml = {
    groups = ["default" "development" "test"];
    platforms = [];
@ -764,10 +829,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0rdidxgpk1b6y1jq9v77lcx5khq0s9q0s253lr8x57d3hk43iskx";
+      sha256 = "056bwiwxvnbkbgsr2wqcsknnc73nqasqdnjcpgj2r61wkm8mzmbn";
      type = "gem";
    };
-    version = "0.28.4.1";
+    version = "1.0.1";
  };
  sanitize = {
    dependencies = ["crass" "nokogiri" "nokogumbo"];
@ -778,6 +843,17 @@
    };
    version = "4.6.6";
  };
+  sawyer = {
+    dependencies = ["addressable" "faraday"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz";
+      type = "gem";
+    };
+    version = "0.8.2";
+  };
  sentry-raven = {
    dependencies = ["faraday"];
    groups = ["default"];
@ -799,6 +875,16 @@
    };
    version = "2.8.5";
  };
+  thor = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
  thread_safe = {
    source = {
      remotes = ["https://rubygems.org"];
@ -812,10 +898,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv";
+      sha256 = "08076cmdx0g51yrkd7dlxlr45nflink3jhdiq7006ljc2pc3212q";
      type = "gem";
    };
-    version = "0.11.0.0";
+    version = "0.13.0";
  };
  timecop = {
    source = {
@ -867,4 +953,4 @@
    };
    version = "2.4.2";
  };
-}
+}
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@ -2,7 +2,7 @@

 buildGoModule rec {
  pname = "gitlab-shell";
-  version = "13.15.1";
+  version = "13.17.0";
  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitlab-shell";
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@ -3,16 +3,16 @@
 buildGoModule rec {
  pname = "gitlab-workhorse";

-  version = "8.59.2";
+  version = "8.63.2";

  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitlab-workhorse";
    rev = "v${version}";
-    sha256 = "sha256-hMcE7dlUw34DyUO0v5JxwvvEh/HC2emrIKc1K1U4bPE=";
+    sha256 = "1vjk7r7228p2gblx9nmqiz70ckbllg1p3bwkyfd4m49jhp13hryi";
  };

-  vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5";
+  vendorSha256 = "0hc02nxw5jp1mhpjcx1f2a2dfaq7ji4qkf5g7lbpd1rzhqwp6zsz";
  buildInputs = [ git ];
  buildFlagsArray = "-ldflags=-X main.Version=${version}";
  doCheck = false;
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'

 gem 'rails', '~> 6.0.3.1'
@ -10,12 +12,12 @@ gem 'responders', '~> 3.0'
 gem 'sprockets', '~> 3.7.0'

 # Default values for AR models
-gem 'default_value_for', '~> 3.3.0'
+gem 'default_value_for', '~> 3.4.0'

 # Supported DBs
 gem 'pg', '~> 1.1'

-gem 'rugged', '~> 0.28'
+gem 'rugged', '~> 1.0.1'
 gem 'grape-path-helpers', '~> 1.6.1'

 gem 'faraday', '~> 1.0'
@ -25,8 +27,8 @@ gem 'marginalia', '~> 1.10.0'
 gem 'devise', '~> 4.7.2'
 # TODO: verify ARM compile issue on 3.1.13+ version (see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18828)
 gem 'bcrypt', '3.1.12'
-gem 'doorkeeper', '~> 5.3.0'
-gem 'doorkeeper-openid_connect', '~> 1.7.4'
+gem 'doorkeeper', '~> 5.5.0.rc2'
+gem 'doorkeeper-openid_connect', '~> 1.7.5'
 gem 'omniauth', '~> 1.8'
 gem 'omniauth-auth0', '~> 2.0.0'
 gem 'omniauth-azure-oauth2', '~> 0.0.9'
@ -81,7 +83,7 @@ gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
 gem 'net-ldap', '~> 0.16.3'

 # API
-gem 'grape', '~> 1.5.1'
+gem 'grape', '~> 1.5.2'
 gem 'grape-entity', '~> 0.7.1'
 gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'

@ -103,7 +105,7 @@ gem 'hashie-forbidden_attributes'
 gem 'kaminari', '~> 1.0'

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

 # Files attachments
 gem 'carrierwave', '~> 1.3'
@ -154,7 +156,7 @@ gem 'wikicloth', '0.8.1'
 gem 'asciidoctor', '~> 2.0.10'
 gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
 gem 'asciidoctor-plantuml', '~> 0.0.12'
-gem 'asciidoctor-kroki', '~> 0.2.2', require: false
+gem 'asciidoctor-kroki', '~> 0.4.0', require: false
 gem 'rouge', '~> 3.26.0'
 gem 'truncato', '~> 0.7.11'
 gem 'bootstrap_form', '~> 4.2.0'
@ -266,7 +268,7 @@ gem 'babosa', '~> 1.0.2'
 gem 'loofah', '~> 2.2'

 # Working with license
-gem 'licensee', '~> 8.9'
+gem 'licensee', '~> 9.14.1'

 # Detect and convert string character encoding
 gem 'charlock_holmes', '~> 0.7.7'
@ -284,6 +286,7 @@ gem 'gitlab_chronic_duration', '~> 0.10.6.2'
 gem 'rack-proxy', '~> 0.6.0'

 gem 'sassc-rails', '~> 2.1.0'
+gem 'autoprefixer-rails', '10.2.0.0'
 gem 'terser', '1.0.2'

 gem 'addressable', '~> 2.7'
@ -292,7 +295,7 @@ gem 'gon', '~> 6.2'
 gem 'request_store', '~> 1.5'
 gem 'base32', '~> 0.3.0'

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

 # Protect against bruteforcing
 gem 'rack-attack', '~> 6.3.0'
@ -339,6 +342,7 @@ end
 group :development do
  gem 'brakeman', '~> 4.2', require: false
  gem 'danger', '~> 8.0.6', require: false
+  gem 'lefthook', '~> 0.7', require: false

  gem 'letter_opener_web', '~> 1.3.4'

@ -346,12 +350,12 @@ group :development do
  gem 'better_errors', '~> 2.7.1'

  # thin instead webrick
-  gem 'thin', '~> 1.7.0'
+  gem 'thin', '~> 1.8.0'
 end

 group :development, :test do
  gem 'deprecation_toolkit', '~> 1.5.1', require: false
-  gem 'bullet', '~> 6.1.0'
+  gem 'bullet', '~> 6.1.3'
  gem 'gitlab-pry-byebug', platform: :mri, require: ['pry-byebug', 'pry-byebug/pry_remote_ext']
  gem 'pry-rails', '~> 0.3.9'
  gem 'pry-remote'
@ -360,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.1'
+  gem 'rspec-rails', '~> 4.0.2'

  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
  gem 'minitest', '~> 5.11.0'
@ -375,7 +379,7 @@ group :development, :test do

  gem 'scss_lint', '~> 0.59.0', require: false
  gem 'haml_lint', '~> 0.36.0', require: false
-  gem 'bundler-audit', '~> 0.6.1', require: false
+  gem 'bundler-audit', '~> 0.7.0.1', require: false

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

@ -465,7 +469,7 @@ group :ed25519 do
 end

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

 gem 'grpc', '~> 1.30.2'

@ -478,7 +482,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.4.5'
+gem 'gitlab-experiment', '~> 0.4.9'

 # Structured logging
 gem 'lograge', '~> 0.5'
@ -520,3 +524,5 @@ gem 'webauthn', '~> 2.3'

 # IPAddress utilities
 gem 'ipaddress', '~> 0.8.3'
+
+gem 'parslet', '~> 1.8'
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@ -81,10 +81,10 @@ GEM
      faraday_middleware (~> 1.0)
      faraday_middleware-multi_json (~> 0.0)
      oauth2 (~> 1.4)
-    asciidoctor (2.0.10)
+    asciidoctor (2.0.12)
    asciidoctor-include-ext (0.3.1)
      asciidoctor (>= 1.5.6, < 3.0.0)
-    asciidoctor-kroki (0.2.2)
+    asciidoctor-kroki (0.4.0)
      asciidoctor (~> 2.0)
    asciidoctor-plantuml (0.0.12)
      asciidoctor (>= 1.5.6, < 3.0.0)
@ -94,6 +94,8 @@ GEM
    attr_encrypted (3.1.0)
      encryptor (~> 3.0.0)
    attr_required (1.0.1)
+    autoprefixer-rails (10.2.0.0)
+      execjs
    awesome_print (1.8.0)
    awrence (1.1.1)
    aws-eventstream (1.1.0)
@ -145,12 +147,12 @@ GEM
    brakeman (4.2.1)
    browser (4.2.0)
    builder (3.2.4)
-    bullet (6.1.0)
+    bullet (6.1.3)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.11)
-    bundler-audit (0.6.1)
+    bundler-audit (0.7.0.1)
      bundler (>= 1.2.0, < 3)
-      thor (~> 0.18)
+      thor (>= 0.18, < 2)
    byebug (11.1.3)
    capybara (3.34.0)
      addressable
@ -205,7 +207,7 @@ GEM
      git
    css_parser (1.7.0)
      addressable
-    daemons (1.2.6)
+    daemons (1.3.1)
    danger (8.0.6)
      claide (~> 1.0)
      claide-plugins (>= 0.9.2)
@ -225,8 +227,8 @@ GEM
      html-pipeline
    declarative (0.0.20)
    declarative-option (0.1.0)
-    default_value_for (3.3.0)
-      activerecord (>= 3.2.0, < 6.1)
+    default_value_for (3.4.0)
+      activerecord (>= 3.2.0, < 7.0)
    deprecation_toolkit (1.5.1)
      activesupport (>= 4.2)
    derailed_benchmarks (1.8.1)
@ -260,11 +262,12 @@ GEM
    docile (1.3.2)
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.3.3)
+    doorkeeper (5.5.0.rc2)
      railties (>= 5)
-    doorkeeper-openid_connect (1.7.4)
+    doorkeeper-openid_connect (1.7.5)
      doorkeeper (>= 5.2, < 5.5)
      json-jwt (>= 1.11.0)
+    dotenv (2.7.6)
    dry-configurable (0.12.0)
      concurrent-ruby (~> 1.0)
      dry-core (~> 0.5, >= 0.5.0)
@ -417,12 +420,12 @@ GEM
      rails (>= 3.2.0)
    git (1.7.0)
      rchardet (~> 1.8)
-    gitaly (13.8.0.pre.rc2)
+    gitaly (13.9.0.pre.rc1)
      grpc (~> 1.0)
    github-markup (1.7.0)
    gitlab-chronic (0.10.5)
      numerizer (~> 0.2)
-    gitlab-experiment (0.4.5)
+    gitlab-experiment (0.4.9)
      activesupport (>= 3.0)
      scientist (~> 1.5, >= 1.5.0)
    gitlab-fog-azure-rm (1.0.0)
@ -440,7 +443,7 @@ GEM
      jaeger-client (~> 1.1)
      opentracing (~> 0.4)
      redis (> 3.0.0, < 5.0.0)
-    gitlab-license (1.0.0)
+    gitlab-license (1.3.0)
    gitlab-mail_room (0.0.8)
    gitlab-markup (1.7.1)
    gitlab-net-dns (0.9.1)
@ -492,7 +495,7 @@ GEM
      signet (~> 0.14)
    gpgme (2.0.20)
      mini_portile2 (~> 2.3)
-    grape (1.5.1)
+    grape (1.5.2)
      activesupport
      builder
      dry-types (>= 1.1)
@ -557,7 +560,7 @@ GEM
      rainbow
      rubocop (>= 0.50.0)
      sysexits (~> 1.1)
-    hamlit (2.11.0)
+    hamlit (2.14.4)
      temple (>= 0.8.2)
      thor
      tilt
@ -658,6 +661,7 @@ GEM
      rest-client (~> 2.0)
    launchy (2.4.3)
      addressable (~> 2.3)
+    lefthook (0.7.2)
    letter_opener (1.7.0)
      launchy (~> 2.2)
    letter_opener_web (1.3.4)
@ -671,8 +675,12 @@ GEM
      toml (= 0.2.0)
      with_env (= 1.1.0)
      xml-simple
-    licensee (8.9.2)
-      rugged (~> 0.24)
+    licensee (9.14.1)
+      dotenv (~> 2.0)
+      octokit (~> 4.17)
+      reverse_markdown (~> 1.0)
+      rugged (>= 0.24, < 2.0)
+      thor (>= 0.19, < 2.0)
    listen (3.2.1)
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
@ -753,7 +761,7 @@ GEM
      multi_json (~> 1.3)
      multi_xml (~> 0.5)
      rack (>= 1.2, < 3)
-    octokit (4.15.0)
+    octokit (4.20.0)
      faraday (>= 0.9)
      sawyer (~> 0.8.0, >= 0.5.3)
    oj (3.10.6)
@ -987,6 +995,8 @@ GEM
      mime-types (>= 1.16, < 4.0)
      netrc (~> 0.8)
    retriable (3.1.2)
+    reverse_markdown (1.4.0)
+      nokogiri
    rexml (3.2.4)
    rinku (2.0.0)
    rotp (2.1.2)
@ -999,12 +1009,12 @@ GEM
      rspec-core (~> 3.10.0)
      rspec-expectations (~> 3.10.0)
      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
+    rspec-core (3.10.1)
      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.1)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.10.0)
    rspec-parameterized (0.4.2)
@ -1013,17 +1023,17 @@ GEM
      proc_to_ast
      rspec (>= 2.13, < 4)
      unparser
-    rspec-rails (4.0.1)
+    rspec-rails (4.0.2)
      actionpack (>= 4.2)
      activesupport (>= 4.2)
      railties (>= 4.2)
-      rspec-core (~> 3.9)
-      rspec-expectations (~> 3.9)
-      rspec-mocks (~> 3.9)
-      rspec-support (~> 3.9)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
    rspec-retry (0.6.1)
      rspec-core (> 3.3)
-    rspec-support (3.10.0)
+    rspec-support (3.10.2)
    rspec_junit_formatter (0.4.1)
      rspec-core (>= 2, < 4, != 2.12.0)
    rspec_profiling (0.0.6)
@ -1069,7 +1079,7 @@ GEM
    rubyntlm (0.6.2)
    rubypants (0.2.0)
    rubyzip (2.0.0)
-    rugged (0.28.4.1)
+    rugged (1.0.1)
    safe_yaml (1.0.4)
    safety_net_attestation (0.4.0)
      jwt (~> 2.0)
@ -1170,11 +1180,11 @@ GEM
      execjs (>= 0.3.0, < 3)
    test-prof (0.12.0)
    text (1.3.1)
-    thin (1.7.2)
+    thin (1.8.0)
      daemons (~> 1.0, >= 1.0.9)
      eventmachine (~> 1.0, >= 1.0.4)
      rack (>= 1, < 3)
-    thor (0.20.3)
+    thor (1.1.0)
    thread_safe (0.3.6)
    thrift (0.14.0)
    tilt (2.0.10)
@ -1281,10 +1291,11 @@ DEPENDENCIES
  asana (~> 0.10.3)
  asciidoctor (~> 2.0.10)
  asciidoctor-include-ext (~> 0.3.1)
-  asciidoctor-kroki (~> 0.2.2)
+  asciidoctor-kroki (~> 0.4.0)
  asciidoctor-plantuml (~> 0.0.12)
  atlassian-jwt (~> 0.2.0)
  attr_encrypted (~> 3.1.0)
+  autoprefixer-rails (= 10.2.0.0)
  awesome_print
  aws-sdk-cloudformation (~> 1)
  aws-sdk-core (~> 3)
@ -1301,8 +1312,8 @@ DEPENDENCIES
  bootstrap_form (~> 4.2.0)
  brakeman (~> 4.2)
  browser (~> 4.2)
-  bullet (~> 6.1.0)
-  bundler-audit (~> 0.6.1)
+  bullet (~> 6.1.3)
+  bundler-audit (~> 0.7.0.1)
  capybara (~> 3.34.0)
  capybara-screenshot (~> 1.0.22)
  carrierwave (~> 1.3)
@ -1316,7 +1327,7 @@ DEPENDENCIES
  danger (~> 8.0.6)
  database_cleaner (~> 1.7.0)
  deckar01-task_list (= 2.3.1)
-  default_value_for (~> 3.3.0)
+  default_value_for (~> 3.4.0)
  deprecation_toolkit (~> 1.5.1)
  derailed_benchmarks
  device_detector
@ -1325,8 +1336,8 @@ DEPENDENCIES
  diff_match_patch (~> 0.1.0)
  diffy (~> 3.3)
  discordrb-webhooks-blackst0ne (~> 3.3)
-  doorkeeper (~> 5.3.0)
-  doorkeeper-openid_connect (~> 1.7.4)
+  doorkeeper (~> 5.5.0.rc2)
+  doorkeeper-openid_connect (~> 1.7.5)
  ed25519 (~> 1.2)
  elasticsearch-api (~> 6.8.2)
  elasticsearch-model (~> 6.1)
@ -1357,13 +1368,13 @@ DEPENDENCIES
  gettext (~> 3.3)
  gettext_i18n_rails (~> 1.8.0)
  gettext_i18n_rails_js (~> 1.3)
-  gitaly (~> 13.8.0.pre.rc2)
+  gitaly (~> 13.9.0.pre.rc1)
  github-markup (~> 1.7.0)
  gitlab-chronic (~> 0.10.5)
-  gitlab-experiment (~> 0.4.5)
+  gitlab-experiment (~> 0.4.9)
  gitlab-fog-azure-rm (~> 1.0)
  gitlab-labkit (= 0.14.0)
-  gitlab-license (~> 1.0)
+  gitlab-license (~> 1.3)
  gitlab-mail_room (~> 0.0.8)
  gitlab-markup (~> 1.7.1)
  gitlab-net-dns (~> 0.9.1)
@ -1376,7 +1387,7 @@ DEPENDENCIES
  google-api-client (~> 0.33)
  google-protobuf (~> 3.12)
  gpgme (~> 2.0.19)
-  grape (~> 1.5.1)
+  grape (~> 1.5.2)
  grape-entity (~> 0.7.1)
  grape-path-helpers (~> 1.6.1)
  grape_logging (~> 1.7)
@ -1388,7 +1399,7 @@ DEPENDENCIES
  gssapi
  guard-rspec
  haml_lint (~> 0.36.0)
-  hamlit (~> 2.11.0)
+  hamlit (~> 2.14.4)
  hangouts-chat (~> 0.0.5)
  hashie
  hashie-forbidden_attributes
@ -1410,9 +1421,10 @@ DEPENDENCIES
  knapsack (~> 1.17)
  kramdown (~> 2.3.0)
  kubeclient (~> 4.9.1)
+  lefthook (~> 0.7)
  letter_opener_web (~> 1.3.4)
  license_finder (~> 6.0)
-  licensee (~> 8.9)
+  licensee (~> 9.14.1)
  lockbox (~> 0.3.3)
  lograge (~> 0.5)
  loofah (~> 2.2)
@ -1452,6 +1464,7 @@ DEPENDENCIES
  omniauth_openid_connect (~> 0.3.5)
  org-ruby (~> 0.9.12)
  parallel (~> 1.19)
+  parslet (~> 1.8)
  peek (~> 1.1)
  pg (~> 1.1)
  pg_query (~> 1.3.0)
@ -1487,7 +1500,7 @@ DEPENDENCIES
  rouge (~> 3.26.0)
  rqrcode-rails3 (~> 0.1.7)
  rspec-parameterized
-  rspec-rails (~> 4.0.1)
+  rspec-rails (~> 4.0.2)
  rspec-retry (~> 0.6.1)
  rspec_junit_formatter
  rspec_profiling (~> 0.0.6)
@ -1496,7 +1509,7 @@ DEPENDENCIES
  ruby-progressbar (~> 1.10)
  ruby_parser (~> 3.15)
  rubyzip (~> 2.0.0)
-  rugged (~> 0.28)
+  rugged (~> 1.0.1)
  sanitize (~> 5.2.1)
  sassc-rails (~> 2.1.0)
  scss_lint (~> 0.59.0)
@ -1521,7 +1534,7 @@ DEPENDENCIES
  sys-filesystem (~> 1.1.6)
  terser (= 1.0.2)
  test-prof (~> 0.12.0)
-  thin (~> 1.7.0)
+  thin (~> 1.8.0)
  thrift (>= 0.14.0)
  timecop (~> 0.9.1)
  toml-rb (~> 1.0.0)
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@ -242,10 +242,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1b2ajs3sabl0s27r7lhwkacw0yn0zfk4jpmidg9l8lzp2qlgjgbz";
+      sha256 = "1gjk9v83vw0pz4x0xqqnw231z9sgscm6vnacjw7hy5njkw8fskj9";
      type = "gem";
    };
-    version = "2.0.10";
+    version = "2.0.12";
  };
  asciidoctor-include-ext = {
    dependencies = ["asciidoctor"];
@ -264,10 +264,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "10yc07x2z9f122wnncf34s91vlfcd4wy8y9wshxc7j2m4a2jlzm5";
+      sha256 = "13gx22xld4rbxxirnsxyrsajy9v666r8a4ngms71611af5afgk6w";
      type = "gem";
    };
-    version = "0.2.2";
+    version = "0.4.0";
  };
  asciidoctor-plantuml = {
    dependencies = ["asciidoctor"];
@ -322,6 +322,17 @@
    };
    version = "1.0.1";
  };
+  autoprefixer-rails = {
+    dependencies = ["execjs"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0p9j0sxw0nm27x7wj0n8a9zikwb0v8b6varr601rcgymsjj2v7wy";
+      type = "gem";
+    };
+    version = "10.2.0.0";
+  };
  awesome_print = {
    groups = ["development" "test"];
    platforms = [];
@ -599,10 +610,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "18ifwnvn13755qkfigapyj5bflpby3phxzbb7x5336d0kzv5k7d9";
+      sha256 = "04wm807czdixpgnqp446vj8vc7dj96k26p90rmwll9ahlib37mmm";
      type = "gem";
    };
-    version = "6.1.0";
+    version = "6.1.3";
  };
  bundler-audit = {
    dependencies = ["thor"];
@ -610,10 +621,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0pm22xpn3xyymsainixnrk8v3l3xi9bzwkjkspx00cfzp84xvxbq";
+      sha256 = "04l9rs56rlvihbr2ybkrigjajgd3swa98lxvmdl8iylj1g5m7n0j";
      type = "gem";
    };
-    version = "0.6.1";
+    version = "0.7.0.1";
  };
  byebug = {
    groups = ["default" "development" "test"];
@ -910,10 +921,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0lxqq6dgb8xhliywar2lvkwqy2ssraf9dk4b501pb4ixc2mvxbp2";
+      sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w";
      type = "gem";
    };
-    version = "1.2.6";
+    version = "1.3.1";
  };
  danger = {
    dependencies = ["claide" "claide-plugins" "colored2" "cork" "faraday" "faraday-http-cache" "git" "kramdown" "kramdown-parser-gfm" "no_proxy_fix" "octokit" "terminal-table"];
@ -987,10 +998,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "08hwnnqm3bxd4n627isliq79zysdlmfkf813403v0b4mkhika5my";
+      sha256 = "03zln3mp8wa734jl7abd6gby08xq8j6n4y2phzxfsssscx8xrlim";
      type = "gem";
    };
-    version = "3.3.0";
+    version = "3.4.0";
  };
  deprecation_toolkit = {
    dependencies = ["activesupport"];
@ -1114,10 +1125,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "01scvhvrw44ksv1aaywpp9kfm4c8qs4gwnnha40r5mq0vpc0qrny";
+      sha256 = "1mdjnw5n2r3hclg4gmzx19w750sdcxw9y6dhcawbzb9wrbzj58wk";
      type = "gem";
    };
-    version = "5.3.3";
+    version = "5.5.0.rc2";
  };
  doorkeeper-openid_connect = {
    dependencies = ["doorkeeper" "json-jwt"];
@ -1125,10 +1136,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1yylcg4j7msxma0s8rx8990bfgr0c414a7vafs3gpgmbwy47wq45";
+      sha256 = "1cj7b45lxiifi6pw8gnylfzlhji572v0pj896rbyqjwyzlgj1sid";
      type = "gem";
    };
-    version = "1.7.4";
+    version = "1.7.5";
+  };
+  dotenv = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94";
+      type = "gem";
+    };
+    version = "2.7.6";
  };
  dry-configurable = {
    dependencies = ["concurrent-ruby" "dry-core"];
@ -1798,10 +1819,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0kns9lw8gdxm61vyvf3jin448zrl2h3qdx2ggilzxig28hdi0vha";
+      sha256 = "137gr4nbxhcyh4s60r2z0js8q2bfnmxiggwnf122wp9csywlnyg2";
      type = "gem";
    };
-    version = "13.8.0.pre.rc2";
+    version = "13.9.0.pre.rc1";
  };
  github-markup = {
    groups = ["default"];
@ -1830,10 +1851,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1v8ygrc2c98rz72za59g313n1mmr18jdbzr965lkp2zv2rw7cs9n";
+      sha256 = "0skqg90i6qdpm7dhy8bv99gk8siwgm6mpr675790ngri1ns4f5xk";
      type = "gem";
    };
-    version = "0.4.5";
+    version = "0.4.9";
  };
  gitlab-fog-azure-rm = {
    dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"];
@ -1862,10 +1883,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1q26cgp3ln3b36n3sc69r6hxafkxjwdr3m0d7jlch5j7vyib9bih";
+      sha256 = "04846kr8pw0fkw4mavakai978raq5d2kjna4rawxpc3dqlr897g4";
      type = "gem";
    };
-    version = "1.0.0";
+    version = "1.3.0";
  };
  gitlab-mail_room = {
    groups = ["default"];
@ -2059,10 +2080,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0lizcma35sygkd3q7zjv13mrr905ncn80f1ym6n305s75kc0pk9n";
+      sha256 = "0adf01kihxbmh8q84r6zyfgdmpbyb0lwcar3fi8j6bl6qcsbgwqx";
      type = "gem";
    };
-    version = "1.5.1";
+    version = "1.5.2";
  };
  grape-entity = {
    dependencies = ["activesupport" "multi_json"];
@ -2233,10 +2254,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "13wkrvyldk21xlc9illam495fpgf7w7bksaj8y6n00y036wmbg60";
+      sha256 = "1gjbdni9jdpsdahrx2q7cvrc6jkrzpf9rdi0rli8mdvwi9xjafz5";
      type = "gem";
    };
-    version = "2.11.0";
+    version = "2.14.4";
  };
  hana = {
    groups = ["default"];
@ -2705,6 +2726,16 @@
    };
    version = "2.4.3";
  };
+  lefthook = {
+    groups = ["development"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17bv6zfdzwbbh8n0iw8zgjngsvyp2imrrfshj62yrlxpka9ka0z3";
+      type = "gem";
+    };
+    version = "0.7.2";
+  };
  letter_opener = {
    dependencies = ["launchy"];
    groups = ["default" "development"];
@ -2739,15 +2770,15 @@
    version = "6.0.0";
  };
  licensee = {
-    dependencies = ["rugged"];
+    dependencies = ["dotenv" "octokit" "reverse_markdown" "rugged" "thor"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0w6d2smhg3kzcx4m2ii06akakypwhiglansk51bpx290hhc8h3pc";
+      sha256 = "0c551j4qy773d79hgypjaz43h5wjn08mnxnxy9s2vdjc40qm95k5";
      type = "gem";
    };
-    version = "8.9.2";
+    version = "9.14.1";
  };
  listen = {
    dependencies = ["rb-fsevent" "rb-inotify"];
@ -3236,10 +3267,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0yg6dhd028j74sm8hpw9w7bwfwlkml9wiis7nq20ivfsbcz4g8ac";
+      sha256 = "1fl517ld5vj0llyshp3f9kb7xyl9iqy28cbz3k999fkbwcxzhlyq";
      type = "gem";
    };
-    version = "4.15.0";
+    version = "4.20.0";
  };
  oj = {
    groups = ["default"];
@ -4260,6 +4291,17 @@
    };
    version = "3.1.2";
  };
+  reverse_markdown = {
+    dependencies = ["nokogiri"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0w786j869fjhjf72waj0hc9i4ghi45b78a2am27kij4sa2hmsc53";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
  rexml = {
    groups = ["default" "development" "test"];
    platforms = [];
@ -4339,10 +4381,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0n2rdv8f26yw8c6asymc0mgddyr5d2b5n6mfvpd3n6lnpf1jdyv2";
+      sha256 = "0wwnfhxxvrlxlk1a3yxlb82k2f9lm0yn0598x7lk8fksaz4vv6mc";
      type = "gem";
    };
-    version = "3.10.0";
+    version = "3.10.1";
  };
  rspec-expectations = {
    dependencies = ["diff-lcs" "rspec-support"];
@ -4350,10 +4392,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0j37dvnvfbjwj8dqx27yfvz0frl7f2jc1abqg99h0ppriz9za6dc";
+      sha256 = "1sz9bj4ri28adsklnh257pnbq4r5ayziw02qf67wry0kvzazbb17";
      type = "gem";
    };
-    version = "3.10.0";
+    version = "3.10.1";
  };
  rspec-mocks = {
    dependencies = ["diff-lcs" "rspec-support"];
@ -4361,10 +4403,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1pz89y1522i6f8wzrg72ykmch3318ih87nlpl0y1ghsrs5hqymw3";
+      sha256 = "1d13g6kipqqc9lmwz5b244pdwc97z15vcbnbq6n9rlf32bipdz4k";
      type = "gem";
    };
-    version = "3.10.0";
+    version = "3.10.2";
  };
  rspec-parameterized = {
    dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"];
@ -4383,10 +4425,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0lzik01ziaskgpdpy8knffpw0fsy9151f5lfigyhb89wq4q45hfs";
+      sha256 = "0aw5knjij21kzwis3vkcmqc16p55lbig1wq0i37093qga7zfsdg1";
      type = "gem";
    };
-    version = "4.0.1";
+    version = "4.0.2";
  };
  rspec-retry = {
    dependencies = ["rspec-core"];
@ -4404,10 +4446,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0j0n28i6zci5j7gg370bdy87dy43hlwx6dw428d9kamf5a0i2klz";
+      sha256 = "15j52parvb8cgvl6s0pbxi2ywxrv6x0764g222kz5flz0s4mycbl";
      type = "gem";
    };
-    version = "3.10.0";
+    version = "3.10.2";
  };
  rspec_junit_formatter = {
    dependencies = ["rspec-core"];
@ -4616,10 +4658,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0rdidxgpk1b6y1jq9v77lcx5khq0s9q0s253lr8x57d3hk43iskx";
+      sha256 = "056bwiwxvnbkbgsr2wqcsknnc73nqasqdnjcpgj2r61wkm8mzmbn";
      type = "gem";
    };
-    version = "0.28.4.1";
+    version = "1.0.1";
  };
  safe_yaml = {
    groups = ["default" "test"];
@ -5124,20 +5166,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f";
+      sha256 = "0g5p3r47qxxfmfagdf8wb68pd24938cgzdfn6pmpysrn296pg5m5";
      type = "gem";
    };
-    version = "1.7.2";
+    version = "1.8.0";
  };
  thor = {
    groups = ["default" "development" "omnibus" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29";
+      sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";
      type = "gem";
    };
-    version = "0.20.3";
+    version = "1.1.0";
  };
  thread_safe = {
    groups = ["default" "development" "test"];
@ -5590,4 +5632,4 @@
    };
    version = "2.4.2";
  };
-}
+}
--- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix
+++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -946,7 +946,10 @@ self: super: {

  # Generate shell completion.
  cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
-  niv = generateOptparseApplicativeCompletion "niv" super.niv;
+  niv = generateOptparseApplicativeCompletion "niv" (super.niv.overrideScope (self: super: {
+   # Needs override because of: https://github.com/nmattia/niv/issues/312
+   optparse-applicative = self.optparse-applicative_0_15_1_0;
+  }));
  ormolu = generateOptparseApplicativeCompletion "ormolu" super.ormolu;
  stack = generateOptparseApplicativeCompletion "stack" super.stack;

--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@ -2753,6 +2753,7 @@ extra-packages:
  - haskell-lsp == 0.23.0.0             # required by hls-plugin-api 0.7.0.0, 2021-02-08
  - haskell-lsp-types == 0.23.0.0       # required by hls-plugin-api 0.7.0.0, 2021-02-08
  - lsp-test == 0.11.0.7                # required by hls-plugin-api 0.7.0.0, 2021-02-08
+  - optparse-applicative < 0.16         # needed for niv-0.2.19

 package-maintainers:
  peti:
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@ -192102,6 +192102,25 @@ self: {
       broken = true;
     }) {};

+  "optparse-applicative_0_15_1_0" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, bytestring, process
+     , QuickCheck, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "optparse-applicative";
+       version = "0.15.1.0";
+       sha256 = "1ws6y3b3f6hsgv0ff0yp6lw4hba1rps4dnvry3yllng0s5gngcsd";
+       revision = "1";
+       editedCabalFile = "0zmhqkd96v2z1ilhqdkd9z4jgsnsxb8yi2479ind8m5zm9363zr9";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base process transformers transformers-compat
+       ];
+       testHaskellDepends = [ base bytestring QuickCheck ];
+       description = "Utilities and combinators for parsing command line options";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
  "optparse-applicative" = callPackage
    ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck
     , transformers, transformers-compat
--- a/pkgs/development/interpreters/trealla/default.nix
+++ b/pkgs/development/interpreters/trealla/default.nix
@ -0,0 +1,48 @@
+{ lib, stdenv, fetchFromGitHub, readline, openssl, withThread ? true, withSSL ? true, xxd }:
+
+stdenv.mkDerivation rec {
+  pname = "trealla";
+  version = "1.7.65";
+
+  src = fetchFromGitHub {
+    owner = "infradig";
+    repo = "trealla";
+    rev = "v${version}";
+    sha256 = "sha256-uCDACBwdiCeAwF6IZHz7s5pD83JXTP7jAQDjGld8tt0=";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace '-I/usr/local/include' "" \
+      --replace '-L/usr/local/lib' "" \
+      --replace 'GIT_VERSION :=' 'GIT_VERSION ?='
+  '';
+
+  makeFlags = [
+    "GIT_VERSION=\"v${version}\""
+    (lib.optionalString withThread "THREADS=1")
+    (lib.optionalString (!withSSL) "NOSSL=1")
+    (lib.optionalString stdenv.isDarwin "NOLDLIBS=1")
+  ];
+
+  nativeBuildInputs = [ xxd ];
+  buildInputs = [ readline openssl ];
+
+  installPhase = ''
+    install -Dm755 -t $out/bin tpl
+  '';
+
+  doCheck = true;
+  preCheck = ''
+    # Disable test 81 due to floating point error
+    rm tests/issues/test081.expected tests/issues/test081.pl
+  '';
+
+  meta = with lib; {
+    description = "A compact, efficient Prolog interpreter written in ANSI C";
+    homepage = "https://github.com/infradig/trealla";
+    license = licenses.mit;
+    maintainers = with maintainers; [ siraben ];
+    platforms = platforms.all;
+  };
+}
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@ -90,11 +90,7 @@ qtModule {
    '' else ''
    substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \
      --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]"
-    '')
-    + ''
-    substituteInPlace src/3rdparty/chromium/sandbox/mac/BUILD.gn \
-      --replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]'
-    '');
+    ''));

  NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
    # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
@ -190,6 +186,7 @@ qtModule {

  buildInputs = optionals stdenv.isDarwin (with darwin; [
    cups
+    apple_sdk.libs.sandbox

    # `sw_vers` is used by `src/3rdparty/chromium/build/config/mac/sdk_info.py`
    # to get some information about the host platform.
@ -205,15 +202,8 @@ qtModule {
        shift
      done
    '')
-
-    # For sandbox.h include
-    (runCommand "MacOS_SDK_sandbox.h" {} ''
-      install -Dm444 "${lib.getDev darwin.apple_sdk.sdk}"/include/sandbox.h "$out"/include/sandbox.h
-    '')
  ]);

-  __impureHostDeps = optional stdenv.isDarwin "/usr/lib/libsandbox.1.dylib";
-
  dontUseNinjaBuild = true;
  dontUseNinjaInstall = true;
  dontUseXcbuild = true;
--- a/pkgs/development/python-modules/APScheduler/default.nix
+++ b/pkgs/development/python-modules/APScheduler/default.nix
@ -11,20 +11,19 @@
 , tornado
 , twisted
 , mock
-, trollius
 , gevent
 , six
 , pytz
 , tzlocal
 , funcsigs
-, futures
 , setuptools
-, isPy3k
+, pythonOlder
 }:

 buildPythonPackage rec {
  pname = "APScheduler";
  version = "3.7.0";
+  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
@ -45,7 +44,7 @@ buildPythonPackage rec {
    twisted
    mock
    gevent
-  ] ++ lib.optionals (!isPy3k) [ trollius ];
+  ];

  propagatedBuildInputs = [
    six
@ -53,7 +52,7 @@ buildPythonPackage rec {
    tzlocal
    funcsigs
    setuptools
-  ] ++ lib.optional (!isPy3k) futures;
+  ];

  disabledTests = lib.optionals stdenv.isDarwin [
    "test_submit_job"
--- a/pkgs/development/tools/literate-programming/noweb/default.nix
+++ b/pkgs/development/tools/literate-programming/noweb/default.nix
@ -1,6 +1,6 @@
-{ lib, stdenv, fetchFromGitHub, gawk, groff, icon-lang ? null }:
+{ lib, stdenv, fetchFromGitHub, nawk, groff, icon-lang }:

-let noweb = stdenv.mkDerivation rec {
+lib.fix (noweb: stdenv.mkDerivation rec {
  pname = "noweb";
  version = "2.12";

@ -11,25 +11,28 @@ let noweb = stdenv.mkDerivation rec {
    sha256 = "1160i2ghgzqvnb44kgwd6s3p4jnk9668rmc15jlcwl7pdf3xqm95";
  };

-  patches = [ ./no-FAQ.patch ];
+  sourceRoot = "source/src";
+
+  patches = [
+    # Remove FAQ
+    ./no-FAQ.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace Makefile --replace 'strip' '${stdenv.cc.targetPrefix}strip'
+  '';

  nativeBuildInputs = [ groff ] ++ lib.optionals (!isNull icon-lang) [ icon-lang ];
+  buildInputs = [ nawk ];

  preBuild = ''
    mkdir -p "$out/lib/noweb"
-    cd src
  '';

  makeFlags = lib.optionals (!isNull icon-lang) [
    "LIBSRC=icon"
    "ICONC=icont"
-  ] ++ lib.optionals stdenv.isDarwin [
-    "CC=clang"
-  ];
-
-
-  installFlags = [
-  ];
+  ] ++ [ "CC=${stdenv.cc.targetPrefix}cc" ];

  preInstall = ''
    mkdir -p "$tex/tex/latex/noweb"
@ -50,11 +53,11 @@ let noweb = stdenv.mkDerivation rec {
    for f in $out/bin/no{index,roff,roots,untangle,web} \
             $out/lib/noweb/to{ascii,html,roff,tex} \
             $out/lib/noweb/{bt,empty}defn \
-             $out/lib/noweb/{noidx,unmarkup}; do
+             $out/lib/noweb/{noidx,pipedocs,unmarkup}; do
        # NOTE: substituteInPlace breaks Icon binaries, so make sure the script
        #       uses (n)awk before calling.
        if grep -q nawk "$f"; then
-            substituteInPlace "$f" --replace "nawk" "${gawk}/bin/awk"
+            substituteInPlace "$f" --replace "nawk" "${nawk}/bin/awk"
        fi
    done

@ -77,4 +80,4 @@ let noweb = stdenv.mkDerivation rec {
    maintainers = with maintainers; [ yurrriq ];
    platforms = with platforms; linux ++ darwin;
  };
-}; in noweb
+})
--- a/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch
+++ b/pkgs/development/tools/literate-programming/noweb/no-FAQ.patch
@ -1,5 +1,5 @@
--- a/src/Makefile	2006-06-12 22:14:20.000000000 +0200
-+++ b/src/Makefile	2010-06-17 11:30:11.804018145 +0200
+--- a/Makefile	2006-06-12 22:14:20.000000000 +0200
+++ b/Makefile	2010-06-17 11:30:11.804018145 +0200
@@ -198,7 +198,7 @@
 	(cd elisp; ci -l $(CINAME) $(CIMSG) *.el)
 	ci -l $(CINAME) $(CIMSG) Makefile.nw INSTALL INSTALL.DOS README FAQ COPYRIGHT nwmake *.nw
--- a/pkgs/development/tools/minizinc/default.nix
+++ b/pkgs/development/tools/minizinc/default.nix
@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, cmake, flex, bison }:
 let
-  version = "2.5.3";
+  version = "2.5.4";
 in
 stdenv.mkDerivation {
  pname = "minizinc";
@ -12,7 +12,7 @@ stdenv.mkDerivation {
    owner = "MiniZinc";
    repo = "libminizinc";
    rev = version;
-    sha256 = "1kc65sxkc64pr560qaaznc44jnlvq7pbpzwijad410lpcnna5byg";
+    sha256 = "sha256-/vJyh2WdESimJTCASsg6xjVzG2EkL4V87B+xvIUBcMM=";
  };

  meta = with lib; {
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@ -16,12 +16,12 @@ let
  ];
 in stdenv.mkDerivation rec {
  pname = "insomnia";
-  version = "2021.1.0";
+  version = "2021.1.1";

  src = fetchurl {
    url =
      "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb";
-    sha256 = "sha256-3T334t+Oje6LOzUBqQCK6wdJ/4Mi4WLmW5vcHig8zj4=";
+    sha256 = "sha256-GPOeLSbKiaJR5ppzyJMllzM+2gSddZN7+P5ttkocuDg=";
  };

  nativeBuildInputs =
--- a/pkgs/games/steam/steam.nix
+++ b/pkgs/games/steam/steam.nix
@ -2,7 +2,7 @@

 let
  traceLog = "/tmp/steam-trace-dependencies.log";
-  version = "1.0.0.68";
+  version = "1.0.0.69";

 in stdenv.mkDerivation {
  pname = "steam-original";
@ -10,7 +10,7 @@ in stdenv.mkDerivation {

  src = fetchurl {
    url = "https://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz";
-    sha256 = "sha256-ZeiCYjxnH0Ath5bB20QHmE8R3wU4/3RiAw2NUhrrKNM=";
+    sha256 = "sha256-b5g4AUprE/lTunJs59IDlGu5O/1dB0kBvCFq0Eqyx2c=";
  };

  makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/pkgs/misc/drivers/epkowa/default.nix
@ -13,7 +13,6 @@
 , rpm
 , cpio
 , getopt
-, patchelf
 , autoPatchelfHook
 , gcc
 }:
@ -99,6 +98,35 @@ let plugins = {
    };
    meta = common_meta // { description = "Plugin to support " + passthru.hw + " scanner in sane"; };
  };
+  v600 = stdenv.mkDerivation rec {
+    pname = "iscan-gt-x820-bundle";
+    version = "2.30.4";
+
+    nativeBuildInputs = [ autoPatchelfHook rpm ];
+    src = fetchurl {
+      urls = [
+        "https://download2.ebz.epson.net/iscan/plugin/gt-x820/rpm/x64/iscan-gt-x820-bundle-${version}.x64.rpm.tar.gz"
+        "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x820/rpm/x64/iscan-gt-x820-bundle-${version}.x64.rpm.tar.gz"
+      ];
+      sha256 = "1vlba7dsgpk35nn3n7is8nwds3yzlk38q43mppjzwsz2d2n7sr33";
+    };
+    installPhase = ''
+      cd plugins
+      ${rpm}/bin/rpm2cpio iscan-plugin-gt-x820-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
+      mkdir $out
+      cp -r usr/share $out
+      cp -r usr/lib64 $out/lib
+      mv $out/share/iscan $out/share/esci
+      mv $out/lib/iscan $out/lib/esci
+    '';
+    passthru = {
+      registrationCommand = ''
+        $registry --add interpreter usb 0x04b8 0x013a "$plugin/lib/esci/libesintA1 $plugin/share/esci/esfwA1.bin"
+      '';
+      hw = "Perfection V600 Photo";
+    };
+    meta = common_meta // { description = "iscan esci x820 plugin for " + passthru.hw; };
+  };
  x770 = stdenv.mkDerivation rec {
    pname = "iscan-gt-x770-bundle";
    version = "2.30.4";
@ -295,17 +323,16 @@ stdenv.mkDerivation rec {
    sha256 = "1ma76jj0k3bz0fy06fiyl4di4y77rcryb0mwjmzs5ms2vq9rjysr";
  };

-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ pkg-config libtool makeWrapper ];
  buildInputs = [
    gtk2
    libxml2
-    libtool
    libusb-compat-0_1
    sane-backends
-    makeWrapper
  ];

  patches = [
+    # Patch for compatibility with libpng versions greater than 10499
    (fetchpatch {
      urls = [
        "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch?h=b6e4c805d53b49da79a0f64ef16bb82d6d800fcf"
@ -313,7 +340,9 @@ stdenv.mkDerivation rec {
      ];
      sha256 = "04y70qjd220dpyh771fiq50lha16pms98mfigwjczdfmx6kpj1jd";
    })
+    # Patch iscan to search appropriate folders for firmware files
    ./firmware_location.patch
+    # Patch deprecated use of sscanf code to use a more modern C99 compatible version
    ./sscanf.patch
  ];
  patchFlags = [ "-p0" ];
--- a/pkgs/misc/emulators/snes9x-gtk/default.nix
+++ b/pkgs/misc/emulators/snes9x-gtk/default.nix
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
  preConfigure = "cd gtk";

  meta = with lib; {
-    homepage = "http://www.snes9x.com";
+    homepage = "https://www.snes9x.com";
    description = "Super Nintendo Entertainment System (SNES) emulator";

    longDescription = ''
@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
      includes some real gems that were only ever released in Japan.
    '';

-    license = licenses.lgpl2;
+    # see https://github.com/snes9xgit/snes9x/blob/master/LICENSE for exact details
+    license = licenses.unfreeRedistributable;
    maintainers = with maintainers; [ qknight ];
    platforms = platforms.linux;
  };
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@ -241,6 +241,18 @@ in rec {
        popd >/dev/null
      '';
    };
+
+    sandbox = stdenv.mkDerivation {
+      name = "apple-lib-sandbox";
+      dontUnpack = true;
+
+      installPhase = ''
+        mkdir -p $out/include $out/lib
+        ln -s "${lib.getDev sdk}/include/sandbox.h" $out/include/sandbox.h
+        cp "${darwin-stubs}/usr/lib/libsandbox.1.tbd" $out/lib
+        ln -s libsandbox.1.tbd $out/lib/libsandbox.tbd
+      '';
+    };
  };

  overrides = super: {
--- a/pkgs/os-specific/linux/ell/default.nix
+++ b/pkgs/os-specific/linux/ell/default.nix
@ -7,14 +7,14 @@

 stdenv.mkDerivation rec {
  pname = "ell";
-  version = "0.36";
+  version = "0.38";

  outputs = [ "out" "dev" ];

  src = fetchgit {
    url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
    rev = version;
-    sha256 = "0w7v2hihwwmnqd56bsmbjsiw8yyadr7zbdssjamqxx0pyl3dnrda";
+    sha256 = "sha256-UR6NHIO/L/QbuVerXe32RNT33wwrDvIZpV6nlYaImI8=";
  };

  nativeBuildInputs = [
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@ -1,6 +1,5 @@
 { lib, stdenv
 , fetchgit
-, fetchpatch
 , autoreconfHook
 , pkg-config
 , ell
@ -13,12 +12,12 @@

 stdenv.mkDerivation rec {
  pname = "iwd";
-  version = "1.11";
+  version = "1.12";

  src = fetchgit {
    url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
    rev = version;
-    sha256 = "0wnyg0f1swi7gvvgf5kzbiz44g2wscf5d5bp320iwyfwnlbqb1bn";
+    sha256 = "sha256-o3Vc5p/AFZwbkEWJZzO6wWAJ/BmSh0eKxdnjm5B9BFU=";
  };

  outputs = [ "out" "man" ]
@ -88,7 +87,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    homepage = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
    description = "Wireless daemon for Linux";
-    license = licenses.lgpl21;
+    license = licenses.lgpl21Plus;
    platforms = platforms.linux;
    maintainers = with maintainers; [ dtzWill fpletz ];
  };
--- a/pkgs/servers/home-assistant/appdaemon.nix
+++ b/pkgs/servers/home-assistant/appdaemon.nix
@ -6,6 +6,14 @@
 let
  python = python3.override {
    packageOverrides = self: super: {
+      astral = super.astral.overridePythonAttrs (oldAttrs: rec {
+        version = "1.10.1";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "1wbvnqffbgh8grxm07cabdpahlnyfq91pyyaav432cahqi1p59nj";
+        };
+      });
+
      bcrypt = super.bcrypt.overridePythonAttrs (oldAttrs: rec {
        version = "3.1.7";
        src = oldAttrs.src.override {
@ -62,7 +70,6 @@ in python.pkgs.buildPythonApplication rec {
      --replace "sockjs==0.10.0" "sockjs" \
      --replace "deepdiff==4.3.1" "deepdiff" \
      --replace "voluptuous==0.11.7" "voluptuous" \
-      --replace "astral==1.10.1" "astral" \
      --replace "python-socketio==4.4.0" "python-socketio" \
      --replace "feedparser==5.2.1" "feedparser>=5.2.1" \
      --replace "aiohttp_jinja2==1.2.0" "aiohttp_jinja2>=1.2.0" \
--- a/pkgs/tools/misc/hidrd/default.nix
+++ b/pkgs/tools/misc/hidrd/default.nix
@ -0,0 +1,23 @@
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation {
+  pname = "hidrd";
+  version = "unstable-2019-06-03";
+
+  src = fetchFromGitHub {
+    owner = "DIGImend";
+    repo = "hidrd";
+    rev = "6c0ed39708a5777ac620f902f39c8a0e03eefe4e";
+    sha256 = "1rnhq6b0nrmphdig1qrpzpbpqlg3943gzpw0v7p5rwcdynb6bb94";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = with lib; {
+    description = "HID report descriptor I/O library and conversion tool";
+    homepage = "https://github.com/DIGImend/hidrd";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ pacien ];
+    platforms = platforms.all;
+  };
+}
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@ -11,11 +11,11 @@ assert usePcre -> pcre != null;

 stdenv.mkDerivation rec {
  pname = "haproxy";
-  version = "2.3.6";
+  version = "2.3.7";

  src = fetchurl {
    url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz";
-    sha256 = "sha256-bUYg5dodk+118ikBEhbbgdUJe2i/F14wny+rKJC7oDY=";
+    sha256 = "sha256-Mbp6zQ14NnxxtW5Kh8nxHNI1/FYCvFuEaQd5Eg4KMFs=";
  };

  buildInputs = [ openssl zlib ]
--- a/pkgs/tools/system/nq/default.nix
+++ b/pkgs/tools/system/nq/default.nix
@ -2,12 +2,12 @@

 stdenv.mkDerivation rec {
  pname = "nq";
-  version = "0.3.1";
+  version = "0.4";
  src = fetchFromGitHub {
    owner = "chneukirchen";
    repo = "nq";
    rev = "v${version}";
-    sha256 = "1db96ykz35r273jyhf7cdknqk4p2jj9l8gbz7pjy1hq4pb6ffk99";
+    sha256 = "sha256-UfCeHwOD+tG6X2obW64DYZr6j90yh1Yl7My4ur+sqmk=";
  };
  makeFlags = [ "PREFIX=$(out)" ];
  postPatch = ''
--- a/pkgs/tools/text/nawk/default.nix
+++ b/pkgs/tools/text/nawk/default.nix
@ -1,26 +1,28 @@
-{ lib, stdenv, fetchFromGitHub, yacc }:
+{ lib, stdenv, fetchFromGitHub, bison, buildPackages }:

 stdenv.mkDerivation rec {
  pname = "nawk";
-  version = "20180827";
+  version = "unstable-2021-02-15";

  src = fetchFromGitHub {
    owner = "onetrueawk";
    repo = "awk";
-    rev = version;
-    sha256 = "0qcsxhcwg6g3c0zxmbipqa8d8d5n8zxrq0hymb8yavsaz103fcl6";
+    rev = "c0f4e97e4561ff42544e92512bbaf3d7d1f6a671";
+    sha256 = "kQCvItpSJnDJMDvlB8ruY+i0KdjmAphRDqCKw8f0m/8=";
  };

-  nativeBuildInputs = [ yacc ];
-
-  patchPhase = ''
-    substituteInPlace ./makefile \
-    --replace "YACC = yacc -d -S" ""
-  '';
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+  nativeBuildInputs = [ bison ];
+  makeFlags = [
+    "CC=${stdenv.cc.targetPrefix}cc"
+    "HOSTCC=${if stdenv.buildPlatform.isDarwin then "clang" else "cc"}"
+  ];

  installPhase = ''
+    runHook preInstall
    install -Dm755 a.out "$out/bin/nawk"
    install -Dm644 awk.1 "$out/share/man/man1/nawk.1"
+    runHook postInstall
  '';

  meta = {
@ -33,6 +35,6 @@ stdenv.mkDerivation rec {
    homepage = "https://www.cs.princeton.edu/~bwk/btl.mirror/";
    license = lib.licenses.mit;
    maintainers = [ lib.maintainers.konimex ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.all;
  };
 }
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -2531,6 +2531,8 @@ in

  hid-listen = callPackage ../tools/misc/hid-listen { };

+  hidrd = callPackage ../tools/misc/hidrd { };
+
  hocr-tools = with python3Packages; toPythonApplication hocr-tools;

  home-manager = callPackage ../tools/package-management/home-manager {};
@ -8185,6 +8187,8 @@ in

  stubby = callPackage ../tools/networking/stubby { };

+  sunwait = callPackage ../applications/misc/sunwait { };
+
  surface-control = callPackage ../applications/misc/surface-control { };

  syntex = callPackage ../tools/graphics/syntex {};
@ -11787,6 +11791,8 @@ in

  tclreadline = callPackage ../development/interpreters/tclreadline { };

+  trealla = callPackage ../development/interpreters/trealla { };
+
  wasm = ocamlPackages.wasm;

  proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { };