Merge master into staging-next

2021-08-02 18:01:25 +00:00 · 2021-08-02 18:01:25 +00:00 · 9a482b20d8
commit 9a482b20d8
parent 2e1b619a62 2adaddd1d3
50 changed files with 17048 additions and 1151 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -4541,6 +4541,12 @@
    githubId = 592849;
    name = "Ilya Kolpakov";
  };
+  ilyakooo0 = {
+    name = "Ilya Kostyuchenko";
+    email = "ilyakooo0@gmail.com";
+    github = "ilyakooo0";
+    githubId = 6209627;
+  };
  imalison = {
    email = "IvanMalison@gmail.com";
    github = "IvanMalison";
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@ -140,6 +140,15 @@
          <link linkend="opt-services.mx-puppet-discord.enable">services.mx-puppet-discord</link>.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          <link xlink:href="https://www.meshcommander.com/meshcentral2/overview">MeshCentral</link>,
+          a remote administration service (<quote>TeamViewer but
+          self-hosted and with more features</quote>) is now available
+          with a package and a module:
+          <link linkend="opt-services.meshcentral.enable">services.meshcentral.enable</link>
+        </para>
+      </listitem>
    </itemizedlist>
  </section>
  <section xml:id="sec-release-21.11-incompatibilities">
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@ -43,6 +43,8 @@ pt-services.clipcat.enable).

 - [mx-puppet-discord](https://github.com/matrix-discord/mx-puppet-discord), a discord puppeting bridge for matrix. Available as [services.mx-puppet-discord](#opt-services.mx-puppet-discord.enable).

+- [MeshCentral](https://www.meshcommander.com/meshcentral2/overview), a remote administration service ("TeamViewer but self-hosted and with more features") is now available with a package and a module: [services.meshcentral.enable](#opt-services.meshcentral.enable)
+
 ## Backward Incompatibilities {#sec-release-21.11-incompatibilities}

 - The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@ -58,6 +58,7 @@ in {
        rtl8723bs-firmware
        rtl8761b-firmware
        rtw88-firmware
+        rtw89-firmware
        zd1211fw
        alsa-firmware
        sof-firmware
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@ -187,6 +187,7 @@ in
      #seeks = 148; # removed 2020-06-21
      prosody = 149;
      i2pd = 150;
+      systemd-coredump = 151;
      systemd-network = 152;
      systemd-resolve = 153;
      systemd-timesync = 154;
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -236,6 +236,7 @@
  ./security/doas.nix
  ./security/systemd-confinement.nix
  ./security/tpm2.nix
+  ./services/admin/meshcentral.nix
  ./services/admin/oxidized.nix
  ./services/admin/salt/master.nix
  ./services/admin/salt/minion.nix
--- a/nixos/modules/services/admin/meshcentral.nix
+++ b/nixos/modules/services/admin/meshcentral.nix
@ -0,0 +1,53 @@
+{ config, pkgs, lib, ... }:
+let
+  cfg = config.services.meshcentral;
+  configFormat = pkgs.formats.json {};
+  configFile = configFormat.generate "meshcentral-config.json" cfg.settings;
+in with lib; {
+  options.services.meshcentral = with types; {
+    enable = mkEnableOption "MeshCentral computer management server";
+    package = mkOption {
+      description = "MeshCentral package to use. Replacing this may be necessary to add dependencies for extra functionality.";
+      type = types.package;
+      default = pkgs.meshcentral;
+      defaultText = "pkgs.meshcentral";
+    };
+    settings = mkOption {
+      description = ''
+        Settings for MeshCentral. Refer to upstream documentation for details:
+
+        <itemizedlist>
+          <listitem><para><link xlink:href="https://github.com/Ylianst/MeshCentral/blob/master/meshcentral-config-schema.json">JSON Schema definition</link></para></listitem>
+          <listitem><para><link xlink:href="https://github.com/Ylianst/MeshCentral/blob/master/sample-config.json">simple sample configuration</link></para></listitem>
+          <listitem><para><link xlink:href="https://github.com/Ylianst/MeshCentral/blob/master/sample-config-advanced.json">complex sample configuration</link></para></listitem>
+          <listitem><para><link xlink:href="https://www.meshcommander.com/meshcentral2">Old homepage) with documentation link</link></para></listitem>
+        </itemizedlist>
+      '';
+      type = types.submodule {
+        freeformType = configFormat.type;
+      };
+      example = {
+        settings = {
+          WANonly = true;
+          Cert = "meshcentral.example.com";
+          TlsOffload = "10.0.0.2,fd42::2";
+          Port = 4430;
+        };
+        domains."".certUrl = "https://meshcentral.example.com/";
+      };
+    };
+  };
+  config = mkIf cfg.enable {
+    services.meshcentral.settings.settings.autoBackup.backupPath = lib.mkDefault "/var/lib/meshcentral/backups";
+    systemd.services.meshcentral = {
+      wantedBy = ["multi-user.target"];
+      serviceConfig = {
+        ExecStart = "${cfg.package}/bin/meshcentral --datapath /var/lib/meshcentral --configfile ${configFile}";
+        DynamicUser = true;
+        StateDirectory = "meshcentral";
+        CacheDirectory = "meshcentral";
+      };
+    };
+  };
+  meta.maintainers = [ maintainers.lheckemann ];
+}
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@ -272,7 +272,7 @@ in {
      }
      (mkIf (cfg.bind != null) { bind = cfg.bind; })
      (mkIf (cfg.unixSocket != null) { unixsocket = cfg.unixSocket; unixsocketperm = "${toString cfg.unixSocketPerm}"; })
-      (mkIf (cfg.slaveOf != null) { slaveof = "${cfg.slaveOf.ip} ${cfg.slaveOf.port}"; })
+      (mkIf (cfg.slaveOf != null) { slaveof = "${cfg.slaveOf.ip} ${toString cfg.slaveOf.port}"; })
      (mkIf (cfg.masterAuth != null) { masterauth = cfg.masterAuth; })
      (mkIf (cfg.requirePass != null) { requirepass = cfg.requirePass; })
    ];
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@ -1053,6 +1053,7 @@ in

    services.dbus.enable = true;

+    users.users.systemd-coredump.uid = config.ids.uids.systemd-coredump;
    users.users.systemd-network.uid = config.ids.uids.systemd-network;
    users.groups.systemd-network.gid = config.ids.gids.systemd-network;
    users.users.systemd-resolve.uid = config.ids.uids.systemd-resolve;
--- a/pkgs/applications/blockchains/chia-plotter/default.nix
+++ b/pkgs/applications/blockchains/chia-plotter/default.nix
@ -0,0 +1,65 @@
+{ lib
+, fetchFromGitHub
+, stdenv
+, libsodium
+, cmake
+, substituteAll
+, pythonPackages
+}:
+
+stdenv.mkDerivation {
+  pname = "chia-plotter";
+  version = "unstable-2021-07-12";
+
+  src = fetchFromGitHub {
+    owner = "madMAx43v3r";
+    repo = "chia-plotter";
+    rev = "974d6e5f1440f68c48492122ca33828a98864dfc";
+    sha256 = "0dliswvqmi3wq9w8jp0sb0z74n5k37608sig6r60z206g2bwhjja";
+    fetchSubmodules = true;
+  };
+
+  patches = [
+    # prevent CMake from trying to get libraries on the Internet
+    (substituteAll {
+      src = ./dont_fetch_dependencies.patch;
+      pybind11_src = pythonPackages.pybind11.src;
+      relic_src = fetchFromGitHub {
+        owner = "relic-toolkit";
+        repo = "relic";
+        rev = "1885ae3b681c423c72b65ce1fe70910142cf941c";
+        hash = "sha256-tsSZTcssl8t7Nqdex4BesgQ+ACPgTdtHnJFvS9josN0=";
+      };
+    })
+  ];
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ libsodium ];
+
+  # These flags come from the upstream build script:
+  # https://github.com/madMAx43v3r/chia-plotter/blob/974d6e5f1440f68c48492122ca33828a98864dfc/make_devel.sh#L7
+  CXXFLAGS = "-O3 -fmax-errors=1";
+  cmakeFlags = [
+    "-DARITH=easy"
+    "-DBUILD_BLS_PYTHON_BINDINGS=false"
+    "-DBUILD_BLS_TESTS=false"
+    "-DBUILD_BLS_BENCHMARKS=false"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D -m 755 chia_plot $out/bin/chia_plot
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/madMAx43v3r/chia-plotter";
+    description = "New implementation of a chia plotter which is designed as a processing pipeline";
+    license = licenses.gpl3Only;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ilyakooo0 ];
+  };
+}
--- a/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch
+++ b/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch
@ -0,0 +1,50 @@
+diff --git a/lib/bls-signatures/python-bindings/CMakeLists.txt b/lib/bls-signatures/python-bindings/CMakeLists.txt
+index 255e3bb..5f99c3a 100644
+--- a/lib/bls-signatures/python-bindings/CMakeLists.txt
+++ b/lib/bls-signatures/python-bindings/CMakeLists.txt
+@@ -6,8 +6,7 @@ include(FetchContent)
+ 
+ FetchContent_Declare(
+   pybind11
+-  GIT_REPOSITORY https://github.com/pybind/pybind11.git
+-  GIT_TAG        v2.6.2
+  SOURCE_DIR @pybind11_src@
+ )
+ FetchContent_MakeAvailable(pybind11 relic)
+ 
+diff --git a/lib/bls-signatures/src/CMakeLists.txt b/lib/bls-signatures/src/CMakeLists.txt
+index b762b5d..e06073b 100644
+--- a/lib/bls-signatures/src/CMakeLists.txt
+++ b/lib/bls-signatures/src/CMakeLists.txt
+@@ -4,18 +4,11 @@ set (CMAKE_CXX_STANDARD 17)
+ # CMake 3.14+
+ include(FetchContent)
+ 
+-if (DEFINED ENV{RELIC_MAIN})
+-  set(RELIC_GIT_TAG "origin/main")
+-else ()
+-  set(RELIC_GIT_TAG "1885ae3b681c423c72b65ce1fe70910142cf941c")
+-endif ()
+-
+ message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}")
+ 
+ FetchContent_Declare(
+   relic
+-  GIT_REPOSITORY https://github.com/relic-toolkit/relic.git
+-  GIT_TAG        ${RELIC_GIT_TAG}
+  SOURCE_DIR @relic_src@
+ )
+ FetchContent_MakeAvailable(relic)
+ 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 970ec74..948441a 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -38,6 +38,7 @@ include_directories(
+ 	${BLAKE3_PATH}
+ 	${CMAKE_BINARY_DIR}/_deps/relic-src/include
+ 	${CMAKE_BINARY_DIR}/_deps/relic-build/include
+     @relic_src@/include
+ )
+ 
+ IF (WIN32)
--- a/pkgs/applications/blockchains/pivx/default.nix
+++ b/pkgs/applications/blockchains/pivx/default.nix
@ -1,38 +1,57 @@
-{ fetchFromGitHub, lib, stdenv, pkg-config, autoreconfHook, wrapQtAppsHook ? null
-, openssl, db48, boost, zlib, miniupnpc, gmp
-, qrencode, glib, protobuf, yasm, libevent
-, util-linux, qtbase ? null, qttools ? null
+{ fetchFromGitHub
+, lib
+, stdenv
+, pkg-config
+, autoreconfHook
+, wrapQtAppsHook
+, openssl
+, db48
+, boost
+, zlib
+, miniupnpc
+, gmp
+, qrencode
+, glib
+, protobuf
+, yasm
+, libevent
+, util-linux
+, qtbase
+, qttools
 , enableUpnp ? false
 , disableWallet ? false
 , disableDaemon ? false
-, withGui ? false }:
+, withGui ? false
+}:

-with lib;
 stdenv.mkDerivation rec {
-  name = "pivx-${version}";
+  pname = "pivx";
  version = "4.1.1";

  src = fetchFromGitHub {
    owner = "PIVX-Project";
-    repo= "PIVX";
+    repo = "PIVX";
    rev = "v${version}";
    sha256 = "03ndk46h6093v8s18d5iffz48zhlshq7jrk6vgpjfs6z2iqgd2sy";
  };

-  nativeBuildInputs = [ pkg-config autoreconfHook ] ++ optionals withGui [ wrapQtAppsHook ];
+  nativeBuildInputs = [ pkg-config autoreconfHook ]
+    ++ lib.optionals withGui [ wrapQtAppsHook ];
+
  buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf util-linux ]
-                  ++ optionals withGui [ qtbase qttools qrencode ];
+    ++ lib.optionals withGui [ qtbase qttools qrencode ];

  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
