Merge remote-tracking branch 'nixpkgs/master' into staging-next

Conflicts: pkgs/os-specific/linux/libfabric/default.nix pkgs/tools/filesystems/btrfs-progs/default.nix
2021-09-22 10:07:27 +00:00 · 2021-09-22 10:07:27 +00:00 · b898e958da
commit b898e958da
parent 611b805c53 ac01c2996c
125 changed files with 6670 additions and 3129 deletions
--- a/nixos/modules/config/malloc.nix
+++ b/nixos/modules/config/malloc.nix
@ -30,6 +30,15 @@ let
        vulnerabilities, while maintaining good performance.
      '';
    };
+
+    mimalloc = {
+      libPath = "${pkgs.mimalloc}/lib/libmimalloc.so";
+      description = ''
+        A compact and fast general purpose allocator, which may
+        optionally be built with mitigations against various heap
+        vulnerabilities.
+      '';
+    };
  };

  providerConf = providers.${cfg.provider};
@ -91,7 +100,10 @@ in
      "abstractions/base" = ''
        r /etc/ld-nix.so.preload,
        r ${config.environment.etc."ld-nix.so.preload".source},
-        mr ${providerLibPath},
+        include "${pkgs.apparmorRulesFromClosure {
+            name = "mallocLib";
+            baseRules = ["mr $path/lib/**.so*"];
+          } [ mallocLib ] }"
      '';
    };
  };
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -202,6 +202,7 @@
  ./programs/vim.nix
  ./programs/wavemon.nix
  ./programs/waybar.nix
+  ./programs/weylus.nix
  ./programs/wireshark.nix
  ./programs/wshowkeys.nix
  ./programs/xfs_quota.nix
--- a/nixos/modules/programs/weylus.nix
+++ b/nixos/modules/programs/weylus.nix
@ -0,0 +1,47 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.weylus;
+in
+{
+  options.programs.weylus = with types; {
+    enable = mkEnableOption "weylus";
+
+    openFirewall = mkOption {
+      type = bool;
+      default = false;
+      description = ''
+        Open ports needed for the functionality of the program.
+      '';
+    };
+
+     users = mkOption {
+      type = listOf str;
+      default = [ ];
+      description = ''
+        To enable stylus and multi-touch support, the user you're going to use must be added to this list.
+        These users can synthesize input events system-wide, even when another user is logged in - untrusted users should not be added.
+      '';
+    };
+
+    package = mkOption {
+      type = package;
+      default = pkgs.weylus;
+      defaultText = "pkgs.weylus";
+      description = "Weylus package to install.";
+    };
+  };
+  config = mkIf cfg.enable {
+    networking.firewall = mkIf cfg.openFirewall {
+      allowedTCPPorts = [ 1701 9001 ];
+    };
+
+    hardware.uinput.enable = true;
+
+    users.groups.uinput.members = cfg.users;
+
+    environment.systemPackages = [ cfg.package ];
+  };
+}
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@ -9,9 +9,9 @@ let
    mkdir -p $out/libexec/netdata/plugins.d
    ln -s /run/wrappers/bin/apps.plugin $out/libexec/netdata/plugins.d/apps.plugin
    ln -s /run/wrappers/bin/cgroup-network $out/libexec/netdata/plugins.d/cgroup-network
-    ln -s /run/wrappers/bin/freeipmi.plugin $out/libexec/netdata/plugins.d/freeipmi.plugin
    ln -s /run/wrappers/bin/perf.plugin $out/libexec/netdata/plugins.d/perf.plugin
    ln -s /run/wrappers/bin/slabinfo.plugin $out/libexec/netdata/plugins.d/slabinfo.plugin
