Merge master into staging-next

2021-10-02 00:04:43 +00:00 · 2021-10-02 00:04:43 +00:00 · 90a3ecee8f
commit 90a3ecee8f
parent 224019bd1c a7afddb159
47 changed files with 1354 additions and 959 deletions
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@ -55,7 +55,7 @@ in
          description = "Root path for log files.";
        };
        level = mkOption {
-          default = "Trace";
+          default = "Info";
          type = types.enum [ "Trace" "Debug" "Info" "Warn" "Error" "Critical" ];
          description = "General log level.";
        };
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@ -6,7 +6,7 @@ let
  cfg = config.services.nextcloud;
  fpm = config.services.phpfpm.pools.nextcloud;

-  phpPackage = pkgs.php74.buildEnv {
+  phpPackage = cfg.phpPackage.buildEnv {
    extensions = { enabled, all }:
      (with all;
        enabled
@ -94,6 +94,14 @@ in {
      description = "Which package to use for the Nextcloud instance.";
      relatedPackages = [ "nextcloud20" "nextcloud21" "nextcloud22" ];
    };
+    phpPackage = mkOption {
+      type = types.package;
+      relatedPackages = [ "php74" "php80" ];
+      defaultText = "pkgs.php";
+      description = ''
+        PHP package to use for Nextcloud.
+      '';
+    };

    maxUploadSize = mkOption {
      default = "512M";
@ -449,6 +457,10 @@ in {
          else if versionOlder stateVersion "21.11" then nextcloud21
          else nextcloud22
        );
+
+      services.nextcloud.phpPackage =
+        if versionOlder cfg.package.version "21" then pkgs.php74
+        else pkgs.php80;
    }

    { systemd.timers.nextcloud-cron = {
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@ -6,6 +6,8 @@ let

  cfg = config.services.xserver.displayManager;
  gdm = pkgs.gnome.gdm;
+  settingsFormat = pkgs.formats.ini { };
+  configFile = settingsFormat.generate "custom.conf" cfg.gdm.settings;

  xSessionWrapper = if (cfg.setupCommands == "") then null else
    pkgs.writeScript "gdm-x-session-wrapper" ''
@ -105,6 +107,18 @@ in
        type = types.bool;
      };

+      settings = mkOption {
+        type = settingsFormat.type;
+        default = { };
+        example = {
+          debug.enable = true;
+        };
+        description = ''
+          Options passed to the gdm daemon.
+          See <link xlink:href="https://help.gnome.org/admin/gdm/stable/configuration.html.en#daemonconfig">here</link> for supported options.
+        '';
+      };
+
    };

  };
@ -270,31 +284,26 @@ in
    # Use AutomaticLogin if delay is zero, because it's immediate.
    # Otherwise with TimedLogin with zero seconds the prompt is still
    # presented and there's a little delay.
-    environment.etc."gdm/custom.conf".text = ''
-      [daemon]
-      WaylandEnable=${boolToString cfg.gdm.wayland}
-      ${optionalString cfg.autoLogin.enable (
-        if cfg.gdm.autoLogin.delay > 0 then ''
-          TimedLoginEnable=true
-          TimedLogin=${cfg.autoLogin.user}
-          TimedLoginDelay=${toString cfg.gdm.autoLogin.delay}
-        '' else ''
-          AutomaticLoginEnable=true
-          AutomaticLogin=${cfg.autoLogin.user}
-        '')
-      }
+    services.xserver.displayManager.gdm.settings = {
+      daemon = mkMerge [
+        { WaylandEnable = cfg.gdm.wayland; }
+        # nested if else didn't work
+        (mkIf (cfg.autoLogin.enable && cfg.gdm.autoLogin.delay != 0 ) {
+          TimedLoginEnable = true;
+          TimedLogin = cfg.autoLogin.user;
+          TimedLoginDelay = cfg.gdm.autoLogin.delay;
+        })
+        (mkIf (cfg.autoLogin.enable && cfg.gdm.autoLogin.delay == 0 ) {
+          AutomaticLoginEnable = true;
+          AutomaticLogin = cfg.autoLogin.user;
+        })
+      ];
+      debug = mkIf cfg.gdm.debug {
+        Enable = true;
+      };
+    };

-      [security]
-
-      [xdmcp]
-
-      [greeter]
-
-      [chooser]
-
-      [debug]
-      ${optionalString cfg.gdm.debug "Enable=true"}
-    '';
+    environment.etc."gdm/custom.conf".source = configFile;

    environment.etc."gdm/Xsession".source = config.services.xserver.displayManager.sessionData.wrapper;

--- a/nixos/tests/nextcloud/basic.nix
+++ b/nixos/tests/nextcloud/basic.nix
@ -1,4 +1,6 @@
-import ../make-test-python.nix ({ pkgs, ...}: let
+args@{ pkgs, nextcloudVersion ? 22, ... }:
+
+(import ../make-test-python.nix ({ pkgs, ...}: let
  adminpass = "notproduction";
  adminuser = "root";
 in {
@ -39,6 +41,7 @@ in {
          inherit adminpass;
          dbtableprefix = "nixos_";
        };
+        package = pkgs.${"nextcloud" + (toString nextcloudVersion)};
        autoUpdateApps = {
          enable = true;
          startAt = "20:00";
@ -100,4 +103,4 @@ in {
    )
    assert "hi" in client.succeed("cat /mnt/dav/test-shared-file")
  '';
-})
+})) args
--- a/nixos/tests/nextcloud/default.nix
+++ b/nixos/tests/nextcloud/default.nix
@ -2,8 +2,20 @@
  config ? {},
  pkgs ? import ../../.. { inherit system config; }
 }:
-{
-  basic = import ./basic.nix { inherit system pkgs; };
-  with-postgresql-and-redis = import ./with-postgresql-and-redis.nix { inherit system pkgs; };
-  with-mysql-and-memcached = import ./with-mysql-and-memcached.nix { inherit system pkgs; };
-}
+
+with pkgs.lib;
+
+foldl
+  (matrix: ver: matrix // {
+    "basic${toString ver}" = import ./basic.nix { inherit system pkgs; nextcloudVersion = ver; };
+    "with-postgresql-and-redis${toString ver}" = import ./with-postgresql-and-redis.nix {
+      inherit system pkgs;
+      nextcloudVersion = ver;
+    };
+    "with-mysql-and-memcached${toString ver}" = import ./with-mysql-and-memcached.nix {
+      inherit system pkgs;
+      nextcloudVersion = ver;
+    };
+  })
+  {}
+  [ 20 21 22 ]
--- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix
+++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix
@ -1,4 +1,6 @@
-import ../make-test-python.nix ({ pkgs, ...}: let
+args@{ pkgs, nextcloudVersion ? 22, ... }:
+
+(import ../make-test-python.nix ({ pkgs, ...}: let
  adminpass = "hunter2";
  adminuser = "root";
 in {
@ -18,6 +20,7 @@ in {
        enable = true;
        hostName = "nextcloud";
        https = true;
+        package = pkgs.${"nextcloud" + (toString nextcloudVersion)};
        caching = {
          apcu = true;
          redis = false;
@ -103,4 +106,4 @@ in {
        "${withRcloneEnv} ${diffSharedFile}"
    )
  '';
-})
+})) args
--- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix
+++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
@ -1,4 +1,6 @@
-import ../make-test-python.nix ({ pkgs, ...}: let
+args@{ pkgs, nextcloudVersion ? 22, ... }:
+
+(import ../make-test-python.nix ({ pkgs, ...}: let
  adminpass = "hunter2";
  adminuser = "custom-admin-username";
 in {
@ -17,6 +19,7 @@ in {
      services.nextcloud = {
        enable = true;
        hostName = "nextcloud";
+        package = pkgs.${"nextcloud" + (toString nextcloudVersion)};
        caching = {
          apcu = false;
          redis = true;
@ -96,4 +99,4 @@ in {
        "${withRcloneEnv} ${diffSharedFile}"
    )
  '';
-})
+})) args
--- a/pkgs/applications/audio/helm/default.nix
+++ b/pkgs/applications/audio/helm/default.nix
@ -26,10 +26,13 @@
  buildInputs = [
    xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
    xorg.libXinerama xorg.libXrender xorg.libXrandr
-    freetype alsa-lib curl libjack2 pkg-config libGLU libGL lv2
+    freetype alsa-lib curl libjack2 libGLU libGL lv2
  ];
+  nativeBuildInputs = [ pkg-config ];

  CXXFLAGS = "-DHAVE_LROUND";
+  enableParallelBuilding = true;
+  makeFlags = [ "DESTDIR=$(out)" ];

  patches = [
    # gcc9 compatibility https://github.com/mtytel/helm/pull/233
@ -41,15 +44,7 @@

  prePatch = ''
    sed -i 's|usr/||g' Makefile
-  '';
-
-  buildPhase = ''
-    make lv2
-    make standalone
-  '';
-
-  installPhase = ''
-   make DESTDIR="$out" install
+    sed -i "s|/usr/share/|$out/share/|" src/common/load_save.cpp
  '';

  meta = with lib; {
@ -72,7 +67,7 @@
        Simple arpeggiator
        Effects: Formant filter, stutter, delay
    '';
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Plus;
    maintainers = [ maintainers.magnetophon ];
    platforms = platforms.linux;
  };
--- a/pkgs/applications/audio/pamixer/default.nix
+++ b/pkgs/applications/audio/pamixer/default.nix
@ -1,20 +1,30 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, boost, libpulseaudio }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, boost, libpulseaudio, installShellFiles }:

 stdenv.mkDerivation rec {
  pname = "pamixer";
-  version = "1.4";
+  version = "unstable-2021-03-29";

  src = fetchFromGitHub {
    owner = "cdemoulins";
    repo = "pamixer";
-    rev = version;
-    sha256 = "1i14550n8paijwwnhksv5izgfqm3s5q2773bdfp6vyqybkll55f7";
+    rev = "4ea2594cb8c605dccd00a381ba19680eba368e94";
+    sha256 = "sha256-kV4wIxm1WZvqqyfmgQ2cSbRJwJR154OW0MMDg2ntf6g=";
  };

  buildInputs = [ boost libpulseaudio ];

+  nativeBuildInputs = [ installShellFiles ];
+
  installPhase = ''
+    runHook preInstall
+
    install -Dm755 pamixer -t $out/bin
+
+    runHook postInstall
+  '';
+
+  postInstall = ''
+    installManPage pamixer.1
  '';

  meta = with lib; {
@ -29,7 +39,9 @@ stdenv.mkDerivation rec {
        - Mute or unmute a device
    '';
    homepage = "https://github.com/cdemoulins/pamixer";
+    maintainers = with maintainers; [ thiagokokada ];
    license = licenses.gpl3;
    platforms = platforms.linux;
+    mainProgram = "pamixer";
  };
 }
--- a/pkgs/applications/misc/visidata/default.nix
+++ b/pkgs/applications/misc/visidata/default.nix
@ -24,13 +24,13 @@
 }:
 buildPythonApplication rec {
  pname = "visidata";
-  version = "2.6";
+  version = "2.6.1";

  src = fetchFromGitHub {
    owner = "saulpw";
    repo = "visidata";
    rev = "v${version}";
-    sha256 = "sha256-fsk+Cn7CzrOAif5+LUMrs8llSnEfoSLAdg1qOFMJOh8=";
+    sha256 = "1dmiy87x0yc0d594v3d3km13dl851mx7ym1vgh3bg91llg8ykg33";
  };

  propagatedBuildInputs = [
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@ -92,11 +92,11 @@ in

 stdenv.mkDerivation rec {
  pname = "brave";
-  version = "1.30.86";
+  version = "1.30.87";

  src = fetchurl {
    url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "0pg29i01dm5gqfd3aagsc83dbx0n3051wfxi0r1c9l93dwm5bmq9";
+    sha256 = "0mx1vnrip1y87g6zj9sdcf5siihwn0b6v1q106d9kz89znpzd64s";
  };

  dontConfigure = true;
--- a/pkgs/applications/office/hledger-check-fancyassertions/default.nix
+++ b/pkgs/applications/office/hledger-check-fancyassertions/default.nix
@ -0,0 +1,41 @@
+{lib, stdenvNoCC, haskellPackages, fetchurl, writers}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "hledger-check-fancyassertions";
+  version = "1.23";
+
+  src = fetchurl {
+    url = "https://raw.githubusercontent.com/simonmichael/hledger/hledger-lib-${version}/bin/hledger-check-fancyassertions.hs";
+    sha256 = "08p2din1j7l4c29ipn68k8vvs3ys004iy8a3zf318lzby4h04h0n";
+  };
+
+  dontUnpack = true;
+  dontBuild = true;
+
+  executable = writers.writeHaskell
+    "hledger-check-fancyassertions"
+    {
+      libraries = with haskellPackages; [
+        base base-compat base-compat-batteries filepath hledger-lib_1_23
+        megaparsec microlens optparse-applicative string-qq text time
+        transformers
+      ];
+      inherit (haskellPackages) ghc;
+    }
+    src;
+
+  installPhase = ''
+    runHook preInstall
+    install -D $executable $out/bin/${pname}
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Complex account balance assertions for hledger journals";
+    homepage = "https://hledger.org/";
+    changelog = "https://github.com/simonmichael/hledger/blob/master/CHANGES.md";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.DamienCassou ];
+    platforms = lib.platforms.all; # GHC can cross-compile
+  };
+}
--- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
@ -49,7 +49,7 @@ stdenv.mkDerivation {


  configureFlags = [
-    "--with-terminfo=$terminfo/share/terminfo"
+    "--with-terminfo=${placeholder "terminfo"}/share/terminfo"
    "--enable-256-color"
    (enableFeature perlSupport "perl")
    (enableFeature unicode3Support "unicode3")
--- a/pkgs/applications/virtualization/docker-slim/default.nix
+++ b/pkgs/applications/virtualization/docker-slim/default.nix
@ -6,7 +6,7 @@

 buildGoPackage rec {
  pname = "docker-slim";
-  version = "1.36.4";
+  version = "1.37.0";

  goPackagePath = "github.com/docker-slim/docker-slim";

@ -14,7 +14,7 @@ buildGoPackage rec {
    owner = "docker-slim";
    repo = "docker-slim";
    rev = version;
-    sha256 = "0hgiigai5jpczjll4s4r4jzbq272s3p8f0r6mj4r3mjjs89hkqz1";
+    sha256 = "1gxbgn61qv4zhzxwdd917hywwicr3jand34ghjzha35r44lmyzgz";
  };

  subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ];
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@ -1,6 +1,6 @@
 {
-  "commit": "e0bd041989865809059f6039125dfb93cb075f72",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e0bd041989865809059f6039125dfb93cb075f72.tar.gz",
-  "sha256": "1fpm2kawxlias5xxmiara6224akgii0mnwnlyklc8szflv9cbs17",
-  "msg": "Update from Hackage at 2021-09-19T21:23:33Z"
+  "commit": "85edb79d7ee62685f6ccc57b932ff3920affcb77",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/85edb79d7ee62685f6ccc57b932ff3920affcb77.tar.gz",
+  "sha256": "13yxypamp0pwx8mcslg4mgq5599cldhmfss881m22zqjkbqvi8sj",
+  "msg": "Update from Hackage at 2021-09-29T20:58:23Z"
 }
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -856,6 +856,11 @@ self: super: {
      stripLen = 1;
    });

+  # hledger-lib 1.23 depends on doctest >= 0.18
+  hledger-lib_1_23 = super.hledger-lib_1_23.override {
+    doctest = self.doctest_0_18_1;
+  };
+
  # Copy hledger man pages from data directory into the proper place. This code
  # should be moved into the cabal2nix generator.
  hledger = overrideCabal super.hledger (drv: {
@ -1987,4 +1992,19 @@ EOT
  hw-xml = assert pkgs.lib.versionOlder self.generic-lens.version "2.2.0.0";
    doJailbreak super.hw-xml;

+  # doctests fail due to deprecation warnings in 0.2
+  candid = assert pkgs.lib.versionOlder super.candid.version "0.3";
+    overrideCabal super.candid (drv: {
+      version = "0.3";
+      sha256 = "0zq29zddkkwvlyz9qmxl942ml53m6jawl4m5rkb2510glbkcvr5x";
+      libraryHaskellDepends = drv.libraryHaskellDepends ++ [
+        self.file-embed
+      ];
+    });
+
+  # Needs network >= 3.1.2
+  quic = super.quic.overrideScope (self: super: {
+    network = self.network_3_1_2_2;
+  });
+
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
--- a/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/pkgs/development/haskell-modules/configuration-darwin.nix
@ -197,6 +197,7 @@ self: super: ({
  hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin;
  hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;
  hls-floskell-plugin = dontCheck super.hls-floskell-plugin;
+  hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin;

  # We are lacking pure pgrep at the moment for tests to work
  tmp-postgres = dontCheck super.tmp-postgres;
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@ -155,7 +155,7 @@ self: super: {
  # 2021-09-18: Need path >= 0.9.0 for ghc 9 compat
  path = self.path_0_9_0;
  # 2021-09-18: Need ormolu >= 0.3.0.0 for ghc 9 compat
-  ormolu = self.ormolu_0_3_0_0;
+  ormolu = doDistribute self.ormolu_0_3_0_1;
  # 2021-09-18: https://github.com/haskell/haskell-language-server/issues/2206
  # Restrictive upper bound on ormolu
  hls-ormolu-plugin = doJailbreak super.hls-ormolu-plugin;
--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
@ -53,7 +53,8 @@ self: super: {

  # Jailbreaks & Version Updates
  async = doJailbreak super.async;
-  ChasingBottoms = markBrokenVersion "1.3.1.9" super.ChasingBottoms;
+  base64-bytestring = doJailbreak super.base64-bytestring;
+  ChasingBottoms = doJailbreak super.ChasingBottoms;
  data-fix = doJailbreak super.data-fix;
  dec = doJailbreak super.dec;
  ed25519 = doJailbreak super.ed25519;
@ -62,8 +63,9 @@ self: super: {
  HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; });
  integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; });
  lukko = doJailbreak super.lukko;
+  network = super.network_3_1_2_2;
  parallel = doJailbreak super.parallel;
-  primitive = doJailbreak (dontCheck super.primitive);
+  primitive = doJailbreak super.primitive;
  regex-posix = doJailbreak super.regex-posix;
  resolv = doJailbreak super.resolv;
  singleton-bool = doJailbreak super.singleton-bool;
@ -88,14 +90,11 @@ self: super: {
  });

  # 1.3.0 (on stackage) defines instances for the Option-type, which has been removed from base in GHC 9.2.x
-  # Tests fail because random hasn't been updated for GHC 9.2.x
-  hashable = dontCheck super.hashable_1_3_3_0;
+  hashable = super.hashable_1_3_3_0;

-  # Tests fail because random hasn't been updated for GHC 9.2.x
-  unordered-containers = dontCheck super.unordered-containers;
-
-  # The test suite seems pretty broken.
-  base64-bytestring = dontCheck super.base64-bytestring;
+  # 1.2.1 introduced support for GHC 9.2.1, stackage has 1.2.0
+  # The test suite indirectly depends on random, which leads to infinite recursion
+  random = dontCheck super.random_1_2_1;

  # 5 introduced support for GHC 9.0.x, but hasn't landed in stackage yet
  lens = super.lens_5_0_1;
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@ -4269,6 +4269,7 @@ broken-packages:
  - semialign-extras
  - semibounded-lattices
  - Semigroup
+  - semigroupoids-do
  - semigroupoids-syntax
  - semigroups-actions
  - sendgrid-haskell
@ -4662,6 +4663,7 @@ broken-packages:
  - streaming-utils
  - streaming-with
  - streamly-examples
+  - streamly-lz4
  - streamly-process
  - stream-monad
  - streamproc
@ -4949,6 +4951,7 @@ broken-packages:
  - Titim
  - tkhs
  - tkyprof
+  - tmp-proc-example
  - todo
  - tofromxml
  - to-haskell
@ -5405,6 +5408,7 @@ broken-packages:
  - xml-prettify
  - xml-query
  - xml-tydom-core
+  - xml-verify
  - XMMS
  - xmonad-bluetilebranch
  - xmonad-contrib-gpl
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@ -271,6 +271,10 @@ package-maintainers:
    - witch
  ncfavier:
    - lambdabot
+  nomeata:
+    - candid
+    - leb128-cereal
+    - tasty-expected-failure
  pacien:
    - ldgallery-compiler
  peti:
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@ -1,4 +1,4 @@
-# Stackage LTS 18.10
+# Stackage LTS 18.12
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@ -172,7 +172,6 @@ default-package-overrides:
  - ascii-progress ==0.3.3.0
  - ascii-superset ==1.0.1.4
  - ascii-th ==1.0.0.4
-  - asif ==6.0.4
  - asn1-encoding ==0.9.6
  - asn1-parse ==0.9.5
  - asn1-types ==0.3.4
@ -195,7 +194,7 @@ default-package-overrides:
  - attoparsec-path ==0.0.0.1
  - audacity ==0.0.2
  - aur ==7.0.6
-  - aura ==3.2.5
+  - aura ==3.2.6
  - authenticate ==1.3.5
  - authenticate-oauth ==1.6.0.1
  - autoexporter ==1.1.20
@ -311,7 +310,7 @@ default-package-overrides:
  - bv ==0.5
  - bv-little ==1.1.1
  - byteable ==0.1.1
-  - byte-count-reader ==0.10.1.5
+  - byte-count-reader ==0.10.1.6
  - bytedump ==1.0
  - byte-order ==0.1.2.0
  - byteorder ==1.0.4
@ -331,7 +330,7 @@ default-package-overrides:
  - c2hs ==0.28.8
  - cabal2spec ==2.6.2
  - cabal-appimage ==0.3.0.2
-  - cabal-clean ==0.1.20210815
+  - cabal-clean ==0.1.20210924
  - cabal-debian ==5.1
  - cabal-doctest ==1.0.8
  - cabal-file ==0.1.1
@ -395,7 +394,7 @@ default-package-overrides:
  - cipher-des ==0.0.6
  - cipher-rc4 ==0.1.4
  - circle-packing ==0.1.0.6
-  - circular ==0.4.0.0
+  - circular ==0.4.0.1
  - citeproc ==0.4.0.1
  - clash-ghc ==1.4.3
  - clash-lib ==1.4.3
@ -448,7 +447,7 @@ default-package-overrides:
  - concurrent-supply ==0.1.8
  - cond ==0.4.1.1
  - conduino ==0.2.2.0
-  - conduit ==1.3.4.1
+  - conduit ==1.3.4.2
  - conduit-algorithms ==0.0.11.0
  - conduit-combinators ==1.3.0
  - conduit-concurrent-map ==0.1.1
@ -609,7 +608,7 @@ default-package-overrides:
  - di-monad ==1.3.1
  - directory-tree ==0.12.1
  - direct-sqlite ==2.3.26
-  - dirichlet ==0.1.0.4
+  - dirichlet ==0.1.0.5
  - discount ==0.1.1
  - disk-free-space ==0.1.0.1
  - distributed-closure ==0.4.2.0
@ -791,7 +790,7 @@ default-package-overrides:
  - fmlist ==0.9.4
  - fmt ==0.6.3.0
  - fn ==0.3.0.2
-  - focus ==1.0.2
+  - focus ==1.0.3
  - focuslist ==0.1.0.2
  - foldable1 ==0.1.0.0
  - fold-debounce ==0.2.0.9
@ -828,7 +827,7 @@ default-package-overrides:
  - fusion-plugin ==0.2.3
  - fusion-plugin-types ==0.1.0
  - fuzzcheck ==0.1.1
-  - fuzzy ==0.1.0.0
+  - fuzzy ==0.1.0.1
  - fuzzy-dates ==0.1.1.2
  - fuzzyset ==0.2.1
  - fuzzy-time ==0.1.0.0
@ -925,7 +924,7 @@ default-package-overrides:
  - ginger ==0.10.1.0
  - gingersnap ==0.3.1.0
  - gi-pango ==1.0.24
-  - githash ==0.1.6.1
+  - githash ==0.1.6.2
  - github-release ==1.3.7
  - github-rest ==1.0.3
  - github-types ==0.2.1
@ -1004,7 +1003,7 @@ default-package-overrides:
  - haskell-src-meta ==0.8.7
  - haskey-btree ==0.3.0.1
  - hasktags ==0.72.0
-  - hasql ==1.4.5.1
+  - hasql ==1.4.5.2
  - hasql-notifications ==0.2.0.0
  - hasql-optparse-applicative ==0.3.0.6
  - hasql-pool ==0.5.2
@ -1179,19 +1178,14 @@ default-package-overrides:
  - hw-conduit ==0.2.1.0
  - hw-conduit-merges ==0.2.1.0
  - hw-diagnostics ==0.0.1.0
-  - hw-dsv ==0.4.1.0
  - hweblib ==0.6.3
-  - hw-eliasfano ==0.1.2.0
  - hw-excess ==0.2.3.0
  - hw-fingertree ==0.1.2.0
  - hw-fingertree-strict ==0.1.2.0
  - hw-hedgehog ==0.1.1.0
  - hw-hspec-hedgehog ==0.1.1.0
  - hw-int ==0.0.2.0
-  - hw-ip ==2.4.2.0
  - hw-json-simd ==0.1.1.0
-  - hw-json-simple-cursor ==0.1.1.0
-  - hw-json-standard-cursor ==0.2.3.1
  - hw-kafka-client ==4.0.3
  - hw-packed-vector ==0.2.1.0
  - hw-parser ==0.1.1.0
@ -1202,7 +1196,6 @@ default-package-overrides:
  - hw-streams ==0.0.1.0
  - hw-string-parse ==0.0.0.4
  - hw-succinct ==0.1.0.1
-  - hw-xml ==0.5.1.0
  - hxt ==9.3.1.22
  - hxt-charproperties ==9.5.0.0
  - hxt-css ==0.1.0.3
@ -1396,7 +1389,7 @@ default-package-overrides:
  - LibZip ==1.0.1
  - lifted-async ==0.10.2.1
  - lifted-base ==0.2.3.12
-  - lift-generics ==0.2
+  - lift-generics ==0.2.1
  - lift-type ==0.1.0.1
  - line ==4.0.1
  - linear ==1.21.6
@ -1410,7 +1403,7 @@ default-package-overrides:
  - list-predicate ==0.1.0.1
  - listsafe ==0.1.0.1
  - list-singleton ==1.0.0.5
-  - list-t ==1.0.4
+  - list-t ==1.0.5
  - list-transformer ==1.0.7
  - ListTree ==0.2.3
  - literatex ==0.1.0.2
@ -1443,7 +1436,7 @@ default-package-overrides:
  - lz4-frame-conduit ==0.1.0.1
  - lzma ==0.0.0.3
  - lzma-clib ==5.2.2
-  - lzma-conduit ==1.2.1
+  - lzma-conduit ==1.2.2
  - machines ==0.7.2
  - machines-binary ==7.0.0.0
  - magic ==1.1
@ -1528,7 +1521,7 @@ default-package-overrides:
  - mock-time ==0.1.0
  - mod ==0.1.2.2
  - model ==0.5
-  - modern-uri ==0.3.4.1
+  - modern-uri ==0.3.4.2
  - modular ==0.1.0.8
  - monad-chronicle ==1.0.0.1
  - monad-control ==1.0.3.1
@ -1563,7 +1556,7 @@ default-package-overrides:
  - mongoDB ==2.7.1.1
  - monoid-subclasses ==1.1.1
  - monoid-transformer ==0.0.4
-  - mono-traversable ==1.0.15.1
+  - mono-traversable ==1.0.15.3
  - mono-traversable-instances ==0.1.1.0
  - mono-traversable-keys ==0.1.0
  - more-containers ==0.2.2.2
@ -1748,7 +1741,7 @@ default-package-overrides:
  - pathtype ==0.8.1.1
  - pathwalk ==0.3.1.2
  - pattern-arrows ==0.0.2
-  - pava ==0.1.1.1
+  - pava ==0.1.1.2
  - pcg-random ==0.1.3.7
  - pcre2 ==1.1.5
  - pcre-heavy ==1.0.0.2
@ -1838,12 +1831,12 @@ default-package-overrides:
  - pretty-class ==1.0.1.1
  - pretty-diff ==0.4.0.3
  - pretty-hex ==1.1
-  - prettyprinter ==1.7.0
-  - prettyprinter-ansi-terminal ==1.1.2
+  - prettyprinter ==1.7.1
+  - prettyprinter-ansi-terminal ==1.1.3
  - prettyprinter-compat-annotated-wl-pprint ==1.1
-  - prettyprinter-compat-ansi-wl-pprint ==1.0.1
-  - prettyprinter-compat-wl-pprint ==1.0.0.1
-  - prettyprinter-convert-ansi-wl-pprint ==1.1.1
+  - prettyprinter-compat-ansi-wl-pprint ==1.0.2
+  - prettyprinter-compat-wl-pprint ==1.0.1
+  - prettyprinter-convert-ansi-wl-pprint ==1.1.2
  - pretty-relative-time ==0.2.0.0
  - pretty-show ==1.10
  - pretty-simple ==4.0.0.0
@ -1930,7 +1923,7 @@ default-package-overrides:
  - Ranged-sets ==0.4.0
  - range-set-list ==0.1.3.1
  - rank1dynamic ==0.4.1
-  - rank2classes ==1.4.2
+  - rank2classes ==1.4.3
  - Rasterific ==0.7.5.4
  - rasterific-svg ==0.3.3.2
  - ratel ==1.0.15
@ -1975,7 +1968,7 @@ default-package-overrides:
  - regex-compat ==0.95.2.1
  - regex-compat-tdfa ==0.95.1.4
  - regex-pcre ==0.95.0.0
-  - regex-pcre-builtin ==0.95.2.3.8.43
+  - regex-pcre-builtin ==0.95.2.3.8.44
  - regex-posix ==0.96.0.1
  - regex-posix-clib ==2.7
  - regex-tdfa ==1.3.1.1
@ -2127,7 +2120,7 @@ default-package-overrides:
  - set-cover ==0.1.1
  - setenv ==0.1.1.3
  - setlocale ==1.0.0.10
-  - sexp-grammar ==2.3.1
+  - sexp-grammar ==2.3.2
  - SHA ==1.6.4.4
  - shake ==0.19.6
  - shake-language-c ==0.12.0
@ -2175,7 +2168,7 @@ default-package-overrides:
  - skylighting-core ==0.10.5.2
  - slack-api ==0.12
  - slack-progressbar ==0.1.0.1
-  - slick ==1.1.1.0
+  - slick ==1.1.2.2
  - slist ==0.2.0.0
  - slynx ==0.5.1.1
  - smallcheck ==1.2.1
@ -2339,7 +2332,7 @@ default-package-overrides:
  - tasty-program ==1.0.5
  - tasty-quickcheck ==0.10.1.2
  - tasty-rerun ==1.1.18
-  - tasty-silver ==3.2.2
+  - tasty-silver ==3.2.3
  - tasty-smallcheck ==0.8.2
  - tasty-test-reporter ==0.1.1.4
  - tasty-th ==0.1.7
@ -2367,7 +2360,7 @@ default-package-overrides:
  - texmath ==0.12.3.1
  - text-ansi ==0.1.1
  - text-binary ==0.2.1.1
-  - text-builder ==0.6.6.2
+  - text-builder ==0.6.6.3
  - text-conversions ==0.3.1
  - text-format ==0.3.2
  - text-icu ==0.7.1.0
@ -2568,7 +2561,7 @@ default-package-overrides:
  - vault ==0.3.1.5
  - vcs-ignore ==0.0.1.0
  - vec ==0.4
-  - vector ==0.12.3.0
+  - vector ==0.12.3.1
  - vector-algorithms ==0.8.0.4
  - vector-binary-instances ==0.2.5.2
  - vector-buffer ==0.4.1
@ -2689,7 +2682,7 @@ default-package-overrides:
  - xmonad-extras ==0.15.3
  - xss-sanitize ==0.3.6
  - xxhash-ffi ==0.2.0.0
-  - yaml ==0.11.5.0
+  - yaml ==0.11.6.0
  - yamlparse-applicative ==0.2.0.0
  - yesod ==1.6.1.2
  - yesod-auth ==1.6.10.4
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@ -489,7 +489,6 @@ dont-distribute-packages:
 - atuin
 - audiovisual
 - aura
- - aura_3_2_6
 - authoring
 - autonix-deps-kf5
 - avers
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@ -932,6 +932,8 @@ self: super: builtins.intersectAttrs super {
  # Runtime dependencies and CLI completion
  nvfetcher = generateOptparseApplicativeCompletion "nvfetcher" (overrideCabal
    super.nvfetcher (drv: {
+      # test needs network
+      doCheck = false;
      buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ];
      postInstall = drv.postInstall or "" + ''
        wrapProgram "$out/bin/nvfetcher" --prefix 'PATH' ':' "${
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "aioesphomeapi";
-  version = "9.1.1";
+  version = "9.1.2";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "esphome";
    repo = pname;
    rev = "v${version}";
-    sha256 = "1bkk6mj1h1zhhp4s1ps6g950vzgfbxdj9pw762fz238p48ccw90b";
+    sha256 = "sha256-rgRXJ0kbIHg8QpYdBXJ5KA2kU6lV14yuVfj5OjQvmU8=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/tools/analysis/tfsec/default.nix
+++ b/pkgs/development/tools/analysis/tfsec/default.nix
@ -5,13 +5,13 @@

 buildGoPackage rec {
  pname = "tfsec";
-  version = "0.58.11";
+  version = "0.58.12";

  src = fetchFromGitHub {
    owner = "aquasecurity";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-IapWH7bkjrFmdkGHUHROECmfF3su4HtJJ8Ii5a4GSRg=";
+    sha256 = "sha256-+djNbTr4TBo3KJ2skQysfrhVp9Q+HuaeB1UCzASB1+w=";
  };

  goPackagePath = "github.com/aquasecurity/tfsec";
--- a/pkgs/development/tools/htmltest/default.nix
+++ b/pkgs/development/tools/htmltest/default.nix
@ -5,17 +5,23 @@

 buildGoModule rec {
  pname = "htmltest";
-  version = "0.14.0";
+  version = "0.15.0";

  src = fetchFromGitHub {
    owner = "wjdp";
    repo = pname;
    rev = "v${version}";
-    sha256 = "0z2j54ywim1nl10vidcnbwhywyzanj4qd93ai533808wrm3ghwb6";
+    sha256 = "sha256-lj+bR27huswHemF8M+G69PblqnQQUWsg4jtLfz89yVY=";
  };

  vendorSha256 = "0zx3ii9crick647kslzwg4d39li6jds938f9j9dp287rhrlzjfbm";

+  ldflags = [
+    "-w"
+    "-s"
+    "-X main.version=${version}"
+  ];
+
  # tests require network access
  doCheck = false;

--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@ -1,25 +1,17 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles, fetchpatch }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:

 buildGoModule rec {
  pname = "packer";
-  version = "1.7.5";
+  version = "1.7.6";

  src = fetchFromGitHub {
    owner = "hashicorp";
    repo = "packer";
    rev = "v${version}";
-    sha256 = "15kw4zy0p7hr6jm0202s0fk5ja3ff0pdir37qdifngm1x7id1vxc";
+    sha256 = "sha256-nZeOtV6sbgzUhDOlWJ5eLzOh0gsaukXFrPg3y8x9ce4=";
  };

-  vendorSha256 = "1785yv48sn504zcig9szjw9s4dxb55dg9idh10i2gzfgbda2c3nf";
-
-  patches = [
-    # https://github.com/hashicorp/packer/pull/11282
-    (fetchpatch {
-      url = "https://github.com/hashicorp/packer/commit/dbf13803217e18c6cb567ffefc9476c4e0149e02.patch";
-      sha256 = "1n038x6qnr75c5ci2jp8jcwp6yvlchcf2nydksb2s75ffvidjrsa";
-    })
-  ];
+  vendorSha256 = "sha256-zg4mVFvP/SciCLDF9FopqzeiE5dfpxfZJ6BYjcj2BZ0=";

  subPackages = [ "." ];

--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@ -101,12 +101,12 @@ final: prev:

  aniseed = buildVimPluginFrom2Nix {
    pname = "aniseed";
-    version = "2021-09-29";
+    version = "2021-10-01";
    src = fetchFromGitHub {
      owner = "Olical";
      repo = "aniseed";
-      rev = "6e1bee1c2bef907eb5361fd8d4e8014b9c122c47";
-      sha256 = "1x96zv6p5x8n2yy4m9ndggilvg6x6sqy3805mn7k2hc8zma91v3i";
+      rev = "f764c5cf633a89ea71a41055413e3a36acb43541";
+      sha256 = "1za93194wdhw29fz6z4lj8xh8cq38gq9sdavc2syyc50amfqpxh3";
    };
    meta.homepage = "https://github.com/Olical/aniseed/";
  };
@ -663,6 +663,18 @@ final: prev:
    meta.homepage = "https://github.com/f3fora/cmp-spell/";
  };

+  cmp-tabnine = buildVimPluginFrom2Nix {
+    pname = "cmp-tabnine";
+    version = "2021-09-30";
+    src = fetchFromGitHub {
+      owner = "tzachar";
+      repo = "cmp-tabnine";
+      rev = "71fd46be319f96dc35ecda2fb2641a643c1ca3ba";
+      sha256 = "08kqzhzx90r06hjbbr5y79bh4xgg4nj73lsam0wcvq6xyjh7qbnn";
+    };
+    meta.homepage = "https://github.com/tzachar/cmp-tabnine/";
+  };
+
  cmp-treesitter = buildVimPluginFrom2Nix {
    pname = "cmp-treesitter";
    version = "2021-09-11";
@ -990,12 +1002,12 @@ final: prev:

  conjure = buildVimPluginFrom2Nix {
    pname = "conjure";
-    version = "2021-09-29";
+    version = "2021-10-01";
    src = fetchFromGitHub {
      owner = "Olical";
      repo = "conjure";
-      rev = "22f62e95b19cb5758e4738843165ee7796598f1f";
-      sha256 = "1dlz9gm6pb9f26d820idb7b9qk65ajzjldx1vmfyzp8abbp2mdfy";
+      rev = "2c1105f1e21544db614caed82b2873b563b31620";
+      sha256 = "1ndh772dml8d4y347smlg7bap2h6mnd3q77canzgashj1ramk4rh";
    };
    meta.homepage = "https://github.com/Olical/conjure/";
  };
@ -1066,8 +1078,8 @@ final: prev:
    src = fetchFromGitHub {
      owner = "saecki";
      repo = "crates.nvim";
-      rev = "7f4cfb543541abea7de564434063415d2b0d3ba5";
-      sha256 = "0g0xnzsavvqd49vikcfkjw93avw655kc7h9mqz6yjfkqj65zy3lq";
+      rev = "3a77d7af5fe50e1a8e56dcd79e78ae2e221e4cde";
+      sha256 = "13yg5d4vndm81kaas62ga0nlx0srfpcg8cwfj70g7410kqfph9m3";
    };
    meta.homepage = "https://github.com/saecki/crates.nvim/";
  };
@ -1967,12 +1979,12 @@ final: prev:

  fzf-lsp-nvim = buildVimPluginFrom2Nix {
    pname = "fzf-lsp.nvim";
-    version = "2021-09-27";
+    version = "2021-10-01";
    src = fetchFromGitHub {
      owner = "gfanto";
      repo = "fzf-lsp.nvim";
-      rev = "6ccdcc3527848af12093a6e4c47dc8cbbe59b8dd";
-      sha256 = "0a5d17ik3jvxd0nv3djp4x2drxbg121pl4v1gn2bgwl2mf0rgdn5";
+      rev = "880de9e83a3390a1c15fb20ad24fa48006d8cefd";
+      sha256 = "1xrhqb8dsfhf2v0kb0k8fdmizaxsyf1dlryrynyn8v4s644h7zyl";
    };
    meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/";
  };
@ -3072,12 +3084,12 @@ final: prev:

  luasnip = buildVimPluginFrom2Nix {
    pname = "luasnip";
-    version = "2021-09-30";
+    version = "2021-10-01";
    src = fetchFromGitHub {
      owner = "l3mon4d3";
      repo = "luasnip";
-      rev = "40d9886a4294ecd28fed72324de7b6afb43b67af";
-      sha256 = "1wvw18k2afpnica53l18ixrkdqbb5d5g84sk9nz1nbnk6skhfbah";
+      rev = "0349dccdfe9bb27af5280dc252cd38ca61f2fbbf";
+      sha256 = "0sqy2bk10dpfn1fh3cfk2j8szc5na2cci6gslp0bl8gwj8xiwvgn";
    };
    meta.homepage = "https://github.com/l3mon4d3/luasnip/";
  };
@ -3828,12 +3840,12 @@ final: prev:

  null-ls-nvim = buildVimPluginFrom2Nix {
    pname = "null-ls.nvim";
-    version = "2021-09-29";
+    version = "2021-10-01";
    src = fetchFromGitHub {
      owner = "jose-elias-alvarez";
      repo = "null-ls.nvim";
-      rev = "9d179a26ff974dbd0d3729c2603bc958cf929876";
-      sha256 = "08jwaj8n2n8d6c0xcgn4kgypyclcd3jr84wlk2p7jmr8m5q36xi6";
+      rev = "27d30e43b8ecd0623463ff8e71f7c1bb989b7e21";
+      sha256 = "1ikyi99mgysf1b780cldrqm0pym2023wxi1a6s55v7pm649xnrwy";
    };
    meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
  };
@ -3880,8 +3892,8 @@ final: prev:
    src = fetchFromGitHub {
      owner = "windwp";
      repo = "nvim-autopairs";
-      rev = "ff985c71417bceb168c5415813e40e656e3ea9ed";
-      sha256 = "1khff4grbldrc086w9mgnig5k2hrwmh61pn0wsn4kb1fjd09snf3";
+      rev = "e93e047051e4dbf034930fea19ec8e90c1cb6260";
+      sha256 = "19784jb3r52c8ccbgvr2d4jva1r3czadhrf5ij9j57wdf5mp12xx";
    };
    meta.homepage = "https://github.com/windwp/nvim-autopairs/";
  };
@ -4176,12 +4188,12 @@ final: prev:

  nvim-notify = buildVimPluginFrom2Nix {
    pname = "nvim-notify";
-    version = "2021-09-09";
+    version = "2021-10-01";
    src = fetchFromGitHub {
      owner = "rcarriga";
      repo = "nvim-notify";
-      rev = "2f5559d38967587d4982bd70002b6e8091a7dfb3";
-      sha256 = "0a51z3a2n9k80s60palm1gdry3n5zfv8vs8swvqla9zjvj3d960h";
+      rev = "dfaf5b90a8a827cb541b201218aeb0062cd8f312";
+      sha256 = "0scfh3y54cwczn9iwjbwczqxj9bnc025mkxw2l0bqzfp9a157d0a";
    };
    meta.homepage = "https://github.com/rcarriga/nvim-notify/";
  };
@ -4248,12 +4260,12 @@ final: prev:

  nvim-tree-lua = buildVimPluginFrom2Nix {
    pname = "nvim-tree.lua";
-    version = "2021-09-30";
+    version = "2021-10-01";
    src = fetchFromGitHub {
      owner = "kyazdani42";
      repo = "nvim-tree.lua";
-      rev = "1b04082872aaa4b58f0259a2b049402a88be67b6";
-      sha256 = "026llwfds8lm2asyriwdqvk279ka1zjz2ig4aiyv56dw6lxh0ycp";
+      rev = "7c88a0f8ee6250a8408c28e0b03a4925b396c916";
+      sha256 = "1cqz25d619yhrvk3l4asr6vsyynip092difimmp6c1i5nb6hv6sx";
    };
    meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";
  };
@ -4504,8 +4516,8 @@ final: prev:
    src = fetchFromGitHub {
      owner = "kristijanhusak";
      repo = "orgmode.nvim";
-      rev = "f6c8746f9b637d7e8a8255638989bff5fc46c302";
-      sha256 = "0pdp642cmf1rpv6glsp38ak8ksfxw7q2xwa9ia8vlbdqky92rw3i";
+      rev = "a94f7b8169ed9cbb8ca0d1ef9701fdcd2f4c4bbc";
+      sha256 = "0yf4nc7yywh22a44892cppilq58hd4dvlwn0v9jdl7p1b1fng9kc";
    };
    meta.homepage = "https://github.com/kristijanhusak/orgmode.nvim/";
  };
@ -8505,12 +8517,12 @@ final: prev:

  vim-matchup = buildVimPluginFrom2Nix {
    pname = "vim-matchup";
-    version = "2021-09-29";
+    version = "2021-10-01";
    src = fetchFromGitHub {
      owner = "andymass";
      repo = "vim-matchup";
-      rev = "74cbb6b941efc91b236f655ed2f7ac4b6ab55c77";
-      sha256 = "089w05rlb0pgviz0gx6qwjiqainic3jbfd4myk4q93j6icy7ppgb";
+      rev = "870df0bb741eed49d093268593bce385bd82a41a";
+      sha256 = "185jbg2i49vknfy64s811dppwgw1d4lq8q97q0rrnvh7w6q88wl8";
    };
    meta.homepage = "https://github.com/andymass/vim-matchup/";
  };
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@ -117,6 +117,15 @@ self: super: {
    '';
  });

+  cmp-tabnine = super.cmp-tabnine.overrideAttrs (old: {
+    buildInputs = [ tabnine ];
+
+    postFixup = ''
+      mkdir -p $target/binaries/${tabnine.version}
+      ln -s ${tabnine}/bin/ $target/binaries/${tabnine.version}/${tabnine.passthru.platform}
+    '';
+  });
+
  command-t = super.command-t.overrideAttrs (old: {
    buildInputs = [ ruby rake ];
    buildPhase = ''
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@ -800,6 +800,7 @@ Twinside/vim-hoogle
 tyru/caw.vim
 tyru/open-browser-github.vim
 tyru/open-browser.vim
+tzachar/cmp-tabnine@main
 tzachar/compe-tabnine@main
 uarun/vim-protobuf
 udalov/kotlin-vim
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@ -13,20 +13,20 @@
    },
    "5.10": {
        "extra": "-hardened1",
-        "name": "linux-hardened-5.10.69-hardened1.patch",
-        "sha256": "11frhnprvxnqxm8yn1kay2jv2i473i9glnvsjnqz6kj8f0q2gl4v",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.69-hardened1/linux-hardened-5.10.69-hardened1.patch"
+        "name": "linux-hardened-5.10.70-hardened1.patch",
+        "sha256": "12r6x7v7n3f7c7pn86ivykg6gqmqlzwrsncdkvj5qf7raw38ad5r",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.70-hardened1/linux-hardened-5.10.70-hardened1.patch"
    },
    "5.14": {
        "extra": "-hardened1",
-        "name": "linux-hardened-5.14.8-hardened1.patch",
-        "sha256": "1kg02ixyd2dbk97iz28g26k1nnxi96s0bcyr90wc7diylhf7kz4a",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.8-hardened1/linux-hardened-5.14.8-hardened1.patch"
+        "name": "linux-hardened-5.14.9-hardened1.patch",
+        "sha256": "190588p6xw65y1f106zgnv5s043yi633vg0zdbz85qjz27g49db8",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.9-hardened1/linux-hardened-5.14.9-hardened1.patch"
    },
    "5.4": {
        "extra": "-hardened1",
-        "name": "linux-hardened-5.4.149-hardened1.patch",
-        "sha256": "1v21dz66ngsdsdcld23rgmidz955x74al5nsxnvwasc5gh18ahh9",
-        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.149-hardened1/linux-hardened-5.4.149-hardened1.patch"
+        "name": "linux-hardened-5.4.150-hardened1.patch",
+        "sha256": "0vaxp5lfs7d5py0530sdhz8yzbzjxlwaam63mflwfd4mm8gf3ggc",
+        "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.150-hardened1/linux-hardened-5.4.150-hardened1.patch"
    }
 }
--- a/pkgs/os-specific/linux/kernel/linux-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix
@ -3,7 +3,7 @@
 with lib;

 buildLinux (args // rec {
-  version = "5.10.69";
+  version = "5.10.70";

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

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1jhcl8qh4w4m2jnbp0glr6xbpn7phv17q6w3d247djnc7g2rwbr3";
+    sha256 = "0cmj5l425c6kkaplcp1y692j123lhyqq2jgfi642jzqxf4rnqwvm";
  };
 } // (args.argsOverride or {}))
--- a/pkgs/os-specific/linux/kernel/linux-5.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.14.nix
@ -3,7 +3,7 @@
 with lib;

 buildLinux (args // rec {
-  version = "5.14.8";
+  version = "5.14.9";

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

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "12cvvrxky92z1g9kj7pgb83yg9pnv2fvi7jf0pyagvqjqladl3na";
+    sha256 = "1rl77k40xp9j0y8q5bgmhfmwiwbrdxjcsaw8dris456mjbdhg3xs";
  };
 } // (args.argsOverride or { }))
--- a/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix
@ -3,7 +3,7 @@
 with lib;

 buildLinux (args // rec {
-  version = "5.4.149";
+  version = "5.4.150";

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

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "1s1zka0iay0drgkdnmzf587jbrg1gx13xv26k5r1qc7dik8xc6p7";
+    sha256 = "18iaqsbqlvk0j71d4q4h99ah300s0i7jwspr2x6g01shn2xsj97l";
  };
 } // (args.argsOverride or {}))
--- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix
+++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix
@ -1,7 +1,7 @@
 { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args:

 let
-  version = "5.14.8";
+  version = "5.14.9";
  release = "1";
  suffix = "xanmod${release}-cacule";
 in
@ -13,7 +13,7 @@ buildLinux (args // rec {
    owner = "xanmod";
    repo = "linux";
    rev = modDirVersion;
-    sha256 = "sha256-ikASMx5Lbp2BUfjMppnT8Y0UZdKMWqTze78XYoUTeiU=";
+    sha256 = "sha256-CMCZjuK9ofRup05l7HNg87jHTg4jOGrkmtvoxuNGwXE=";
  };

  structuredExtraConfig = with lib.kernel; {
--- a/pkgs/servers/sql/postgresql/ext/age.nix
+++ b/pkgs/servers/sql/postgresql/ext/age.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "age";
-  version = "0.2.0";
+  version = "0.6.0";

  src = fetchFromGitHub {
-    owner = "bitnine-oss";
-    repo = "AgensGraph-Extension";
+    owner = "apache";
+    repo = "incubator-age";
    rev = "v${version}";
-    sha256 = "0way59lj30727jlz2qz6rnw4fsxcd5028xcwgrwk7jxcaqi5fa17";
+    sha256 = "1cl6p9qz2yhgm603ljlyjdn0msk3hzga1frjqsmqmpp3nw4dbkka";
  };

  buildInputs = [ postgresql ];
@ -55,8 +55,8 @@ stdenv.mkDerivation rec {

  meta = with lib; {
    description = "A graph database extension for PostgreSQL";
-    homepage = "https://github.com/bitnine-oss/AgensGraph-Extension";
-    changelog = "https://github.com/bitnine-oss/AgensGraph-Extension/releases/tag/v${version}";
+    homepage = "https://age.apache.org/";
+    changelog = "https://github.com/apache/incubator-age/releases/tag/v${version}";
    maintainers = with maintainers; [ ];
    platforms = postgresql.meta.platforms;
    license = licenses.asl20;
--- a/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_bigm.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "pg_bigm";
-  version = "1.2";
+  version = "1.2-20200228";

  src = fetchurl {
-    url = "mirror://osdn/pgbigm/66565/${pname}-${version}-20161011.tar.gz";
-    sha256 = "1jp30za4bhwlas0yrhyjs9m03b1sj63km61xnvcbnh0sizyvhwis";
+    url = "mirror://osdn/pgbigm/72448/${pname}-${version}.tar.gz";
+    sha256 = "1hxn90prldwriqmqlf33ypgbxw5v54gkzx1305yzghryzfg7rhbl";
  };

  buildInputs = [ postgresql ];
--- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix
@ -2,7 +2,7 @@

 stdenv.mkDerivation rec {
  pname = "pgrouting";
-  version = "3.1.3";
+  version = "3.2.1";

  nativeBuildInputs = [ cmake perl ];
  buildInputs = [ postgresql boost ];
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    owner  = "pgRouting";
    repo   = pname;
    rev    = "v${version}";
-    sha256 = "sha256-ahDQ+nSTeIsdjID/ZwiGZCVBzOf0/oQs3SYsFYEEoxY=";
+    sha256 = "1zn3yyp4zz14yn2mmqwn7c4m65zfb2nj9zg4qj97ppsahs5xc6vw";
  };

  installPhase = ''
--- a/pkgs/servers/sql/postgresql/ext/plr.nix
+++ b/pkgs/servers/sql/postgresql/ext/plr.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "plr";
-  version = "8.4.1";
+  version = "8.4.4";

  src = fetchFromGitHub {
    owner = "postgres-plr";
    repo = "plr";
    rev = "REL${builtins.replaceStrings ["."] ["_"] version}";
-    sha256 = "1wy4blg8jl30kzhrkvbncl4gmy6k71zipnq89ykwi1vmx89v3ab7";
+    sha256 = "15dygf8klx2a4kzpmc1qnch629gcaa43ba1p3cqk9r1db4ima24k";
  };

  nativeBuildInputs = [ pkg-config ];
@ -18,14 +18,14 @@ stdenv.mkDerivation rec {
  '';
  installPhase = ''
    install -D plr.so -t $out/lib/
-    install -D {plr--unpackaged--8.4.1.sql,plr--8.4.1.sql,plr.control} -t $out/share/postgresql/extension
+    install -D {plr--*.sql,plr.control} -t $out/share/postgresql/extension
  '';

  meta = with lib; {
    description = "PL/R - R Procedural Language for PostgreSQL";
    homepage = "https://github.com/postgres-plr/plr";
    maintainers = with maintainers; [ qoelet ];
-    platforms = [ "x86_64-linux" ];
+    platforms = postgresql.meta.platforms;
    license = licenses.gpl2Only;
  };
 }
--- a/pkgs/tools/misc/kalker/default.nix
+++ b/pkgs/tools/misc/kalker/default.nix
@ -6,19 +6,17 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "kalker";
-  version = "1.0.0";
+  version = "1.0.1-2";

  src = fetchFromGitHub {
    owner = "PaddiM8";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-1iZvp30/V0bw9NBxiKNiDgOMYJkDsGhTGdBsAPggdEg=";
+    sha256 = "sha256-fXTsCHqm+wO/ygyg0y+44G9pgaaEEH9fgePCDH86/vU=";
  };

-  cargoSha256 = "sha256-fBWnMlOLgwrOBPS2GIfOUDHQHcMMaU5r9JZVMbA+W58=";
+  cargoSha256 = "sha256-Ul21otEYCJuX5GnfV9OTpk/+3y32biASYZQpOecr8aU=";

-  # https://gitlab.com/tspiteri/gmp-mpfr-sys/-/issues/20
-  nativeBuildInputs = [ gcc ];
  buildInputs = [ gmp mpfr libmpc ];

  outputs = [ "out" "lib" ];
--- a/pkgs/tools/networking/wget2/default.nix
+++ b/pkgs/tools/networking/wget2/default.nix
@ -6,9 +6,7 @@
 , autoreconfHook
 , flex
 , gnulib
-, lzip
 , pkg-config
-, python3
 , texinfo
  # libraries
 , brotli
@ -17,49 +15,71 @@
 , libhsts
 , libidn2
 , libpsl
-, xz
+, lzip
 , nghttp2
-, sslSupport ? true
 , openssl
 , pcre2
+, sslSupport ? true
+, xz
 , zlib
 , zstd
 }:

 stdenv.mkDerivation rec {
  pname = "wget2";
-  version = "1.99.2";
+  version = "2.0.0";
+
+  outputs = [ "out" "lib" "dev" ];

  src = fetchFromGitLab {
    owner = "gnuwget";
    repo = pname;
-    rev = version;
-    sha256 = "1gws8y3z8xzi46c48n7jb162mr3ar4c34s7yy8kjcs14yzq951qz";
+    rev = "v${version}";
+    sha256 = "07zs2x2k62836l0arzc333j96yjpwal1v4mr8j99x6qxgmmssrbj";
  };

  patches = [
    (fetchpatch {
-      name = "fix-autotools-2.70.patch";
-      url = "https://gitlab.com/gnuwget/wget2/-/commit/580af869093cfda6bc8a9d5901850354a16b3666.patch";
-      sha256 = "1x6wq4wxvvy6174d52qrhxkcgmv366f8smxyki49zb6rs4gqhskd";
+      name = "fix-bashism-in-configure-ac.patch";
+      url = "https://gitlab.com/gnuwget/wget2/-/commit/da9788f5d62b89ba796393d9bc496b1d8d7a7b30.patch";
+      sha256 = "0bn3vkgyknks7jzs5722s2c4qlx7k5lwfiyz204bi42v1m28s1a5";
    })
    (fetchpatch {
-      name = "update-potfiles-for-gnulib-2020-11-28.patch";
-      url = "https://gitlab.com/gnuwget/wget2/-/commit/368deb9fcca0c281f9c76333607cc878c3945ad0.patch";
-      sha256 = "1qsz8hbzbgg14wikxsbjjlq0cp3jw4pajbaz9wdn6ny617hdvi8y";
+      name = "fix-double-quotes-in-configure-ac.patch";
+      url = "https://gitlab.com/gnuwget/wget2/-/commit/574c8ae08dfd8949da039879d85899123d31ab1d.patch";
+      sha256 = "14rfmij5w3bvj0fnkkkrxg0lfw3vgwiyvbkal3nqhgb0mlhlmd47";
    })
  ];

  # wget2_noinstall contains forbidden reference to /build/
  postPatch = ''
    substituteInPlace src/Makefile.am \
-      --replace 'bin_PROGRAMS = wget2 wget2_noinstall' 'bin_PROGRAMS = wget2'
+      --replace "bin_PROGRAMS = wget2 wget2_noinstall" "bin_PROGRAMS = wget2"
  '';

-  nativeBuildInputs = [ autoreconfHook flex lzip pkg-config python3 texinfo ];
+  strictDeps = true;

-  buildInputs = [ brotli bzip2 gpgme libhsts libidn2 libpsl xz nghttp2 pcre2 zlib zstd ]
-    ++ lib.optional sslSupport openssl;
+  nativeBuildInputs = [
+    autoreconfHook
+    flex
+    lzip
+    pkg-config
+    texinfo
+  ];
+
+  buildInputs = [
+    brotli
+    bzip2
+    gpgme
+    libhsts
+    libidn2
+    libpsl
+    nghttp2
+    pcre2
+    xz
+    zlib
+    zstd
+  ] ++ lib.optional sslSupport openssl;

  # TODO: include translation files
  autoreconfPhase = ''
@ -69,20 +89,15 @@ stdenv.mkDerivation rec {
    cp -r ${gnulib} gnulib
    chmod -R u+w gnulib/{build-aux,lib}

-    # fix bashisms can be removed when https://gitlab.com/gnuwget/wget2/-/commit/c9499dcf2f58983d03e659e2a1a7f21225141edf is in the release
-    sed 's|==|=|g' -i configure.ac
-
    ./bootstrap --no-git --gnulib-srcdir=gnulib --skip-po
  '';

  configureFlags = [
-    "--disable-static"
+    (lib.enableFeature false "shared")
    # TODO: https://gitlab.com/gnuwget/wget2/-/issues/537
    (lib.withFeatureAs sslSupport "ssl" "openssl")
  ];

-  outputs = [ "out" "lib" "dev" ];
-
  meta = with lib; {
    description = "successor of GNU Wget, a file and recursive website downloader.";
    longDescription = ''
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "vault";
-  version = "1.8.2";
+  version = "1.8.3";

  src = fetchFromGitHub {
    owner = "hashicorp";
    repo = "vault";
    rev = "v${version}";
-    sha256 = "sha256-SFzThZX9oYBM7OGjlvWq1by1mUOA4qc89TMEvCZU9I0=";
+    sha256 = "sha256-7jJMF8pNCKkiOAY9sZEK0lOqP2/yBVqS3FaKOOz74XI=";
  };

-  vendorSha256 = "sha256-Fhj1qWv4NN5oHxS5xZt2BnLBPTTcxKq47Q1kd+60xY4=";
+  vendorSha256 = "sha256-j+07Q5dpt8I0sf5B3AVw4343EMWyJDqrzFrdDrBp0DY=";

  subPackages = [ "." ];

--- a/pkgs/tools/security/vault/vault-bin.nix
+++ b/pkgs/tools/security/vault/vault-bin.nix
@ -1,26 +1,26 @@
 { lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }:

 let
-  version = "1.8.2";
+  version = "1.8.3";

  sources = let
    base = "https://releases.hashicorp.com/vault/${version}";
  in {
    x86_64-linux = fetchurl {
      url = "${base}/vault_${version}_linux_amd64.zip";
-      sha256 = "sha256-10ck1swivx4cfFGQCbAXaAms9vHCDuVhB94Mq1TNhGM=";
+      sha256 = "sha256-x1ZHemRyblfMgmG2zx3AnZmhn2Q952v3nzi3HEvlmE8=";
    };
    i686-linux = fetchurl {
      url = "${base}/vault_${version}_linux_386.zip";
-      sha256 = "0v8l056xs88mjpcfpi9k8chv0zk7lf80gkj580z3d37h2yr2b1gg";
+      sha256 = "1141zjf56fz76ka7bim9qkdk46pa3kk39swxza17g3qxpj21w0jp";
    };
    x86_64-darwin = fetchurl {
      url = "${base}/vault_${version}_darwin_amd64.zip";
-      sha256 = "1xabbndnx85zbhbwid30q0jii41hmwwlqrxz4a0rllqshvmq4fg3";
+      sha256 = "06bkka2k09alhps5h2dk0dgczgnnd6g4npjp9j103lvzi935zjsy";
    };
    aarch64-linux = fetchurl {
      url = "${base}/vault_${version}_linux_arm64.zip";
-      sha256 = "00p2540bdhw46licab401vbwdyvp1hkngssx6nh99igj14sl60qa";
+      sha256 = "1z9pv46pgqnn34mc624x9z41kvr4hrjjdp6y9zv033h0cpxbd0y7";
    };
  };

--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -25040,6 +25040,7 @@ with pkgs;
  hivelytracker = callPackage ../applications/audio/hivelytracker { };

  hledger = haskell.lib.justStaticExecutables haskellPackages.hledger;
+  hledger-check-fancyassertions = callPackage ../applications/office/hledger-check-fancyassertions { };
  hledger-iadd = haskell.lib.justStaticExecutables haskellPackages.hledger-iadd;
  hledger-interest = haskell.lib.justStaticExecutables haskellPackages.hledger-interest;
  hledger-ui = haskell.lib.justStaticExecutables haskellPackages.hledger-ui;
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@ -175,6 +175,7 @@ let
        hinit
        hedgewars
        hledger
+        hledger-check-fancyassertions
        hledger-iadd
        hledger-interest
        hledger-ui