-                    ++ optional enableUpnp "--enable-upnp-default"
-                    ++ optional disableWallet "--disable-wallet"
-                    ++ optional disableDaemon "--disable-daemon"
-                    ++ optionals withGui [ "--with-gui=yes"
-                                           "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
-                                         ];
+    ++ lib.optional enableUpnp "--enable-upnp-default"
+    ++ lib.optional disableWallet "--disable-wallet"
+    ++ lib.optional disableDaemon "--disable-daemon"
+    ++ lib.optionals withGui [
+    "--with-gui=yes"
+    "--with-qt-bindir=${lib.getDev qtbase}/bin:${lib.getDev qttools}/bin"
+  ];

  enableParallelBuilding = true;
-  doChecks = true;
+  doCheck = true;
  postBuild = ''
    mkdir -p $out/share/applications $out/share/icons
    cp contrib/debian/pivx-qt.desktop $out/share/applications/
--- a/pkgs/applications/misc/dasel/default.nix
+++ b/pkgs/applications/misc/dasel/default.nix
@ -5,20 +5,20 @@

 buildGoModule rec {
  pname = "dasel";
-  version = "1.15.0";
+  version = "1.16.1";

  src = fetchFromGitHub {
    owner = "TomWright";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-XJSWdXGa1qkkMfETUV8xx9oaMdNVFdO27/GvDvczjG8=";
+    sha256 = "sha256-BrtTBy/Tb4xfs7UHk1acRzKZWNZJqhufHG1ItcM8TPs=";
  };

  vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY=";

-  buildFlagsArray = ''
-    -ldflags=-s -w -X github.com/tomwright/dasel/internal.Version=${version}
-  '';
+  ldflags = [
+    "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}"
+  ];

  doInstallCheck = true;
  installCheckPhase = ''
--- a/pkgs/applications/misc/kratos/default.nix
+++ b/pkgs/applications/misc/kratos/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "kratos";
-  version = "0.6.0-alpha.2";
+  version = "0.7.1-alpha.1";

  src = fetchFromGitHub {
    owner = "ory";
    repo = "kratos";
    rev = "v${version}";
-    sha256 = "0zg6afzqi5fmr7hmy1cd7fknd1bcplz3h0f7z67l75v8k2n73md1";
+    sha256 = "0n0qjnwavr34g8b6vr000wgpbnmyq7n1grcy79cvzdrnc8jxkgxi";
  };

-  vendorSha256 = "16qg44k97l6719hib8vbv0j15x6gvs9d6738d2y990a2qiqbsqpw";
+  vendorSha256 = "14x2flimhvd2wdkajvsm5bqbqikgirynzxs27mzlx0bvhliv247s";

  subPackages = [ "." ];

--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix
@ -0,0 +1,49 @@
+{ stdenv, fetchFromGitHub, jansson, lib, libconfig, libevent, libgcrypt, lua, lua53Packages
+, makeWrapper, openssl, pkg-config, python3, readline, zlib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "telegram-cli";
+  version = "20200106";
+
+  src = fetchFromGitHub {
+    owner = "kenorb-contrib";
+    repo = "tg";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-wYBPr2b8IOycO9y/CNyGjnRsyGyYl3oiXYtTzwTurVA=";
+    fetchSubmodules = true;
+  };
+
+  buildInputs = [
+    jansson
+    libconfig
+    libevent
+    libgcrypt
+    lua
+    lua53Packages.lgi
+    openssl
+    python3
+    readline
+    zlib
+  ];
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 ./bin/telegram-cli $out/bin/telegram-cli-keyless
+    install -Dm644 ./tg-server.pub -t $out/share/telegram-cli
+    makeWrapper $out/bin/telegram-cli-keyless $out/bin/telegram-cli \
+      --add-flags "-k $out/share/telegram-cli/tg-server.pub"
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Command-line interface for Telegram, that uses readline interface, it's a client implementation of TGL library";
+    downloadPage = "https://github.com/kenorb-contrib/tg";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ superherointj ];
+  };
+}
--- a/pkgs/applications/terminal-emulators/wezterm/default.nix
+++ b/pkgs/applications/terminal-emulators/wezterm/default.nix
@ -34,7 +34,7 @@ let
    zlib
    fontconfig
    freetype