+    ln -s /run/wrappers/bin/freeipmi.plugin $out/libexec/netdata/plugins.d/freeipmi.plugin
  '';

  plugins = [
@ -211,44 +211,47 @@ in {

    systemd.enableCgroupAccounting = true;

-    security.wrappers."apps.plugin" = {
-      source = "${cfg.package}/libexec/netdata/plugins.d/apps.plugin.org";
-      capabilities = "cap_dac_read_search,cap_sys_ptrace+ep";
-      owner = cfg.user;
-      group = cfg.group;
-      permissions = "u+rx,g+x,o-rwx";
-    };
+    security.wrappers = {
+      "apps.plugin" = {
+        source = "${cfg.package}/libexec/netdata/plugins.d/apps.plugin.org";
+        capabilities = "cap_dac_read_search,cap_sys_ptrace+ep";
+        owner = cfg.user;
+        group = cfg.group;
+        permissions = "u+rx,g+x,o-rwx";
+      };

-    security.wrappers."cgroup-network" = {
-      source = "${cfg.package}/libexec/netdata/plugins.d/cgroup-network.org";
-      capabilities = "cap_setuid+ep";
-      owner = cfg.user;
-      group = cfg.group;
-      permissions = "u+rx,g+x,o-rwx";
-    };
+      "cgroup-network" = {
+        source = "${cfg.package}/libexec/netdata/plugins.d/cgroup-network.org";
+        capabilities = "cap_setuid+ep";
+        owner = cfg.user;
+        group = cfg.group;
+        permissions = "u+rx,g+x,o-rwx";
+      };

-    security.wrappers."freeipmi.plugin" = {
-      source = "${cfg.package}/libexec/netdata/plugins.d/freeipmi.plugin.org";
-      capabilities = "cap_dac_override,cap_fowner+ep";
-      owner = cfg.user;
-      group = cfg.group;
-      permissions = "u+rx,g+x,o-rwx";
-    };
+      "perf.plugin" = {
+        source = "${cfg.package}/libexec/netdata/plugins.d/perf.plugin.org";
+        capabilities = "cap_sys_admin+ep";
+        owner = cfg.user;
+        group = cfg.group;
+        permissions = "u+rx,g+x,o-rwx";
+      };

-    security.wrappers."perf.plugin" = {
-      source = "${cfg.package}/libexec/netdata/plugins.d/perf.plugin.org";
-      capabilities = "cap_sys_admin+ep";
-      owner = cfg.user;
-      group = cfg.group;
-      permissions = "u+rx,g+x,o-rwx";
-    };
+      "slabinfo.plugin" = {
+        source = "${cfg.package}/libexec/netdata/plugins.d/slabinfo.plugin.org";
+        capabilities = "cap_dac_override+ep";
+        owner = cfg.user;
+        group = cfg.group;
+        permissions = "u+rx,g+x,o-rwx";
+      };

-    security.wrappers."slabinfo.plugin" = {
-      source = "${cfg.package}/libexec/netdata/plugins.d/slabinfo.plugin.org";
-      capabilities = "cap_dac_override+ep";
-      owner = cfg.user;
-      group = cfg.group;
-      permissions = "u+rx,g+x,o-rwx";
+    } // optionalAttrs (cfg.package.withIpmi) {
+      "freeipmi.plugin" = {
+        source = "${cfg.package}/libexec/netdata/plugins.d/freeipmi.plugin.org";
+        capabilities = "cap_dac_override,cap_fowner+ep";
+        owner = cfg.user;
+        group = cfg.group;
+        permissions = "u+rx,g+x,o-rwx";
+      };
    };

    security.pam.loginLimits = [
--- a/pkgs/applications/audio/tauon/default.nix
+++ b/pkgs/applications/audio/tauon/default.nix
@ -15,6 +15,7 @@
 , opusfile
 , pango
 , pulseaudio
+, withDiscordRPC ? false
 }:

 stdenv.mkDerivation rec {
@ -82,7 +83,7 @@ stdenv.mkDerivation rec {
    pysdl2
    requests
    send2trash
-  ];
+  ] ++ lib.optional withDiscordRPC pypresence;

  makeWrapperArgs = [
    "--prefix PATH : ${lib.makeBinPath [ffmpeg]}"
--- a/pkgs/applications/graphics/weylus/default.nix
+++ b/pkgs/applications/graphics/weylus/default.nix
@ -0,0 +1,58 @@
+{ lib
+, dbus
+, stdenv
+, gst_all_1
+, xorg
+, libdrm
+, libva
+, fetchzip
+, copyDesktopItems
+, fontconfig
+, libpng
+, autoPatchelfHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "weylus";
+  version = "0.11.2";
+
+  src = fetchzip {
+    url = "https://github.com/H-M-H/Weylus/releases/download/v${version}/linux.zip";
+    sha256 = "sha256-coA8qUpUgRjVBF/0LZgimx61fTTpdck/AO6e+r2uNu0=";
+    stripRoot = false;
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 ./weylus $out/bin/weylus
+    copyDesktopItems ./weylus.desktop
+
+    runHook postInstall
+  '';
+
+  buildInputs = [
+    libpng
+    dbus
+    libdrm
+    fontconfig
+    libva
+    gst_all_1.gst-plugins-base
+    # autoPatchelfHook complains if these are missing, even on wayland
+    xorg.libXft
+    xorg.libXinerama
+    xorg.libXcursor
+    xorg.libXrandr
+    xorg.libXcomposite
+    xorg.libXtst
+  ];
+
+  nativeBuildInputs = [ copyDesktopItems autoPatchelfHook ];
+
+  meta = with lib; {
+    description = "Use your tablet as graphic tablet/touch screen on your computer";
+    homepage = "https://github.com/H-M-H/Weylus";
+    license = with licenses; [ agpl3Only ];
+    maintainers = with maintainers; [ legendofmiracles ];
+  };
+}
--- a/pkgs/applications/misc/1password-gui/default.nix
+++ b/pkgs/applications/misc/1password-gui/default.nix
@ -86,6 +86,9 @@ stdenv.mkDerivation rec {
      substituteInPlace $out/share/applications/${pname}.desktop \
        --replace 'Exec=/opt/1Password/${pname}' 'Exec=${pname}'

+      # Polkit file
+      install -Dm 0644 -t $out/share/polkit-1/actions com.1password.1Password.policy
+
      # Icons
      cp -a resources/icons $out/share

--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@ -1,20 +1,20 @@
 {
  "stable": {
-    "version": "93.0.4577.82",
-    "sha256": "0lr8zdq06smncdzd6knzww9hxl8ynvxadmrkyyl13fpwb1422rjx",
-    "sha256bin64": "0ydvcakpnl20gx7493hv6aqnyf8f28rkvzgwnm4gws92b92n9ify",
+    "version": "94.0.4606.54",
+    "sha256": "0p8kfnyhykbv1cylsx4hj2qdzqr2xdql9rhpva8bfla2w9hr8g83",
+    "sha256bin64": "0lq34l00zrr92g882xzqwq1lf2vf12x1mwidrr2qh6fz7v5418d3",
    "deps": {
      "gn": {
-        "version": "2021-07-08",
+        "version": "2021-08-11",
        "url": "https://gn.googlesource.com/gn",
-        "rev": "24e2f7df92641de0351a96096fb2c490b2436bb8",
-        "sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl"
+        "rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263",
+        "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0"
      }
    },
    "chromedriver": {
-      "version": "93.0.4577.63",
-      "sha256_linux": "0w2lyjj0y9g1wnvk1sg2wi9dvhbjhdz1jb20rlrp5ny2gak6a47b",
-      "sha256_darwin": "11420nflyfvf95hxj488336jq6xqjn4lcrwpr67rj2fx6ganji7z"
+      "version": "94.0.4606.41",
+      "sha256_linux": "06flgis4am4jmd9qz6yn1jfdr07w2n3mfrlicw6a9icg5ir64fdq",
+      "sha256_darwin": "1mc0hhksqm5ms4k4aji043xzxncbifjwz5fqzywy4ji64w5kqrca"
    }
  },
  "beta": {
@ -31,9 +31,9 @@
    }
  },
  "dev": {
-    "version": "95.0.4638.10",
-    "sha256": "0pgd5k24yly9fqpzigc5qqx6lvn6m95fjp7294cgmk0132icx71j",
-    "sha256bin64": "1gfaal3yxmi1n2nvfp39xp82g8vykzm0fjbdk0c1wh4gvlq2xx85",
+    "version": "95.0.4638.17",
+    "sha256": "1v5r8m3wlwh6prcj7bd4zprsr4g43869lhxv43m207c5nlnqiriz",
+    "sha256bin64": "1azn9216jhcdg4yjr6frz8vp98qbcnnhifp9jn9bwvyg69lr0dwb",
    "deps": {
      "gn": {
        "version": "2021-08-11",
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@ -9,7 +9,7 @@
 , yasm, libGLU, libGL, sqlite, unzip, makeWrapper
 , hunspell, libevent, libstartup_notification
 , libvpx_1_8
-, icu69, libpng, jemalloc, glib, pciutils
+, icu69, libpng, glib, pciutils
 , autoconf213, which, gnused, rustPackages, rustPackages_1_45
 , rust-cbindgen, nodejs, nasm, fetchpatch
 , gnum4
@ -27,6 +27,7 @@
 , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages
 , gssSupport ? true, libkrb5
 , pipewireSupport ? waylandSupport && webrtcSupport, pipewire
+, jemallocSupport ? true, jemalloc

 ## privacy-related options

@ -189,7 +190,7 @@ buildStdenv.mkDerivation ({
    xorg.libXdamage
    xorg.libXext
    libevent libstartup_notification /* cairo */
-    libpng jemalloc glib
+    libpng glib
    nasm icu69 libvpx_1_8
    # >= 66 requires nasm for the AV1 lib dav1d
    # yasm can potentially be removed in future versions
@ -202,6 +203,7 @@ buildStdenv.mkDerivation ({
  ++ lib.optional  gssSupport libkrb5
  ++ lib.optionals waylandSupport [ libxkbcommon libdrm ]
  ++ lib.optional  pipewireSupport pipewire
+  ++ lib.optional  jemallocSupport jemalloc
  ++ lib.optional  (lib.versionAtLeast version "82") gnum4
  ++ lib.optionals buildStdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos
                                          AVFoundation MediaToolbox CoreLocation
@ -309,7 +311,6 @@ buildStdenv.mkDerivation ({
    "--disable-tests"
    "--disable-necko-wifi" # maybe we want to enable this at some point
    "--disable-updater"
-    "--enable-jemalloc"
    "--enable-default-toolkit=${default-toolkit}"
    "--with-libclang-path=${llvmPackages.libclang.lib}/lib"
    "--with-system-nspr"
@ -329,6 +330,7 @@ buildStdenv.mkDerivation ({
  ++ flag alsaSupport "alsa"
  ++ flag pulseaudioSupport "pulseaudio"
  ++ flag ffmpegSupport "ffmpeg"
+  ++ flag jemallocSupport "jemalloc"
  ++ flag gssSupport "negotiateauth"
  ++ flag webrtcSupport "webrtc"
  ++ flag crashreporterSupport "crashreporter"
--- a/pkgs/applications/networking/cloudflared/default.nix
+++ b/pkgs/applications/networking/cloudflared/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "cloudflared";
-  version = "2021.9.0";
+  version = "2021.9.1";

  src = fetchFromGitHub {
    owner  = "cloudflare";
    repo   = "cloudflared";
    rev    = version;
-    sha256 = "sha256-djgMTCDIVcaPI6to/pPN2hPi1tsKPxRCT30EL0OOEQU=";
+    sha256 = "sha256-VekJq7d80hD8AybkpLq4+9yeeBkeLATr2iG5OFU/TFs=";
  };

  vendorSha256 = null;
--- a/pkgs/applications/networking/irc/weechat/scripts/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix
@ -3,6 +3,8 @@
 {
  colorize_nicks = callPackage ./colorize_nicks { };

+  edit = callPackage ./edit { };
+
  multiline = callPackage ./multiline {
    inherit (perlPackages) PodParser;
  };
--- a/pkgs/applications/networking/irc/weechat/scripts/edit/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/edit/default.nix
@ -0,0 +1,30 @@
+{ lib, stdenv, fetchFromGitHub, weechat }:
+
+stdenv.mkDerivation rec {
+  pname = "edit-weechat";
+  version = "1.0.2";
+
+  src = fetchFromGitHub {
+    owner = "keith";
+    repo = "edit-weechat";
+    rev = version;
+    sha256 = "1s42r0l0xkhlp6rbc23cm4vlda91il6cg53w33hqfhd2wz91s66w";
+  };
+
+  dontBuild = true;
+
+  passthru.scripts = [ "edit.py" ];
+
+  installPhase = ''
+    runHook preInstall
+    install -D edit.py $out/share/edit.py
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    inherit (weechat.meta) platforms;
+    description = "This simple weechat plugin allows you to compose messages in your $EDITOR.";
+    license = licenses.mit;
+    maintainers = with maintainers; [ eraserhd ];
+  };
+}
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@ -21,13 +21,13 @@

 mkDerivation rec {
  pname = "nextcloud-client";
-  version = "3.3.3";
+  version = "3.3.4";

  src = fetchFromGitHub {
    owner = "nextcloud";
    repo = "desktop";
    rev = "v${version}";
-    sha256 = "sha256-QE6F+L1uy2Tmsf/DI8eUF5Ck+oE8CXDTpZS3xg2tiSs=";
+    sha256 = "sha256-9RumsGpPHWa3EQXobBC3RcDUqwHCKiff+ngpTXKLyaE=";
  };

  patches = [
--- a/pkgs/applications/networking/remote/aws-workspaces/default.nix
+++ b/pkgs/applications/networking/remote/aws-workspaces/default.nix
@ -5,15 +5,15 @@

 stdenv.mkDerivation rec {
  pname = "aws-workspaces";
-  version = "3.1.8.1198";
+  version = "4.0.1.1302";

  src = fetchurl {
    # ref https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/Packages
    urls = [
      "https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb"
-      "https://web.archive.org/web/20210626165043/https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb"
+      "https://web.archive.org/web/20210921220718/https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb"
    ];
-    sha256 = "e784bc4401c2ffaf19f3cc42cb6c6f229c73adba36df49093a1d8cd30c86aaf0";
+    sha256 = "208e67a544be5be7ff25218d68b4eb2ea9e65abfed444c99a0f7a6738d69ab9a";
  };

  nativeBuildInputs = [
@ -45,14 +45,21 @@ stdenv.mkDerivation rec {
    ${dpkg}/bin/dpkg -x $src $out
  '';

-  installPhase = ''
-    mkdir -p $out/bin
-    mv $out/opt/workspacesclient/* $out/bin
+  preFixup = ''
+    patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so $out/lib/libcoreclrtraceptprovider.so
+  '';

-    wrapProgram $out/bin/workspacesclient \
+  installPhase = ''
+    mkdir -p $out/bin $out/lib
+    mv $out/opt/workspacesclient/* $out/lib
+    rm -rf $out/opt
+
+    wrapProgram $out/lib/workspacesclient \
      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \
      --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
      --set GIO_EXTRA_MODULES "${glib-networking.out}/lib/gio/modules"
+
+    mv $out/lib/workspacesclient $out/bin
  '';

  meta = with lib; {
--- a/pkgs/applications/office/paperless-ng/default.nix
+++ b/pkgs/applications/office/paperless-ng/default.nix
@ -5,7 +5,6 @@
 , ghostscript
 , imagemagick
 , jbig2enc
-, ocrmypdf
 , optipng
 , pngquant
 , qpdf
--- a/pkgs/applications/version-management/git-and-tools/glitter/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/glitter/default.nix
@ -0,0 +1,27 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "glitter";
+  version = "1.4.4";
+
+  src = fetchFromGitHub {
+    owner = "milo123459";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1hj1md4h4m1g7cx41sjihlr8xq0zhkikci4cp2gbldqcq5x8iws4";
+  };
+
+  cargoSha256 = "sha256-2QgL8iH0FNlUR/863YML3PLad8lRkYjfSmbl49LTfWw=";
+
+  # tests require it to be in a git repository
+  preCheck = ''
+    git init
+  '';
+
+  meta = with lib; {
+    description = "A git wrapper that allows you to compress multiple commands into one";
+    homepage = "https://github.com/milo123459/glitter";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@ -16,12 +16,12 @@ with lib;

 buildGoPackage rec {
  pname = "gitea";
-  version = "1.15.2";
+  version = "1.15.3";

  # not fetching directly from the git repo, because that lacks several vendor files for the web UI
  src = fetchurl {
    url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
-    sha256 = "sha256-zvWJ1Q8nJw4hjPeBnuVprjn2NSlFwv4BwtHwgwHHvSI=";
+    sha256 = "sha256-r8FP9jEIChg4XDb0AF9riQBpNCVmffrVI0yzI83qwA0=";
  };

  unpackPhase = ''
--- a/pkgs/applications/video/catt/default.nix
+++ b/pkgs/applications/video/catt/default.nix
@ -1,11 +1,48 @@
-{ lib, python3 }:
+{ lib
+, fetchFromGitHub
+, python3
+}:

-with python3.pkgs;
+let
+  py = python3.override {
+    packageOverrides = self: super: {
+      # Upstream is pinning releases incl. dependencies of their dependencies
+      zeroconf = super.zeroconf.overridePythonAttrs (oldAttrs: rec {
+        version = "0.31.0";
+        src = fetchFromGitHub {
+          owner = "jstasiak";
+          repo = "python-zeroconf";
+          rev = version;
+          sha256 = "158dqay74zvnz6kmpvip4ml0kw59nf2aaajwgaamx0zc8ci1p5pj";
+        };
+      });
+
+      click = super.click.overridePythonAttrs (oldAttrs: rec {
+        version = "7.1.2";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj";
+        };
+      });
+
+      PyChromecast = super.PyChromecast.overridePythonAttrs (oldAttrs: rec {
+        version = "9.2.0";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "02ig2wf2yyrnnl88r2n13s1naskwsifwgx3syifmcxygflsmjd3d";
+        };
+      });
+    };
+  };
+in
+with py.pkgs;

 buildPythonApplication rec {
  pname = "catt";
  version = "0.12.2";

+  disabled = python3.pythonOlder "3.4";
+
  src = fetchPypi {
    inherit pname version;
    sha256 = "sha256-BOETKTkcbLOu5SubiejswU7D47qWS13QZ7rU9x3jf5Y=";
@ -19,19 +56,12 @@ buildPythonApplication rec {
    youtube-dl
  ];

-  # remove click when 0.12.3 is released
-  # upstream doesn't use zeroconf directly but pins it for pychromecast
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "zeroconf==0.31.0" "" \
-      --replace "Click>=7.1.2,<8" "click"
-  '';
-
  doCheck = false; # attempts to access various URLs
+
  pythonImportsCheck = [ "catt" ];

  meta = with lib; {
-    description = "Cast All The Things allows you to send videos from many, many online sources to your Chromecast";
+    description = "Tool to send media from online sources to Chromecast devices";
    homepage = "https://github.com/skorokithakis/catt";
    license = licenses.bsd2;
    maintainers = with maintainers; [ dtzWill ];
--- a/pkgs/applications/video/pipe-viewer/default.nix
+++ b/pkgs/applications/video/pipe-viewer/default.nix
@ -0,0 +1,86 @@
+{ lib
+, fetchFromGitHub
+, perl
+, buildPerlModule
+, makeWrapper
+, wrapGAppsHook
+, withGtk3 ? false
+, ffmpeg
+, gtk3
+, wget
+, xdg-utils
+, youtube-dl
+, yt-dlp
+, TestPod
+, Gtk3
+}:
+let
+  perlEnv = perl.withPackages (ps: with ps; [
+    AnyURIEscape
+    DataDump
+    Encode
+    FilePath
+    GetoptLong
+    HTTPMessage
+    JSON
+    JSONXS
+    LWPProtocolHttps
+    LWPUserAgentCached
+    Memoize
+    PathTools
+    ScalarListUtils
+    TermReadLineGnu
+    TextParsewords
+    UnicodeLineBreak
+  ] ++ lib.optionals withGtk3 [
+    FileShareDir
+  ]);
+in
+buildPerlModule rec {
+  pname = "pipe-viewer";
+  version = "0.1.4";
+
+  src = fetchFromGitHub {
+    owner = "trizen";
+    repo = "pipe-viewer";
+    rev = version;
+    hash = "sha256-kDlZ3Cl8zvN/naGExh2yVW5yHwc1O04x4s22lNkbCzU=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ]
+    ++ lib.optionals withGtk3 [ wrapGAppsHook ];
+
+  buildInputs = [ perlEnv ]
+    # Can't be in perlEnv for wrapGAppsHook to work correctly
+    ++ lib.optional withGtk3 Gtk3;
+
+  # Not supported by buildPerlModule
+  # and the Perl code fails anyway
+  # when Getopt::Long sets $gtk in Build.PL:
+  # Modification of a read-only value attempted at /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-perl5.34.0-Getopt-Long-2.52/lib/perl5/site_perl/5.34.0/Getopt/Long.pm line 585.
+  #buildFlags = lib.optional withGtk3 "--gtk3";
+  postPatch = lib.optionalString withGtk3 ''
+    substituteInPlace Build.PL --replace 'my $gtk ' 'my $gtk = 1;#'
+  '';
+
+  checkInputs = [
+    TestPod
+  ];
+
+  dontWrapGApps = true;
+  postFixup = ''
+    wrapProgram "$out/bin/pipe-viewer" \
+      --prefix PATH : "${lib.makeBinPath [ ffmpeg wget youtube-dl yt-dlp ]}"
+  '' + lib.optionalString withGtk3 ''
+    wrapProgram "$out/bin/gtk-pipe-viewer" ''${gappsWrapperArgs[@]} \
+      --prefix PATH : "${lib.makeBinPath [ ffmpeg wget xdg-utils youtube-dl yt-dlp ]}"
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/trizen/pipe-viewer";
+    description = "CLI+GUI YouTube Client";
+    license = licenses.artistic2;
+    maintainers = with maintainers; [ julm ];
+    platforms = platforms.all;
+  };
+}
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@ -22,6 +22,7 @@
 , clang
 , llvmPackages
 , linux-pam
+, rdkafka
 , ...
 }:

@ -135,6 +136,11 @@ in
    buildInputs = [ postgresql ];
  };

+  rdkafka-sys = attr: {
+    nativeBuildInputs = [ pkg-config ];
+    buildInputs = [ rdkafka ];
+  };
+
  rink = attrs: {
    buildInputs = [ gmp ];
    crateBin = [{ name = "rink"; path = "src/bin/rink.rs"; }];
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@ -13,7 +13,7 @@ with import ../../../nixos/lib/qemu-flags.nix { inherit pkgs; };

 rec {

-  qemu = pkgs.qemu_kvm;
+  qemu = buildPackages.qemu_kvm;

  modulesClosure = makeModulesClosure {
    inherit kernel rootModules;
@ -24,7 +24,7 @@ rec {
  hd = "vda"; # either "sda" or "vda"

  initrdUtils = runCommand "initrd-utils"
-    { buildInputs = [ nukeReferences ];
+    { nativeBuildInputs = [ buildPackages.nukeReferences ];
      allowedReferences = [ "out" modulesClosure ]; # prevent accidents like glibc being included in the initrd
    }
    ''
@ -655,7 +655,10 @@ rec {
  rpmClosureGenerator =
    {name, packagesLists, urlPrefixes, packages, archs ? []}:
    assert (builtins.length packagesLists) == (builtins.length urlPrefixes);
-    runCommand "${name}.nix" {buildInputs = [perl perlPackages.XMLSimple]; inherit archs;} ''
+    runCommand "${name}.nix" {
+      nativeBuildInputs = [ buildPackages.perl buildPackages.perlPackages.XMLSimple ];
+      inherit archs;
+    } ''
      ${lib.concatImapStrings (i: pl: ''
        gunzip < ${pl} > ./packages_${toString i}.xml
      '') packagesLists}
@ -694,7 +697,8 @@ rec {
  debClosureGenerator =
    {name, packagesLists, urlPrefix, packages}:

-    runCommand "${name}.nix" { buildInputs = [ perl dpkg ]; } ''
+    runCommand "${name}.nix"
+      { nativeBuildInputs = [ buildPackages.perl buildPackages.dpkg ]; } ''
      for i in ${toString packagesLists}; do
        echo "adding $i..."
        case $i in
--- a/pkgs/desktops/gnome/games/tali/default.nix
+++ b/pkgs/desktops/gnome/games/tali/default.nix
@ -20,11 +20,11 @@

 stdenv.mkDerivation rec {
  pname = "tali";
-  version = "40.2";
+  version = "40.3";

  src = fetchurl {
    url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "9SHsnW1SKA/Pfi1IerbVqIw54yx6n5XrqwKdUsAj4Cs=";
+    sha256 = "neLxCreZjHprLKYvs3nBgby8HtYqp6gkG8VVHVF4/iE=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/pantheon/apps/appcenter/default.nix
+++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix
@ -30,19 +30,22 @@

 stdenv.mkDerivation rec {
  pname = "appcenter";
-  version = "3.7.1";
+  version = "3.8.0";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = pname;
    rev = version;
-    sha256 = "1llkc0p47jcx992lkwics86vv622dmmvm5hxrdsq26j9crcd5dam";
+    sha256 = "07lkdpnjj9pxbq8h794qjiidvnysvzx0132w98r1wg9k7ca170bj";
  };

  patches = [
    # Try to remove other backends to make flatpak backend work.
    # https://github.com/NixOS/nixpkgs/issues/70214
    ./flatpak-only.patch
+    # The homepage banner does not show up on first run,
+    # has issues with app icon and mouse scrolling.
+    ./drop-homepage-banner.patch
  ];

  passthru = {
@ -82,7 +85,6 @@ stdenv.mkDerivation rec {
  ];

  mesonFlags = [
-    "-Dhomepage=false"
    "-Dpayments=false"
    "-Dcurated=false"
  ];
--- a/pkgs/desktops/pantheon/apps/appcenter/drop-homepage-banner.patch
+++ b/pkgs/desktops/pantheon/apps/appcenter/drop-homepage-banner.patch
@ -0,0 +1,234 @@
+From b1e09653d755ca6ffd03a1e3e67750e6bcc2bc6f Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Wed, 22 Sep 2021 11:54:48 +0800
+Subject: [PATCH 2/2] Drop homepage banner
+
+---
+ src/Views/Homepage.vala | 181 +---------------------------------------
+ 1 file changed, 1 insertion(+), 180 deletions(-)
+
+diff --git a/src/Views/Homepage.vala b/src/Views/Homepage.vala
+index 576fc02c..80a1d221 100644
+--- a/src/Views/Homepage.vala
+++ b/src/Views/Homepage.vala
+@@ -31,67 +31,12 @@ public class AppCenter.Homepage : AbstractView {
+     public bool viewing_package { get; private set; default = false; }
+ 
+     public AppStream.Category currently_viewed_category;
+-    private Hdy.Carousel banner_carousel;
+-    private Gtk.Revealer banner_revealer;
+-    private Gtk.FlowBox recently_updated_carousel;
+-    private Gtk.Revealer recently_updated_revealer;
+-
+-    private uint banner_timeout_id;
+ 
+     construct {
+-        banner_carousel = new Hdy.Carousel () {
+-            allow_long_swipes = true
+-        };
+-
+-        var banner_event_box = new Gtk.EventBox ();
+-        banner_event_box.events |= Gdk.EventMask.ENTER_NOTIFY_MASK;
+-        banner_event_box.events |= Gdk.EventMask.LEAVE_NOTIFY_MASK;
+-        banner_event_box.add (banner_carousel);
+-
+-        var banner_dots = new Hdy.CarouselIndicatorDots () {
+-            carousel = banner_carousel
+-        };
+-
+-        var banner_grid = new Gtk.Grid () {
+-            orientation = Gtk.Orientation.VERTICAL
+-        };
+-        banner_grid.add (banner_event_box);
+-        banner_grid.add (banner_dots);
+-
+-        banner_revealer = new Gtk.Revealer ();
+-        banner_revealer.add (banner_grid);
+-
+-        var recently_updated_label = new Granite.HeaderLabel (_("Recently Updated")) {
+-            margin_start = 12
+-        };
+-
+-        recently_updated_carousel = new Gtk.FlowBox () {
+-            activate_on_single_click = true,
+-            column_spacing = 12,
+-            row_spacing = 12,
+-            homogeneous = true,
+-            max_children_per_line = 5,
+-            min_children_per_line = 3
+-        };
+-
+-        var recently_updated_grid = new Gtk.Grid () {
+-            margin_end = 12,
+-            margin_start = 12
+-        };
+-        recently_updated_grid.attach (recently_updated_label, 0, 0);
+-        recently_updated_grid.attach (recently_updated_carousel, 0, 1);
+-
+-        recently_updated_revealer = new Gtk.Revealer ();
+-        recently_updated_revealer.add (recently_updated_grid );
+-
+-        var categories_label = new Granite.HeaderLabel (_("Categories")) {
+-            margin_start = 24,
+-            margin_top = 24
+-        };
+-
+         category_flow = new Widgets.CategoryFlowBox () {
+             margin_start = 12,
+             margin_end =12,
+            margin_top = 12,
+             valign = Gtk.Align.START
+         };
+ 
+@@ -99,9 +44,6 @@ public class AppCenter.Homepage : AbstractView {
+             column_spacing = 24,
+             orientation = Gtk.Orientation.VERTICAL
+         };
+-        grid.add (banner_revealer);
+-        grid.add (recently_updated_revealer);
+-        grid.add (categories_label);
+         grid.add (category_flow);
+ 
+         scrolled_window = new Gtk.ScrolledWindow (null, null) {
+@@ -111,19 +53,6 @@ public class AppCenter.Homepage : AbstractView {
+ 
+         add (scrolled_window);
+ 
+-        var local_package = App.local_package;
+-        if (local_package != null) {
+-            var banner = new Widgets.Banner (local_package);
+-
+-            banner_carousel.prepend (banner);
+-
+-            banner.clicked.connect (() => {
+-                show_package (local_package);
+-            });
+-        }
+-
+-        load_banners_and_carousels.begin ();
+-
+         category_flow.child_activated.connect ((child) => {
+             var item = child as Widgets.CategoryItem;
+             if (item != null) {
+@@ -159,94 +88,8 @@ public class AppCenter.Homepage : AbstractView {
+                         }
+                     }
+                 }
+-
+-                return GLib.Source.REMOVE;
+             });
+         });
+-
+-        banner_event_box.enter_notify_event.connect (() => {
+-            banner_timeout_stop ();
+-        });
+-
+-        banner_event_box.leave_notify_event.connect (() => {
+-            banner_timeout_start ();
+-        });
+-
+-        recently_updated_carousel.child_activated.connect ((child) => {
+-            var package_row_grid = (AppCenter.Widgets.ListPackageRowGrid) child.get_child ();
+-
+-            show_package (package_row_grid.package);
+-        });
+-    }
+-
+-    private async void load_banners_and_carousels () {
+-        unowned var fp_client = AppCenterCore.FlatpakBackend.get_default ();
+-        var packages_by_release_date = fp_client.get_featured_packages_by_release_date ();
+-        var packages_in_banner = new Gee.LinkedList<AppCenterCore.Package> ();
+-
+-        int package_count = 0;
+-        foreach (var package in packages_by_release_date) {
+-            if (package_count >= MAX_PACKAGES_IN_BANNER) {
+-                break;
+-            }
+-
+-            var installed = false;
+-            foreach (var origin_package in package.origin_packages) {
+-                try {
+-                    if (yield origin_package.backend.is_package_installed (origin_package)) {
+-                        installed = true;
+-                        break;
+-                    }
+-                } catch (Error e) {
+-                    continue;
+-                }
+-            }
+-
+-            if (!installed) {
+-                packages_in_banner.add (package);
+-                package_count++;
+-            }
+-        }
+-
+-        foreach (var package in packages_in_banner) {
+-            var banner = new Widgets.Banner (package);
+-            banner.clicked.connect (() => {
+-                show_package (package);
+-            });
+-
+-            banner_carousel.add (banner);
+-        }
+-
+-        banner_carousel.show_all ();
+-        banner_revealer.reveal_child = true;
+-        banner_timeout_start ();
+-
+-        foreach (var package in packages_by_release_date) {
+-            if (recently_updated_carousel.get_children ().length () >= MAX_PACKAGES_IN_CAROUSEL) {
+-                break;
+-            }
+-
+-            var installed = false;
+-            foreach (var origin_package in package.origin_packages) {
+-                try {
+-                    if (yield origin_package.backend.is_package_installed (origin_package)) {
+-                        installed = true;
+-                        break;
+-                    }
+-                } catch (Error e) {
+-                    continue;
+-                }
+-            }
+-
+-            if (!installed && !(package in packages_in_banner) && !package.is_explicit) {
+-                var package_row = new AppCenter.Widgets.ListPackageRowGrid (package);
+-                recently_updated_carousel.add (package_row);
+-            }
+-        }
+-        recently_updated_carousel.show_all ();
+-        recently_updated_revealer.reveal_child = recently_updated_carousel.get_children ().length () > 0;
+-
+-        page_loaded ();
+     }
+ 
+     public override void show_package (
+@@ -307,26 +150,4 @@ public class AppCenter.Homepage : AbstractView {
+         var apps = client.get_applications_for_category (category);
+         app_list_view.add_packages (apps);
+     }
+-
+-    private void banner_timeout_start () {
+-        banner_timeout_id = Timeout.add (MILLISECONDS_BETWEEN_BANNER_ITEMS, () => {
+-            var new_index = (uint) banner_carousel.position + 1;
+-            var max_index = banner_carousel.n_pages - 1; // 0-based index
+-
+-            if (banner_carousel.position >= max_index) {
+-                new_index = 0;
+-            }
+-
+-            banner_carousel.switch_child (new_index, Granite.TRANSITION_DURATION_OPEN);
+-
+-            return Source.CONTINUE;
+-        });
+-    }
+-
+-    private void banner_timeout_stop () {
+-        if (banner_timeout_id != 0) {
+-            Source.remove (banner_timeout_id);
+-            banner_timeout_id = 0;
+-        }
+-    }
+ }
--- a/pkgs/desktops/pantheon/apps/appcenter/flatpak-only.patch
+++ b/pkgs/desktops/pantheon/apps/appcenter/flatpak-only.patch
@ -1,15 +1,14 @@
-From 63594caa1da772de504ab1d93b69aae148f29f64 Mon Sep 17 00:00:00 2001
+From 5d3f20b49a89b55e39339a0f90ae7f846356b0e1 Mon Sep 17 00:00:00 2001
 From: Bobby Rong <rjl931189261@126.com>
-Date: Wed, 1 Sep 2021 12:25:09 +0800
-Subject: [PATCH] Drop PackageKitBackend and UbuntuDriversBackend
+Date: Wed, 22 Sep 2021 11:54:24 +0800
+Subject: [PATCH 1/2] Drop PackageKitBackend and UbuntuDriversBackend

 ---
 src/Application.vala            | 14 ---------
 src/Core/BackendAggregator.vala |  2 --
 src/Core/UpdateManager.vala     | 56 ---------------------------------
 src/MainWindow.vala             | 17 ----------
- src/Views/Homepage.vala         | 15 ---------
- 5 files changed, 104 deletions(-)
+ 4 files changed, 89 deletions(-)

 diff --git a/src/Application.vala b/src/Application.vala
 index 65fae5aa..9d42b14f 100644
@ -161,36 +160,3 @@ index a32ce47b..b9f8594a 100644
         return false;
     }
 
-diff --git a/src/Views/Homepage.vala b/src/Views/Homepage.vala
-index 67d1e208..48af8f61 100644
--- a/src/Views/Homepage.vala
-+++ b/src/Views/Homepage.vala
-@@ -212,7 +212,6 @@ public class AppCenter.Homepage : AbstractView {
-         recently_updated_revealer.reveal_child = recently_updated_carousel.get_children ().length () > 0;
- 
-         var houston = AppCenterCore.Houston.get_default ();
-        var pk_client = AppCenterCore.PackageKitBackend.get_default ();
-         var packages_for_banner = new Gee.LinkedList<AppCenterCore.Package> ();
- 
-         var newest_ids = yield houston.get_app_ids ("/newest/project");
-@@ -220,20 +219,6 @@ public class AppCenter.Homepage : AbstractView {
-         Utils.shuffle_array (trending_ids);
- 
-         var packages = new Gee.HashMap<string, AppCenterCore.Package> ();
-        packages.set_all (pk_client.get_packages_for_component_ids (newest_ids));
-        packages.set_all (pk_client.get_packages_for_component_ids (trending_ids));
-
-        if (!AppCenterCore.PackageKitBackend.supports_parallel_package_queries) {
-            foreach (var package in packages.values) {
-                package.update_state ();
-            }
-        } else {
-            try {
-                yield pk_client.update_multiple_package_state (packages.values);
-            } catch (Error e) {
-                warning ("Error while getting installed state of banner packages: %s", e.message);
-            }
-        }
- 
-         foreach (var package in newest_ids) {
-             if (packages_for_banner.size >= NUM_PACKAGES_IN_BANNER) {
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@ -22,9 +22,9 @@ let
      "mips64"
    else if isMsp430 then
      "msp430"
-    else if isPowerPC && is32bit then
+    else if isPower && is32bit then
      "powerpc"
-    else if isPowerPC && is64bit then
+    else if isPower && is64bit then
      "powerpc64"
    else if isRiscV && is64bit then
      "riscv64"
--- a/pkgs/development/embedded/tytools/default.nix
+++ b/pkgs/development/embedded/tytools/default.nix
@ -0,0 +1,26 @@
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook , qtbase}:
+
+stdenv.mkDerivation rec {
+  pname = "tytools";
+  version = "0.9.3";
+
+  src = fetchFromGitHub {
+    owner = "Koromix";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0ax6j17f5nm0q4sp8sg1412hd48qp7whdy7dd699kwjcm763bl5j";
+  };
+
+  nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
+  buildInputs = [
+    qtbase
+  ];
+
+  meta = with lib; {
+    description = "Collection of tools to manage Teensy boards";
+    homepage = "https://koromix.dev/tytools";
+    license = licenses.unlicense;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ ahuzik ];
+  };
+}
--- a/pkgs/development/libraries/kimageannotator/default.nix
+++ b/pkgs/development/libraries/kimageannotator/default.nix
@ -2,13 +2,13 @@

 mkDerivation rec {
  pname = "kimageannotator";
-  version = "0.5.1";
+  version = "0.5.2";

  src = fetchFromGitHub {
    owner = "ksnip";
    repo = "kImageAnnotator";
    rev = "v${version}";
-    sha256 = "0hfvrd78lgwd7bccz0fx2pr7g0v3s401y5plra63rxwk55ffkxf8";
+    sha256 = "07m3il928gwzzab349grpaksqqv4n7r6mn317sx2jly0x0bpv0rh";
  };

  nativeBuildInputs = [ cmake qttools ];
--- a/pkgs/development/libraries/libfabric/default.nix
+++ b/pkgs/development/libraries/libfabric/default.nix
@ -1,4 +1,5 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, libpsm2 }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, libpsm2
+, enablePsm2 ? (stdenv.isx86_64 && stdenv.isLinux) }:

 stdenv.mkDerivation rec {
  pname = "libfabric";
@ -10,20 +11,20 @@ stdenv.mkDerivation rec {
    owner = "ofiwg";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-0USQMBXZrbz4GtXLNsSti9ohUOqqo0OCtVz+0Uk9ndI=";
+    sha256 = "0USQMBXZrbz4GtXLNsSti9ohUOqqo0OCtVz+0Uk9ndI=";
  };

-  nativeBuildInputs = [ pkg-config autoreconfHook ] ;
+  nativeBuildInputs = [ pkg-config autoreconfHook ];

-  buildInputs = [ libpsm2 ] ;
+  buildInputs = lib.optional enablePsm2 libpsm2;

-  configureFlags = [ "--enable-psm2=${libpsm2}" ] ;
+  configureFlags = [ (if enablePsm2 then "--enable-psm2=${libpsm2}" else "--disable-psm2") ];

  meta = with lib; {
-    homepage = "http://libfabric.org/";
+    homepage = "https://ofiwg.github.io/libfabric/";
    description = "Open Fabric Interfaces";
    license = with licenses; [ gpl2 bsd2 ];
-    platforms = [ "x86_64-linux" ];
+    platforms = platforms.all;
    maintainers = [ maintainers.bzizou ];
  };
 }
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@ -7,14 +7,14 @@

 buildPythonPackage rec {
  pname = "ailment";
-  version = "9.0.9947";
+  version = "9.0.10010";
  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "angr";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-4QwpIZbS+ZPjKp2oKSOzpjCK3Bi5AdntKTO8Ujx2TPE=";
+    sha256 = "sha256-kEHbuc5gmurMznTyfn/KnZEClLHJgv2CzK4O30dIgTg=";
  };

  propagatedBuildInputs = [ pyvex ];
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@ -43,14 +43,14 @@ in

 buildPythonPackage rec {
  pname = "angr";
-  version = "9.0.9947";
+  version = "9.0.10010";
  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-qE2LIfcKwMAbmEXycPYo4T1WU9A6tr6mDYcxDs21ySI=";
+    sha256 = "sha256-UWg3lrBMfQsR09wbx8F2nml8eymk7V60gwFbPXwNqAw=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/angrop/default.nix
+++ b/pkgs/development/python-modules/angrop/default.nix
@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "angrop";
-  version = "9.0.9947";
+  version = "9.0.10010";
  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "angr";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-f9T2M2ilT8v6G87sbJ1r192zEpBeuWUpgQP9sYsUoeU=";
+    sha256 = "sha256-VCVvJI98gyVZC2SPb5hd8FKLTYUhEILJtieb4IQGL2c=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@ -7,13 +7,13 @@

 buildPythonPackage rec {
  pname = "archinfo";
-  version = "9.0.9947";
+  version = "9.0.10010";

  src = fetchFromGitHub {
    owner = "angr";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-DffiOMJUxreoWyPxelEL7mzaekwInYLquTS7HBIUJiM=";
+    sha256 = "sha256-Eyquud4Cc0bU4z+ElWs/gPzuNRtNKPMxWjSLpwFlBXQ=";
  };

  checkInputs = [
--- a/pkgs/development/python-modules/bitlist/default.nix
+++ b/pkgs/development/python-modules/bitlist/default.nix
@ -24,6 +24,11 @@ buildPythonPackage rec {
    nose
  ];

+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "parts~=1.0.3" "parts>=1.0.3"
+  '';
+
  pythonImportsCheck = [ "bitlist" ];

  meta = with lib; {
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "claripy";
-  version = "9.0.9947";
+  version = "9.0.10010";
  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "angr";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-3nG173x0N4enGTN52wd0HbHbJJrAI7IKSp7FHQ/v/5U=";
+    sha256 = "sha256-bcVbGDUTVLQ6ybPA2HjRlHJj1gnYK2dazhZXc9k0uSY=";
  };

  # Use upstream z3 implementation
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@ -15,7 +15,7 @@

 let
  # The binaries are following the argr projects release cycle
-  version = "9.0.9947";
+  version = "9.0.10010";

  # Binary files from https://github.com/angr/binaries (only used for testing and only here)
  binaries = fetchFromGitHub {
@ -35,7 +35,7 @@ buildPythonPackage rec {
    owner = "angr";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-xlzc5Bde/OFlGJe9e4qb7QSszWyINJkQfEzY0wTaKD0=";
+    sha256 = "sha256-Fq/xkcG6wLRaXG37UEf/3r+EsacpkP2iA+HZLT05ETg=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@ -22,7 +22,7 @@

 buildPythonPackage rec {
  pname = "dask";
-  version = "2021.08.1";
+  version = "2021.09.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -31,7 +31,7 @@ buildPythonPackage rec {
    owner = "dask";
    repo = pname;
    rev = version;
-    sha256 = "sha256-HnrHOp3Y/iLYaK3KVp6NJrK68BMqX8lTl/wLosiGc7k=";
+    sha256 = "sha256-Gb6eQ5Hebx3mBNGvgB5yvM4dPsIxJl9ka++yYC/Zf7Q=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@ -19,13 +19,13 @@

 buildPythonPackage rec {
  pname = "distributed";
-  version = "2021.8.1";
+  version = "2021.9.0";
  disabled = pythonOlder "3.6";

  # get full repository need conftest.py to run tests
  src = fetchPypi {
    inherit pname version;
-    sha256 = "c13ac10ecd9ee5f0ff67f5697149062d6e483f23a079918df1ab2e19b11fa77d";
+    sha256 = "sha256-IiKc0rJYODCtGC9AAOkjbww/VG7PdfrqJ32IHU9xWbo=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/einops/default.nix
+++ b/pkgs/development/python-modules/einops/default.nix
@ -0,0 +1,54 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, numpy
+, nose
+, nbformat
+, nbconvert
+, jupyter
+, chainer
+, pytorch
+, mxnet
+, tensorflow
+}:
+
+buildPythonPackage rec {
+  pname = "einops";
+  version = "0.3.2";
+
+  src = fetchFromGitHub {
+    owner = "arogozhnikov";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0ix094cfh6w4bvx6ymp5dpm35y9nkaibcn1y50g6kwdp4f0473y8";
+  };
+
+  checkInputs = [
+    nose
+    numpy
+    # For notebook tests
+    nbformat
+    nbconvert
+    jupyter
+    # For backend tests
+    chainer
+    pytorch
+    mxnet
+    tensorflow
+  ];
+
+  # No CUDA in sandbox
+  EINOPS_SKIP_CUPY = 1;
+
+  checkPhase = ''
+    export HOME=$TMPDIR
+    nosetests -v -w tests
+  '';
+
+  meta = {
+    description = "Flexible and powerful tensor operations for readable and reliable code";
+    homepage = "https://github.com/arogozhnikov/einops";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ yl3dy ];
+  };
+}
--- a/pkgs/development/python-modules/fsspec/default.nix
+++ b/pkgs/development/python-modules/fsspec/default.nix
@ -14,14 +14,14 @@

 buildPythonPackage rec {
  pname = "fsspec";
-  version = "2021.07.0";
+  version = "2021.08.1";
  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "intake";
    repo = "filesystem_spec";
    rev = version;
-    hash = "sha256-I0oR7qxMCB2egyOx69hY0++H7fzCdK3ZyyzCvP3yXAs=";
+    sha256 = "0xxzcp69div1sy975x82k754snbsksyqr73h6jiasdxj8wka49s0";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/gcsfs/default.nix
+++ b/pkgs/development/python-modules/gcsfs/default.nix
@ -17,14 +17,14 @@

 buildPythonPackage rec {
  pname = "gcsfs";
-  version = "2021.07.0";
+  version = "2021.08.1";
  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "dask";
    repo = pname;
    rev = version;
-    sha256 = "sha256-nC/uyhKKam3W+cOOTBULPeG6Hy2bExWYNOfDs1cPt1Y=";
+    sha256 = "sha256-SPQcSdEEbU791oqkvuwmvyvQ6HglvoWKMi5SdnRcEZI=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/google-cloud-dns/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dns/default.nix
@ -9,11 +9,11 @@

 buildPythonPackage rec {
  pname = "google-cloud-dns";
-  version = "0.33.0";
+  version = "0.33.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-iPAJMzxefRjLA0tGUfjAs15ZJvcyBUJB1QCMfMBo96I=";
+    sha256 = "e4aa73fc6ca22764fd7294de19b602dff084d924c77366c136fb9c28e70ae739";
  };

  propagatedBuildInputs = [ google-api-core google-cloud-core ];
--- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
+++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
@ -9,11 +9,11 @@

 buildPythonPackage rec {
  pname = "google-cloud-runtimeconfig";
-  version = "0.32.4";
+  version = "0.32.5";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "ee239455a5393b51018071678ec0f4cc58ddf0904390e9f317f704f158ab16ab";
+    sha256 = "2f7b2a69f4506239a54f2d88dda872db27fdb0fdfa0d5a9494fefb7ae360aa20";
  };

  propagatedBuildInputs = [ google-api-core google-cloud-core ];
--- a/pkgs/development/python-modules/google-cloud-spanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix
@ -14,11 +14,11 @@

 buildPythonPackage rec {
  pname = "google-cloud-spanner";
-  version = "3.9.0";
+  version = "3.10.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "53fe3d903363fb17db155fd05f5356d9b310a519fbebd53903aa426a31cad706";
+    sha256 = "49b946f9ae67ebae69d39f1f4ceabe88971b880b92277ce037651db49e5cf167";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/google-cloud-speech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-speech/default.nix
@ -11,11 +11,11 @@

 buildPythonPackage rec {
  pname = "google-cloud-speech";
-  version = "2.8.0";
+  version = "2.9.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "3750fd988082b880ed1ec6f3d59c4f29f4cd0df3804a58d6c151d4bf15d3a597";
+    sha256 = "2368beb60e5cdeb6db527509cdcc8fc1156eddfc0c73da8f62d60658a551eee1";
  };

  propagatedBuildInputs = [ libcst google-api-core proto-plus ];
--- a/pkgs/development/python-modules/google-crc32c/default.nix
+++ b/pkgs/development/python-modules/google-crc32c/default.nix
@ -2,13 +2,13 @@

 buildPythonPackage rec {
  pname = "google-crc32c";
-  version = "1.1.3";
+  version = "1.2.0";

  src = fetchFromGitHub {
    owner = "googleapis";
    repo = "python-crc32c";
    rev = "v${version}";
-    sha256 = "1m2hafyfagvyabizr4fhcp2s2s3x56k006fhvl1qzk994qjhyzqk";
+    sha256 = "0snpqmj2avgqvfd7w26g03w78s6phwd8h55bvpjwm4lwj8hm8id7";
  };

  buildInputs = [ crc32c ];
--- a/pkgs/development/python-modules/imap-tools/default.nix
+++ b/pkgs/development/python-modules/imap-tools/default.nix
@ -7,7 +7,7 @@

 buildPythonPackage rec {
  pname = "imap-tools";
-  version = "0.47.0";
+  version = "0.48.1";

  disabled = isPy27;

@ -15,7 +15,7 @@ buildPythonPackage rec {
    owner = "ikvk";
    repo = "imap_tools";
    rev = "v${version}";
-    sha256 = "sha256-7I7g/jxaVQDvhoGLWVerqYZhFhGUM/FwH1XCpLpg3D0=";
+    sha256 = "sha256-AS407jsDk+dAz1DPM44vTUQEleohr9xKnjgCw5Rjs9M=";
  };

  checkInputs = [
--- a/pkgs/development/python-modules/impacket/default.nix
+++ b/pkgs/development/python-modules/impacket/default.nix
@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, flask, ldapdomaindump, pycryptodomex, pyasn1, pyopenssl, chardet }:
+{ lib, buildPythonPackage, fetchPypi, flask, ldapdomaindump, pycryptodomex, pyasn1, pyopenssl, chardet, setuptools }:

 buildPythonPackage rec {
  pname = "impacket";
@ -9,7 +9,7 @@ buildPythonPackage rec {
    sha256 = "1c1be8a50cdbe3cffc566ba64f552b1b28bcc79b7a406b833956b49c56d77184";
  };

-  propagatedBuildInputs = [ flask ldapdomaindump pycryptodomex pyasn1 pyopenssl chardet ];
+  propagatedBuildInputs = [ flask ldapdomaindump pycryptodomex pyasn1 pyopenssl chardet setuptools ];

  # fail with:
  # RecursionError: maximum recursion depth exceeded
--- a/pkgs/development/python-modules/intake-parquet/default.nix
+++ b/pkgs/development/python-modules/intake-parquet/default.nix
@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, pandas
+, dask
+, fastparquet
+, pyarrow
+}:
+
+buildPythonPackage rec {
+  pname = "intake-parquet";
+  version = "0.2.3";
+
+  src = fetchFromGitHub {
+    owner = "intake";
+    repo = pname;
+    rev = version;
+    sha256 = "037jd3qkk6dybssp570kzvaln2c6pk2avd2b5mll42gaxdxxnp02";
+  };
+
+  propagatedBuildInputs = [
+    pandas
+    dask
+    fastparquet
+    pyarrow
+  ];
+
+  postPatch = ''
+    # Break circular dependency
+    substituteInPlace requirements.txt \
+      --replace "intake" ""
+  '';
+
+  doCheck = false;
+
+  #pythonImportsCheck = [ "intake_parquet" ];
+
+  meta = with lib; {
+    description = "Parquet plugin for Intake";
+    homepage = "https://github.com/intake/intake-parquet";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/intake/default.nix
+++ b/pkgs/development/python-modules/intake/default.nix
@ -5,12 +5,14 @@
 , dask
 , holoviews
 , hvplot
+, fsspec
 , jinja2
 , msgpack
 , msgpack-numpy
 , numpy
 , pandas
 , panel
+, intake-parquet
 , pyarrow
 , pytestCheckHook
 , pythonOlder
@ -24,6 +26,7 @@
 buildPythonPackage rec {
  pname = "intake";
  version = "0.6.3";
+
  disabled = pythonOlder "3.6";

  src = fetchPypi {
@ -49,7 +52,12 @@ buildPythonPackage rec {
    tornado
  ];

-  checkInputs = [ pyarrow pytestCheckHook ];
+  checkInputs = [
+    fsspec
+    intake-parquet
+    pyarrow
+    pytestCheckHook
+  ];

  postPatch = ''
    # Is in setup_requires but not used in setup.py...
@ -64,14 +72,12 @@ buildPythonPackage rec {
  '';

  disabledTests = [
-    # disable tests which touch network
+    # disable tests which touch network and are broken
    "test_discover"
    "test_filtered_compressed_cache"
    "test_get_dir"
    "test_remote_cat"
    "http"
-
-    # broken test
    "test_read_pattern"
    "test_remote_arr"
  ];
@ -80,6 +86,6 @@ buildPythonPackage rec {
    description = "Data load and catalog system";
    homepage = "https://github.com/ContinuumIO/intake";
    license = licenses.bsd2;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
  };
 }
--- a/pkgs/development/python-modules/keystoneauth1/default.nix
+++ b/pkgs/development/python-modules/keystoneauth1/default.nix
@ -24,11 +24,11 @@

 buildPythonPackage rec {
  pname = "keystoneauth1";
-  version = "4.3.1";
+  version = "4.4.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "93605430a6d1424f31659bc5685e9dc1be9a6254e88c99f00cffc0a60c648a64";
+    sha256 = "34662a6be67ab29424aabe6f99a8d7eb6b88d293109a07e60fea123ebffb314f";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/ocrmypdf/default.nix
+++ b/pkgs/development/python-modules/ocrmypdf/default.nix
@ -1,34 +1,32 @@
-{ fetchFromGitHub
+{ lib
+, buildPythonPackage
+, cffi
+, coloredlogs
+, fetchFromGitHub
 , ghostscript
 , img2pdf
+, importlib-resources
 , jbig2enc
 , leptonica
+, pdfminer
+, pikepdf
+, pillow
+, pluggy
 , pngquant
-, python3
-, python3Packages
-, qpdf
-, lib
+, pytest-xdist
+, pytestCheckHook
+, reportlab
+, setuptools
+, setuptools-scm
+, setuptools-scm-git-archive
 , stdenv
-, tesseract4
-, unpaper
 , substituteAll
+, tesseract4
+, tqdm
+, unpaper
 }:
-let
-  inherit (python3Packages) buildPythonApplication;

-  runtimeDeps = with python3Packages; [
-    ghostscript
-    jbig2enc
-    leptonica
-    pngquant
-    qpdf
-    tesseract4
-    unpaper
-    pillow
-  ];
-
-in
-buildPythonApplication rec {
+buildPythonPackage rec {
  pname = "ocrmypdf";
  version = "12.5.0";

@ -39,51 +37,48 @@ buildPythonApplication rec {
    sha256 = "sha256-g80WedX+TGHE9EJ/RSgOc53PM17V3WZslUNaHoqKTo0=";
  };

-  nativeBuildInputs = with python3Packages; [
-    setuptools
+  patches = [
+    (substituteAll {
+      src = ./paths.patch;
+      gs = "${lib.getBin ghostscript}/bin/gs";
+      jbig2 = "${lib.getBin jbig2enc}/bin/jbig2";
+      liblept = "${lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}";
+      pngquant = "${lib.getBin pngquant}/bin/pngquant";
+      tesseract = "${lib.getBin tesseract4}/bin/tesseract";
+      unpaper = "${lib.getBin unpaper}/bin/unpaper";
+    })
+  ];
+
+  nativeBuildInputs = [
    setuptools-scm-git-archive
    setuptools-scm
  ];

-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = [
    cffi
    coloredlogs
    img2pdf
    importlib-resources
    pdfminer
-    pluggy
    pikepdf
    pillow
+    pluggy
    reportlab
    setuptools
    tqdm
  ];

-  checkInputs = with python3Packages; [
-    pypdf2
-    pytest
-    pytest-helpers-namespace
+  checkInputs = [
    pytest-xdist
-    pytest-cov
-    python-xmp-toolkit
    pytestCheckHook
-  ] ++ runtimeDeps;
-
-  patches = [
-    (substituteAll {
-      src = ./liblept.patch;
-      liblept = "${lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}";
-    })
  ];

-  makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ];
-
  meta = with lib; {
    homepage = "https://github.com/jbarlow83/OCRmyPDF";
    description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched";
    license = with licenses; [ mpl20 mit ];
    platforms = platforms.linux;
-    maintainers = [ maintainers.kiwi ];
+    maintainers = with maintainers; [ kiwi dotlambda ];
    changelog = "https://github.com/jbarlow83/OCRmyPDF/blob/v${version}/docs/release_notes.rst";
  };
 }
--- a/pkgs/development/python-modules/ocrmypdf/paths.patch
+++ b/pkgs/development/python-modules/ocrmypdf/paths.patch
@ -0,0 +1,160 @@
+diff --git a/src/ocrmypdf/_exec/ghostscript.py b/src/ocrmypdf/_exec/ghostscript.py
+index 5c357f1b..f459763a 100644
+--- a/src/ocrmypdf/_exec/ghostscript.py
+++ b/src/ocrmypdf/_exec/ghostscript.py
+@@ -25,28 +25,7 @@ from ocrmypdf.subprocess import get_version, run, run_polling_stderr
+ 
+ log = logging.getLogger(__name__)
+ 
+-missing_gs_error = """
+----------------------------------------------------------------------
+-This error normally occurs when ocrmypdf find can't Ghostscript.
+-Please ensure Ghostscript is installed and its location is added to
+-the system PATH environment variable.
+-
+-For details see:
+-    https://ocrmypdf.readthedocs.io/en/latest/installation.html
+----------------------------------------------------------------------
+-"""
+-
+-_gswin = None
+-if os.name == 'nt':
+-    _gswin = which('gswin64c')
+-    if not _gswin:
+-        _gswin = which('gswin32c')
+-        if not _gswin:
+-            raise MissingDependencyError(missing_gs_error)
+-    _gswin = Path(_gswin).stem
+-
+-GS = _gswin if _gswin else 'gs'
+-del _gswin
+GS = '@gs@'
+ 
+ 
+ def version():
+diff --git a/src/ocrmypdf/_exec/jbig2enc.py b/src/ocrmypdf/_exec/jbig2enc.py
+index 2e8a058b..65a09088 100644
+--- a/src/ocrmypdf/_exec/jbig2enc.py
+++ b/src/ocrmypdf/_exec/jbig2enc.py
+@@ -14,7 +14,7 @@ from ocrmypdf.subprocess import get_version, run
+ 
+ 
+ def version():
+-    return get_version('jbig2', regex=r'jbig2enc (\d+(\.\d+)*).*')
+    return get_version('@jbig2@', regex=r'jbig2enc (\d+(\.\d+)*).*')
+ 
+ 
+ def available():
+@@ -27,7 +27,7 @@ def available():
+ 
+ def convert_group(*, cwd, infiles, out_prefix):
+     args = [
+-        'jbig2',
+        '@jbig2@',
+         '-b',
+         out_prefix,
+         '-s',  # symbol mode (lossy)
+@@ -46,7 +46,7 @@ def convert_group_mp(args):
+ 
+ 
+ def convert_single(*, cwd, infile, outfile):
+-    args = ['jbig2', '-p', infile]
+    args = ['@jbig2@', '-p', infile]
+     with open(outfile, 'wb') as fstdout:
+         proc = run(args, cwd=cwd, stdout=fstdout, stderr=PIPE)
+     proc.check_returncode()
+diff --git a/src/ocrmypdf/_exec/pngquant.py b/src/ocrmypdf/_exec/pngquant.py
+index ca8a4542..d0544174 100644
+--- a/src/ocrmypdf/_exec/pngquant.py
+++ b/src/ocrmypdf/_exec/pngquant.py
+@@ -19,7 +19,7 @@ from ocrmypdf.subprocess import get_version, run
+ 
+ 
+ def version():
+-    return get_version('pngquant', regex=r'(\d+(\.\d+)*).*')
+    return get_version('@pngquant@', regex=r'(\d+(\.\d+)*).*')
+ 
+ 
+ def available():
+@@ -46,7 +46,7 @@ def input_as_png(input_file: Path):
+ def quantize(input_file: Path, output_file: Path, quality_min: int, quality_max: int):
+     with input_as_png(input_file) as input_stream:
+         args = [
+-            'pngquant',
+            '@pngquant@',
+             '--force',
+             '--skip-if-larger',
+             '--quality',
+diff --git a/src/ocrmypdf/_exec/tesseract.py b/src/ocrmypdf/_exec/tesseract.py
+index 33ead41e..5840f7c1 100644
+--- a/src/ocrmypdf/_exec/tesseract.py
+++ b/src/ocrmypdf/_exec/tesseract.py
+@@ -78,7 +78,7 @@ class TesseractVersion(StrictVersion):
+ 
+ 
+ def version():
+-    return get_version('tesseract', regex=r'tesseract\s(.+)')
+    return get_version('@tesseract@', regex=r'tesseract\s(.+)')
+ 
+ 
+ def has_user_words():
+@@ -100,7 +100,7 @@ def get_languages():
+         msg += output
+         return msg
+ 
+-    args_tess = ['tesseract', '--list-langs']
+    args_tess = ['@tesseract@', '--list-langs']
+     try:
+         proc = run(
+             args_tess,
+@@ -122,7 +122,7 @@ def get_languages():
+ 
+ 
+ def tess_base_args(langs: List[str], engine_mode: Optional[int]) -> List[str]:
+-    args = ['tesseract']
+    args = ['@tesseract@']
+     if langs:
+         args.extend(['-l', '+'.join(langs)])
+     if engine_mode is not None:
+diff --git a/src/ocrmypdf/_exec/unpaper.py b/src/ocrmypdf/_exec/unpaper.py
+index 3c3ae72c..d269966a 100644
+--- a/src/ocrmypdf/_exec/unpaper.py
+++ b/src/ocrmypdf/_exec/unpaper.py
+@@ -31,7 +31,7 @@ log = logging.getLogger(__name__)
+ 
+ 
+ def version() -> str:
+-    return get_version('unpaper')
+    return get_version('@unpaper@')
+ 
+ 
+ def _setup_unpaper_io(tmpdir: Path, input_file: Path) -> Tuple[Path, Path]:
+@@ -71,7 +71,7 @@ def _setup_unpaper_io(tmpdir: Path, input_file: Path) -> Tuple[Path, Path]:
+ def run(
+     input_file: Path, output_file: Path, *, dpi: DecFloat, mode_args: List[str]
+ ) -> None:
+-    args_unpaper = ['unpaper', '-v', '--dpi', str(round(dpi, 6))] + mode_args
+    args_unpaper = ['@unpaper@', '-v', '--dpi', str(round(dpi, 6))] + mode_args
+ 
+     with TemporaryDirectory() as tmpdir:
+         input_pnm, output_pnm = _setup_unpaper_io(Path(tmpdir), input_file)
+diff --git a/src/ocrmypdf/leptonica.py b/src/ocrmypdf/leptonica.py
+index e4814f1a..fdaf7ea4 100644
+--- a/src/ocrmypdf/leptonica.py
+++ b/src/ocrmypdf/leptonica.py
+@@ -33,14 +33,7 @@ from ocrmypdf.lib._leptonica import ffi
+ 
+ logger = logging.getLogger(__name__)
+ 
+-if os.name == 'nt':
+-    from ocrmypdf.subprocess._windows import shim_env_path
+-
+-    libname = 'liblept-5'
+-    os.environ['PATH'] = shim_env_path()
+-else:
+-    libname = 'lept'
+-_libpath = find_library(libname)
+_libpath = '@liblept@'
+ if not _libpath:
+     raise MissingDependencyError(
+         """
--- a/pkgs/development/python-modules/openstacksdk/default.nix
+++ b/pkgs/development/python-modules/openstacksdk/default.nix
@ -1,26 +1,20 @@
 { lib
 , buildPythonPackage
+, callPackage
 , fetchPypi
 , appdirs
 , cryptography
-, ddt
 , dogpile_cache
-, hacking
 , jmespath
 , jsonpatch
-, jsonschema
 , keystoneauth1
 , munch
 , netifaces
 , os-service-types
-, oslo-config
-, oslotest
 , pbr
-, prometheus-client
-, requests-mock
+, pyyaml
 , requestsexceptions
-, stestr
-, testscenarios
+, stdenv
 }:

 buildPythonPackage rec {
@ -44,35 +38,15 @@ buildPythonPackage rec {
    os-service-types
    pbr
    requestsexceptions
+    pyyaml
  ];

-  checkInputs = [
-    ddt
-    hacking
-    jsonschema
-    oslo-config
-    oslotest
-    prometheus-client
-    requests-mock
-    stestr
-    testscenarios
-  ];
+  # Checks moved to 'passthru.tests' to workaround slowness
+  doCheck = false;

-  checkPhase = ''
-    stestr run -e <(echo "
-    openstack.tests.unit.cloud.test_image.TestImage.test_create_image_task
-    openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_error_396
-    openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait
-    openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails
-    openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute
-    openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match
-    openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match_with_none
-    openstack.tests.unit.test_stats.TestStats.test_list_projects
-    openstack.tests.unit.test_stats.TestStats.test_projects
-    openstack.tests.unit.test_stats.TestStats.test_servers
-    openstack.tests.unit.test_stats.TestStats.test_servers_no_detail
-    ")
-  '';
+  passthru.tests = {
+    tests = callPackage ./tests.nix { };
+  };

  pythonImportsCheck = [ "openstack" ];

--- a/pkgs/development/python-modules/openstacksdk/tests.nix
+++ b/pkgs/development/python-modules/openstacksdk/tests.nix
@ -0,0 +1,65 @@
+{ buildPythonPackage
+, ddt
+, hacking
+, jsonschema
+, lib
+, openstacksdk
+, oslo-config
+, oslotest
+, prometheus-client
+, requests-mock
+, stdenv
+, stestr
+, testscenarios
+}:
+
+buildPythonPackage rec {
+  pname = "openstacksdk-tests";
+  inherit (openstacksdk) version;
+
+  src = openstacksdk.src;
+
+  dontBuild = true;
+  dontInstall = true;
+
+  checkInputs = [
+    ddt
+    hacking
+    jsonschema
+    openstacksdk
+    oslo-config
+    oslotest
+    prometheus-client
+    requests-mock
+    stestr
+    testscenarios
+  ];
+
+  checkPhase =
+    let aarch64TestsExcluded = lib.optionalString stdenv.hostPlatform.isAarch64 ''
+      openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_node_set_provision_state_with_retries
+      openstack.tests.unit.cloud.test_role_assignment.TestRoleAssignment.test_grant_role_user_domain_exists
+      openstack.tests.unit.cloud.test_volume_backups.TestVolumeBackups.test_delete_volume_backup_force
+      openstack.tests.unit.object_store.v1.test_proxy.TestTempURLBytesPathAndKey.test_set_account_temp_url_key_second
+      openstack.tests.unit.cloud.test_security_groups.TestSecurityGroups.test_delete_security_group_neutron_not_found
+    ''; in
+    ''
+      stestr run -e <(echo "${aarch64TestsExcluded}
+      openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_wait_for_baremetal_node_lock_locked
+      openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_inspect_failed
+      openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_available_wait
+      openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_wait
+      openstack.tests.unit.cloud.test_image.TestImage.test_create_image_task
+      openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_error_396
+      openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait
+      openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails
+      openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute
+      openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match
+      openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match_with_none
+      openstack.tests.unit.test_stats.TestStats.test_list_projects
+      openstack.tests.unit.test_stats.TestStats.test_projects
+      openstack.tests.unit.test_stats.TestStats.test_servers
+      openstack.tests.unit.test_stats.TestStats.test_servers_no_detail
+      ")
+    '';
+}
--- a/pkgs/development/python-modules/osc-lib/default.nix
+++ b/pkgs/development/python-modules/osc-lib/default.nix
@ -13,11 +13,11 @@

 buildPythonPackage rec {
  pname = "osc-lib";
-  version = "2.4.1";
+  version = "2.4.2";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1ianpk32vwdllpbk4zhfifqb5b064cbmia2hm02lcrh2m76z0zi5";
+    sha256 = "d6b530e3e50646840a6a5ef134e00f285cc4a04232c163f28585226ed40cc968";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/ospd/default.nix
+++ b/pkgs/development/python-modules/ospd/default.nix
@ -0,0 +1,53 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, defusedxml
+, deprecated
+, fetchFromGitHub
+, lxml
+, paramiko
+, poetry
+, psutil
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "ospd";
+  version = "21.4.3";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7" || stdenv.isDarwin;
+
+  src = fetchFromGitHub {
+    owner = "greenbone";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1i4nfvxgxibqmqb6jwih951960sm2zy00i1wnjfnwb6za1xkpbkp";
+  };
+
+  nativeBuildInputs = [
+    poetry
+  ];
+
+  propagatedBuildInputs = [
+    defusedxml
+    deprecated
+    lxml
+    paramiko
+    psutil
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "ospd" ];
+
+  meta = with lib; {
+    description = "Framework for vulnerability scanners which support OSP";
+    homepage = "https://github.com/greenbone/ospd";
+    license = with licenses; [ agpl3Plus ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/parquet/default.nix
+++ b/pkgs/development/python-modules/parquet/default.nix
@ -0,0 +1,44 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, python-snappy
+, pythonOlder
+, thriftpy2
+}:
+
+buildPythonPackage rec {
+  pname = "parquet";
+  version = "1.3.1";
+
+  src = fetchFromGitHub {
+    owner = "jcrobak";
+    repo = "parquet-python";
+    rev = "v${version}";
+    sha256 = "1ahvg4dz9fzi4vdm9jmslq3v3jahjj17fdcc5fljgcw6h9yxyl2r";
+  };
+
+  propagatedBuildInputs = [
+    python-snappy
+    thriftpy2
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # Fails with AttributeError
+    "test_bson"
+    "testFromExample"
+  ];
+
+  pythonImportsCheck = [ "thriftpy2" ];
+
+  meta = with lib; {
+    description = "Python implementation of the parquet columnar file format";
+    homepage = "https://github.com/jcrobak/parquet-python";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/parts/default.nix
+++ b/pkgs/development/python-modules/parts/default.nix
@ -5,11 +5,11 @@

 buildPythonPackage rec {
  pname = "parts";
-  version = "1.0.3";
+  version = "1.1.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "a4137612bc050f606b4d6f9e6a554ebfb50633c8dd9699481f82271f84d9425f";
+    sha256 = "sha256-Xtcu/0ZO+6L7RiVfq/Jog4f7LOtZo4QUD1qi7UdPO7g=";
  };

  # Project has no tests
--- a/pkgs/development/python-modules/pikepdf/default.nix
+++ b/pkgs/development/python-modules/pikepdf/default.nix
@ -5,13 +5,12 @@
 , fetchPypi
 , hypothesis
 , isPy3k
+, jbig2dec
 , lxml
+, mupdf
 , pillow
 , psutil
 , pybind11
-, pytest-cov
-, pytest-helpers-namespace
-, pytest-timeout
 , pytest-xdist
 , pytestCheckHook
 , python-dateutil
@ -20,18 +19,27 @@
 , setuptools
 , setuptools-scm
 , setuptools-scm-git-archive
+, substituteAll
 }:

 buildPythonPackage rec {
  pname = "pikepdf";
-  version = "2.16.1";
+  version = "3.0.0";
  disabled = ! isPy3k;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-4k3/avMfHrcy/LXbRniDXR8xJkOZb9zZ2+uKylK8Dd4=";
+    sha256 = "sha256-PBeTfiMLIq+pdeaRMOid8pEd0eLHu+IAE4aEFU5CiEM=";
  };

+  patches = [
+    (substituteAll {
+      src = ./paths.patch;
+      jbig2dec = "${lib.getBin jbig2dec}/bin/jbig2dec";
+      mudraw = "${lib.getBin mupdf}/bin/mudraw";
+    })
+  ];
+
  buildInputs = [
    pybind11
    qpdf
@ -45,11 +53,8 @@ buildPythonPackage rec {
  checkInputs = [
    attrs
    hypothesis
-    pytest-helpers-namespace
-    pytest-timeout
    pytest-xdist
    psutil
-    pytest-cov
    pytestCheckHook
    python-dateutil
    python-xmp-toolkit
@ -62,17 +67,13 @@ buildPythonPackage rec {
    setuptools
  ];

-  preBuild = ''
-    HOME=$TMPDIR
-  '';
-
  pythonImportsCheck = [ "pikepdf" ];

  meta = with lib; {
    homepage = "https://github.com/pikepdf/pikepdf";
    description = "Read and write PDFs with Python, powered by qpdf";
    license = licenses.mpl20;
-    maintainers = [ maintainers.kiwi ];
+    maintainers = with maintainers; [ kiwi dotlambda ];
    changelog = "https://github.com/pikepdf/pikepdf/blob/${version}/docs/release_notes.rst";
  };
 }
--- a/pkgs/development/python-modules/pikepdf/paths.patch
+++ b/pkgs/development/python-modules/pikepdf/paths.patch
@ -0,0 +1,26 @@
+diff --git a/src/pikepdf/_methods.py b/src/pikepdf/_methods.py
+index 70cdc9e..c3a14d0 100644
+--- a/src/pikepdf/_methods.py
+++ b/src/pikepdf/_methods.py
+@@ -190,7 +190,7 @@ def _mudraw(buffer, fmt) -> bytes:
+         tmp_in.flush()
+ 
+         proc = run(
+-            ['mudraw', '-F', fmt, '-o', '-', tmp_in.name],
+            ['@mudraw@', '-F', fmt, '-o', '-', tmp_in.name],
+             stdout=PIPE,
+             stderr=PIPE,
+             check=True,
+diff --git a/src/pikepdf/jbig2.py b/src/pikepdf/jbig2.py
+index 80cc910..64f6d31 100644
+--- a/src/pikepdf/jbig2.py
+++ b/src/pikepdf/jbig2.py
+@@ -25,7 +25,7 @@ def extract_jbig2(
+         global_path = Path(tmpdir) / "global"
+         output_path = Path(tmpdir) / "outfile"
+ 
+-        args = ["jbig2dec", "-e", "-o", os.fspath(output_path)]
+        args = ["@jbig2dec@", "-e", "-o", os.fspath(output_path)]
+ 
+         # Get the raw stream, because we can't decode im_obj - that is why we are here
+         # (Strictly speaking we should remove any non-JBIG2 filters if double encoded)
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@ -19,13 +19,13 @@

 buildPythonPackage rec {
  pname = "plugwise";
-  version = "0.13.1";
+  version = "0.14.5";

  src = fetchFromGitHub {
    owner = pname;
    repo = "python-plugwise";
    rev = "v${version}";
-    sha256 = "1sv421aa6ip74ajxa5imnh188hyx9dq3vwkb6aifi14h2wpr9lh3";
+    sha256 = "1kwks87raxs04dvnpmpn8l1cbzg5yb5nyinaqzxdsc6al83isbik";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/plyer/default.nix
+++ b/pkgs/development/python-modules/plyer/default.nix
@ -0,0 +1,63 @@
+{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, keyring, mock, pytestCheckHook, stdenv }:
+
+buildPythonPackage rec {
+  pname = "plyer";
+  version = "2.0.0";
+
+  src = fetchFromGitHub {
+    owner = "kivy";
+    repo = pname;
+    rev = version;
+    sha256 = "15z1wpq6s69s76r6akzgg340bpc21l2r1j8270gp7i1rpnffcjwm";
+  };
+
+  patches = [
+    # fix naming of the DOCUMENTS dir
+    (fetchpatch {
+      url = "https://github.com/rski/plyer/commit/99dabb2d62248fc3ea5705c2720abf71c9fc378b.patch";
+      sha256 = "sha256-bbnw0TxH4FGTso5dopzquDCjrjZAy+6CJauqi/nfstA=";
+    })
+    # fix handling of the ~/.config/user-dirs.dir file
+    (fetchpatch {
+      url = "https://github.com/rski/plyer/commit/f803697a1fe4fb5e9c729ee6ef1997b8d64f3ccd.patch";
+      sha256 = "sha256-akuh//P5puz2PwcBRXZQ4KoGk+fxi4jn2H3pTIT5M78=";
+    })
+  ];
+
+  postPatch = ''
+    rm -r examples
+    # remove all the wifi stuff. Depends on a python wifi module that has not been updated since 2016
+    find -iname "wifi*" -exec rm {} \;
+    substituteInPlace plyer/__init__.py \
+      --replace "wifi = Proxy('wifi', facades.Wifi)" "" \
+      --replace "'wifi'" ""
+    substituteInPlace plyer/facades/__init__.py \
+      --replace "from plyer.facades.wifi import Wifi" ""
+  '';
+
+  propagatedBuildInputs = [ keyring ];
+
+  checkInputs = [ mock pytestCheckHook ];
+
+  pytestFlagsArray = [ "plyer/tests" ];
+  disabledTests = [
+    # assumes dbus is not installed, it fails and is not very robust.
+    "test_notification_notifysend"
+    # fails during nix-build, but I am not able to explain why.
+    # The test and the API under test do work outside the nix build.
+    "test_uniqueid"
+  ];
+  preCheck = ''
+    HOME=$(mktemp -d)
+    mkdir -p $HOME/.config/ $HOME/Pictures
+  '';
+
+  pythonImportsCheck = [ "plyer" ];
+
+  meta = with lib; {
+    description = "Plyer is a platform-independent api to use features commonly found on various platforms";
+    homepage = "https://github.com/kivy/plyer";
+    license = licenses.mit;
+    maintainers = with maintainers; [ rski ];
+  };
+}
--- a/pkgs/development/python-modules/pyfronius/default.nix
+++ b/pkgs/development/python-modules/pyfronius/default.nix
@ -8,14 +8,15 @@

 buildPythonPackage rec {
  pname = "pyfronius";
-  version = "0.6.3";
+  version = "0.7.0";
+
  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "nielstron";
    repo = pname;
    rev = "release-${version}";
-    sha256 = "19cgr0y4zfyghpw9hwl9immh5c464dlasnfd8q570k9f0q682249";
+    sha256 = "1jp9vsllvzfnrkzmln2sp1ggr4pwaj47744n2ijz1wsf8v38nw2j";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/python-glanceclient/default.nix
+++ b/pkgs/development/python-modules/python-glanceclient/default.nix
@ -0,0 +1,65 @@
+{ lib
+, buildPythonApplication
+, fetchPypi
+, coreutils
+, pbr
+, prettytable
+, keystoneauth1
+, requests
+, warlock
+, oslo-utils
+, oslo-i18n
+, wrapt
+, pyopenssl
+, stestr
+, testscenarios
+, ddt
+, requests-mock
+}:
+
+buildPythonApplication rec {
+  pname = "python-glanceclient";
+  version = "3.5.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "417b9d814b43e62df4351f26a0d5569b801e9f99f7758bd8c82ef994c3629356";
+  };
+
+  postPatch = ''
+    substituteInPlace glanceclient/tests/unit/v1/test_shell.py \
+      --replace "/bin/echo" "${coreutils}/bin/echo"
+  '';
+
+  propagatedBuildInputs = [
+    pbr
+    prettytable
+    keystoneauth1
+    requests
+    warlock
+    oslo-utils
+    oslo-i18n
+    wrapt
+    pyopenssl
+  ];
+
+  checkInputs = [
+    stestr
+    testscenarios
+    ddt
+    requests-mock
+  ];
+
+  checkPhase = ''
+    stestr run
+  '';
+
+  pythonImportsCheck = [ "glanceclient" ];
+
+  meta = with lib; {
+    description = "Python bindings for the OpenStack Images API";
+    homepage = "https://github.com/openstack/python-glanceclient/";
+    license = licenses.asl20;
+    maintainers = teams.openstack.members;
+  };
+}
--- a/pkgs/development/python-modules/python-heatclient/default.nix
+++ b/pkgs/development/python-modules/python-heatclient/default.nix
@ -0,0 +1,69 @@
+{ lib
+, buildPythonApplication
+, fetchPypi
+, pbr
+, Babel
+, cliff
+, iso8601
+, osc-lib
+, prettytable
+, oslo-i18n
+, oslo-serialization
+, oslo-utils
+, keystoneauth1
+, python-swiftclient
+, pyyaml
+, requests
+, six
+, stestr
+, testscenarios
+, requests-mock
+}:
+
+buildPythonApplication rec {
+  pname = "python-heatclient";
+  version = "2.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b53529eb73f08c384181a580efaa42293cc35e0e1ecc4b0bc14a5c7b202019bb";
+  };
+
+  propagatedBuildInputs = [
+    pbr
+    Babel
+    cliff
+    iso8601
+    osc-lib
+    prettytable
+    oslo-i18n
+    oslo-serialization
+    oslo-utils
+    keystoneauth1
+    python-swiftclient
+    pyyaml
+    requests
+    six
+  ];
+
+  checkInputs = [
+    stestr
+    testscenarios
+    requests-mock
+  ];
+
+  checkPhase = ''
+    stestr run -e <(echo "
+      heatclient.tests.unit.test_common_http.HttpClientTest.test_get_system_ca_file
+    ")
+  '';
+
+  pythonImportsCheck = [ "heatclient" ];
+
+  meta = with lib; {
+    description = "A client library for Heat built on the Heat orchestration API";
+    homepage = "https://github.com/openstack/python-heatclient";
+    license = licenses.asl20;
+    maintainers = teams.openstack.members;
+  };
+}
--- a/pkgs/development/python-modules/python-ironicclient/default.nix
+++ b/pkgs/development/python-modules/python-ironicclient/default.nix
@ -0,0 +1,63 @@
+{ lib
+, buildPythonApplication
+, fetchPypi
+, pbr
+, appdirs
+, cliff
+, dogpile_cache
+, jsonschema
+, keystoneauth1
+, openstacksdk
+, osc-lib
+, oslo-utils
+, pyyaml
+, requests
+, stevedore
+, stestr
+, requests-mock
+, oslotest
+}:
+
+buildPythonApplication rec {
+  pname = "python-ironicclient";
+  version = "4.8.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b55516a72b995f92fb434619cbc1e2effa604c7fcaa6ac4afb8f5af1ea8193a4";
+  };
+
+  propagatedBuildInputs = [
+    pbr
+    appdirs
+    cliff
+    dogpile_cache
+    jsonschema
+    keystoneauth1
+    openstacksdk
+    osc-lib
+    oslo-utils
+    pyyaml
+    requests
+    stevedore
+  ];
+
+  checkInputs = [
+    stestr
+    requests-mock
+    oslotest
+  ];
+
+  checkPhase = ''
+    stestr run
+  '';
+
+  pythonImportsCheck = [ "ironicclient" ];
+
+  meta = with lib; {
+    description = "A client for OpenStack bare metal provisioning API, includes a Python module (ironicclient) and CLI (baremetal).";
+    homepage = "https://github.com/openstack/python-ironicclient";
+    license = licenses.asl20;
+    maintainers = teams.openstack.members;
+  };
+}
--- a/pkgs/development/python-modules/python-keystoneclient/default.nix
+++ b/pkgs/development/python-modules/python-keystoneclient/default.nix
@ -14,11 +14,11 @@

 buildPythonPackage rec {
  pname = "python-keystoneclient";
-  version = "4.2.0";
+  version = "4.3.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "12jsiw82x2zcn8sf78xisf85kr28gl3jqj46a0wxx59v91p44j02";
+    sha256 = "fd09b7790ce53c20dc94318ec4d76e1cf71908aed59baeb4c7a61c17afd3aad5";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/python-manilaclient/default.nix
+++ b/pkgs/development/python-modules/python-manilaclient/default.nix
@ -0,0 +1,58 @@
+{ lib
+, buildPythonApplication
+, fetchPypi
+, pbr
+, oslo-config
+, oslo-log
+, oslo-serialization
+, oslo-utils
+, prettytable
+, requests
+, simplejson
+, Babel
+, osc-lib
+, python-keystoneclient
+, debtcollector
+, callPackage
+}:
+
+buildPythonApplication rec {
+  pname = "python-manilaclient";
+  version = "3.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2d90af35c5beccc53fa6b0f5a3c4b330a065e86924c33c42b017f18943ab2b05";
+  };
+
+  propagatedBuildInputs = [
+    pbr
+    oslo-config
+    oslo-log
+    oslo-serialization
+    oslo-utils
+    prettytable
+    requests
+    simplejson
+    Babel
+    osc-lib
+    python-keystoneclient
+    debtcollector
+  ];
+
+  # Checks moved to 'passthru.tests' to workaround infinite recursion
+  doCheck = false;
+
+  passthru.tests = {
+    tests = callPackage ./tests.nix { };
+  };
+
+  pythonImportsCheck = [ "manilaclient" ];
+
+  meta = with lib; {
+    description = "Client library for OpenStack Manila API";
+    homepage = "https://github.com/openstack/python-manilaclient";
+    license = licenses.asl20;
+    maintainers = teams.openstack.members;
+  };
+}
--- a/pkgs/development/python-modules/python-manilaclient/tests.nix
+++ b/pkgs/development/python-modules/python-manilaclient/tests.nix
@ -0,0 +1,31 @@
+{ buildPythonPackage
+, python-manilaclient
+, stestr
+, ddt
+, tempest
+, mock
+, python-openstackclient
+}:
+
+buildPythonPackage rec {
+  pname = "python-manilaclient-tests";
+  inherit (python-manilaclient) version;
+
+  src = python-manilaclient.src;
+
+  dontBuild = true;
+  dontInstall = true;
+
+  checkInputs = [
+    python-manilaclient
+    stestr
+    ddt
+    tempest
+    mock
+    python-openstackclient
+  ];
+
+  checkPhase = ''
+    stestr run
+  '';
+}
--- a/pkgs/development/python-modules/python-swiftclient/default.nix
+++ b/pkgs/development/python-modules/python-swiftclient/default.nix
@ -29,6 +29,8 @@ buildPythonApplication rec {
    stestr run
  '';

+  pythonImportsCheck = [ "swiftclient" ];
+
  meta = with lib; {
    homepage = "https://github.com/openstack/python-swiftclient";
    description = "Python bindings to the OpenStack Object Storage API";
--- a/pkgs/development/python-modules/pytibber/default.nix
+++ b/pkgs/development/python-modules/pytibber/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "pytibber";
-  version = "0.19.0";
+  version = "0.19.1";

  disabled = pythonOlder "3.7";

@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "Danielhiversen";
    repo = "pyTibber";
    rev = version;
-    sha256 = "sha256-9xKt6OspdM7zWbVzjtvDPYuGyIW3K6ioASt53LOgdvk=";
+    sha256 = "sha256-+CI2TIGUZTztwx/9JqleKfVksybwGUGiHktu2xcNyUg=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@ -11,11 +11,11 @@

 buildPythonPackage rec {
  pname = "pyvex";
-  version = "9.0.9947";
+  version = "9.0.10010";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-52yI8V2rQTDbo/giHqhTKJ5Pz0PAMEz6ErZuo7RlbbM=";
+    sha256 = "sha256-1vAiDXMYiclK5P8QZUBuy6KllcAQm8d7rQpN+CBDVVA=";
  };

  postPatch = lib.optionalString stdenv.isDarwin ''
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/pkgs/development/python-modules/s3fs/default.nix
@ -8,11 +8,11 @@

 buildPythonPackage rec {
  pname = "s3fs";
-  version = "2021.7.0";
+  version = "2021.8.1";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-KTKU7I7QhgVhfbRA46UCKaQT3Bbc8yyUj66MvZsCrpY=";
+    sha256 = "0zwy2fr95s5wzrr2iwbayjh9xh421p6wf0m75szl7rw930v1kb2y";
  };

  buildInputs = [
--- a/pkgs/development/python-modules/tempest/default.nix
+++ b/pkgs/development/python-modules/tempest/default.nix
@ -0,0 +1,89 @@
+{ lib
+, buildPythonApplication
+, fetchPypi
+, pbr
+, cliff
+, jsonschema
+, testtools
+, paramiko
+, netaddr
+, oslo-concurrency
+, oslo-config
+, oslo-log
+, stestr
+, oslo-serialization
+, oslo-utils
+, fixtures
+, pyyaml
+, subunit
+, stevedore
+, prettytable
+, urllib3
+, debtcollector
+, unittest2
+, hacking
+, oslotest
+, bash
+, python3
+}:
+
+buildPythonApplication rec {
+  pname = "tempest";
+  version = "28.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "24fcc0baa2044454b17b6b4aa2b1b19682cf95eb92ca38a2f289d3cbc488b170";
+  };
+
+  propagatedBuildInputs = [
+    pbr
+    cliff
+    jsonschema
+    testtools
+    paramiko
+    netaddr
+    oslo-concurrency
+    oslo-config
+    oslo-log
+    stestr
+    oslo-serialization
+    oslo-utils
+    fixtures
+    pyyaml
+    subunit
+    stevedore
+    prettytable
+    urllib3
+    debtcollector
+    unittest2
+  ];
+
+  checkInputs = [
+    stestr
+    hacking
+    oslotest
+  ];
+
+  checkPhase = ''
+    # Tests expect these applications available as such.
+    mkdir -p bin
+    export PATH="$PWD/bin:$PATH"
+    printf '#!${bash}/bin/bash\nexec ${python3.interpreter} -m tempest.cmd.main "$@"\n' > bin/tempest
+    printf '#!${bash}/bin/bash\nexec ${python3.interpreter} -m tempest.cmd.subunit_describe_calls "$@"\n' > bin/subunit-describe-calls
+    chmod +x bin/*
+
+    stestr --test-path tempest/tests run -e <(echo "
+      tempest.tests.lib.cli.test_execute.TestExecute.test_execute_with_prefix
+    ")
+  '';
+
+  pythonImportsCheck = [ "tempest" ];
+
+  meta = with lib; {
+    description = "An OpenStack integration test suite that runs against live OpenStack cluster and validates an OpenStack deployment";
+    homepage = "https://github.com/openstack/tempest";
+    license = licenses.asl20;
+    maintainers = teams.openstack.members;
+  };
+}
--- a/pkgs/development/python-modules/thriftpy2/default.nix
+++ b/pkgs/development/python-modules/thriftpy2/default.nix
@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, cython
+, fetchFromGitHub
+, pythonOlder
+, ply
+, six
+, tornado
+}:
+
+buildPythonPackage rec {
+  pname = "thriftpy2";
+  version = "0.4.14";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "Thriftpy";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "17f57vsbym4c9yax128bhrwg2zjxcsgl3ja6422y8hyb38v5mdc3";
+  };
+
+  nativeBuildInputs = [
+    cython
+  ];
+
+  propagatedBuildInputs = [
+    ply
+    six
+    tornado
+  ];
+
+  # Not all needed files seems to be present
+  doCheck = false;
+
+  pythonImportsCheck = [ "thriftpy2" ];
+
+  meta = with lib; {
+    description = "Python module for Apache Thrift";
+    homepage = "https://github.com/Thriftpy/thriftpy2";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/tlsh/default.nix
+++ b/pkgs/development/python-modules/tlsh/default.nix
@ -4,15 +4,15 @@
 , cmake
 }:

-buildPythonPackage {
+buildPythonPackage rec {
  pname = "tlsh";
-  version = "4.5.0";
+  version = "4.9.3";

  src = fetchFromGitHub {
    owner = "trendmicro";
    repo = "tlsh";
-    rev = "f2bb7a97cfb0f9418a750ba92c182d1091e6c159";
-    sha256 = "1kxfhdwqjd4pjdlr1gjh2am8mxpaqmfq7rrxkjfi0mbisl1krkwb";
+    rev = version;
+    sha256 = "sha256-12bhxJTJJWzoiWt4YwhcdwHDvJNoBenWl3l26SFuIGU=";
  };

  nativeBuildInputs = [ cmake ];
@ -26,7 +26,7 @@ buildPythonPackage {

  meta = with lib; {
    description = "Trend Micro Locality Sensitive Hash";
-    homepage = "http://tlsh.org/";
+    homepage = "https://tlsh.org/";
    license = licenses.asl20;
    platforms = platforms.unix;
  };
--- a/pkgs/development/python-modules/zeroconf/default.nix
+++ b/pkgs/development/python-modules/zeroconf/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "zeroconf";
-  version = "0.36.4";
+  version = "0.36.6";
  format = "setuptools";
  disabled = pythonOlder "3.6";

@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "jstasiak";
    repo = "python-zeroconf";
    rev = version;
-    sha256 = "sha256-HjS8KwbSir8L0irstoMeSRfeHaq8Kvcwib9wvGdyHEo=";
+    sha256 = "sha256-Ignbms6/M36cK1fwm2ejMPDkYrANmQ7CcSqM+ISoZig=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/tools/apktool/default.nix
+++ b/pkgs/development/tools/apktool/default.nix
@ -2,14 +2,14 @@

 stdenv.mkDerivation rec {
  pname = "apktool";
-  version = "2.5.0";
+  version = "2.6.0";

  src = fetchurl {
    urls = [
      "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar"
      "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar"
    ];
-    sha256 = "1r4z0z2c1drjd4ynpf36dklxs3hq1wdnzh63mk2yk4mmk75xg4mk";
+    sha256 = "sha256-91CjzSwflC8n9ff9XRfq2jva/wpmQ/SduEfoQlef3aU=";
  };

  dontUnpack = true;
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@ -14,13 +14,13 @@

 buildGoModule rec {
  pname = "buildah";
-  version = "1.22.3";
+  version = "1.23.0";

  src = fetchFromGitHub {
    owner = "containers";
    repo = "buildah";
    rev = "v${version}";
-    sha256 = "sha256-e4Y398VyvoDo5WYyLeZJUMmb0HgWNBWj+hCPxdUlZNY=";
+    sha256 = "sha256-MhPbABGgQG0sAHVnUA9PUGqaVYWd/YsY2pyf8H4uTe8=";
  };

  outputs = [ "out" "man" ];
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "conftest";
-  version = "0.28.0";
+  version = "0.28.1";

  src = fetchFromGitHub {
    owner = "open-policy-agent";
    repo = "conftest";
    rev = "v${version}";
-    sha256 = "1fb2i2pkpf0dv2g17zii68hkxk2ni6xn5xyrhb3gmkc6afz96ni0";
+    sha256 = "sha256-o2P14Nsu77AXO+UnMBXthhP3Q7kI7nd/lI6GFE2cs3M=";
  };

-  vendorSha256 = "sha256-jt1gQDtbZiBm5o5qwkRNeZDJJoRbXnRUcQ4GoTp+otc=";
+  vendorSha256 = "sha256-zzckZI/n00BBl166S7uonJFNQ4RJGLCkDyfLRoHZOtA=";

  ldflags = [
    "-s"
--- a/pkgs/development/tools/rust/cargo-play/default.nix
+++ b/pkgs/development/tools/rust/cargo-play/default.nix
@ -1,4 +1,4 @@
-{ fetchFromGitHub, lib, rustPlatform }:
+{ lib, rustPlatform, fetchFromGitHub }:

 rustPlatform.buildRustPackage rec {
  pname = "cargo-play";
@ -13,8 +13,11 @@ rustPlatform.buildRustPackage rec {

  cargoSha256 = "1xkscd9ci9vlkmbsaxvavrna1xpi16xcf9ri879lw8bdh7sa3nx8";

-  # some tests require internet access
-  doCheck = false;
+  # these tests require internet access
+  checkFlags = [
+    "--skip=dtoa_test"
+    "--skip=infer_override"
+  ];

  meta = with lib; {
    description = "Run your rust code without setting up cargo";
--- a/pkgs/development/tools/rust/cargo-supply-chain/default.nix
+++ b/pkgs/development/tools/rust/cargo-supply-chain/default.nix
@ -0,0 +1,25 @@
+{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "cargo-supply-chain";
+  version = "0.0.2";
+
+  src = fetchFromGitHub {
+    owner = "rust-secure-code";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0kpm842p7l0vwbfa99zq3w3nsasy5sp1b99si7brjjvq99bad9gr";
+  };
+
+  cargoSha256 = "sha256-Mn5s6pfTHoFXtHqn6ii8PtAIBz/RJaR0zO5U5jS3UDU=";
+
+  buildInputs = lib.optional stdenv.isDarwin Security;
+
+  meta = with lib; {
+    description = "Gather author, contributor and publisher data on crates in your dependency graph";
+    homepage = "https://github.com/rust-secure-code/cargo-supply-chain";
+    changelog = "https://github.com/rust-secure-code/cargo-supply-chain/blob/master/CHANGELOG.md";
+    license = with licenses; [ asl20 mit zlib ]; # any of three
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
--- a/pkgs/development/tools/rust/panamax/default.nix
+++ b/pkgs/development/tools/rust/panamax/default.nix
@ -0,0 +1,24 @@
+{ lib, rustPlatform, fetchCrate, pkg-config, openssl, stdenv, Security }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "panamax";
+  version = "1.0.3";
+
+  src = fetchCrate {
+    inherit pname version;
+    sha256 = "sha256-w4waFdzd/Ps0whOp39QLBE/YF2eyc4t2Ili7FskUt1M=";
+  };
+
+  cargoSha256 = "sha256-52snmkTFHI26xJo9qJkmqh1M5lLzhDxw8WT6uFd57aw=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
+
+  meta = with lib; {
+    description = "Mirror rustup and crates.io repositories for offline Rust and cargo usage";
+    homepage = "https://github.com/panamax-rs/panamax";
+    license = with licenses; [ mit /* or */ asl20 ];
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
--- a/pkgs/development/tools/rust/rhack/default.nix
+++ b/pkgs/development/tools/rust/rhack/default.nix
@ -0,0 +1,22 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rhack";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "nakabonne";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "088ynf65szaa86pxwwasn3wwi00z5pn7i8w9gh5dyn983z4d8237";
+  };
+
+  cargoSha256 = "sha256-HmBh2qbO/HuNPfHKifq41IB5ResnGka2iaAsnwppm9s=";
+
+  meta = with lib; {
+    description = "Temporary edit external crates that your project depends on";
+    homepage = "https://github.com/nakabonne/rhack";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
--- a/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/default.nix
@ -6,20 +6,23 @@

 rustPlatform.buildRustPackage rec {
  pname = "rust-analyzer-unwrapped";
-  version = "2021-09-06";
-  cargoSha256 = "sha256-CTCDSoViyVMHxUKQz8fE+r3rkXf7yRgzZ90fZmMtcNM=";
+  version = "2021-09-20";
+  cargoSha256 = "sha256-OPolZ0oXGRcKvWxXkRMjyEXzvf1p41hGfHBpbDbLJck=";

  src = fetchFromGitHub {
    owner = "rust-analyzer";
    repo = "rust-analyzer";
    rev = version;
-    sha256 = "sha256-TacpTVvHAIs4kZ5vibj8luy/kryYwxY+OXFNPnqiXP0=";
+    sha256 = "sha256-k2UGz+h9++8wtV+XdGZbWysjkIDe+UNudKL46eisZzw=";
  };

  patches = [
    # Code format and git history check require more dependencies but don't really matter for packaging.
    # So just ignore them.
    ./ignore-git-and-rustfmt-tests.patch
+
+    # Patch for our rust 1.54.0 in nixpkgs. Remove it when we have rust >= 1.55.0
+    ./no-1-55-control-flow.patch
  ];

  buildAndTestSubdir = "crates/rust-analyzer";
--- a/pkgs/development/tools/rust/rust-analyzer/no-1-55-control-flow.patch
+++ b/pkgs/development/tools/rust/rust-analyzer/no-1-55-control-flow.patch
@ -0,0 +1,212 @@
+diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
+index 3b0c29e87..2841a39e2 100644
+--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
+@@ -31,7 +31,7 @@ pub mod db;
+ 
+ mod display;
+ 
+-use std::{iter, ops::ControlFlow, sync::Arc};
+use std::{iter, sync::Arc};
+ 
+ use arrayvec::ArrayVec;
+ use base_db::{CrateDisplayName, CrateId, Edition, FileId};
+@@ -70,7 +70,7 @@ use itertools::Itertools;
+ use nameres::diagnostics::DefDiagnosticKind;
+ use once_cell::unsync::Lazy;
+ use rustc_hash::FxHashSet;
+-use stdx::{format_to, impl_from};
+use stdx::{format_to, impl_from, ControlFlow};
+ use syntax::{
+     ast::{self, AttrsOwner, NameOwner},
+     AstNode, AstPtr, SmolStr, SyntaxKind, SyntaxNodePtr,
+diff --git a/crates/hir_ty/src/method_resolution.rs b/crates/hir_ty/src/method_resolution.rs
+index c88a8b653..039b5589e 100644
+--- a/crates/hir_ty/src/method_resolution.rs
+++ b/crates/hir_ty/src/method_resolution.rs
+@@ -2,7 +2,7 @@
+ //! For details about how this works in rustc, see the method lookup page in the
+ //! [rustc guide](https://rust-lang.github.io/rustc-guide/method-lookup.html)
+ //! and the corresponding code mostly in librustc_typeck/check/method/probe.rs.
+-use std::{iter, ops::ControlFlow, sync::Arc};
+use std::{iter, sync::Arc};
+ 
+ use arrayvec::ArrayVec;
+ use base_db::{CrateId, Edition};
+@@ -13,6 +13,7 @@ use hir_def::{
+ };
+ use hir_expand::name::Name;
+ use rustc_hash::{FxHashMap, FxHashSet};
+use stdx::{try_control_flow, ControlFlow};
+ 
+ use crate::{
+     autoderef,
+@@ -483,7 +484,7 @@ pub fn iterate_method_candidates_dyn(
+ 
+             let deref_chain = autoderef_method_receiver(db, krate, ty);
+             for i in 0..deref_chain.len() {
+-                iterate_method_candidates_with_autoref(
+                try_control_flow!(iterate_method_candidates_with_autoref(
+                     &deref_chain[i..],
+                     db,
+                     env.clone(),
+@@ -492,7 +493,7 @@ pub fn iterate_method_candidates_dyn(
+                     visible_from_module,
+                     name,
+                     callback,
+-                )?;
+                ));
+             }
+             ControlFlow::Continue(())
+         }
+@@ -522,7 +523,7 @@ fn iterate_method_candidates_with_autoref(
+     name: Option<&Name>,
+     mut callback: &mut dyn FnMut(&Canonical<Ty>, AssocItemId) -> ControlFlow<()>,
+ ) -> ControlFlow<()> {
+-    iterate_method_candidates_by_receiver(
+    try_control_flow!(iterate_method_candidates_by_receiver(
+         &deref_chain[0],
+         &deref_chain[1..],
+         db,
+@@ -532,7 +533,7 @@ fn iterate_method_candidates_with_autoref(
+         visible_from_module,
+         name,
+         &mut callback,
+-    )?;
+    ));
+ 
+     let refed = Canonical {
+         binders: deref_chain[0].binders.clone(),
+@@ -540,7 +541,7 @@ fn iterate_method_candidates_with_autoref(
+             .intern(&Interner),
+     };
+ 
+-    iterate_method_candidates_by_receiver(
+    try_control_flow!(iterate_method_candidates_by_receiver(
+         &refed,
+         deref_chain,
+         db,
+@@ -550,7 +551,7 @@ fn iterate_method_candidates_with_autoref(
+         visible_from_module,
+         name,
+         &mut callback,
+-    )?;
+    ));
+ 
+     let ref_muted = Canonical {
+         binders: deref_chain[0].binders.clone(),
+@@ -586,7 +587,7 @@ fn iterate_method_candidates_by_receiver(
+     // be found in any of the derefs of receiver_ty, so we have to go through
+     // that.
+     for self_ty in std::iter::once(receiver_ty).chain(rest_of_deref_chain) {
+-        iterate_inherent_methods(
+        try_control_flow!(iterate_inherent_methods(
+             self_ty,
+             db,
+             env.clone(),
+@@ -595,11 +596,11 @@ fn iterate_method_candidates_by_receiver(
+             krate,
+             visible_from_module,
+             &mut callback,
+-        )?
+        ))
+     }
+ 
+     for self_ty in std::iter::once(receiver_ty).chain(rest_of_deref_chain) {
+-        iterate_trait_method_candidates(
+        try_control_flow!(iterate_trait_method_candidates(
+             self_ty,
+             db,
+             env.clone(),
+@@ -608,7 +609,7 @@ fn iterate_method_candidates_by_receiver(
+             name,
+             Some(receiver_ty),
+             &mut callback,
+-        )?
+        ))
+     }
+ 
+     ControlFlow::Continue(())
+@@ -624,7 +625,7 @@ fn iterate_method_candidates_for_self_ty(
+     name: Option<&Name>,
+     mut callback: &mut dyn FnMut(&Canonical<Ty>, AssocItemId) -> ControlFlow<()>,
+ ) -> ControlFlow<()> {
+-    iterate_inherent_methods(
+    try_control_flow!(iterate_inherent_methods(
+         self_ty,
+         db,
+         env.clone(),
+@@ -633,7 +634,7 @@ fn iterate_method_candidates_for_self_ty(
+         krate,
+         visible_from_module,
+         &mut callback,
+-    )?;
+    ));
+     iterate_trait_method_candidates(self_ty, db, env, krate, traits_in_scope, name, None, callback)
+ }
+ 
+@@ -697,7 +698,7 @@ fn iterate_trait_method_candidates(
+             }
+             known_implemented = true;
+             // FIXME: we shouldn't be ignoring the binders here
+-            callback(self_ty, *item)?
+            try_control_flow!(callback(self_ty, *item))
+         }
+     }
+     ControlFlow::Continue(())
+@@ -774,7 +775,7 @@ fn iterate_inherent_methods(
+                     continue;
+                 }
+                 let receiver_ty = receiver_ty.unwrap_or(self_ty);
+-                callback(receiver_ty, item)?;
+                try_control_flow!(callback(receiver_ty, item));
+             }
+         }
+     }
+diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs
+index 506d3ba3c..590963c17 100644
+--- a/crates/ide/src/hover.rs
+++ b/crates/ide/src/hover.rs
+@@ -1,4 +1,4 @@
+-use std::{collections::HashSet, ops::ControlFlow};
+use std::collections::HashSet;
+ 
+ use either::Either;
+ use hir::{AsAssocItem, HasAttrs, HasSource, HirDisplay, Semantics, TypeInfo};
+@@ -12,7 +12,7 @@ use ide_db::{
+     RootDatabase,
+ };
+ use itertools::Itertools;
+-use stdx::format_to;
+use stdx::{format_to, ControlFlow};
+ use syntax::{
+     algo, ast, display::fn_as_proc_macro_label, match_ast, AstNode, Direction, SyntaxKind::*,
+     SyntaxNode, SyntaxToken, TextRange, TextSize, T,
+diff --git a/crates/stdx/src/lib.rs b/crates/stdx/src/lib.rs
+index e7d4753de..fddf95147 100644
+--- a/crates/stdx/src/lib.rs
+++ b/crates/stdx/src/lib.rs
+@@ -7,6 +7,22 @@ pub mod panic_context;
+ 
+ pub use always_assert::{always, never};
+ 
+/// std::ops::ControlFlow from rust std 1.55.0
+pub enum ControlFlow<B, C = ()> {
+    Continue(C),
+    Break(B),
+}
+
+#[macro_export]
+macro_rules! try_control_flow {
+    ($e:expr) => {
+        match $e {
+            $crate::ControlFlow::Continue(c) => c,
+            $crate::ControlFlow::Break(b) => return $crate::ControlFlow::Break(b),
+        }
+    };
+}
+
+ #[inline(always)]
+ pub fn is_ci() -> bool {
+     option_env!("CI").is_some()
+
--- a/pkgs/development/tools/rust/rust-script/default.nix
+++ b/pkgs/development/tools/rust/rust-script/default.nix
@ -0,0 +1,26 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rust-script";
+  version = "0.17.0";
+
+  src = fetchFromGitHub {
+    owner = "fornwall";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0jz8hlvl31c5h8whd6pnpmslw6w6alkxijd9lhgric1yypiym9x3";
+  };
+
+  cargoSha256 = "sha256-hg0QtxR1qm/x8G6HoN7xAyOwh9jiQvX2wWYjUR8YvMs=";
+
+  # TODO: switch to `cargoCheckType = "false"` after #138822 is merged
+  # tests only work in debug mode
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Run Rust files and expressions as scripts without any setup or compilation step";
+    homepage = "https://rust-script.org";
+    license = with licenses; [ mit /* or */ asl20 ];
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
--- a/pkgs/development/tools/vultr-cli/default.nix
+++ b/pkgs/development/tools/vultr-cli/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "vultr-cli";
-  version = "2.8.2";
+  version = "2.8.3";

  src = fetchFromGitHub {
    owner = "vultr";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-fjmisTDW35aIFbWFF4gdyP8ygNd0o7sdsNr0NX1Hvfg=";
+    sha256 = "sha256-TQgyJBzcfvT004Op7p6Iq7olOebJMK3HuU7PtGBkNII=";
  };

  vendorSha256 = null;
--- a/pkgs/development/tools/yq-go/default.nix
+++ b/pkgs/development/tools/yq-go/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "yq-go";
-  version = "4.13.0";
+  version = "4.13.2";

  src = fetchFromGitHub {
    owner = "mikefarah";
    repo = "yq";
    rev = "v${version}";
-    sha256 = "sha256-9yKCFEtGg6TiHo3PGobVzQSbqc27ptKhH+2WgbLKXRI=";
+    sha256 = "sha256-manTuR7/3FE+q08WTVAtKilPCQBK136O8w1r5OX9T08=";
  };

  vendorSha256 = "sha256-u7elWOW/tz1ISM/KC1njkZmPi8AEEssZ5QtxK/+1/1I=";
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@ -17,15 +17,15 @@

 rustPlatform.buildRustPackage rec {
  pname = "deno";
-  version = "1.14.0";
+  version = "1.14.1";

  src = fetchFromGitHub {
    owner = "denoland";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-AVWQDFw/kof8rxKCs9N5efNDRe6TGseD6g1QAf02fx0=";
+    sha256 = "sha256-WTBurNXI+t8S0f2ER6zw+6SlkzKYLDGFQcEVbXSQAtc=";
  };
-  cargoSha256 = "sha256-MjmnKypvnPKhU5qZFGNVAz1hK3VkHudRwSPxciobuJU=";
+  cargoSha256 = "sha256-/ohAzcfsoarPicinsZf5fi2cQwYD1oW5TOdWP8RbXos=";

  # Install completions post-install
  nativeBuildInputs = [ installShellFiles ];
--- a/pkgs/games/empty-epsilon/0001-bundle-system-glm-in-seriousproton.patch
+++ b/pkgs/games/empty-epsilon/0001-bundle-system-glm-in-seriousproton.patch
@ -26,7 +26,7 @@ index cbd68ca..730df82 100644
 target_link_libraries(seriousproton_deps
     INTERFACE 
 -        box2d lua glew ${SFML_LIBRARIES}
-+        box2d lua glew ${SFML_LIBRARIES} glm
+        box2d lua glew ${SFML_LIBRARIES} glm::glm
         "$<$<BOOL:${WIN32}>:wsock32>"
         # LTO flag must be on the linker's list as well.
         "$<$<AND:$<BOOL:${CMAKE_COMPILER_IS_GNUCC}>,$<OR:$<CONFIG:RelWithDebInfo>,$<CONFIG:Release>>>:-flto>"
--- 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-09-17";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "dense-analysis";
      repo = "ale";
-      rev = "2f72a3ed1972d23a5ef50c78715ec68f090932e8";
-      sha256 = "1vjg0y02cnnknjgj0zp9f4s84y7dbcy80aw1jp6qizb6cfbkv39v";
+      rev = "f8a4c78b5b293d11da9075373c9de0bb5afdeffe";
+      sha256 = "0jmcsaz9hswcwkdmisggr34sn10mrfvybk5b8cmi86v8swz559yw";
    };
    meta.homepage = "https://github.com/dense-analysis/ale/";
  };
@ -389,12 +389,12 @@ final: prev:

  bufferline-nvim = buildVimPluginFrom2Nix {
    pname = "bufferline.nvim";
-    version = "2021-09-16";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "akinsho";
      repo = "bufferline.nvim";
-      rev = "be5866b77c713d92cf3d383a387bec1d55e3f798";
-      sha256 = "1v4fw3idhbhnnnn08zw92g7pyb2x5ss8zbi7hfbxvn5jkpzyqz6p";
+      rev = "94211eac27c931f4458ce713fbe430b7cc82dea8";
+      sha256 = "12r6fyhip1gxxskmzakd209zh8pw8wx0niz3519m6giss7chllif";
    };
    meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
  };
@ -437,24 +437,24 @@ final: prev:

  caw-vim = buildVimPluginFrom2Nix {
    pname = "caw.vim";
-    version = "2021-09-16";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "tyru";
      repo = "caw.vim";
-      rev = "8978f977a2a80396ab3a536a0df0a3727fca9882";
-      sha256 = "0rskyi56rhq6l3iv1695xl049ji2l3y5y7fm272hyb18ggq1rzja";
+      rev = "3aefcb5a752a599a9200dd801d6bcb0b7606bf29";
+      sha256 = "0v21vp0ngj60ksmyrk6f8ld25qqmx298nsd0v1kj2ysrcvj3hjb7";
    };
    meta.homepage = "https://github.com/tyru/caw.vim/";
  };

  chadtree = buildVimPluginFrom2Nix {
    pname = "chadtree";
-    version = "2021-09-18";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "chadtree";
-      rev = "566ed3821410954826e2e5b55b3cbdd1333f1723";
-      sha256 = "1f1k1hqvjjip0i6hqdhaaihw57krb6bafaaq4xh1dk3h83gkx96m";
+      rev = "037682510c0229437b4969dd1780d88b4eb10718";
+      sha256 = "0y34w513wl77i5iq1930xv04hhd4ndiy21n728bj6bv7fkqbs95c";
    };
    meta.homepage = "https://github.com/ms-jpq/chadtree/";
  };
@ -473,12 +473,12 @@ final: prev:

  cheatsheet-nvim = buildVimPluginFrom2Nix {
    pname = "cheatsheet.nvim";
-    version = "2021-08-20";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "sudormrfbin";
      repo = "cheatsheet.nvim";
-      rev = "7d83f02176287436acc06428ded782fe4bc08b94";
-      sha256 = "1ajqmg4lls4nc9bpw233rd25z5qfbnkwbdi1jnrh79nlr9sxvcyp";
+      rev = "3f0b718a030dd2c2757e053345de4f130f213514";
+      sha256 = "0k1y57k14hgvjr7cq6likbwb2vdxmj6kiqbiqnk6arhnf8n614gi";
    };
    meta.homepage = "https://github.com/sudormrfbin/cheatsheet.nvim/";
  };
@ -689,12 +689,12 @@ final: prev:

  cmp_luasnip = buildVimPluginFrom2Nix {
    pname = "cmp_luasnip";
-    version = "2021-09-13";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "saadparwaiz1";
      repo = "cmp_luasnip";
-      rev = "e22fe57aec4f9e7029b8e547657fbee1b16cbaf7";
-      sha256 = "0fkzxhs8gj5vbcbs2s8n66fjzmrxvzh1bn3kxijszmcm706d3nyq";
+      rev = "a0fb34a0ecfd06ae74f90517bb4da1e27223ec34";
+      sha256 = "1y6vpb5l2qy9vis2flm5s074lkhagbibgjwrzh8vzbfjghywadls";
    };
    meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/";
  };
@ -1110,12 +1110,12 @@ final: prev:

  ctrlp-py-matcher = buildVimPluginFrom2Nix {
    pname = "ctrlp-py-matcher";
-    version = "2021-04-08";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "FelikZ";
      repo = "ctrlp-py-matcher";
-      rev = "24969b88702bca79a6bfd85256450936968cf55d";
-      sha256 = "0fc2i14gsg6srjvmibz1d5dzzg9bry35pl5xs43l80xnhpkdndm8";
+      rev = "940e267d4fecd81287a1bdecc8475bf079e9dca9";
+      sha256 = "133xhi069ndcgj6wcgj5xvpf4m9c34zs9cnk35qpx13h2scxdsa4";
    };
    meta.homepage = "https://github.com/FelikZ/ctrlp-py-matcher/";
  };
@ -1592,12 +1592,12 @@ final: prev:

  echodoc-vim = buildVimPluginFrom2Nix {
    pname = "echodoc.vim";
-    version = "2021-09-16";
+    version = "2021-09-19";
    src = fetchFromGitHub {
      owner = "Shougo";
      repo = "echodoc.vim";
-      rev = "b77548dcebf3a3324fec44ba361f3cd8dbe89f18";
-      sha256 = "0fqd3fqfg7zri0y4mm0d4rpp87wjf8kpy0gphkha5r4lpd2mjgv4";
+      rev = "da6ce88098c71b1b959471af06b2f9f2412145a9";
+      sha256 = "1n321bglnmd9xi7zrvg32l4ilanvx5aiqq4kcqrb9cai5dw8arla";
    };
    meta.homepage = "https://github.com/Shougo/echodoc.vim/";
  };
@ -1786,12 +1786,12 @@ final: prev:

  fern-vim = buildVimPluginFrom2Nix {
    pname = "fern.vim";
-    version = "2021-08-08";
+    version = "2021-09-19";
    src = fetchFromGitHub {
      owner = "lambdalisue";
      repo = "fern.vim";
-      rev = "ed2e422f047eb2cc8afcfecea9464984cfa801a0";
-      sha256 = "0jr632pd274xhyji7b1l195i8avf20v4d9g8r4w1ryskirj1k3ry";
+      rev = "264a73d4df15a9234a4ec74ecd70e9a0b9d45bf7";
+      sha256 = "165kac22gmfm8f64rb5xgv8pqap2zh87xvhnd7i1fy34yzj0n514";
    };
    meta.homepage = "https://github.com/lambdalisue/fern.vim/";
  };
@ -1883,12 +1883,12 @@ final: prev:

  formatter-nvim = buildVimPluginFrom2Nix {
    pname = "formatter.nvim";
-    version = "2021-09-15";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "mhartington";
      repo = "formatter.nvim";
-      rev = "42aa771f34843f1583be98bfabc8f4a71f20a001";
-      sha256 = "0zrrsisil9z1w6xcf9r5f52w0mnhv9qcl3zsl5c2hkw8ar7im27j";
+      rev = "2b187813f63d22f572ebe406711e2d0e81272f8e";
+      sha256 = "0vbwagbx2wzalf9sp3w6fr06fllvj936id4yvafk73gp6ihsn1wj";
    };
    meta.homepage = "https://github.com/mhartington/formatter.nvim/";
  };
@ -1931,12 +1931,12 @@ final: prev:

  fugitive-gitlab-vim = buildVimPluginFrom2Nix {
    pname = "fugitive-gitlab.vim";
-    version = "2021-09-14";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "shumphrey";
      repo = "fugitive-gitlab.vim";
-      rev = "36155d4b9f7a7abc2e6e94936952c661314f141f";
-      sha256 = "1y0fpzgrqvnk2bgks1icbidc60z07syiaf8912rncmx4pdc2gzv1";
+      rev = "85d4e16e03b05964560514afe53bc74f9d445b02";
+      sha256 = "1zvn4rz765yjxyhv71dxly9lzdp9r94762jprff0srpnsyjiypz2";
    };
    meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/";
  };
@ -2135,12 +2135,12 @@ final: prev:

  gitsigns-nvim = buildVimPluginFrom2Nix {
    pname = "gitsigns.nvim";
-    version = "2021-09-14";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "lewis6991";
      repo = "gitsigns.nvim";
-      rev = "42acbae18327c53b8a82011074bcb529c3c75c8a";
-      sha256 = "1m5wczqigx3a73a97p0qgqj5121mjawslj596jd18v5scbr39gv0";
+      rev = "60403b46c67ee3ead7e59715ceab27a2affb2e6e";
+      sha256 = "1mq5nyhy9cxp45bk261jzbh1yaniy0xh22v6yzqg5mfbjipmvcpc";
    };
    meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
  };
@ -2207,12 +2207,12 @@ final: prev:

  goto-preview = buildVimPluginFrom2Nix {
    pname = "goto-preview";
-    version = "2021-09-17";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "rmagatti";
      repo = "goto-preview";
-      rev = "88ebcb56214ace7f52f2a846b40ff1f3e098af35";
-      sha256 = "17xpdh5q62d97v5akq52b7qpfqmnvai5ggn46c0ysgl0r5cdycrv";
+      rev = "0f2f5a960f4de920741614bc5142d9c83a775254";
+      sha256 = "1g9mf0zyd5favsspy8sa7j25x0981n4fyhrdxix3m1dglcpc1h5b";
    };
    meta.homepage = "https://github.com/rmagatti/goto-preview/";
  };
@ -2495,12 +2495,12 @@ final: prev:

  indent-blankline-nvim = buildVimPluginFrom2Nix {
    pname = "indent-blankline.nvim";
-    version = "2021-09-15";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "lukas-reineke";
      repo = "indent-blankline.nvim";
-      rev = "aed095e367bead0784a72e946ddfa2337b59ace8";
-      sha256 = "0w90k6zd26a5zsfni10m509gcv7w5gfrcwx9xazhkz4bqwzc8jjr";
+      rev = "f39a3a58baa7f6dbe76db9c8b36473eedb27348d";
+      sha256 = "00qwhvhfx8a6nbw6b2jjrgnj1drslqqx8yrd50324iblxhs9gbf4";
    };
    meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
  };
@ -2772,12 +2772,12 @@ final: prev:

  LeaderF = buildVimPluginFrom2Nix {
    pname = "LeaderF";
-    version = "2021-08-31";
+    version = "2021-09-19";
    src = fetchFromGitHub {
      owner = "Yggdroot";
      repo = "LeaderF";
-      rev = "880888469193a6bf020376bab098a7401a06e445";
-      sha256 = "03hq263cqay01v6hazghma4h48j30kqpx6bbnwsar26m8vg6vpg1";
+      rev = "f80ff99c434d4d233a4a8bf2d116289b6619fbcd";
+      sha256 = "0l0jy9wj95vz86rzmf5yvrvmbapg8g6rfx8ls21i95kzbm02c435";
    };
    meta.homepage = "https://github.com/Yggdroot/LeaderF/";
  };
@ -2940,12 +2940,12 @@ final: prev:

  lir-nvim = buildVimPluginFrom2Nix {
    pname = "lir.nvim";
-    version = "2021-08-27";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "tamago324";
      repo = "lir.nvim";
-      rev = "ccbae9636949afa9d3afbcba93f35dba3437ad94";
-      sha256 = "1lxh6vh4nnfldxqivnv1f03300pmm7cb5pvapa2afv6h8src8hzs";
+      rev = "bc14ddcb173d332e62ce3712eb0ca3ac6d9fa59a";
+      sha256 = "1sh13m98dni9dspjiwsaafzvg3nlwd41v5ma5achpzla80hzm2h1";
    };
    meta.homepage = "https://github.com/tamago324/lir.nvim/";
  };
@ -3012,12 +3012,12 @@ final: prev:

  lsp_signature-nvim = buildVimPluginFrom2Nix {
    pname = "lsp_signature.nvim";
-    version = "2021-09-17";
+    version = "2021-09-19";
    src = fetchFromGitHub {
      owner = "ray-x";
      repo = "lsp_signature.nvim";
-      rev = "5ee2b1fff09463e22679f5f3f8040d1200d6f848";
-      sha256 = "18pa21ia9mvla19glf0k20l73mm8kam81xqq73ns16ww9mmql51z";
+      rev = "99a81120838dad866a42823670e6b6666eb8c9c5";
+      sha256 = "0mvv9xkks18d581jc6s2j2hkds3ajg7r9qsxxrrfn4g0n03gcka4";
    };
    meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
  };
@ -3072,12 +3072,12 @@ final: prev:

  luasnip = buildVimPluginFrom2Nix {
    pname = "luasnip";
-    version = "2021-09-18";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "l3mon4d3";
      repo = "luasnip";
-      rev = "ccf8d5da2370877ccf7b3ea164d0530ff1f59a87";
-      sha256 = "04646vmfkpzby0dimxs2xaim4isjnvfivildjskl8frbabkfwkrw";
+      rev = "800e1876df24a178252520253eb63cb5c9f0e1b9";
+      sha256 = "1w334jqw7b0bmrhx0036iaxb9lpi17vb1wq99kgwada7yxl5a72s";
    };
    meta.homepage = "https://github.com/l3mon4d3/luasnip/";
  };
@ -3456,12 +3456,12 @@ final: prev:

  neco-vim = buildVimPluginFrom2Nix {
    pname = "neco-vim";
-    version = "2021-08-28";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "Shougo";
      repo = "neco-vim";
-      rev = "31e5725ab5666396921d86bcec2f0b6ea0028ce7";
-      sha256 = "1mm827a9d848ypp6x77paqii37a1j70vwh3hayp8p7g3pv4cimjl";
+      rev = "cd666d51cb4d03e509039fd35e5744bbf9db431b";
+      sha256 = "0q3sdrdi78p09mns9mdpicvhrm8y6n1vna96n0v4yfjknkxa02yw";
    };
    meta.homepage = "https://github.com/Shougo/neco-vim/";
  };
@ -3600,12 +3600,12 @@ final: prev:

  neosnippet-vim = buildVimPluginFrom2Nix {
    pname = "neosnippet.vim";
-    version = "2021-09-15";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "Shougo";
      repo = "neosnippet.vim";
-      rev = "5d07842911b485240719b781dfd7817b85c8eb96";
-      sha256 = "0igrsgvaa36p42gp375w17dp9iz652lr91mmbznbbbb71d7y7l1y";
+      rev = "0ab419e93f4256baed77229548195402e170afa8";
+      sha256 = "1gsf5d610slh9cdy6i52fh0k98m5b7xvzp35l6cq008acgsvh575";
    };
    meta.homepage = "https://github.com/Shougo/neosnippet.vim/";
  };
@ -3696,12 +3696,12 @@ final: prev:

  nerdtree = buildVimPluginFrom2Nix {
    pname = "nerdtree";
-    version = "2021-09-15";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "preservim";
      repo = "nerdtree";
-      rev = "7eee457efae1bf9b96d7a266ac097639720a68fe";
-      sha256 = "0lm58labs6jr1yyax839ks67ij30ijlknf0lnwijv2alf5rzqsc2";
+      rev = "e731b845590017493224dfcb7403c2332105b700";
+      sha256 = "1ksvs97cck1m8k1m6gngv62c7hh3l9ray82nmwyghs68mncn87nc";
    };
    meta.homepage = "https://github.com/preservim/nerdtree/";
  };
@ -3792,11 +3792,11 @@ final: prev:

  nord-nvim = buildVimPluginFrom2Nix {
    pname = "nord.nvim";
-    version = "2021-09-09";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "shaunsingh";
      repo = "nord.nvim";
-      rev = "467d684f296a57b0069ff4ee9566df439511efe3";
+      rev = "ebd3ff7b96ff8f9e75ec19f77bd10cb2bb7c8e84";
      sha256 = "1grnvi8glqffbr1k4sifr0bg6dkflarzj3f6c2jbm98l4dk3vps8";
    };
    meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
@ -3816,24 +3816,24 @@ final: prev:

  nterm-nvim = buildVimPluginFrom2Nix {
    pname = "nterm.nvim";
-    version = "2021-08-24";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "jlesquembre";
      repo = "nterm.nvim";
-      rev = "bb612046c7775c6986e706b8ab31057ed8ca19b2";
-      sha256 = "1r50z8c3jjx1ysazih298ni2iikblmj48gxh3k9p722kngfdsxjg";
+      rev = "fb16fc215702b075574f83c0e332d47575da642e";
+      sha256 = "1kcdkw4i1q889hnil70fjqqikzlzqcrhf0i5ab6y8mh5vpg6cp96";
    };
    meta.homepage = "https://github.com/jlesquembre/nterm.nvim/";
  };

  null-ls-nvim = buildVimPluginFrom2Nix {
    pname = "null-ls.nvim";
-    version = "2021-09-17";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "jose-elias-alvarez";
      repo = "null-ls.nvim";
-      rev = "2c6a20434de6b1d09f76c20eea34e37e7432e06c";
-      sha256 = "1z58wqvw8xslz9yzbrnmsjn0mdn9kpvrrv7hmydfc2a8vir55mlk";
+      rev = "96b977966810b5038cb3b96ec54247c7a63c9c92";
+      sha256 = "1yhcm3p9msw09jh968isg09dqn49gfbjbdpvqd638siij70zs9ki";
    };
    meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
  };
@ -3876,24 +3876,24 @@ final: prev:

  nvim-autopairs = buildVimPluginFrom2Nix {
    pname = "nvim-autopairs";
-    version = "2021-09-18";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "windwp";
      repo = "nvim-autopairs";
-      rev = "e465f581f9dce556a37366587ab1fabd2bb75fbf";
-      sha256 = "0l4r3ba7rqiab47fqzbzbxvkxirpw7f9lsvif4agm1hdm5hqpgxi";
+      rev = "19bb83320aec21d7fcb1514f3cb8bd8496d22ea8";
+      sha256 = "18xwwdbzggfyy86mh1ji17a9b62d86cc1jnw9r93996ynqdrs87n";
    };
    meta.homepage = "https://github.com/windwp/nvim-autopairs/";
  };

  nvim-base16 = buildVimPluginFrom2Nix {
    pname = "nvim-base16";
-    version = "2021-08-23";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "RRethy";
      repo = "nvim-base16";
-      rev = "bb06f63bacdd6ca0ea6e5874843e5854ea01cb6f";
-      sha256 = "1qginyalp9j9pv1pb0448ngvfjphhj03n30jjsnk7zq11pdcdrwg";
+      rev = "3e9e1d9c2f49ddc018f7f6b934d7a14e0d87f266";
+      sha256 = "14bz8csj0ci67fkj01jc8zrxq8pg00y4dz91dy8d5a37lzrj2s1z";
    };
    meta.homepage = "https://github.com/RRethy/nvim-base16/";
  };
@ -3936,12 +3936,12 @@ final: prev:

  nvim-cmp = buildVimPluginFrom2Nix {
    pname = "nvim-cmp";
-    version = "2021-09-18";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "hrsh7th";
      repo = "nvim-cmp";
-      rev = "7c8876330df6e11cf91ca42ab6e52f37d81cc003";
-      sha256 = "1z0kyffycwrl7izdmss9k9ldqqynhq1j2js4izbgpp1660iqsfja";
+      rev = "0a8ca50d9e96ae5b84e71146b5eb9d30baabc84a";
+      sha256 = "1lbp45hbwzprfpzrhkws853dnv1ax63bqnzav04bl787kk5ryajn";
    };
    meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";
  };
@ -3984,12 +3984,12 @@ final: prev:

  nvim-dap = buildVimPluginFrom2Nix {
    pname = "nvim-dap";
-    version = "2021-09-18";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "mfussenegger";
      repo = "nvim-dap";
-      rev = "5ecabb093c360786321bce1b618c324bde3dae70";
-      sha256 = "1gxp0x6b4f08xbvl8w5s17v665b59r8nqky27vvz0pmwwnkjxwlp";
+      rev = "1ccfcc12f7d1019e4afa0a1bb64c371d0944d179";
+      sha256 = "1xvvv6sxcsf6n3gxfrdxdcbvqfs8sc2fjwg6jz0rgbsavlis476b";
    };
    meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
  };
@ -4044,12 +4044,12 @@ final: prev:

  nvim-gps = buildVimPluginFrom2Nix {
    pname = "nvim-gps";
-    version = "2021-09-12";
+    version = "2021-09-19";
    src = fetchFromGitHub {
      owner = "smiteshp";
      repo = "nvim-gps";
-      rev = "38adf37b1937abdbee41860299d6dc29303bcfcc";
-      sha256 = "0cvbdg4mvvnnziz28h0imgwf5cj9s3nji9z0gbkf0xzqanlfqbaa";
+      rev = "aebf14fa2fdbdc468045d55d07641f498c548374";
+      sha256 = "01hfm570hrx2paifnxxqirailxl5hfx22ay7j0cxk9v9z01p4dks";
    };
    meta.homepage = "https://github.com/smiteshp/nvim-gps/";
  };
@ -4092,24 +4092,24 @@ final: prev:

  nvim-jdtls = buildVimPluginFrom2Nix {
    pname = "nvim-jdtls";
-    version = "2021-09-06";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "mfussenegger";
      repo = "nvim-jdtls";
-      rev = "3792030b5281a2f7bcc186e04440036b44648e90";
-      sha256 = "0wq82v8z0vsnbakc5dnn0f00bjm3mirqdaq3zlq0z2gx7jkmldfg";
+      rev = "2aae87e2f5f7afd2a6fb8c75bcb63908299390b2";
+      sha256 = "1lxlh0jbz2krfl4f037h2x992yc5riqznq257rahy7n7nydd0yma";
    };
    meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
  };

  nvim-lightbulb = buildVimPluginFrom2Nix {
    pname = "nvim-lightbulb";
-    version = "2021-09-18";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "kosayoda";
      repo = "nvim-lightbulb";
-      rev = "7180e64d7f8dcde0fd162d6ca55b73e2d9d9621b";
-      sha256 = "1sv3xgjgbm3d9v1mwln9zfwllxjn37virzb9fmr6m1axc2vn5lj4";
+      rev = "5b265fe19a3a60b6429b34c8cfdb0284ce52de33";
+      sha256 = "0m2kq0rs0rkif8d8783dbd9dwahzih67zfz3wi58r5lsm4fnai9h";
    };
    meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
  };
@ -4200,12 +4200,12 @@ final: prev:

  nvim-spectre = buildVimPluginFrom2Nix {
    pname = "nvim-spectre";
-    version = "2021-09-11";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "windwp";
      repo = "nvim-spectre";
-      rev = "f8d6775bf41a341b1ee4a9c76da1f2f98836c505";
-      sha256 = "0vizqw40im61c5638910dh6aa4l9g9lspn0l1yqc3qnj7rvcjflc";
+      rev = "966a8ca70599e818108b92f49ff45105df98f3cc";
+      sha256 = "1x20a8pklmhanqvbiykwznwpgsg2mr6l2m3w6xkhjxpll7kb2vy4";
    };
    meta.homepage = "https://github.com/windwp/nvim-spectre/";
  };
@ -4464,36 +4464,36 @@ final: prev:

  open-browser-vim = buildVimPluginFrom2Nix {
    pname = "open-browser.vim";
-    version = "2020-05-20";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "tyru";
      repo = "open-browser.vim";
-      rev = "d6f1784685abdd86500fdb5fa2fbaf2aab833f18";
-      sha256 = "1akgsq1v9v5klm995y09zmka0hbfsa0gr44gyp2nvqi9ggfadp0k";
+      rev = "4d7131705ee97db15e10ec59f6de808feffa1f2e";
+      sha256 = "1sxfflyrfly16l6b6lrga8r7mn7if7w9243lcx05jvp1sjdkw21n";
    };
    meta.homepage = "https://github.com/tyru/open-browser.vim/";
  };

  orgmode-nvim = buildVimPluginFrom2Nix {
    pname = "orgmode.nvim";
-    version = "2021-09-17";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "kristijanhusak";
      repo = "orgmode.nvim";
-      rev = "09ecdefb8f7a6d13a2dde1efe271e406ffa407c6";
-      sha256 = "1s1mg8hvlz4n3fjfdhakihwpqcnrs1p5hdnwin6fx3wifbb55gp3";
+      rev = "09d3d87b5a48cb31b8b1ddd84a1aa2012771fb9a";
+      sha256 = "1l1jlcabjhqbz7dv0mr1qwajavq288y1ki07sjq70r8dzpzprg27";
    };
    meta.homepage = "https://github.com/kristijanhusak/orgmode.nvim/";
  };

  packer-nvim = buildVimPluginFrom2Nix {
    pname = "packer.nvim";
-    version = "2021-09-17";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "wbthomason";
      repo = "packer.nvim";
-      rev = "b6b568cb790b10bd2a83c2af27af8393ddc4832d";
-      sha256 = "07pyvf4gqwr2qjdq5yjf5zgxx9g173jv6nlx2qwa01pp0jxca0x1";
+      rev = "0a2d8cbaa2045bdf3797af7a5abb2d42d0edecb0";
+      sha256 = "01xx86wj4yx730mpzzy805dh72ridvbhk5540zylbjxwwb5dh1y7";
    };
    meta.homepage = "https://github.com/wbthomason/packer.nvim/";
  };
@ -4596,12 +4596,12 @@ final: prev:

  plenary-nvim = buildVimPluginFrom2Nix {
    pname = "plenary.nvim";
-    version = "2021-09-16";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "nvim-lua";
      repo = "plenary.nvim";
-      rev = "ce8f7fa999b5c091d3e7badcc2340df62b94abf9";
-      sha256 = "0v7yidq75yhcghg7bz86r3r59aj6ls7n9w5dhj1s4zskbmqvr94h";
+      rev = "03ac32af651bb33acfc4ce20d5cb51bf5a424aa1";
+      sha256 = "1rvw01i89mz43fzyxrynvfyxhb0xsijllf3y8yp5dvy61i9c7yar";
    };
    meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
  };
@ -4655,6 +4655,18 @@ final: prev:
    meta.homepage = "https://github.com/andweeb/presence.nvim/";
  };

+  presenting-vim = buildVimPluginFrom2Nix {
+    pname = "presenting.vim";
+    version = "2021-06-02";
+    src = fetchFromGitHub {
+      owner = "sotte";
+      repo = "presenting.vim";
+      rev = "fd826318582ffccf2f79aff7bef365d68f2ca4fc";
+      sha256 = "1s2c44ngv5vpszwg0nkcghb5flzq9pby1m0l7gr7vwb9p7xl3b83";
+    };
+    meta.homepage = "https://github.com/sotte/presenting.vim/";
+  };
+
  PreserveNoEOL = buildVimPluginFrom2Nix {
    pname = "PreserveNoEOL";
    version = "2013-06-14";
@ -5172,6 +5184,18 @@ final: prev:
    meta.homepage = "https://github.com/mopp/sky-color-clock.vim/";
  };

+  slimv = buildVimPluginFrom2Nix {
+    pname = "slimv";
+    version = "2021-08-24";
+    src = fetchFromGitHub {
+      owner = "kovisoft";
+      repo = "slimv";
+      rev = "1c1ef6dad577e8c5fb7d94ec3b6d698b68e7730d";
+      sha256 = "03wy3apmzbrjxypq2xv1z71xnx7bkvhyarw5w1y3l8gl430vjmgi";
+    };
+    meta.homepage = "https://github.com/kovisoft/slimv/";
+  };
+
  smartpairs-vim = buildVimPluginFrom2Nix {
    pname = "smartpairs.vim";
    version = "2018-01-01";
@ -5331,12 +5355,12 @@ final: prev:

  sqlite-lua = buildVimPluginFrom2Nix {
    pname = "sqlite.lua";
-    version = "2021-09-18";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "tami5";
      repo = "sqlite.lua";
-      rev = "edf642e2f2088a7a4bafa5a3850fd2b338566c2c";
-      sha256 = "06l604b2jfj1735dpgprkd00f02mfwbl43bjj08nsnpbjsd541mn";
+      rev = "828cf63fd2494cd47bd6d2a3a5b927157d3204d1";
+      sha256 = "0h34xl1ich9m4xgz3a9ck9liyya6swmmc9iqcr61lihhgh5fz3qz";
    };
    meta.homepage = "https://github.com/tami5/sqlite.lua/";
  };