-  ] ++ lib.optionals (stdenv.isLinux) [
+  ] ++ lib.optionals stdenv.isLinux [
    libX11
    xcbutil
    libxcb
@ -49,7 +49,7 @@ let
    libGLU
    libGL
    openssl
-  ] ++ lib.optionals (stdenv.isDarwin) [
+  ] ++ lib.optionals stdenv.isDarwin [
    Foundation
    CoreGraphics
    Cocoa
@ -90,6 +90,10 @@ rustPlatform.buildRustPackage rec {
    mkdir -p $terminfo/share/terminfo/w $out/nix-support
    tic -x -o $terminfo/share/terminfo termwiz/data/wezterm.terminfo
    echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
+
+    install -Dm644 assets/icon/terminal.png $out/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png
+    install -Dm644 assets/wezterm.desktop $out/share/applications/org.wezfurlong.wezterm.desktop
+    install -Dm644 assets/wezterm.appdata.xml $out/share/metainfo/org.wezfurlong.wezterm.appdata.xml
  '';

  preFixup = lib.optionalString stdenv.isLinux ''
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@ -23,7 +23,7 @@ let
  buildType = "release";
  # Use maintainers/scripts/update.nix to update the version and all related hashes or
  # change the hashes in extpack.nix and guest-additions/default.nix as well manually.
-  version = "6.1.22";
+  version = "6.1.26";

  iasl' = iasl.overrideAttrs (old: rec {
    inherit (old) pname;
@ -40,7 +40,7 @@ in stdenv.mkDerivation {

  src = fetchurl {
    url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "99816d2a15205d49362a31e8ffeb8262d2fa0678c751dfd0a7c43b2faca8be49";
+    sha256 = "0212602eea878d6c9fd7f4a3e0182da3e4505f31d25f5539fb8f7b1fbe366195";
  };

  outputs = [ "out" "modsrc" ];
@ -104,6 +104,9 @@ in stdenv.mkDerivation {
    })
  ++ [
    ./qtx11extras.patch
+    # Temporary workaround for broken build
+    # https://www.virtualbox.org/pipermail/vbox-dev/2021-July/015670.html
+    ./fix-configure-pkgconfig-qt.patch
  ];

  postPatch = ''
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@ -12,7 +12,7 @@ fetchurl rec {
    # Manually sha256sum the extensionPack file, must be hex!
    # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
    # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS
-    let value = "6d33d9cc1c5a8f8a2a70e5aaaa778a341322d2ba7eb34f7de420fb5f312b9e87";
+    let value = "aaa1a1f8615d5bd2e08b158ce6f415262fbb595e169e2d415c5b1844ac258eee";
    in assert (builtins.stringLength value) == 64; value;

  meta = {
--- a/pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch
+++ b/pkgs/applications/virtualization/virtualbox/fix-configure-pkgconfig-qt.patch
@ -0,0 +1,11 @@
+Index: /trunk/configure
+===================================================================
+--- a/configure	(revision 90360)
+++ b/configure	(revision 90377)
+@@ -1588,5 +1588,5 @@
+         if [ $? -eq 0 ]; then
+           echo "(Qt5 from pkg-config)" >> $LOG
+-          FLGQT5=`pkg-config Qt5Core Qt5Gui --cflags`
+          FLGQT5=`pkg-config Qt5Core --cflags`
+           # gcc 4.8 is able to compile with C++11 (see also VBOX_GCC_std in Config.kmk)
+           [ $(($cc_maj * 100 + $cc_min)) -ge 408 ] && FLGQT5="$FLGQT5 -std=c++11"
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {

  src = fetchurl {
    url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "bffc316a7b8d5ed56d830e9f6aef02b4e5ffc28674032142e96ffbedd905f8c9";
+    sha256 = "22d02ec417cd7723d7269dbdaa71c48815f580c0ca7a0606c42bd623f84873d7";
  };

  KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
--- a/pkgs/build-support/fetchgitlab/default.nix
+++ b/pkgs/build-support/fetchgitlab/default.nix
@ -1,22 +1,26 @@
-{ fetchzip, lib }:
+{ fetchgit, fetchzip, lib }:

 # gitlab example
 { owner, repo, rev, domain ? "gitlab.com", name ? "source", group ? null
+, fetchSubmodules ? false, leaveDotGit ? false, deepClone ? false
 , ... # For hash agility
 } @ args:

-with lib;
-
 let
-  slug = concatStringsSep "/"
-    ((optional (group != null) group) ++ [ owner repo ]);
+  slug = lib.concatStringsSep "/" ((lib.optional (group != null) group) ++ [ owner repo ]);
+  escapedSlug = lib.replaceStrings [ "." "/" ] [ "%2E" "%2F" ] slug;
+  escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] rev;
+  passthruAttrs = removeAttrs args [ "domain" "owner" "group" "repo" "rev" ];

-  escapedSlug = replaceStrings ["." "/"] ["%2E" "%2F"] slug;
-  escapedRev = replaceStrings ["+" "%" "/"] ["%2B" "%25" "%2F"] rev;
+  useFetchGit = deepClone || fetchSubmodules || leaveDotGit;
+  fetcher = if useFetchGit then fetchgit else fetchzip;
+
+  fetcherArgs = (if useFetchGit then {
+    inherit rev deepClone fetchSubmodules leaveDotGit;
+    url = "https://${domain}/${slug}.git";
+  } else {
+    url = "https://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}";
+  }) // passthruAttrs // { inherit name; };
 in

-fetchzip ({
-  inherit name;
-  url = "https://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}";
-  meta.homepage = "https://${domain}/${slug}/";
-} // removeAttrs args [ "domain" "owner" "group" "repo" "rev" ]) // { inherit rev; }
+fetcher fetcherArgs // { meta.homepage = "https://${domain}/${slug}/"; inherit rev; }
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "matcha-gtk-theme";
-  version = "2021-07-20";
+  version = "2021-08-02";

  src = fetchFromGitHub {
    owner = "vinceliuice";
    repo = pname;
    rev = version;
-    sha256 = "0shdkwpqj3fw5qr99ww4z5dyrpa2pq79s0i02p9j3v6w6aca2gic";
+    sha256 = "sha256-vvWRHtE0Fgz41Aa5kaxNfbupodaWNc8gRJ1qW7vIyuc=";
  };

  buildInputs = [ gdk-pixbuf librsvg ];
--- a/pkgs/development/compilers/llvm/11/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/11/llvm/default.nix
@ -94,6 +94,7 @@ in stdenv.mkDerivation (rec {
    rm test/DebugInfo/X86/convert-inlined.ll
    rm test/DebugInfo/X86/convert-linked.ll
    rm test/tools/dsymutil/X86/op-convert.test
+    rm test/tools/llvm-readobj/ELF/dependent-libraries.test
  '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") ''
    # Seems to require certain floating point hardware (NEON?)
    rm test/ExecutionEngine/frem.ll
--- a/pkgs/development/compilers/llvm/12/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/12/llvm/default.nix
@ -98,7 +98,6 @@ in stdenv.mkDerivation (rec {
    rm test/DebugInfo/X86/convert-debugloc.ll
    rm test/DebugInfo/X86/convert-inlined.ll
    rm test/DebugInfo/X86/convert-linked.ll
-    rm test/DebugInfo/X86/vla-multi.ll
    rm test/tools/dsymutil/X86/op-convert.test
  '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") ''
    # Seems to require certain floating point hardware (NEON?)
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@ -1,6 +1,18 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, buildPackages
-, cmake, zlib, c-ares, pkg-config, re2, openssl, protobuf, grpc
-, abseil-cpp, libnsl
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, buildPackages
+, cmake
+, zlib
+, c-ares
+, pkg-config
+, re2
+, openssl
+, protobuf
+, grpc
+, abseil-cpp
+, libnsl
 }:

 stdenv.mkDerivation rec {
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
--- a/pkgs/development/python-modules/cbor2/default.nix
+++ b/pkgs/development/python-modules/cbor2/default.nix
@ -9,11 +9,11 @@

 buildPythonPackage rec {
  pname = "cbor2";
-  version = "5.4.0";
+  version = "5.4.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "a7926f7244b08c413f1a4fa71a81aa256771c75bdf1a4fd77308547a2d63dd48";
+    sha256 = "1jga5wj3kalf6zj5gyrmy6kwmxxkld52mvcgxc5gb5dmdhpl7gx8";
  };

  nativeBuildInputs = [ setuptools-scm ];
--- a/pkgs/development/python-modules/sphinx-inline-tabs/default.nix
+++ b/pkgs/development/python-modules/sphinx-inline-tabs/default.nix
@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, sphinx
+}:
+
+buildPythonPackage rec {
+  pname = "sphinx-inline-tabs";
+  version = "2021.04.11.beta9";
+  format = "flit";
+
+  src = fetchFromGitHub {
+    owner = "pradyunsg";
+    repo = "sphinx-inline-tabs";
+    rev = version;
+    sha256 = "sha256-UYrLQAXPProjpGPQNkju6+DmzjPG+jbjdKveoeViVTY=";
+  };
+
+  propagatedBuildInputs = [
+    sphinx
+  ];
+
+  # no tests, see https://github.com/pradyunsg/sphinx-inline-tabs/issues/6
+  doCheck = false;
+
+  pythonImportsCheck = [ "sphinx_inline_tabs" ];
+
+  meta = with lib; {
+    description = "Add inline tabbed content to your Sphinx documentation";
+    homepage = "https://github.com/pradyunsg/sphinx-inline-tabs";
+    license = licenses.mit;
+    maintainers = with maintainers; [ Luflosi ];
+  };
+}
--- a/pkgs/development/tools/misc/terraform-ls/default.nix
+++ b/pkgs/development/tools/misc/terraform-ls/default.nix
@ -2,36 +2,27 @@

 buildGoModule rec {
  pname = "terraform-ls";
-  version = "0.19.1";
+  version = "0.20.0";

  src = fetchFromGitHub {
    owner = "hashicorp";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-ag8Dq3lhLoKE4rgrnWLHtKRHEnw/ytyXI+pRt5CgZJI=";
+    sha256 = "sha256-G1i5SS1BY+h8qPPjrZ9HCnKX3o2VkwvpeHPNxW6rnuI=";
  };
-  vendorSha256 = "sha256-/lpjlThr6HPkuJ6om9ifBsdsh0x4kVXM6PAonk7GJCY=";
+  vendorSha256 = "sha256-nRElOa9IQ31Wh01wTFM6pazDYFnmR06vkU4CI8Gx4Vw=";

  ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ];

-  preCheck = ''
-    # Remove tests that requires networking
-    rm internal/terraform/exec/exec_test.go
-  '' + lib.optionalString stdenv.isAarch64 ''
-    # Not all test failures have tracking issues as HashiCorp do not have
-    # aarch64 testing infra easily available, see issue 549 below.
+  # There's a mixture of tests that use networking and several that fail on aarch64
+  doCheck = false;

-    # Remove file that contains `TestLangServer_workspaceExecuteCommand_modules_multiple`
-    # which fails on aarch64: https://github.com/hashicorp/terraform-ls/issues/549
-    rm internal/langserver/handlers/execute_command_modules_test.go
-
-    # `TestModuleManager_ModuleCandidatesByPath` variants fail
-    rm internal/terraform/module/module_manager_test.go
-
-    # internal/terraform/module/module_ops_queue_test.go:17:15: undefined: testLogger
-    # internal/terraform/module/watcher_test.go:39:11: undefined: testLogger
-    # internal/terraform/module/watcher_test.go:79:14: undefined: testLogger
-    rm internal/terraform/module/{watcher_test,module_ops_queue_test}.go
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+    $out/bin/terraform-ls --help
+    $out/bin/terraform-ls version | grep "v${version}"
+    runHook postInstallCheck
  '';

  meta = with lib; {
--- a/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/default.nix
@ -7,14 +7,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "rust-analyzer-unwrapped";
-  version = "2021-07-12";
-  cargoSha256 = "sha256-wlo3GlB9OhyVXys5pHAqWPKHWZHzNjcQ0hiaYnp2SUc=";
+  version = "2021-08-02";
+  cargoSha256 = "10mdkqf6fqbzx49gwc283ms56yvrcdlvyk4y98jf33b8g5jmr8j5";

  src = fetchFromGitHub {
    owner = "rust-analyzer";
    repo = "rust-analyzer";
    rev = version;
-    sha256 = "sha256-nd8valnltycywxBObSVFbt4fySEYQknFsFf5ZnEbgOk=";
+    sha256 = "1nh1naaqc6f40raz31a0vwypaxm5drzdl2bwjfqx2gydy6051gcl";
  };

  buildAndTestSubdir = "crates/rust-analyzer";
--- a/pkgs/development/tools/rust/rust-analyzer/update.sh
+++ b/pkgs/development/tools/rust/rust-analyzer/update.sh
@ -51,9 +51,6 @@ build_deps="../../../../misc/vscode-extensions/rust-analyzer/build-deps"
 jq '{ name, version, dependencies: (.dependencies + .devDependencies) }' "$node_src/package.json" \
    >"$build_deps/package.json.new"

-# FIXME: vsce@1.93.0 breaks the build.
-sed 's/"vsce": ".*"/"vsce": "=1.88.0"/' --in-place "$build_deps/package.json.new"
-
 if cmp --quiet "$build_deps"/package.json{.new,}; then
    echo "package.json not changed, skip updating nodePackages"
    rm "$build_deps"/package.json.new
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@ -77,12 +77,12 @@ final: prev:

  ale = buildVimPluginFrom2Nix {
    pname = "ale";
-    version = "2021-07-23";
+    version = "2021-07-28";
    src = fetchFromGitHub {
      owner = "dense-analysis";
      repo = "ale";
-      rev = "530b38de342a21cce330a32af0c1b66671d335c2";
-      sha256 = "1qvdywgn79fvjdyk2bj7ym9fa65l96dcnp69yhravb9rinrawb5i";
+      rev = "dce088a4f07c55f7cff4eef90224fa85aa402877";
+      sha256 = "17i58pfyq9950pkjcaiknx2bmp34x2sc3vswjpxj905d0ni36z9d";
    };
    meta.homepage = "https://github.com/dense-analysis/ale/";
  };
@ -113,12 +113,12 @@ final: prev:

  ansible-vim = buildVimPluginFrom2Nix {
    pname = "ansible-vim";
-    version = "2021-06-01";
+    version = "2021-07-27";
    src = fetchFromGitHub {
      owner = "pearofducks";
      repo = "ansible-vim";
-      rev = "804099202b72ffd4bf4ea4ce24d8d7bac8b9ae2d";
-      sha256 = "0p93g0zi8j6bf5zh0ng9vdl9f76dan524g22jpb8c0xmm6ywns5l";
+      rev = "40e28ee318b968c09a1724cd25cd450330b136c9";
+      sha256 = "09fcn2mdi05alhzkk89namymk7lryycb303nah9i63km39h5rs12";
    };
    meta.homepage = "https://github.com/pearofducks/ansible-vim/";
  };
@ -425,12 +425,12 @@ final: prev:

  chadtree = buildVimPluginFrom2Nix {
    pname = "chadtree";
-    version = "2021-07-25";
+    version = "2021-07-29";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "chadtree";
-      rev = "393fbc24cab3fdfaffca85e286e01c84bcf748c9";
-      sha256 = "08pcp6dh6kibppndf97nzj90iw1qv51s4zk3vq59z16w32zwkzda";
+      rev = "75fa52709d1eb4a981075ef7e3cb9e220cc45bf3";
+      sha256 = "0syb3f0m7d5pv4ikj7ss8c81vzz0a71axfplvs9i9z9q1qrp3jkj";
    };
    meta.homepage = "https://github.com/ms-jpq/chadtree/";
  };
@ -569,12 +569,12 @@ final: prev:

  coc-nvim = buildVimPluginFrom2Nix {
    pname = "coc-nvim";
-    version = "2021-07-22";
+    version = "2021-07-26";
    src = fetchFromGitHub {
      owner = "neoclide";
      repo = "coc.nvim";
-      rev = "479b4ac1d09cec838a232e49ad54b79f2217ad4c";
-      sha256 = "0lxpcyvgii8xal6s16aw6y4430709xsba3kn1jwm1lbnrz5mhqwb";
+      rev = "bdd11f8bfbe38522e20e49c97739d747c9db5bcf";
+      sha256 = "0a3y0ldj6y7xc3nbkzj2af1zs430z69wkzf5y8mcgxcavfg3krz4";
    };
    meta.homepage = "https://github.com/neoclide/coc.nvim/";
  };
@ -690,12 +690,12 @@ final: prev:

  compe-tmux = buildVimPluginFrom2Nix {
    pname = "compe-tmux";
-    version = "2021-07-19";
+    version = "2021-07-25";
    src = fetchFromGitHub {
      owner = "andersevenrud";
      repo = "compe-tmux";
-      rev = "82d2139de0279a20a70da61320042adf31b94798";
-      sha256 = "06dyrknc6gap8ybsjai4ndr4cdhzkwz1hnxilz9ffcbplzwldhs5";
+      rev = "d0256c802411e0e76c979e2b7e150f4f8a71a6b0";
+      sha256 = "1crryfvkr9f2dnva565m23cy0v0hz7jkc0ck110ya3ib2r929pmx";
    };
    meta.homepage = "https://github.com/andersevenrud/compe-tmux/";
  };
@ -798,12 +798,12 @@ final: prev:

  context_filetype-vim = buildVimPluginFrom2Nix {
    pname = "context_filetype-vim";
-    version = "2021-06-05";
+    version = "2021-07-25";
    src = fetchFromGitHub {
      owner = "Shougo";
      repo = "context_filetype.vim";
-      rev = "eca5b28dca1bace3b5694eb20b3ab244f65180e0";
-      sha256 = "0n0av5x6js5ld4xnlq5nh18cdwhvrljdsx17gq2sf54q342hlwp0";
+      rev = "89496f3c110d907605319355ea9fc2a560827719";
+      sha256 = "09shjaxqr71nfq4yj15xkvkh204l7fjr7na0cyx3k3mflmldha8w";
    };
    meta.homepage = "https://github.com/Shougo/context_filetype.vim/";
  };
@ -846,12 +846,12 @@ final: prev:

  cpsm = buildVimPluginFrom2Nix {
    pname = "cpsm";
-    version = "2020-08-01";
+    version = "2021-07-25";
    src = fetchFromGitHub {
      owner = "nixprime";
      repo = "cpsm";
-      rev = "42cfb0f83083b33640619c208341629bff67bd8a";
-      sha256 = "0wcq442wj73ra0agflljjkhcwlma7r703l7l9hn7zd8wfb4iv48s";
+      rev = "814961aef3eba4412e5e63342575c46f87eaead4";
+      sha256 = "13qp6qaghaw355wjwmmd8d7cakb3ry9ijpnz06mj8yza50w7p3fx";
    };
    meta.homepage = "https://github.com/nixprime/cpsm/";
  };
@ -1316,12 +1316,12 @@ final: prev:

  diffview-nvim = buildVimPluginFrom2Nix {
    pname = "diffview-nvim";
-    version = "2021-07-22";
+    version = "2021-07-25";
    src = fetchFromGitHub {
      owner = "sindrets";
      repo = "diffview.nvim";
-      rev = "dea0e244bca3a89479e9225b531a319cd812cd52";
-      sha256 = "0gf1x10ix3p6ls1g1cbx57fxd5ln13p3abhv52wqy2gkdl3syvw4";
+      rev = "2411f5303192a9c8056ec174fb995773f90b52b8";
+      sha256 = "03ssikggkymsxwvf5c9w7w9jv4b0ivk25p3b0i0lwvw3fpzdbsgn";
    };
    meta.homepage = "https://github.com/sindrets/diffview.nvim/";
  };
@ -1388,24 +1388,24 @@ final: prev:

  edge = buildVimPluginFrom2Nix {
    pname = "edge";
-    version = "2021-07-19";
+    version = "2021-07-29";
    src = fetchFromGitHub {
      owner = "sainnhe";
      repo = "edge";
-      rev = "8785d0c2737b6354c847a2ac2cd327a16e2087f2";
-      sha256 = "0nhf9vnsba7gm1yxnbj8lqd9d1ihdgpqrlyihlc815ayqzzs3h9b";
+      rev = "d80cb807ab6101567862e99568c13a7b6093f2f7";
+      sha256 = "031lrwzipamm1sbr7kjmisfya35p2magvaq5i919ncnjpvfcmgws";
    };
    meta.homepage = "https://github.com/sainnhe/edge/";
  };

  editorconfig-vim = buildVimPluginFrom2Nix {
    pname = "editorconfig-vim";
-    version = "2021-07-20";
+    version = "2021-07-25";
    src = fetchFromGitHub {
      owner = "editorconfig";
      repo = "editorconfig-vim";
-      rev = "1c4f781f2439469e5342217131886260c9445fc6";
-      sha256 = "0m39if0n4kijqzxk91r1a1fnyhr2p4b9nx1yzvwzkj21snysi4w8";
+      rev = "3078cd10b28904e57d878c0d0dab42aa0a9fdc89";
+      sha256 = "1zjwhg3g56skqi9lndjhn9fh8hr478yvns8xz9xpnzcgzdaqbi1w";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
@ -1522,12 +1522,12 @@ final: prev:

  feline-nvim = buildVimPluginFrom2Nix {
    pname = "feline-nvim";
-    version = "2021-07-24";
+    version = "2021-07-28";
    src = fetchFromGitHub {
      owner = "famiu";
      repo = "feline.nvim";
-      rev = "fb51d6ba6363d10d6fc9e14d0fcef09fd402e431";
-      sha256 = "1cpk0jyhgx93bvjpc76gjp671k53av8mj6d19j4zwm3xm5v1by2p";
+      rev = "cfc0ecfd5e6d37e45ca5102e76cbbbc8f5a03d26";
+      sha256 = "03qjlbby7ayy7q4wasz6k3blvfwy2ph7nvw3zmfw8rwmb2n7w6hc";
    };
    meta.homepage = "https://github.com/famiu/feline.nvim/";
  };
@ -1643,12 +1643,12 @@ final: prev:

  formatter-nvim = buildVimPluginFrom2Nix {
    pname = "formatter-nvim";
-    version = "2021-07-15";
+    version = "2021-07-28";
    src = fetchFromGitHub {
      owner = "mhartington";
      repo = "formatter.nvim";
-      rev = "9efa18bc9552a8b2a00644f79d41f279be322e45";
-      sha256 = "0hfq580ng3wlzkc9g44pz1ciwa9ax46ylka3s3y4v79szhviykby";
+      rev = "51f10c8acc610d787cad2257224cee92b40216e5";
+      sha256 = "15jkrypcd3fa6vcz035yvcpd1rfrxcwvp93mqnihm0g1a74klrql";
    };
    meta.homepage = "https://github.com/mhartington/formatter.nvim/";
  };
@ -1703,12 +1703,12 @@ final: prev:

  fwatch-nvim = buildVimPluginFrom2Nix {
    pname = "fwatch-nvim";
-    version = "2021-04-26";
+    version = "2021-07-25";
    src = fetchFromGitHub {
      owner = "rktjmp";
      repo = "fwatch.nvim";
-      rev = "5fd6bff00d7fa432cdc847819563dad90bcf649d";
-      sha256 = "1jc3kv0w3767593p9capif3p0msf8ac5xal170757ghfiy2jhsp9";
+      rev = "83600d71e7d7dd73194375adcea938789a41249a";
+      sha256 = "1kqmyqzx4g45dayhbbck4bavfdr2y41lwjdv5z4bwd9hqys7s4rz";
    };
    meta.homepage = "https://github.com/rktjmp/fwatch.nvim/";
  };
@ -1871,12 +1871,12 @@ final: prev:

  gitsigns-nvim = buildVimPluginFrom2Nix {
    pname = "gitsigns-nvim";
-    version = "2021-07-23";
+    version = "2021-07-29";
    src = fetchFromGitHub {
      owner = "lewis6991";
      repo = "gitsigns.nvim";
-      rev = "22a1d6db29a2c6b485a48512d2c38ac84d6a78bb";
-      sha256 = "1dxz6zjhf2z4n2pqdk95ifdj379fravfr55k401plgy223hmpkip";
+      rev = "0d45fff0a28cebdc87604117c0fc46f3a64550f6";
+      sha256 = "11mbcblgzsp7mzsy1knjd3cjcl60x45d57jf2nbcnf0ml312m1qc";
    };
    meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
  };
@ -2001,14 +2001,26 @@ final: prev:
    meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/";
  };

+  gruvbox-material = buildVimPluginFrom2Nix {
+    pname = "gruvbox-material";
+    version = "2021-07-29";
+    src = fetchFromGitHub {
+      owner = "sainnhe";
+      repo = "gruvbox-material";
+      rev = "7a1d276a3d938d488d2d592fbb52ecec642268fc";
+      sha256 = "1pvdlci25qr122gzrb661bpl62sfz81vxsbyzwwnf16b18qsxi5r";
+    };
+    meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
+  };
+
  gruvbox-nvim = buildVimPluginFrom2Nix {
    pname = "gruvbox-nvim";
-    version = "2021-07-05";
+    version = "2021-07-26";
    src = fetchFromGitHub {
      owner = "npxbr";
      repo = "gruvbox.nvim";
-      rev = "ac0948e28203cba5d0510cf3443906228645e3eb";
-      sha256 = "0g9j2gqsgx7la96xhc72l7rb535phqjpb5mva191wjfn13j0hkda";
+      rev = "05da7d5a8199522c27ad746e655593b5933fe5d0";
+      sha256 = "1dnpc83sv49gs5i9xbyj7m0cgfbjahsy5fxpgy5a79yj0czphid7";
    };
    meta.homepage = "https://github.com/npxbr/gruvbox.nvim/";
  };
@ -2616,12 +2628,12 @@ final: prev:

  lightspeed-nvim = buildVimPluginFrom2Nix {
    pname = "lightspeed-nvim";
-    version = "2021-07-16";
+    version = "2021-07-29";
    src = fetchFromGitHub {
      owner = "ggandor";
      repo = "lightspeed.nvim";
-      rev = "62f02aabce3b5af190cf113d5bdf4a8271a966c3";
-      sha256 = "1cckxvr035vsall3891j60yc1a12p8q63rjnm7ac1wzdhh7d8c38";
+      rev = "98841f4c3262214513f4f0de7d944d8384d50803";
+      sha256 = "0d0kwip2yds2m25q3f5mmrsqk8jmv3zl17mvg1jbdwmklyqwkk9f";
    };
    meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";
  };
@ -2700,12 +2712,12 @@ final: prev:

  lsp_signature-nvim = buildVimPluginFrom2Nix {
    pname = "lsp_signature-nvim";
-    version = "2021-07-19";
+    version = "2021-07-29";
    src = fetchFromGitHub {
      owner = "ray-x";
      repo = "lsp_signature.nvim";
-      rev = "78af1399d0e7a85152d4f75b9ce0c20286735d6e";
-      sha256 = "156wdb57vabz0syx84zlnn5v6wy7g02flq4r5caz9xwccdszwz33";
+      rev = "9fcc1de38e861a42433ec25c3513b4c2f98d2422";
+      sha256 = "0sgh7nz3w7whfyvwwbpi610svwdq95wbr3awx17sjvvxhp5pcavj";
    };
    meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
  };
@ -2760,12 +2772,12 @@ final: prev:

  luasnip = buildVimPluginFrom2Nix {
    pname = "luasnip";
-    version = "2021-07-24";
+    version = "2021-07-25";
    src = fetchFromGitHub {
      owner = "l3mon4d3";
      repo = "luasnip";
-      rev = "e9f4d03aaacc8af6ebd17833dfb5804a6abbd021";
-      sha256 = "0k86j2rq5ykav8i6gna91v893j4panyr7l2cyp6vrrkj441bx5ww";
+      rev = "631a1551c9e0d983e9545d37c79fb024f4680a83";
+      sha256 = "0jiq37bfn8wpbrk62xrknglfkh3hbsx325crgg7amsk0bkhi8nav";
    };
    meta.homepage = "https://github.com/l3mon4d3/luasnip/";
  };
@ -3108,12 +3120,12 @@ final: prev:

  neco-look = buildVimPluginFrom2Nix {
    pname = "neco-look";
-    version = "2019-11-19";
+    version = "2021-07-26";
    src = fetchFromGitHub {
      owner = "ujihisa";
      repo = "neco-look";
-      rev = "4d7f1fd7e406c302fba2a1358017c5a76d0f9fc1";
-      sha256 = "1brvzg15ni5j60wncpvxhs5k36wz83lhvfcnvja2l9yrngcgh6vr";
+      rev = "d98e550b741265fa8ca2b18f51c19adb2d3ff00a";
+      sha256 = "01bb5d3n7k7m5gd1rn78qhrjf9cvsccwib390zh0h22aryswzqnx";
    };
    meta.homepage = "https://github.com/ujihisa/neco-look/";
  };
@ -3336,12 +3348,12 @@ final: prev:

  nerdcommenter = buildVimPluginFrom2Nix {
    pname = "nerdcommenter";
-    version = "2021-05-29";
+    version = "2021-07-29";
    src = fetchFromGitHub {
      owner = "preservim";
      repo = "nerdcommenter";
-      rev = "a5d1663185bee20bfb120c9ab212144444514982";
-      sha256 = "03799774h9f7k52gwjnhjjm2w9s6ip5zdrpljinwp6lfavxd4w8a";
+      rev = "85364c56c4d85af69ac6c57262b40812a77be1e4";
+      sha256 = "0qvy4ragn5f93ckmnph5zb90yfp7sv47zhz68f9cmvfrvc8hfa6i";
    };
    meta.homepage = "https://github.com/preservim/nerdcommenter/";
  };
@ -3360,12 +3372,12 @@ final: prev:

  nerdtree-git-plugin = buildVimPluginFrom2Nix {
    pname = "nerdtree-git-plugin";
-    version = "2021-06-04";
+    version = "2021-07-28";
    src = fetchFromGitHub {
      owner = "Xuyuanp";
      repo = "nerdtree-git-plugin";
-      rev = "bca0ed63883d028e6afc7f11a78c56fcaf34d363";
-      sha256 = "1j5llx2l36hgr10mjjdrp8xdv9mhmc6panpjgdxzdg5ncwn4ndzm";
+      rev = "ff9b14f14dceecb6c08cb05053ad649c3b6ac250";
+      sha256 = "1q2zjbg3j4j4746ljp2ccssgp2sykrn3zp4kyc9n0hlqaiwmhbm9";
    };
    meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/";
  };
@ -3420,12 +3432,12 @@ final: prev:

  nnn-vim = buildVimPluginFrom2Nix {
    pname = "nnn-vim";
-    version = "2021-06-07";
+    version = "2021-07-29";
    src = fetchFromGitHub {
      owner = "mcchrish";
      repo = "nnn.vim";
-      rev = "abf700104c0450bac10be3ece613ff88997f47e4";
-      sha256 = "0s3z5kd2h8cx6lplvg3yqp2pacx8c7kcavpvwnl71vmi0s2ld85s";
+      rev = "9de4725aff31c196602274ab9521ac740c9c801f";
+      sha256 = "0fjws1k352ij01gfz3dr5r5x5h8r3lh4s6bfz2apjc4m47nghiy7";
    };
    meta.homepage = "https://github.com/mcchrish/nnn.vim/";
  };
@ -3480,12 +3492,12 @@ final: prev:

  null-ls-nvim = buildVimPluginFrom2Nix {
    pname = "null-ls-nvim";
-    version = "2021-07-24";
+    version = "2021-07-29";
    src = fetchFromGitHub {
      owner = "jose-elias-alvarez";
      repo = "null-ls.nvim";
-      rev = "52286ee4d11016b3366481935c12211c44d43777";
-      sha256 = "0lf0d2b2yajjv39l9zy0h5cmrnah8ig7fk3ckmlpvcfhrlqry9j8";
+      rev = "7c50ca73dc2f89b128f1c42a4e04144d1213e7dc";
+      sha256 = "1qd7hmsxcn6w5fvqn28nb48xp33nl2hzgvh0fy12mzyq39d0n6ld";
    };
    meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
  };
@ -3528,12 +3540,12 @@ final: prev:

  nvim-autopairs = buildVimPluginFrom2Nix {
    pname = "nvim-autopairs";
-    version = "2021-07-24";
+    version = "2021-07-29";
    src = fetchFromGitHub {
      owner = "windwp";
      repo = "nvim-autopairs";
-      rev = "e3e105b11a3b34e93bdcee0c895801cf3ed2a835";
-      sha256 = "0pgg4xvq0dxn4rzip7nzzy1sscm8v1fixkwlpr9jdbp86s9kkq87";
+      rev = "ad40d49f4512cf77c6527cb6aa9ee6b1c97855c9";
+      sha256 = "0qmdyr26va3il80lb166n0cadkxxq1vf0q56zj6vqihv4rn9nas5";
    };
    meta.homepage = "https://github.com/windwp/nvim-autopairs/";
  };
@ -3564,24 +3576,24 @@ final: prev:

  nvim-bufdel = buildVimPluginFrom2Nix {
    pname = "nvim-bufdel";
-    version = "2021-05-21";
+    version = "2021-07-28";
    src = fetchFromGitHub {
      owner = "ojroques";
      repo = "nvim-bufdel";
-      rev = "9a1f0f3ed55db86f66ad87f72639269ac1374169";
-      sha256 = "0f10pik2msm7rdi9lx9ll7jgh1gk9y3q8756ri6jdzk4bwd8j4is";
+      rev = "17d17a4b16e5b5a7403470a8b5afc10772d4e84a";
+      sha256 = "1x14kiwklrnd264ihib84x2l3xgdshnv7yxvjdia5rdsvxny4kvb";
    };
    meta.homepage = "https://github.com/ojroques/nvim-bufdel/";
  };

  nvim-bufferline-lua = buildVimPluginFrom2Nix {
    pname = "nvim-bufferline-lua";
-    version = "2021-07-22";
+    version = "2021-07-27";
    src = fetchFromGitHub {
      owner = "akinsho";
      repo = "nvim-bufferline.lua";
-      rev = "789c204cbec3ec060eb345a8820c3788c0ac4335";
-      sha256 = "14h1h47fijw4r76pdav6p3nrl4chhf6l4vmml89chill34lspdab";
+      rev = "7bf463cf7c61faa9f24222bba9412230d4cc1dc7";
+      sha256 = "12x4lnhxv2sij47drrdxxk814hsmghfz7sv8fc2c5wbbdg9ygg5a";
    };
    meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/";
  };
@ -3636,48 +3648,48 @@ final: prev:

  nvim-dap = buildVimPluginFrom2Nix {
    pname = "nvim-dap";
-    version = "2021-07-24";
+    version = "2021-07-25";
    src = fetchFromGitHub {
      owner = "mfussenegger";
      repo = "nvim-dap";
-      rev = "b557bf8d503c966a4233a72449a80ebcaaed5415";
-      sha256 = "0p6jq9a6xgbxpjcffm6bk88aicqg05cnk0an5j0cy60s7hp5vvv7";
+      rev = "c8a5ec7ec32c1fe1697437ad83bd26ba3b997abd";
+      sha256 = "07qy81zpdh0wnxmiawj2yfbyvbvswvrlgj8pm95fwy7fvr7gbrnk";
    };
    meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
  };

  nvim-dap-ui = buildVimPluginFrom2Nix {
    pname = "nvim-dap-ui";
-    version = "2021-07-24";
+    version = "2021-07-28";
    src = fetchFromGitHub {
      owner = "rcarriga";
      repo = "nvim-dap-ui";
-      rev = "10a57a6b6973661d7082589df3bafc949f004346";
-      sha256 = "10w6wxn3gf3pn6xw9ws05pxqp4a4ssg252bq7bsq8xys9saf12gy";
+      rev = "0b5f6cf6da0884d0788239d9270a2bd89855ec09";
+      sha256 = "04ha4zjjb78i98vn21v404g3fki77mwax7lq5w1hmmsp4qxmyv5k";
    };
    meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
  };

  nvim-dap-virtual-text = buildVimPluginFrom2Nix {
    pname = "nvim-dap-virtual-text";
-    version = "2021-06-12";
+    version = "2021-07-25";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "nvim-dap-virtual-text";
-      rev = "c07c23f52e1019b237927f9520c691e57adb9e6a";
-      sha256 = "0pa1xjp6h5ny7lnql8nsqszx0gpzc1fa9xiksq3k1k5yjjj4wm1z";
+      rev = "ebd0a7850432e2c9b9651b8e4091e74e59604c77";
+      sha256 = "17z8g124cg3m28fn418d3rgia6aa44xyw70h7kkl0w1xpa908n03";
    };
    meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";
  };

  nvim-gdb = buildVimPluginFrom2Nix {
    pname = "nvim-gdb";
-    version = "2021-06-07";
+    version = "2021-07-29";
    src = fetchFromGitHub {
      owner = "sakhnik";
      repo = "nvim-gdb";
-      rev = "53bfce7a254651469ce9577349811bc76d9af46c";
-      sha256 = "1xcwrjfvikb1qqyaic2m0fi12l0hmxj0y5mwx1h95karpydbb0rz";
+      rev = "388d1f952cf849d8ff066f87c13d7d162ae49e89";
+      sha256 = "001s0g80kv1xx6zjza0nai0x10p7j0ysvf31xm6clbl2r023zv2h";
    };
    meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
  };
@ -3720,12 +3732,12 @@ final: prev:

  nvim-jdtls = buildVimPluginFrom2Nix {
    pname = "nvim-jdtls";
-    version = "2021-07-12";
+    version = "2021-07-27";
    src = fetchFromGitHub {
      owner = "mfussenegger";
      repo = "nvim-jdtls";
-      rev = "391e55bb5f90bc23e47c3b57eed6c6fcc95b0e7f";
-      sha256 = "1djjdllr1klzy9yggkwmv7cv8gcpyb96mw1c9qfq9vdi5fmhcsyn";
+      rev = "e5ed033f610837c1b145c904063ef7164ae1c435";
+      sha256 = "1ga7k2rhhlkd97157qq2symmck6ygrc8mfvpn0w4pqgpgw54dyfq";
    };
    meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
  };
@ -3744,12 +3756,12 @@ final: prev:

  nvim-lspconfig = buildVimPluginFrom2Nix {
    pname = "nvim-lspconfig";
-    version = "2021-07-24";
+    version = "2021-07-28";
    src = fetchFromGitHub {
      owner = "neovim";
      repo = "nvim-lspconfig";
-      rev = "00028be5527abbc829ae8263cb3319dcae08e8ec";
-      sha256 = "17vxq8b70v9kq7labi3di0r6rgdhf4vz4mkiw6ji26pa60bfxy8w";
+      rev = "3df7c2afa4e6e5c9e9c9f85ab275837248ed7db4";
+      sha256 = "16krk21g2r45h9hds2jpgplchqzcqgpqg6pdw89pvzx3b5qazab2";
    };
    meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
  };
@ -3792,12 +3804,12 @@ final: prev:

  nvim-scrollview = buildVimPluginFrom2Nix {
    pname = "nvim-scrollview";
-    version = "2021-07-20";
+    version = "2021-07-28";
    src = fetchFromGitHub {
      owner = "dstein64";
      repo = "nvim-scrollview";
-      rev = "b7ca5298fd75700cc74b122654241f5ed24ecf96";
-      sha256 = "0pywghia4hv9pa8g1irmqc1qrbvbhhibazx8z6kcqrrmsb3026g5";
+      rev = "53d9d8057ca33151e0dfe5c3e31021ab2461831f";
+      sha256 = "059ww0s49li41wy7l48xg33nj3vsp36ksbadhzpzbykxs2kwdqfj";
    };
    meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
  };
@ -3816,12 +3828,12 @@ final: prev:

  nvim-toggleterm-lua = buildVimPluginFrom2Nix {
    pname = "nvim-toggleterm-lua";
-    version = "2021-07-22";
+    version = "2021-07-28";
    src = fetchFromGitHub {
      owner = "akinsho";
      repo = "nvim-toggleterm.lua";
-      rev = "895f8e2485267640ccd11fe3fbf1ab5fe178bc4c";
-      sha256 = "1jmg13618r9yxidb2y6fs1y342qqnqa19m1srfkczsxgqr89wrsh";
+      rev = "f9ffba63cc77837edaceae61a5b9de6e77c88e7f";
+      sha256 = "0j5znzrpmxmzkb2l2rpp9iaxggmnjz5lns648a67x1bkilcrmnx4";
    };
    meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/";
  };
@ -3840,12 +3852,12 @@ final: prev:

  nvim-treesitter = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter";
-    version = "2021-07-24";
+    version = "2021-07-29";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter";
-      rev = "296fe9b8611061a1054c05922dbaa134f2b712b2";
-      sha256 = "0qxdd3z4696xf3nnaxmww3gs0ijfi2bw5aq9ywnqxpb3n734iapd";
+      rev = "dedd74ebdbb8a921d95e3c670be9684d9f655c34";
+      sha256 = "1bkakcshw8f5j1iq4hm723jyc9dwwixa4fz5hb32wl7mxxqh9x82";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
  };
@ -3888,36 +3900,36 @@ final: prev:

  nvim-treesitter-textobjects = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter-textobjects";
-    version = "2021-07-20";
+    version = "2021-07-25";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter-textobjects";
-      rev = "7f36db566c66998e04ea569723174c42d8190903";
-      sha256 = "1j2vjlfrvvvxzqq2z6z9mdlanq8q8zhfhffbrygv1zgrp6izhhkx";
+      rev = "04a3fbe657581f6f45c0bb11735a6a4bcecdc46f";
+      sha256 = "1widam8cji1l7z628gsv3s15iid5jfq83df62iamfcjrbxzqcw56";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
  };

  nvim-ts-rainbow = buildVimPluginFrom2Nix {
    pname = "nvim-ts-rainbow";
-    version = "2021-07-23";
+    version = "2021-07-26";
    src = fetchFromGitHub {
      owner = "p00f";
      repo = "nvim-ts-rainbow";
-      rev = "fabcc1ac8392cc9a5beae8020b6c80538a725077";
-      sha256 = "1a3871n3kwvwgz40a74c74lyy5p2l4rih75asb6rnjrrknkk47fb";
+      rev = "dab7f11a14155fbc6076dccbb48cb7ab14bcbde5";
+      sha256 = "00bcbkskfigf3c83b28zgckiafh3xlv7azrw492ardf4ks3zdv79";
    };
    meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";
  };

  nvim-web-devicons = buildVimPluginFrom2Nix {
    pname = "nvim-web-devicons";
-    version = "2021-05-19";
+    version = "2021-07-27";
    src = fetchFromGitHub {
      owner = "kyazdani42";
      repo = "nvim-web-devicons";
-      rev = "da717e19678bd6ec33008cf92da05da1b8ceb87d";
-      sha256 = "0jvvjpbxdgch0wvgdmihkqng84rwifq74q858cvfahrx3y5y1cnw";
+      rev = "80ec3ba1aa3fd4005c4679b7b03da37435bc1654";
+      sha256 = "1pmg2qp6sdk2ijcav4s1la1zax05cwd9vvbrr3s283lqsqwzflax";
    };
    meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/";
  };
@ -4056,12 +4068,12 @@ final: prev:

  packer-nvim = buildVimPluginFrom2Nix {
    pname = "packer-nvim";
-    version = "2021-07-25";
+    version = "2021-07-29";
    src = fetchFromGitHub {
      owner = "wbthomason";
      repo = "packer.nvim";
-      rev = "92dcbe5b1052c2cec1b5455a624710dd1e899777";
-      sha256 = "0mh3ghbz38inwlcv4sqrpmyzwxr62j10d4873p9d5zb6j68ajxn9";
+      rev = "637520cbd85629bfee9e8bd2eb15d775d4c85373";
+      sha256 = "03s35f49lasx5bxigsd5miqfkm2jdz6mh72y9hllk8rzimi59agz";
    };
    meta.homepage = "https://github.com/wbthomason/packer.nvim/";
  };
@ -4152,12 +4164,12 @@ final: prev:

  playground = buildVimPluginFrom2Nix {
    pname = "playground";
-    version = "2021-07-13";
+    version = "2021-07-27";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "playground";
-      rev = "2715d35f27cbdfe6231e48212d12be383013f442";
-      sha256 = "0z1vlsdmhlw6pbga9nypsihzjybglyr8is3maqbyqswrmz1yg87h";
+      rev = "deb887b3f49d66654d9faa9778e8949fe0d80bc3";
+      sha256 = "10jlgsqkplisa1fd7i36yb46fdsa0cx069bpwp2yl4ki2jys953j";
    };
    meta.homepage = "https://github.com/nvim-treesitter/playground/";
  };
@ -4213,12 +4225,12 @@ final: prev:

  presence-nvim = buildVimPluginFrom2Nix {
    pname = "presence-nvim";
-    version = "2021-07-23";
+    version = "2021-07-28";
    src = fetchFromGitHub {
      owner = "andweeb";
      repo = "presence.nvim";
-      rev = "a695e5d653e3a864e11a5ad777e1274eaae90494";
-      sha256 = "0ahvklrll8wswzzhqqc6qqp1f023njrkqbry439l8s21zsnq63dh";
+      rev = "f2a0dd50c67a62cea144775a120c1246a645f5ed";
+      sha256 = "08di6dfzvn2jzr4ym2ikcf036ycm2pi4s4qwn36nfxyg3zbii71q";
    };
    meta.homepage = "https://github.com/andweeb/presence.nvim/";
  };
@ -4501,12 +4513,12 @@ final: prev:

  rust-tools-nvim = buildVimPluginFrom2Nix {
    pname = "rust-tools-nvim";
-    version = "2021-07-24";
+    version = "2021-07-28";
    src = fetchFromGitHub {
      owner = "simrat39";
      repo = "rust-tools.nvim";
-      rev = "27e1555146331f42ebb07fb7ba0a196b75e03dde";
-      sha256 = "13dr30nifxrkjj7rf8dyv9p942dinjcpiy24sbfwni2ibmyf2p52";
+      rev = "858bb2a293e74b7c45b281491afd8e67cd8810c6";
+      sha256 = "1sjyffv375j1jgkhhpmbg880dvakn2ckw8h5a0wpvyxaqd84yrpv";
    };
    meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
  };
@ -4730,12 +4742,12 @@ final: prev:

  sonokai = buildVimPluginFrom2Nix {
    pname = "sonokai";
-    version = "2021-07-19";
+    version = "2021-07-29";
    src = fetchFromGitHub {
      owner = "sainnhe";
      repo = "sonokai";
-      rev = "9d8c57c2b0bf57082093bf1b162ac492206d35dd";
-      sha256 = "0ymgbcy8v7ang4ghlkr52wq86ydr4pma1vwvp78y5yhi4xmn82mn";
+      rev = "f4f43c13af9d1dfb5bbe7c43d76de27d2af2d1cd";
+      sha256 = "1yqqgckjg7hr8q33q49rxf678crl8dk9avs56h9yrgi0f8zs90qk";
    };
    meta.homepage = "https://github.com/sainnhe/sonokai/";
  };
@ -4863,12 +4875,12 @@ final: prev:

  srcery-vim = buildVimPluginFrom2Nix {
    pname = "srcery-vim";
-    version = "2021-07-22";
+    version = "2021-07-26";
    src = fetchFromGitHub {
      owner = "srcery-colors";
      repo = "srcery-vim";
-      rev = "e47e911d4fba1c584cfb31dd710c1f2a03961561";
-      sha256 = "0bb1bsswffp45g38fn41dcbr5dx2gfaz1xhr470h5ln7ywkwv2hi";
+      rev = "9a34db8c7e1eda84754420eaced9fdf00f43a929";
+      sha256 = "1nh6zwx4lcyx8vdvdfr04z5vwvpcbg8ns2pfxmcgjpcajhawg3nx";
    };
    meta.homepage = "https://github.com/srcery-colors/srcery-vim/";
  };
@ -4959,12 +4971,12 @@ final: prev:

  symbols-outline-nvim = buildVimPluginFrom2Nix {
    pname = "symbols-outline-nvim";
-    version = "2021-07-21";
+    version = "2021-07-29";
    src = fetchFromGitHub {
      owner = "simrat39";
      repo = "symbols-outline.nvim";
-      rev = "6a51c637dd8deb4c1e398932651b3a635d1694e2";
-      sha256 = "1hxdklzbci1cxaq6mvy6f2zih8cxyp4s8y6yrnz9w2587pxh0c7j";
+      rev = "81c615a9f108093b64b2b8f1b30837a34a8486cc";
+      sha256 = "1dqgxl7748mvagz3s58hfqb0yxwqx2vww1402zw20qv9736kcfsv";
    };
    meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/";
  };
@ -5044,12 +5056,12 @@ final: prev:

  tagbar = buildVimPluginFrom2Nix {
    pname = "tagbar";
-    version = "2021-06-24";
+    version = "2021-07-27";
    src = fetchFromGitHub {
      owner = "preservim";
      repo = "tagbar";
-      rev = "2da3443f5fb78aa0b9a60bb5b2926d72df734e14";
-      sha256 = "0xihnfp1jv3ixhinqvnfig1v5k8swf3vcqjavspchd94lnb4b2h4";
+      rev = "a0a5714910d29ac3bfe91a2529a9c8cb28de77cc";
+      sha256 = "0y31fi2103ggv5s2lg9wqxvc0xghh3i3iwhzrwxylvimajcv4s0f";
    };
    meta.homepage = "https://github.com/preservim/tagbar/";
  };
@ -5189,12 +5201,12 @@ final: prev:

  telescope-nvim = buildVimPluginFrom2Nix {
    pname = "telescope-nvim";
-    version = "2021-07-23";
+    version = "2021-07-29";
    src = fetchFromGitHub {
      owner = "nvim-telescope";
      repo = "telescope.nvim";
-      rev = "c0f1999b0280bb042bba01c930dd94a4bfdee363";
-      sha256 = "13igy3nph7vg1pnq7hjvql71i0031xdxgkiyd1h38chcs7whvxzf";
+      rev = "82f4d3028b64ad930123a5c713c538c872185a80";
+      sha256 = "08dv4vxa8rn5xbdakv9j4vd1287bpdgckzayl3bmy4rn9djmk8vs";
    };
    meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
  };
@ -5418,12 +5430,12 @@ final: prev:

  ultisnips = buildVimPluginFrom2Nix {
    pname = "ultisnips";
-    version = "2021-06-15";
+    version = "2021-07-26";
    src = fetchFromGitHub {
      owner = "SirVer";
      repo = "ultisnips";
-      rev = "aec91caefec10741722927cf073703a528fe7a8f";
-      sha256 = "1a5527adkaawgcj1pm5qp0qiq084x70ljj7a35abjil20f3s7y85";
+      rev = "8803960a4e09daf1ad4d82e16a25bbdb4c78530e";
+      sha256 = "09d86328387f0qvrn3afh69889bcc67n3fxqxysxfrsifwsxqy74";
    };
    meta.homepage = "https://github.com/SirVer/ultisnips/";
  };
@ -5814,12 +5826,12 @@ final: prev:

  vim-android = buildVimPluginFrom2Nix {
    pname = "vim-android";
-    version = "2021-07-10";
+    version = "2021-07-25";
    src = fetchFromGitHub {
      owner = "hsanson";
      repo = "vim-android";
-      rev = "9be0a3c46a45c7a790022e5e3e293635469446fb";
-      sha256 = "16xgidkd2v2g5zljfpdx82nai7cxq4nzw1irdfsdllv4ns9q27si";
+      rev = "aeea4d67e377659077d7db99cf3c582211e941eb";
+      sha256 = "07lyyxhf79mwlwrkyp9yq61nfvj2mb2xhcf3gb60adwy7qxcfl2k";
    };
    meta.homepage = "https://github.com/hsanson/vim-android/";
  };
@ -6066,12 +6078,12 @@ final: prev:

  vim-clap = buildVimPluginFrom2Nix {
    pname = "vim-clap";
-    version = "2021-07-22";
+    version = "2021-07-27";
    src = fetchFromGitHub {
      owner = "liuchengxu";
      repo = "vim-clap";
-      rev = "111ef624c0d39fe5fcf869fba01c16036e106fbd";
-      sha256 = "0xgdvk362fk6491pk5dv46a2cg77gk57gk6dvhzf3ldi5zshckfj";
+      rev = "5fa131dc95a7b3e03fa1307802b3a43419571921";
+      sha256 = "10viqhmyvw8lik53gbslfxfsv36f1vl8qi0vzn7zi6waqdrr3n79";
    };
    meta.homepage = "https://github.com/liuchengxu/vim-clap/";
  };
@ -6402,12 +6414,12 @@ final: prev:

  vim-devicons = buildVimPluginFrom2Nix {
    pname = "vim-devicons";
-    version = "2021-07-16";
+    version = "2021-07-27";
    src = fetchFromGitHub {
      owner = "ryanoasis";
      repo = "vim-devicons";
-      rev = "0a11dae811e6c8b939fe80aeb750469f8ca44d67";
-      sha256 = "07lgjzi10h1gfvr2ij1pc4qxj63n4bg3jvj01ilj6yas56a3hk09";
+      rev = "aa13718e367c44d27a784291a546923eb562fd2a";
+      sha256 = "0vvdjqickp1c13ixkams6yayqasrz05r6bqqfb4qbwpqmispvwkl";
    };
    meta.homepage = "https://github.com/ryanoasis/vim-devicons/";
  };
@ -6666,12 +6678,12 @@ final: prev:

  vim-eunuch = buildVimPluginFrom2Nix {
    pname = "vim-eunuch";
-    version = "2021-04-05";
+    version = "2021-07-28";
    src = fetchFromGitHub {
      owner = "tpope";
      repo = "vim-eunuch";
-      rev = "dbbbf853fc523d312f61b4bbdf2e13297645dcde";
-      sha256 = "0lwkzxz76pcmash56p14pf54blz9v9kw17qj2i5wa8wdcymia98l";
+      rev = "e8b1be581b88de524fc62cd24265d602f8caac19";
+      sha256 = "08gcwnayp6k0xm62rrw6zqkdacs3mng2h29vnbpfgsviazxa6b85";
    };
    meta.homepage = "https://github.com/tpope/vim-eunuch/";
  };
@ -6846,12 +6858,12 @@ final: prev:

  vim-fugitive = buildVimPluginFrom2Nix {
    pname = "vim-fugitive";
-    version = "2021-07-24";
+    version = "2021-07-29";
    src = fetchFromGitHub {
      owner = "tpope";
      repo = "vim-fugitive";
-      rev = "75b2a9a8daf6589f9747ff4f2d068fdea54e92ea";
-      sha256 = "1c265bq5a60y7ndpvwdn54kdzb6spdfnkfdaffp47rgq0y1pfphj";
+      rev = "058ffa406d8013ab8431b7543ae29dec72fd24e5";
+      sha256 = "1gnc4cxdq3srfbzl9v9cgbj7yyr5mjn5gnggr6af69q7ps7f81dg";
    };
    meta.homepage = "https://github.com/tpope/vim-fugitive/";
  };
@ -7773,12 +7785,12 @@ final: prev:

  vim-matchup = buildVimPluginFrom2Nix {
    pname = "vim-matchup";
-    version = "2021-07-24";
+    version = "2021-07-25";
    src = fetchFromGitHub {
      owner = "andymass";
      repo = "vim-matchup";
-      rev = "8ae49bf65c960f6260f2d475b35b068bc6b822f2";
-      sha256 = "1r0car7vbz57b5fq7kjibsdi6knw50n8az145dbfq8svkf7s1fvy";
+      rev = "80315c2933aa495b8af5833750e8534bf5b1d3bf";
+      sha256 = "0f7j7cl7p8d5ac2wz7xhxzxgnm743wgb7360yav1pazivx0i5h5c";
    };
    meta.homepage = "https://github.com/andymass/vim-matchup/";
  };
@ -8313,12 +8325,12 @@ final: prev:

  vim-polyglot = buildVimPluginFrom2Nix {
    pname = "vim-polyglot";
-    version = "2021-07-08";
+    version = "2021-07-28";
    src = fetchFromGitHub {
      owner = "sheerun";
      repo = "vim-polyglot";
-      rev = "554a6ac7575f87b5b85d1b2bf60e7071c4164cbc";
-      sha256 = "0qh3gzvv3y4fjjk9cqz8nqqh87181rq9pxp4j4ly52jpk7hca7qc";
+      rev = "ce31cd1d2f4e8eee9fd91325e4599f15cb9566fd";
+      sha256 = "16wxmqq90n2153w1lkycq2drpcgdxmrsfiizz0m2vi17ph69avnr";
    };
    meta.homepage = "https://github.com/sheerun/vim-polyglot/";
  };
@ -8433,12 +8445,12 @@ final: prev:

  vim-puppet = buildVimPluginFrom2Nix {
    pname = "vim-puppet";
-    version = "2021-07-18";
+    version = "2021-07-26";
    src = fetchFromGitHub {
      owner = "rodjek";
      repo = "vim-puppet";
-      rev = "7bb7586896b7afe6e6f26bcbaf70ad8517d98018";
-      sha256 = "1mqnawfpg23rwjp3zpz85s3dpspcl8zrh9dymv5p0pqbn27mlf5n";
+      rev = "f92bf8c0b343870faec2be09243ca0d778524049";
+      sha256 = "06s46pl9gz6802nfcdfa3bgvzfhlc3bhi5qxnl185jn5mv6vz50i";
    };
    meta.homepage = "https://github.com/rodjek/vim-puppet/";
  };
@ -8565,12 +8577,12 @@ final: prev:

  vim-rooter = buildVimPluginFrom2Nix {
    pname = "vim-rooter";
-    version = "2021-06-08";
+    version = "2021-07-28";
    src = fetchFromGitHub {
      owner = "airblade";
      repo = "vim-rooter";
-      rev = "9a5ce8edc67cca36cc530ee27a805112ce7a7e9b";
-      sha256 = "0zx1mzaiqwqyg7imahwy0mzp52b2dzp4qdnrsgcnkvkxf8v67bak";
+      rev = "0415be8b5989e56f6c9e382a04906b7f719cfb38";
+      sha256 = "1v7akjwrk62q2bk03iqhvziw6s13wnh2lk0vppzvlksv6rj0cmpi";
    };
    meta.homepage = "https://github.com/airblade/vim-rooter/";
  };
@ -8949,12 +8961,12 @@ final: prev:

  vim-startuptime = buildVimPluginFrom2Nix {
    pname = "vim-startuptime";
-    version = "2021-07-11";
+    version = "2021-07-26";
    src = fetchFromGitHub {
      owner = "dstein64";
      repo = "vim-startuptime";
-      rev = "e82e635e1e188b1d00fa9ed3de21794c07ea1445";
-      sha256 = "1623rkqni2xbz6jl8cs848db0gydnpsp0nxss6rg2cp9l813k68f";
+      rev = "48c9dcd59e40d028fde5e5899deacc4aff27bb15";
+      sha256 = "0ym3w45aw3h1wjw2lxazfind1b6wmdllpsfhdwxc9ldy39bsnnfc";
    };
    meta.homepage = "https://github.com/dstein64/vim-startuptime/";
  };
@ -9406,12 +9418,12 @@ final: prev:

  vim-visual-multi = buildVimPluginFrom2Nix {
    pname = "vim-visual-multi";
-    version = "2021-07-11";
+    version = "2021-07-27";
    src = fetchFromGitHub {
      owner = "mg979";
      repo = "vim-visual-multi";
-      rev = "46c082aad84fd83c3c3d962c65afa800c2c33d85";
-      sha256 = "1i3vz8c2v0ygk2m512phkpb8hcz1jj60k583yjkra9l78y7dj7y5";
+      rev = "ccb024c03dda7eb01a5c057408b1828334d97e0a";
+      sha256 = "1p4hlxifmmhr7rg4cfxnwph1z5i895kwqq2nbdd8dashrqcl0vc9";
    };
    meta.homepage = "https://github.com/mg979/vim-visual-multi/";
  };
@ -9514,12 +9526,12 @@ final: prev:

  vim-wordmotion = buildVimPluginFrom2Nix {
    pname = "vim-wordmotion";
-    version = "2021-06-04";
+    version = "2021-07-26";
    src = fetchFromGitHub {
      owner = "chaoren";
      repo = "vim-wordmotion";
-      rev = "dca1a1827513497def6362411d093ae6b3cff7f8";
-      sha256 = "1ij2j35bskk20wyiwjg1krqr9fi5fk043gfpxihhlbxd7yxlbpq1";
+      rev = "0edeebdfa95c0a1fc5fbb83b8faf6b0b2cc3bf7e";
+      sha256 = "0f9jfb9x1p43q3apyj68200dp8821qv8bdybax0c33hyxyzbz6n6";
    };
    meta.homepage = "https://github.com/chaoren/vim-wordmotion/";
  };
@ -9767,12 +9779,12 @@ final: prev:

  vimtex = buildVimPluginFrom2Nix {
    pname = "vimtex";
-    version = "2021-07-24";
+    version = "2021-07-28";
    src = fetchFromGitHub {
      owner = "lervag";
      repo = "vimtex";
-      rev = "d1439f47a481b8665fbfa8511c6ae4e7514bdfc7";
-      sha256 = "0brs97yhnfbkyyz6fzhs7s7kjwgwrw6kkinyycq51idxqdqvk4s8";
+      rev = "6e3d52a23972b309b2d9f1ade7a16ed37a88d26e";
+      sha256 = "0650gjgicavqjapp86w7634ya0bjykcfkvdrcvpx72vnfjl7myiz";
    };
    meta.homepage = "https://github.com/lervag/vimtex/";
  };
@ -9996,12 +10008,12 @@ final: prev:

  YouCompleteMe = buildVimPluginFrom2Nix {
    pname = "YouCompleteMe";
-    version = "2021-07-23";
+    version = "2021-07-28";
    src = fetchFromGitHub {
      owner = "ycm-core";
      repo = "YouCompleteMe";
-      rev = "8411859f48c8066a3b6f29c1a8e3bfa2d0653551";
-      sha256 = "0yx2aig7pk8f99d539p85q3csb3l7bf2575r24w3fvchwj8w2pqy";
+      rev = "8c6081c79b2250467c45f475332e3a3a33028467";
+      sha256 = "1m0yjngysk0hngrp7awc7m5ahg39yb6hg17zd2fj0ywcf18fw7kf";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@ -647,7 +647,7 @@ self: super: {
            libiconv
          ];

-          cargoSha256 = "sha256-J5BCLcwOPB+EfOmdITCHgec9XDkm2oCGfRo/sKjEOIg=";
+          cargoSha256 = "sha256-E16fwBb9ZDRrcs+rZVKG0UESDqrVIcybr+kbFIxrS1o=";
        };
      in
      ''
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@ -595,6 +595,7 @@ rust-lang/rust.vim
 ryanoasis/vim-devicons
 ryvnf/readline.vim
 sainnhe/edge
+sainnhe/gruvbox-material
 sainnhe/sonokai
 sakhnik/nvim-gdb
 saltstack/salt-vim
--- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
+++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
@ -6,22 +6,22 @@
    "node-fetch": "^2.6.1",
    "vscode-languageclient": "^7.1.0-next.5",
    "@rollup/plugin-commonjs": "^17.0.0",
-    "@rollup/plugin-node-resolve": "^11.0.0",
-    "@types/glob": "^7.1.3",
-    "@types/mocha": "^8.0.4",
-    "@types/node": "~12.12.6",
-    "@types/node-fetch": "^2.5.7",
-    "@types/vscode": "^1.53.0",
-    "@typescript-eslint/eslint-plugin": "^4.9.0",
-    "@typescript-eslint/parser": "^4.9.0",
-    "eslint": "^7.15.0",
+    "@rollup/plugin-node-resolve": "^13.0.0",
+    "@types/glob": "^7.1.4",
+    "@types/mocha": "^8.2.3",
+    "@types/node": "~14.17.5",
+    "@types/node-fetch": "^2.5.11",
+    "@types/vscode": "^1.57.0",
+    "@typescript-eslint/eslint-plugin": "^4.28.2",
+    "@typescript-eslint/parser": "^4.28.2",
+    "eslint": "^7.30.0",
    "glob": "^7.1.6",
-    "mocha": "^8.2.1",
-    "rollup": "^2.34.2",
-    "tslib": "^2.0.3",
-    "typescript": "^4.1.2",
+    "mocha": "^9.0.2",
+    "rollup": "^2.51.1",
+    "tslib": "^2.3.0",
+    "typescript": "^4.3.5",
    "typescript-formatter": "^7.2.2",
-    "vsce": "=1.88.0",
+    "vsce": "^1.95.1",
    "vscode-test": "^1.5.1"
  }
 }
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@ -46,11 +46,17 @@ installPhase() {
    fi

    # Install systemd power management executables
+    if [ -e systemd/nvidia-sleep.sh ]; then
+        mv systemd/nvidia-sleep.sh ./
+    fi
    if [ -e nvidia-sleep.sh ]; then
        sed -E 's#(PATH=).*#\1"$PATH"#' nvidia-sleep.sh > nvidia-sleep.sh.fixed
        install -Dm755 nvidia-sleep.sh.fixed $out/bin/nvidia-sleep.sh
    fi

+    if [ -e systemd/system-sleep/nvidia ]; then
+        mv systemd/system-sleep/nvidia ./
+    fi
    if [ -e nvidia ]; then
        sed -E "s#/usr(/bin/nvidia-sleep.sh)#$out\\1#" nvidia > nvidia.fixed
        install -Dm755 nvidia.fixed $out/lib/systemd/system-sleep/nvidia
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@ -3,8 +3,6 @@
 , autoreconfHook, nixosTests
 }:

-let inherit (lib) optional optionals; in
-
 stdenv.mkDerivation rec {
  pname = "knot-dns";
  version = "3.1.0";
@ -29,6 +27,12 @@ stdenv.mkDerivation rec {
    ./runtime-deps.patch
  ];

+  # Disable knotd journal tests on platforms that don't use 4k sysconf(_SC_PAGESIZE).
+  # The journal most likely works fine, but some of the tests currently don't.
+  postPatch = lib.optionalString (doCheck && stdenv.isDarwin && stdenv.isAarch64) ''
+    sed '/^\tknot\/test_journal\>/d' -i tests/Makefile.am
+  '';
+
  nativeBuildInputs = [ pkg-config autoreconfHook ];
  buildInputs = [
    gnutls liburcu libidn2 libunistring
@ -39,12 +43,10 @@ stdenv.mkDerivation rec {
    libmnl # required for knot >= 3.1
    # without sphinx &al. for developer documentation
    # TODO: add dnstap support?
-  ]
-    ++ optionals stdenv.isLinux [
-      libcap_ng systemd
-      libbpf # XDP support
-    ]
-    ++ optional stdenv.isDarwin zlib; # perhaps due to gnutls
+  ] ++ lib.optionals stdenv.isLinux [
+    libcap_ng systemd
+    libbpf # XDP support
+  ] ++ lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls

  enableParallelBuilding = true;

--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@ -12,16 +12,16 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.23.5.4862-0f739d462";
+  version = "1.23.6.4881-e2e58f321";
  pname = "plexmediaserver";

  # Fetch the source
  src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
    url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
-    sha256 = "1qbv30ki8xw9vdvqw8fh56br8gkm1ndcw361sal7ahn62d4h85nq";
+    sha256 = "02vmisqcrchr48pdx61ysfd9j95i5vyr30k20inx3xk4rj50a3cl";
  } else fetchurl {
    url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
-    sha256 = "1ac169197gfi78mnm46lhgvzlg2y9c0pzdm5a6031lfalqc7z9nc";
+    sha256 = "1wf48h8aqzg5wszp2rcx9mv8xv6xsnqh405z3jna65mxhycf4cv9";
  };

  outputs = [ "out" "basedb" ];
--- a/pkgs/tools/admin/meshcentral/default.nix
+++ b/pkgs/tools/admin/meshcentral/default.nix
@ -0,0 +1,36 @@
+{ lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs, jq, dos2unix }:
+yarn2nix-moretea.mkYarnPackage rec {
+  version = "0.8.87";
+
+  src = fetchzip {
+    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-0.8.87.tgz";
+    sha256 = "1jb65pvbld83mdjdb4f4z2brqsdh3b1mvnjdhbllcsn35m705cp5";
+  };
+
+  packageJSON = ./package.json;
+  yarnLock = ./yarn.lock;
+  yarnNix = ./yarn.nix;
+
+  # Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
+  nativeBuildInputs = [ dos2unix ];
+  prePatch = ''
+    find . -name '*.js' -exec dos2unix {} +
+    ln -snf meshcentral.js bin/meshcentral
+  '';
+
+  preFixup = ''
+    mkdir -p $out/bin
+    chmod a+x $out/libexec/meshcentral/deps/meshcentral/meshcentral.js
+    sed -i '1i#!${nodejs}/bin/node' $out/libexec/meshcentral/deps/meshcentral/meshcentral.js
+    ln -s $out/libexec/meshcentral/deps/meshcentral/meshcentral.js $out/bin/meshcentral
+  '';
+
+  publishBinsFor = [ ];
+
+  meta = with lib; {
+    description = "Computer management web app";
+    homepage = "https://meshcentral.com/info/";
+    maintainers = [ maintainers.lheckemann ];
+    license = licenses.asl20;
+  };
+}
--- a/pkgs/tools/admin/meshcentral/package.json
+++ b/pkgs/tools/admin/meshcentral/package.json
@ -0,0 +1,123 @@
+{
+  "name": "meshcentral",
+  "version": "0.8.87",
+  "keywords": [
+    "Remote Device Management",
+    "Remote Device Monitoring",
+    "Remote Desktop",
+    "Remote Terminal",
+    "Remote File Access",
+    "KVM",
+    "2FA",
+    "Two-Factor Authentication",
+    "Intel Active Management Technology",
+    "Intel AMT"
+  ],
+  "homepage": "https://meshcentral.com",
+  "description": "Web based remote computer management server",
+  "author": "Ylian Saint-Hilaire <ylianst@gmail.com>",
+  "main": "meshcentral.js",
+  "bin": {
+    "meshcentral": "bin/meshcentral"
+  },
+  "license": "Apache-2.0",
+  "files": [
+    "*.js",
+    "amt",
+    "bin",
+    "views",
+    "emails",
+    "agents",
+    "public",
+    "translate",
+    "readme.txt",
+    "license.txt",
+    "sample-config.json",
+    "sample-config-advanced.json"
+  ],
+  "dependencies": {
+    "body-parser": "^1.19.0",
+    "cbor": "~5.2.0",
+    "compression": "^1.7.4",
+    "cookie-session": "^2.0.0-beta.3",
+    "express": "^4.17.0",
+    "express-handlebars": "^3.1.0",
+    "express-ws": "^4.0.0",
+    "ipcheck": "^0.1.0",
+    "minimist": "^1.2.0",
+    "multiparty": "^4.2.1",
+    "nedb": "^1.8.0",
+    "node-forge": "^0.10.0",
+    "ws": "^5.2.3",
+    "xmldom": "^0.5.0",
+    "yauzl": "^2.10.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Ylianst/MeshCentral.git"
+  },
+  "readme": "readme.txt",
+  "optionalDependencies": {
+    "passport": "*",
+    "passport-twitter": "*",
+    "passport-google-oauth20": "*",
+    "passport-github2": "*",
+    "passport-reddit": "*",
+    "passport-azure-oauth2": "*",
+    "jwt-simple": "*",
+    "passport-saml": "*",
+    "ws": "5.2.3",
+    "cbor": "5.2.0",
+    "nedb": "*",
+    "https": "*",
+    "yauzl": "*",
+    "xmldom": "*",
+    "ipcheck": "*",
+    "express": "*",
+    "archiver": "4.0.2",
+    "multiparty": "*",
+    "node-forge": "*",
+    "express-ws": "4.0.0",
+    "compression": "*",
+    "body-parser": "*",
+    "cookie-session": "*",
+    "express-handlebars": "*",
+    "node-windows": "*",
+    "loadavg-windows": "*",
+    "node-sspi": "*",
+    "ldapauth-fork": "*",
+    "node-rdpjs-2": "*",
+    "ssh2": "*",
+    "image-size": "*",
+    "acme-client": "*",
+    "aedes": "0.39.0",
+    "mysql": "*",
+    "@mysql/xdevapi": "*",
+    "mongodb": "*",
+    "saslprep": "*",
+    "mariadb": "*",
+    "node-vault": "*",
+    "semver": "*",
+    "https-proxy-agent": "*",
+    "mongojs": "*",
+    "nodemailer": "*",
+    "@sendgrid/mail": "*",
+    "jsdom": "*",
+    "esprima": "*",
+    "minify-js": "*",
+    "html-minifier": "*",
+    "archiver-zip-encrypted": "*",
+    "googleapis": "*",
+    "webdav": "*",
+    "wildleek": "2.0.0",
+    "yubikeyotp": "*",
+    "otplib": "10.2.3",
+    "twilio": "*",
+    "plivo": "*",
+    "web-push": "*",
+    "node-xcs": "*",
+    "modern-syslog": "*",
+    "syslog": "*",
+    "heapdump": "*"
+  }
+}
--- a/pkgs/tools/admin/meshcentral/update.sh
+++ b/pkgs/tools/admin/meshcentral/update.sh
@ -0,0 +1,50 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p nodejs yarn yarn2nix jq rsync common-updater-scripts moreutils
+
+set -exuo pipefail
+
+expr_dir=$(cd "$(dirname "$0")"; pwd)
+tmp=$(mktemp -dt update-meshcentral.XXXXXX)
+
+npm show --json meshcentral > "$tmp/npm.json"
+version=$(<"$tmp/npm.json" jq -r .version)
+tarball=$(<"$tmp/npm.json" jq -r .dist.tarball)
+
+prefetch=$(nix-prefetch-url --unpack --print-path "$tarball" | tr '\n' ' ')
+read -r hash storePath <<<"$prefetch"
+cd "$tmp"
+rsync -r --chmod=u=rwX "$storePath/" package/
+cd package
+
+# Very crude way of discovering optional dependencies. These are
+# fetched at runtime by stock upstream, but we don't allow that kind
+# of thing in nix :)
+awk <meshcentral.js "
+  BEGIN { RS=\"[\n;]\" }
+  match(\$0, /(modules|passport) = (\[.*\])$/, a) { print a[2] }
+  match(\$0, /(modules|passport).push\(('[^']+')\)/, a) { print a[2] }
+" |
+    tr \' \" |
+    jq --slurp '[if type == "array" then .[] else . end] | flatten' |
+    # And an equally crude way of adding them to package.json. We
+    # can't use yarn add here, because that will blow up on
+    # dependencies which don't support the current platform. Even with
+    # --optional.
+    jq --slurpfile package package.json \
+       '(. | map(. | capture("(?<name>@?[^@]+)(@(?<version>.+))?") | { key: .name, value: (.version // "*")}) | from_entries) as $optionalDependencies | $package | .[] | .optionalDependencies |= . + $optionalDependencies' |
+    sponge package.json
+
+# Fetch all the optional dependencies, so we have them available in
+# yarn.lock/yarn.nix
+yarn install --ignore-scripts
+
+cp package.json "$expr_dir"
+cp yarn.lock "$expr_dir/yarn.lock"
+yarn2nix > "$expr_dir/yarn.nix"
+
+cd "$expr_dir/../../../.."
+update-source-version meshcentral "$version" "$hash" "$tarball"
+
+# Only clean up if everything worked
+cd /
+rm -rf "$tmp"
--- a/pkgs/tools/admin/meshcentral/yarn.lock
+++ b/pkgs/tools/admin/meshcentral/yarn.lock
--- a/pkgs/tools/admin/meshcentral/yarn.nix
+++ b/pkgs/tools/admin/meshcentral/yarn.nix
--- a/pkgs/tools/networking/ssmtp/default.nix
+++ b/pkgs/tools/networking/ssmtp/default.nix
@ -1,12 +1,11 @@
-{lib, stdenv, fetchurl, tlsSupport ? true, openssl ? null}:
+{ lib, stdenv, fetchurl, tlsSupport ? true, openssl }:

-assert tlsSupport -> openssl != null;
-
-stdenv.mkDerivation {
-  name = "ssmtp-2.64";
+stdenv.mkDerivation rec {
+  pname = "ssmtp";
+  version = "2.64";

  src = fetchurl {
-    url = "mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2";
+    url = "mirror://debian/pool/main/s/ssmtp/ssmtp_${version}.orig.tar.bz2";
    sha256 = "0dps8s87ag4g3jr6dk88hs9zl46h3790marc5c2qw7l71k4pvhr2";
  };

@ -19,16 +18,15 @@ stdenv.mkDerivation {
    (lib.enableFeature tlsSupport "ssl")
  ];

-  postConfigure =
-    ''
-      # Don't run the script that interactively generates a config file.
-      # Also don't install the broken, cyclic symlink /lib/sendmail.
-      sed -e '/INSTALLED_CONFIGURATION_FILE/d' \
-          -e 's|/lib/sendmail|$(TMPDIR)/sendmail|' \
-          -i Makefile
-      substituteInPlace Makefile \
-        --replace '$(INSTALL) -s' '$(INSTALL) -s --strip-program $(STRIP)'
-    '';
+  postConfigure = ''
+    # Don't run the script that interactively generates a config file.
+    # Also don't install the broken, cyclic symlink /lib/sendmail.
+    sed -e '/INSTALLED_CONFIGURATION_FILE/d' \
+        -e 's|/lib/sendmail|$(TMPDIR)/sendmail|' \
+        -i Makefile
+    substituteInPlace Makefile \
+      --replace '$(INSTALL) -s' '$(INSTALL) -s --strip-program $(STRIP)'
+  '';

  installFlags = [ "etcdir=$(out)/etc" ];

@ -39,6 +37,7 @@ stdenv.mkDerivation {
  NIX_LDFLAGS = lib.optionalString tlsSupport "-lcrypto";

  meta = with lib; {
+    description = "simple MTA to deliver mail from a computer to a mail hub";
    platforms = platforms.linux;
    license = licenses.gpl2;
    maintainers = with maintainers; [ basvandijk ];
--- a/pkgs/tools/networking/toxvpn/default.nix
+++ b/pkgs/tools/networking/toxvpn/default.nix
@ -1,33 +1,40 @@
-{ lib, stdenv, fetchFromGitHub, cmake, nlohmann_json,
-  libtoxcore, libsodium, libcap, zeromq,
-  systemd ? null }:
-
-with lib;
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, nlohmann_json
+, libtoxcore
+, libsodium
+, libcap
+, zeromq
+, systemd
+}:

 stdenv.mkDerivation {
-  name = "toxvpn-2019-09-09";
+  name = "toxvpn";
+  version = "unstable-2019-09-09";

  src = fetchFromGitHub {
-    owner  = "cleverca22";
-    repo   = "toxvpn";
-    rev    = "45083dec172ce167f7ed84d571ec2822ebe4d51a";
+    owner = "cleverca22";
+    repo = "toxvpn";
+    rev = "45083dec172ce167f7ed84d571ec2822ebe4d51a";
    sha256 = "193crarrx6q0zd2p6dn67pzv8kngwi440zm1y54njgcz0v3fpxmb";
  };

  buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ]
-    ++ optionals stdenv.isLinux [ libcap systemd ];
+    ++ lib.optionals stdenv.isLinux [ libcap systemd ];

  nativeBuildInputs = [ cmake ];

-  cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ];
+  cmakeFlags = lib.optional stdenv.isLinux [ "-DSYSTEMD=1" ];

  postInstall = "$out/bin/toxvpn -h";

  meta = with lib; {
    description = "A powerful tool that allows one to make tunneled point to point connections over Tox";
-    homepage    = "https://github.com/cleverca22/toxvpn";
-    license     = licenses.gpl3;
+    homepage = "https://github.com/cleverca22/toxvpn";
+    license = licenses.gpl3;
    maintainers = with maintainers; [ cleverca22 obadz toonn ];
-    platforms   = platforms.linux ++ platforms.darwin;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/tools/security/cosign/default.nix
+++ b/pkgs/tools/security/cosign/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "cosign";
-  version = "1.0.0";
+  version = "1.0.1";

  src = fetchFromGitHub {
    owner = "sigstore";
    repo = pname;
    rev = "v${version}";
-    sha256 = "0s9mv580habr8pprdz2n5jisxakd10vv1y79fhwfcs29njr7yi7v";
+    sha256 = "sha256-j1C4OGyVY41bG+rRr6chbii94H4yeRCum52A8XcnP6g=";
  };

  buildInputs =
@ -17,14 +17,14 @@ buildGoModule rec {

  nativeBuildInputs = [ pkg-config ];

-  vendorSha256 = "0njvgykzpiym5w5b4ddnnq597qm90hcng51lf01yf6csir7nyr12";
+  vendorSha256 = "sha256-9/KrgokCqSWqC4nOgA1e9H0sOx6O/ZFGFEPxiPEKoNI=";

  excludedPackages = "\\(copasetic\\)";

  preBuild = ''
    buildFlagsArray+=(${lib.optionalString pivKeySupport "-tags=pivkey"})
  '';
-  ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli.gitVersion=v${version}"];
+  ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli.gitVersion=v${version}" ];

  meta = with lib; {
    homepage = "https://github.com/sigstore/cosign";
--- a/pkgs/tools/security/verifpal/default.nix
+++ b/pkgs/tools/security/verifpal/default.nix
@ -6,15 +6,15 @@

 buildGoModule rec {
  pname = "verifpal";
-  version = "0.13.7";
+  version = "0.26.0";

  src = fetchgit {
    url = "https://source.symbolic.software/verifpal/verifpal.git";
    rev = "v${version}";
-    sha256 = "1ia3mxwcvcxghga2vvhf6mia59cm3jl7vh8laywh421bfj42sh9d";
+    sha256 = "1ag1fpgk4xa5041y6a0pchmh32j876bl0iqjb7lxxqg5nc76d3v1";
  };

-  vendorSha256 = "0cmj6h103igg5pcs9c9wrcmrsf0mwp9vbgzf5amsnj1206ryb1p2";
+  vendorSha256 = "XHeXonzRDHXayge5G3apvDarbOfTiV+UQ+IqSbrLkCk=";

  doCheck = false;

--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@ -2,20 +2,20 @@

 buildGoModule rec {
  pname = "shfmt";
-  version = "3.3.0";
+  version = "3.3.1";

  src = fetchFromGitHub {
    owner = "mvdan";
    repo = "sh";
    rev = "v${version}";
-    sha256 = "sha256-pD1nkbBw5NBCyuhn2DYop2AR+1T8p6/zTa6FeWiya7Q=";
+    sha256 = "sha256-43v64TQS1xpmU9pyjSTgV03n7xYJR+JAfZVoK3vwbiY=";
  };

-  vendorSha256 = "sha256-euJYStN21xFYosouWYXpHN3MWCKR4NT8z6OSonM0HW8=";
+  vendorSha256 = "sha256-t1Zdn+NaHrKde6F5o86e+FmN3tH55YpZLuDhTv2lIf4=";

  subPackages = [ "cmd/shfmt" ];

-  buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];
+  ldflags = [ "-s" "-w" "-X main.version=${version}" ];

  nativeBuildInputs = [ installShellFiles scdoc ];

--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -25722,6 +25722,8 @@ in

  merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };

+  meshcentral = callPackage ../tools/admin/meshcentral { };
+
  meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { };

  metadata-cleaner = callPackage ../applications/misc/metadata-cleaner { };
@ -27436,6 +27438,8 @@ in

  tektoncd-cli = callPackage ../applications/networking/cluster/tektoncd-cli { };

+  telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { };
+
  telepathy-gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { };

  telepathy-haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {};
@ -28629,6 +28633,8 @@ in

  chia = callPackage ../applications/blockchains/chia { };

+  chia-plotter = callPackage ../applications/blockchains/chia-plotter { };
+
  clightning = callPackage ../applications/blockchains/clightning { };

  bitcoin-abc  = libsForQt5.callPackage ../applications/blockchains/bitcoin-abc {
@ -28763,6 +28769,9 @@ in
  pivx = libsForQt5.callPackage ../applications/blockchains/pivx { withGui = true; };
  pivxd = callPackage ../applications/blockchains/pivx {
    withGui = false;
+    qtbase = null;
+    qttools = null;
+    wrapQtAppsHook = null;
    autoreconfHook = buildPackages.autoreconfHook269;
  };

--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -8280,6 +8280,8 @@ in {

  sphinx-copybutton = callPackage ../development/python-modules/sphinx-copybutton { };

+  sphinx-inline-tabs = callPackage ../development/python-modules/sphinx-inline-tabs { };
+
  sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { };

  sphinx-markdown-parser = callPackage ../development/python-modules/sphinx-markdown-parser { };