@ -5487,12 +5511,12 @@ final: prev:

  tabnine-vim = buildVimPluginFrom2Nix {
    pname = "tabnine-vim";
-    version = "2021-09-14";
+    version = "2021-09-19";
    src = fetchFromGitHub {
      owner = "codota";
      repo = "tabnine-vim";
-      rev = "b7fdf200d309f024bb035a65611422d22abe8710";
-      sha256 = "1bvky5gsxhh9ldxk1l9fsaqmqvi7m248dgpwc4f6hh1xdyi9gvcf";
+      rev = "7700a2809a08c1774bba6fa140c61bbd9831e12a";
+      sha256 = "1swc4y8njgr343hfc4qiyfxzavz9fhzg6hnrplxm3zm8i8fbqz68";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/codota/tabnine-vim/";
@ -5584,12 +5608,12 @@ final: prev:

  taskwiki = buildVimPluginFrom2Nix {
    pname = "taskwiki";
-    version = "2021-09-18";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "tools-life";
      repo = "taskwiki";
-      rev = "146d0891a62e6f9202d3d4795668626cb0f79494";
-      sha256 = "1js1sq8arr9c8bzcyga64vblpq5qfy8dx16xvkyahakz2fk7rz40";
+      rev = "70b33f336a0388c2d4fc72ecf7cab2245df580b8";
+      sha256 = "1k3yh2ypzy6vwdvf1rrnswnpc9cqnjhvdsjal7yfqk2brvwawk46";
    };
    meta.homepage = "https://github.com/tools-life/taskwiki/";
  };
@ -5717,12 +5741,12 @@ final: prev:

  telescope-nvim = buildVimPluginFrom2Nix {
    pname = "telescope.nvim";
-    version = "2021-09-17";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "nvim-telescope";
      repo = "telescope.nvim";
-      rev = "2e7584f1cfdffb32bf26039a050cd2cf74ede4cd";
-      sha256 = "16gdsx9yv5kwg8girmf51l6wb4v2kzg5snc1d2lhilizhs35qzmw";
+      rev = "60660334c70d9d81dccc10a563e01920b9455e76";
+      sha256 = "1ss1yrbsp4hnw7h1aqb7bkpd9p594r0g1906sgsmcglyjyc1zasc";
    };
    meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
  };
@ -6076,6 +6100,18 @@ final: prev:
    meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/";
  };

+  vifm-vim = buildVimPluginFrom2Nix {
+    pname = "vifm.vim";
+    version = "2021-09-21";
+    src = fetchFromGitHub {
+      owner = "vifm";
+      repo = "vifm.vim";
+      rev = "858ef2d7a637b1c50c9266806473d895829d0775";
+      sha256 = "1fbnhcxwic629nz49vp8qdxr164dqnlp7gfdb4qngj2j2mv6g44r";
+    };
+    meta.homepage = "https://github.com/vifm/vifm.vim/";
+  };
+
  vim-abolish = buildVimPluginFrom2Nix {
    pname = "vim-abolish";
    version = "2021-03-20";
@ -6330,12 +6366,12 @@ final: prev:

  vim-airline = buildVimPluginFrom2Nix {
    pname = "vim-airline";
-    version = "2021-09-10";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "vim-airline";
      repo = "vim-airline";
-      rev = "2e29ab965625d1315f0ad070c928794baea3d66f";
-      sha256 = "1v1n6q6iq1d82i4hrkp0rqmd5yd2p0znlwd5khwq3nsfgbqsnwa9";
+      rev = "26f922753a288df639b8d05d13ed62b9b04a26bc";
+      sha256 = "0ikjcdx7c0k8skl6mwywpnqdprp64fhvpkvzz0v95s1p7pmjbl83";
    };
    meta.homepage = "https://github.com/vim-airline/vim-airline/";
  };
@ -6642,12 +6678,12 @@ final: prev:

  vim-clap = buildVimPluginFrom2Nix {
    pname = "vim-clap";
-    version = "2021-09-15";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "liuchengxu";
      repo = "vim-clap";
-      rev = "c88f7fdd1c9a394a203785ed791261e7f9e159c7";
-      sha256 = "1y7mzlns37a62zys87zd0zbzkwhb7216arjym9bf1n5gfllfbgcl";
+      rev = "e5490b568561d51ea41ccc72e3cef88f85c8968a";
+      sha256 = "19r3kgr2ahfyvm7slf6qvyxbzjviiq6ckkrqnkws6pr0n3jz1irl";
    };
    meta.homepage = "https://github.com/liuchengxu/vim-clap/";
  };
@ -6906,12 +6942,12 @@ final: prev:

  vim-dadbod = buildVimPluginFrom2Nix {
    pname = "vim-dadbod";
-    version = "2021-09-12";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "tpope";
      repo = "vim-dadbod";
-      rev = "3900e1003ba64bce7d8ed877d742bee386ad56dc";
-      sha256 = "1xbjadnp0mx4a6r5ghlqx7w9ngf930yg4qyhkvlji0scf20vvjis";
+      rev = "8fcde4c500440757f04e38c039005319476d1471";
+      sha256 = "1b6759y9s8sl6d96xzc2lx5qqh0x5sabls12hz0zj6s1736hs3sk";
    };
    meta.homepage = "https://github.com/tpope/vim-dadbod/";
  };
@ -7432,14 +7468,26 @@ final: prev:
    meta.homepage = "https://github.com/thinca/vim-ft-diff_fold/";
  };

+  vim-fubitive = buildVimPluginFrom2Nix {
+    pname = "vim-fubitive";
+    version = "2020-09-10";
+    src = fetchFromGitHub {
+      owner = "tommcdo";
+      repo = "vim-fubitive";
+      rev = "5717417ee75c39ea2f8f446a9491cdf99d5965e9";
+      sha256 = "0lkp5i8s1214b9b1q9mg3aq32cvqzfd8q0i90bx9nf6n42cg2kjn";
+    };
+    meta.homepage = "https://github.com/tommcdo/vim-fubitive/";
+  };
+
  vim-fugitive = buildVimPluginFrom2Nix {
    pname = "vim-fugitive";
-    version = "2021-09-17";
+    version = "2021-09-19";
    src = fetchFromGitHub {
      owner = "tpope";
      repo = "vim-fugitive";
-      rev = "a67e1f8189938c44f295fc97e6c9dd13b727b1e3";
-      sha256 = "1r9z936myiasyvx8v838kfjgk1ymwdznsm7w629wchjm2zlxy4by";
+      rev = "e1d382b3e7e7491acea8546ef3bdfa9ce7e54fef";
+      sha256 = "1y1iascskvqq08020c7ks8xhn0b4zrsxva326iaa3ypwhsjada94";
    };
    meta.homepage = "https://github.com/tpope/vim-fugitive/";
  };
@ -8397,12 +8445,12 @@ final: prev:

  vim-matchup = buildVimPluginFrom2Nix {
    pname = "vim-matchup";
-    version = "2021-09-12";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "andymass";
      repo = "vim-matchup";
-      rev = "5a1978e46a0e721b5c5d113379c685ff7ec339e7";
-      sha256 = "0r5hwfc41p0yv3ny7sgr8aqyl2y81kfjwy4mcqiha0rbw0x41fas";
+      rev = "daaa7dbde55d829dd456f458d90ae2ba98717ed2";
+      sha256 = "1lqx3ixdf3l4pd4k2cbhxpsja66lm30bas4zciyxq5c9fgbpg091";
    };
    meta.homepage = "https://github.com/andymass/vim-matchup/";
  };
@ -8637,12 +8685,12 @@ final: prev:

  vim-ocaml = buildVimPluginFrom2Nix {
    pname = "vim-ocaml";
-    version = "2021-09-05";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "ocaml";
      repo = "vim-ocaml";
-      rev = "3582a24f46c965cfe5d6b0c50f636f52168df650";
-      sha256 = "0wmrc4z4l8rk96kkixb148d53jzdm4w4vxlqidjm8q4d9vxnf6sb";
+      rev = "d02e928db459d3c9e9727d990838caa70b83714a";
+      sha256 = "0qqyr1r4sgbwylr2i1rpqkx9ww2im5nk3c2qai420ywp3y4hr8x5";
    };
    meta.homepage = "https://github.com/ocaml/vim-ocaml/";
  };
@ -9776,6 +9824,18 @@ final: prev:
    meta.homepage = "https://github.com/glts/vim-textobj-comment/";
  };

+  vim-textobj-entire = buildVimPluginFrom2Nix {
+    pname = "vim-textobj-entire";
+    version = "2018-01-19";
+    src = fetchFromGitHub {
+      owner = "kana";
+      repo = "vim-textobj-entire";
+      rev = "64a856c9dff3425ed8a863b9ec0a21dbaee6fb3a";
+      sha256 = "0kv0s85wbcxn9hrvml4hdzbpf49b1wwr3nk6gsz3p5rvfs6fbvmm";
+    };
+    meta.homepage = "https://github.com/kana/vim-textobj-entire/";
+  };
+
  vim-textobj-function = buildVimPluginFrom2Nix {
    pname = "vim-textobj-function";
    version = "2014-05-03";
@ -9910,12 +9970,12 @@ final: prev:

  vim-toml = buildVimPluginFrom2Nix {
    pname = "vim-toml";
-    version = "2021-09-09";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "cespare";
      repo = "vim-toml";
-      rev = "b524235e91a6ce07a53411719c67e5265b3d5edf";
-      sha256 = "05s9bl15myi6cppapfjadkjaqldsb6bsw8ksbqm379lscd6l6nv8";
+      rev = "9a05931018f4046179b76dec5b3932b48f3e3fb9";
+      sha256 = "11ck5flydf48hpagl0v6ik6cd05il6jv57hixnhg7pzyrjp5q26y";
    };
    meta.homepage = "https://github.com/cespare/vim-toml/";
  };
@ -10006,12 +10066,12 @@ final: prev:

  vim-unimpaired = buildVimPluginFrom2Nix {
    pname = "vim-unimpaired";
-    version = "2021-09-17";
+    version = "2021-09-19";
    src = fetchFromGitHub {
      owner = "tpope";
      repo = "vim-unimpaired";
-      rev = "c51ed445182334aabd392f295708ebe8677bd8e8";
-      sha256 = "0j5q11czlkhm4x78z6idbj6am29nfcg3yzli2l5607s60lvxnc0j";
+      rev = "9cf8b258e444b393784c32d7560fff25b24c79d3";
+      sha256 = "0bd9k8446163n8f5f3w3sxvx2s72b2mv0zjphkxxyhy9h7jycmz8";
    };
    meta.homepage = "https://github.com/tpope/vim-unimpaired/";
  };
@ -10090,12 +10150,12 @@ final: prev:

  vim-vsnip-integ = buildVimPluginFrom2Nix {
    pname = "vim-vsnip-integ";
-    version = "2021-09-13";
+    version = "2021-09-19";
    src = fetchFromGitHub {
      owner = "hrsh7th";
      repo = "vim-vsnip-integ";
-      rev = "a570685fc5f691e2323cb2e3c267355b8f72527f";
-      sha256 = "0ib7zmvwp46lacay0xq30sxx8jf2d5afzsrsyjkrzkzlvx8c40qh";
+      rev = "21c77665bd9d57416be2b6d11378347e163cfaa4";
+      sha256 = "0wpscf9mavc7g1494c53bghh733db7v02lvqv2ggskjygz7v7ikc";
    };
    meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/";
  };
@ -10402,12 +10462,12 @@ final: prev:

  vimspector = buildVimPluginFrom2Nix {
    pname = "vimspector";
-    version = "2021-09-18";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "puremourning";
      repo = "vimspector";
-      rev = "66c5a3d08ca5f481851d360d4b39860b00fc8e00";
-      sha256 = "1lrvzsy3grv2klm47diklhdx2i94h8hdxhzpcxr2ymnjl91c9isq";
+      rev = "eb782756ac46a1f09dfaa1664fae3b9722876b8a";
+      sha256 = "08hcd0gai7hxs6632s3w4yp93kpvz0525rps68g0nyyr8blrlp0i";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/puremourning/vimspector/";
@ -10415,12 +10475,12 @@ final: prev:

  vimtex = buildVimPluginFrom2Nix {
    pname = "vimtex";
-    version = "2021-09-16";
+    version = "2021-09-21";
    src = fetchFromGitHub {
      owner = "lervag";
      repo = "vimtex";
-      rev = "43ba45fe94e6b162c36f06ee80ecd8b225d7c703";
-      sha256 = "12c1drvpiwg1jffgar057p9vk7jkcn8ijfxl5hhl9gp2jsy29xzv";
+      rev = "562afdb82a58f105ae17c3e93e37ee233ae166a9";
+      sha256 = "0nysplhi5yj7y4ngij284hp4g45f3qbf0fmssinhyl75miz102i4";
    };
    meta.homepage = "https://github.com/lervag/vimtex/";
  };
@ -10487,12 +10547,12 @@ final: prev:

  vista-vim = buildVimPluginFrom2Nix {
    pname = "vista.vim";
-    version = "2021-08-03";
+    version = "2021-09-20";
    src = fetchFromGitHub {
      owner = "liuchengxu";
      repo = "vista.vim";
-      rev = "cb908f21c23d9c9ebce678c8dbc7a0f876384b8c";
-      sha256 = "0s2r7k1g7bzwy0yc7hx6iqyha3839jngr2db5gdihnc1niq9z8q5";
+      rev = "f49ca3dbf334ac33d2629c510524285335031706";
+      sha256 = "1pb6njvshml5vwk4wf1w62dgf2ph2farccka2ly2wwiij8ajk6qk";
    };
    meta.homepage = "https://github.com/liuchengxu/vista.vim/";
  };
@ -10668,12 +10728,12 @@ final: prev:

  YouCompleteMe = buildVimPluginFrom2Nix {
    pname = "YouCompleteMe";
-    version = "2021-09-13";
+    version = "2021-09-19";
    src = fetchFromGitHub {
      owner = "ycm-core";
      repo = "YouCompleteMe";
-      rev = "bb9ebb5b25be3534e33a585c77a14c77f15e8bc8";
-      sha256 = "1pqa4j7i0qv5k5mxwdwmqrxb2jhqllv1s9rdyvji4qqpdfs6q343";
+      rev = "4117a99861b537830d717c3113e3d584523bc573";
+      sha256 = "1c0p1zk54rcn4ph1h17qyfrsdx90rgw7cc9hp1n8xpb9nhwvx494";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@ -686,7 +686,7 @@ self: super: {
            libiconv
          ];

-          cargoSha256 = "083v2bnnjyf9j923p6bidgbvmwnh8sfv5ai70qfffzrysi5gvzdf";
+          cargoSha256 = "sha256-zg8PKuzC1srCOtn0ZcqI9cZxMwN9hsf+sNhYgDg93Gs=";
        };
      in
      ''
@ -836,6 +836,11 @@ self: super: {
    dependencies = with self; [ vim-repeat ];
  });

+  vim-textobj-entire = super.vim-textobj-entire.overrideAttrs (old: {
+    dependencies = with self; [ vim-textobj-user ];
+    meta.maintainers = with lib.maintainers; [ farlion ];
+  });
+
  vim-unimpaired = super.vim-unimpaired.overrideAttrs (old: {
    dependencies = with self; [ vim-repeat ];
  });
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@ -324,6 +324,7 @@ kana/vim-niceblock
 kana/vim-operator-replace
 kana/vim-operator-user
 kana/vim-tabpagecd
+kana/vim-textobj-entire
 kana/vim-textobj-function
 kana/vim-textobj-user
 karb94/neoscroll.nvim
@ -345,6 +346,7 @@ konfekt/fastfold
 Konfekt/vim-alias
 konfekt/vim-DetectSpellLang
 kosayoda/nvim-lightbulb
+kovisoft/slimv
 kristijanhusak/defx-git
 kristijanhusak/defx-icons
 kristijanhusak/deoplete-phpactor
@ -690,6 +692,7 @@ smiteshp/nvim-gps
 sodapopcan/vim-twiggy
 solarnz/arcanist.vim
 sonph/onehalf
+sotte/presenting.vim
 srcery-colors/srcery-vim
 steelsojka/completion-buffers
 steelsojka/pears.nvim
@ -743,6 +746,7 @@ tomasiser/vim-code-dark
 tomasr/molokai
 tomlion/vim-solidity
 tommcdo/vim-exchange
+tommcdo/vim-fubitive
 tommcdo/vim-lion
 tommcdo/vim-ninja-feet
 tomtom/tcomment_vim
@ -801,6 +805,7 @@ urbit/hoon.vim
 Valloric/MatchTagAlways
 Valodim/deoplete-notmuch
 vhda/verilog_systemverilog.vim
+vifm/vifm.vim
 vigoux/LanguageTool.nvim
 vim-airline/vim-airline
 vim-airline/vim-airline-themes
--- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
+++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
@ -1,6 +1,6 @@
 {
  "name": "rust-analyzer",
-  "version": "0.2.735",
+  "version": "0.2.751",
  "dependencies": {
    "https-proxy-agent": "^5.0.0",
    "node-fetch": "^2.6.1",
--- a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json
+++ b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json
@ -1,6 +1,6 @@
 {
  "name": "vscode-lldb",
-  "version": "1.6.5",
+  "version": "1.6.7",
  "dependencies": {
    "string-argv": "^0.3.1",
    "yaml": "^1.10.0",
@ -15,7 +15,7 @@
    "memory-streams": "^0.1.3",
    "vscode-debugprotocol": "^1.47.0",
    "vscode-debugadapter-testsupport": "^1.47.0",
-    "vsce": "=1.88.0",
+    "vsce": "^1.88.0",
    "webpack": "^5.37.1",
    "webpack-cli": "^4.7.0",
    "ts-loader": "^8.0.0"
--- a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix
+++ b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix
@ -5,7 +5,7 @@ assert lib.versionAtLeast python3.version "3.5";
 let
  publisher = "vadimcn";
  pname = "vscode-lldb";
-  version = "1.6.5";
+  version = "1.6.7";

  vscodeExtUniqueId = "${publisher}.${pname}";

@ -13,7 +13,7 @@ let
    owner = "vadimcn";
    repo = "vscode-lldb";
    rev = "v${version}";
-    sha256 = "sha256-ppiEWFKJiUtlF8LSqBb8Xvg26B+wHcIZJhU+ANE4J2k=";
+    sha256 = "sha256-9rqdqpxUWcUV9RnZOTxg+zMW7wlTXZVkoKYHuv/lE7c=";
  };

  lldb = callPackage ./lldb.nix {};
@ -25,7 +25,7 @@ let
    # It will pollute the build environment of `buildRustPackage`.
    cargoPatches = [ ./reset-cargo-config.patch ];

-    cargoSha256 = "sha256-ksRFlbtrFAbcX/Pc6rgWUHVl859GVUOvNckxM7Q971U=";
+    cargoSha256 = "sha256-KeZpjMCBdOJTLj8pA5WWi3EMyhhWw/+aik4IJqIs/mk=";

    nativeBuildInputs = [ makeWrapper ];

--- a/pkgs/misc/vscode-extensions/vscode-lldb/update.sh
+++ b/pkgs/misc/vscode-extensions/vscode-lldb/update.sh
@ -30,9 +30,6 @@ jq '{ name, version: $version, dependencies: (.dependencies + .devDependencies)
    "$src/package.json" \
    > build-deps/package.json

-# FIXME: vsce@1.93.0 breaks the build.
-sed 's/"vsce": ".*"/"vsce": "=1.88.0"/' --in-place build-deps/package.json
-
 # Regenerate nodePackages.
 cd "$nixpkgs/pkgs/development/node-packages"
 exec ./generate.sh
--- a/Show More
+++ b/Show More