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

Conflicts:
	pkgs/development/python-modules/pysdl2/default.nix
	pkgs/top-level/aliases.nix

186 files changed, 4088 insertions, 2824 deletions

diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml
index 33ebb6f14ac..9de57d6e3d1 100644
--- a/.github/workflows/update-terraform-providers.yml
+++ b/.github/workflows/update-terraform-providers.yml
@@ -21,7 +21,7 @@ jobs:
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git config user.name "github-actions[bot]"
           pushd pkgs/applications/networking/cluster/terraform-providers
-          ./update-all-providers
+          ./update-all-providers --no-build
           git commit -m "${{ steps.setup.outputs.title }}" providers.json
           popd
       - name: create PR
diff --git a/flake.nix b/flake.nix
index 29dffa9fa4e..c48d6c68e58 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,35 +21,13 @@
 
         nixos = import ./nixos/lib { lib = final; };
 
-        nixosSystem = { modules, ... } @ args:
+        nixosSystem = args:
           import ./nixos/lib/eval-config.nix (args // {
-            modules =
-              let
-                moduleDeclarationFile =
-                  let
-                    # Even though `modules` is a mandatory argument for `nixosSystem`, it doesn't
-                    # mean that the evaluator always keeps track of its position. If there
-                    # are too many levels of indirection, the position gets lost at some point.
-                    intermediatePos = builtins.unsafeGetAttrPos "modules" args;
-                  in
-                    if intermediatePos == null then null else intermediatePos.file;
-
-                # Add the invoking file as error message location for modules
-                # that don't have their own locations; presumably inline modules.
-                addModuleDeclarationFile =
-                  m: if moduleDeclarationFile == null then m else {
-                    _file = moduleDeclarationFile;
-                    imports = [ m ];
-                  };
-
-              in
-              map addModuleDeclarationFile modules ++ [
-                {
-                  system.nixos.versionSuffix =
-                    ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}";
-                  system.nixos.revision = final.mkIf (self ? rev) self.rev;
-                }
-              ];
+            modules = args.modules ++ [ {
+              system.nixos.versionSuffix =
+                ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}";
+              system.nixos.revision = final.mkIf (self ? rev) self.rev;
+            } ];
           });
       });
 
diff --git a/lib/default.nix b/lib/default.nix
index 26842253880..3e43733ad20 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -111,8 +111,8 @@ let
       cleanSource sourceByRegex sourceFilesBySuffices
       commitIdFromGitRepo cleanSourceWith pathHasContext
       canCleanSource pathIsRegularFile pathIsGitRepo;
-    inherit (self.modules) evalModules unifyModuleSyntax
-      applyIfFunction mergeModules
+    inherit (self.modules) evalModules setDefaultModuleLocation
+      unifyModuleSyntax applyIfFunction mergeModules
       mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions
       pushDownProperties dischargeProperties filterOverrides
       sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride
diff --git a/lib/modules.nix b/lib/modules.nix
index c68bbfcaa3e..f1125aca0a3 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -334,6 +334,10 @@ rec {
     in modulesPath: initialModules: args:
       filterModules modulesPath (collectStructuredModules unknownModule "" initialModules args);
 
+  /* Wrap a module with a default location for reporting errors. */
+  setDefaultModuleLocation = file: m:
+    { _file = file; imports = [ m ]; };
+
   /* Massage a module into canonical form, that is, a set consisting
      of ‘options’, ‘config’ and ‘imports’ attributes. */
   unifyModuleSyntax = file: key: m:
@@ -534,11 +538,9 @@ rec {
      correspond to the definition of 'loc' in 'opt.file'. */
   mergeOptionDecls =
    let
-    packSubmodule = file: m:
-      { _file = file; imports = [ m ]; };
     coerceOption = file: opt:
-      if isFunction opt then packSubmodule file opt
-      else packSubmodule file { options = opt; };
+      if isFunction opt then setDefaultModuleLocation file opt
+      else setDefaultModuleLocation file { options = opt; };
    in loc: opts:
     foldl' (res: opt:
       let t  = res.type;
@@ -568,7 +570,7 @@ rec {
 
           getSubModules = opt.options.type.getSubModules or null;
           submodules =
-            if getSubModules != null then map (packSubmodule opt._file) getSubModules ++ res.options
+            if getSubModules != null then map (setDefaultModuleLocation opt._file) getSubModules ++ res.options
             else if opt.options ? options then map (coerceOption opt._file) options' ++ res.options
             else res.options;
         in opt.options // res //
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index e3eb88a60eb..2daaa8a1186 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -21,6 +21,7 @@ evalConfigArgs@
 , # !!! See comment about args in lib/modules.nix
   specialArgs ? {}
 , modules
+, modulesLocation ? (builtins.unsafeGetAttrPos "modules" evalConfigArgs).file or null
 , # !!! See comment about check in lib/modules.nix
   check ? true
 , prefix ? []
@@ -74,7 +75,18 @@ let
         _module.check = lib.mkDefault check;
       };
     };
-  allUserModules = modules ++ legacyModules;
+
+  allUserModules =
+    let
+      # Add the invoking file (or specified modulesLocation) as error message location
+      # for modules that don't have their own locations; presumably inline modules.
+      locatedModules =
+        if modulesLocation == null then
+          modules
+        else
+          map (lib.setDefaultModuleLocation modulesLocation) modules;
+    in
+      locatedModules ++ legacyModules;
 
   noUserModules = evalModulesMinimal ({
     inherit prefix specialArgs;
diff --git a/nixos/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix
index 92c060147bf..81bf497c993 100644
--- a/nixos/modules/services/hardware/upower.nix
+++ b/nixos/modules/services/hardware/upower.nix
@@ -155,8 +155,8 @@ in
         default = 1200;
         description = ''
           When <literal>usePercentageForPolicy</literal> is
-          <literal>false</literal>, the time remaining at which UPower will
-          consider the battery low.
+          <literal>false</literal>, the time remaining in seconds at which
+          UPower will consider the battery low.
 
           If any value (of <literal>timeLow</literal>,
           <literal>timeCritical</literal> and <literal>timeAction</literal>) is
@@ -169,8 +169,8 @@ in
         default = 300;
         description = ''
           When <literal>usePercentageForPolicy</literal> is
-          <literal>false</literal>, the time remaining at which UPower will
-          consider the battery critical.
+          <literal>false</literal>, the time remaining in seconds at which
+          UPower will consider the battery critical.
 
           If any value (of <literal>timeLow</literal>,
           <literal>timeCritical</literal> and <literal>timeAction</literal>) is
@@ -183,8 +183,8 @@ in
         default = 120;
         description = ''
           When <literal>usePercentageForPolicy</literal> is
-          <literal>false</literal>, the time remaining at which UPower will
-          take action for the critical battery level.
+          <literal>false</literal>, the time remaining in seconds at which
+          UPower will take action for the critical battery level.
 
           If any value (of <literal>timeLow</literal>,
           <literal>timeCritical</literal> and <literal>timeAction</literal>) is
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index 5482b2aaf88..b311b91b4a0 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -260,24 +260,17 @@ in
         ipfs --offline config Mounts.IPNS ${cfg.ipnsMountDir}
       '' + optionalString cfg.autoMigrate ''
         ${pkgs.ipfs-migrator}/bin/fs-repo-migrations -y
-      '' + concatStringsSep "\n" (collect
-        isString
-        (mapAttrsRecursive
-          (path: value:
-            # Using heredoc below so that the value is never improperly quoted
-            ''
-              read value <<EOF
-              ${builtins.toJSON value}
-              EOF
-              ipfs --offline config --json "${concatStringsSep "." path}" "$value"
-            '')
-          ({
-            Addresses.API = cfg.apiAddress;
-            Addresses.Gateway = cfg.gatewayAddress;
-            Addresses.Swarm = cfg.swarmAddress;
-          } //
-          cfg.extraConfig))
-      );
+      '' + ''
+        ipfs --offline config show \
+          | ${pkgs.jq}/bin/jq '. * $extraConfig' --argjson extraConfig ${
+              escapeShellArg (builtins.toJSON ({
+                Addresses.API = cfg.apiAddress;
+                Addresses.Gateway = cfg.gatewayAddress;
+                Addresses.Swarm = cfg.swarmAddress;
+              } // cfg.extraConfig))
+            } \
+          | ipfs --offline config replace -
+      '';
       serviceConfig = {
         ExecStart = [ "" "${cfg.package}/bin/ipfs daemon ${ipfsFlags}" ];
         User = cfg.user;
diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix
index eb82b738e49..d05dfcfc42d 100644
--- a/nixos/modules/services/system/cloud-init.nix
+++ b/nixos/modules/services/system/cloud-init.nix
@@ -52,11 +52,22 @@ in
         '';
       };
 
+      network.enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Allow the cloud-init service to configure network interfaces
+          through systemd-networkd.
+        '';
+      };
+
       config = mkOption {
         type = types.str;
         default = ''
           system_info:
             distro: nixos
+            network:
+              renderers: [ 'networkd' ]
           users:
              - root
 
@@ -109,9 +120,12 @@ in
 
     environment.etc."cloud/cloud.cfg".text = cfg.config;
 
+    systemd.network.enable = cfg.network.enable;
+
     systemd.services.cloud-init-local =
       { description = "Initial cloud-init job (pre-networking)";
         wantedBy = [ "multi-user.target" ];
+        before = ["systemd-networkd.service"];
         path = path;
         serviceConfig =
           { Type = "oneshot";
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index fe248a94488..bd7077ff7ea 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -155,7 +155,7 @@ in
     systemd.services."serial-getty@ttyS0".enable = true;
 
     # Creates symlinks for block device names.
-    services.udev.packages = [ pkgs.ec2-utils ];
+    services.udev.packages = [ pkgs.amazon-ec2-utils ];
 
     # Force getting the hostname from EC2.
     networking.hostName = mkDefault "";
diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix
index e06cbd056a3..3f191ff5616 100644
--- a/nixos/tests/cloud-init.nix
+++ b/nixos/tests/cloud-init.nix
@@ -35,6 +35,24 @@ let
       public-keys:
         - "${snakeOilPublicKey}"
       EOF
+
+      cat << EOF > $out/iso/network-config
+      version: 1
+      config:
+          - type: physical
+            name: eth0
+            mac_address: '52:54:00:12:34:56'
+            subnets:
+            - type: static
+              address: '12.34.56.78'
+              netmask: '255.255.255.0'
+              gateway: '12.34.56.9'
+          - type: nameserver
+            address:
+            - '8.8.8.8'
+            search:
+            - 'example.com'
+      EOF
       ${pkgs.cdrkit}/bin/genisoimage -volid cidata -joliet -rock -o $out/metadata.iso $out/iso
       '';
   };
@@ -46,9 +64,13 @@ in makeTest {
   machine = { ... }:
   {
     virtualisation.qemu.options = [ "-cdrom" "${metadataDrive}/metadata.iso" ];
-    services.cloud-init.enable = true;
+    services.cloud-init = {
+      enable = true;
+      network.enable = true;
+    };
     services.openssh.enable = true;
     networking.hostName = "";
+    networking.useDHCP = false;
   };
   testScript = ''
     # To wait until cloud-init terminates its run
@@ -80,5 +102,8 @@ in makeTest {
         ).strip()
         == "test"
     )
+
+    assert "default via 12.34.56.9 dev eth0 proto static" in unnamed.succeed("ip route")
+    assert "12.34.56.0/24 dev eth0 proto kernel scope link src 12.34.56.78" in unnamed.succeed("ip route")
   '';
 }
diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index 97870c478eb..cb2ac2b9e0b 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -57,7 +57,7 @@ in mkDerivation rec {
       there are basic functionalities to align the signals in time and
       amplitude, this software does not aim to be an audio editor.
     '';
-    homepage = "http://gillesdegottex.github.io/dfasma/";
+    homepage = "https://gillesdegottex.gitlab.io/dfasma-website/";
     license = [ licenses.gpl3Plus reaperFork.meta.license ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix
index bb421886f5d..8dc86cb8ccf 100644
--- a/pkgs/applications/audio/fomp/default.nix
+++ b/pkgs/applications/audio/fomp/default.nix
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ lv2 python3 ];
 
   meta = with lib; {
-    homepage = "http://drobilla.net/software/fomp/";
+    homepage = "https://drobilla.net/software/fomp.html";
     description = "An LV2 port of the MCP, VCO, FIL, and WAH plugins by Fons Adriaensen";
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     maintainers = [ maintainers.magnetophon ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix
index a2aebc58a82..55f12fd3c64 100644
--- a/pkgs/applications/audio/game-music-emu/default.nix
+++ b/pkgs/applications/audio/game-music-emu/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.xz";
     sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb";
   };
-
+  cmakeFlags = lib.optionals stdenv.isDarwin [ "-DENABLE_UBSAN=OFF" ];
   nativeBuildInputs = [ cmake ];
 
   meta = with lib; {
diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/applications/audio/hybridreverb2/default.nix
index d281ec11c7d..707deeb1a01 100644
--- a/pkgs/applications/audio/hybridreverb2/default.nix
+++ b/pkgs/applications/audio/hybridreverb2/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "http://www2.ika.ruhr-uni-bochum.de/HybridReverb2";
+    homepage = "https://github.com/jpcima/HybridReverb2";
     description = "Reverb effect using hybrid impulse convolution";
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.magnetophon ];
diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix
index 8213aeb5fe5..5e7f5c7cce2 100644
--- a/pkgs/applications/audio/tauon/default.nix
+++ b/pkgs/applications/audio/tauon/default.nix
@@ -5,6 +5,7 @@
 , python3Packages
 , ffmpeg
 , flac
+, librsvg
 , gobject-introspection
 , gtk3
 , libnotify
@@ -20,23 +21,22 @@
 
 stdenv.mkDerivation rec {
   pname = "tauon";
-  version = "6.7.1";
+  version = "7.0.1";
 
   src = fetchFromGitHub {
     owner = "Taiko2k";
     repo = "TauonMusicBox";
     rev = "v${version}";
-    sha256 = "1hm82yfq7q2akrrvff3vmwrd3bz34d2dk8jzhnizhnhar6xc6fzp";
+    sha256 = "sha256-Sw9w6vFXk2Cx7LdfMsou9IDheVckdusc0iGWkVsVtCQ=";
   };
 
   postPatch = ''
     substituteInPlace tauon.py \
       --replace 'install_mode = False' 'install_mode = True' \
-      --replace 'install_directory = os.path.dirname(__file__)' 'install_directory = "${placeholder "out"}/share/tauon"'
+      --replace 'install_directory = os.path.dirname(os.path.abspath(__file__))' 'install_directory = "${placeholder "out"}/share/tauon"'
 
     substituteInPlace t_modules/t_main.py \
       --replace 'install_mode = False' 'install_mode = True' \
-      --replace 'install_directory = sys.path[0]' 'install_directory = "${placeholder "out"}/share/tauon"' \
       --replace 'libopenmpt.so' '${lib.getLib libopenmpt}/lib/libopenmpt.so' \
       --replace 'lib/libphazor.so' '../../lib/libphazor.so'
 
@@ -44,6 +44,8 @@ stdenv.mkDerivation rec {
       --replace 'lib/libphazor.so' '../../lib/libphazor.so'
 
     patchShebangs compile-phazor.sh
+
+    substituteInPlace extra/tauonmb.desktop --replace 'Exec=/opt/tauon-music-box/tauonmb.sh' 'Exec=${placeholder "out"}/bin/tauon'
   '';
 
   postBuild = ''
@@ -61,6 +63,7 @@ stdenv.mkDerivation rec {
     gtk3
     libnotify
     libopenmpt
+    librsvg
     libsamplerate
     libvorbis
     mpg123
@@ -70,11 +73,14 @@ stdenv.mkDerivation rec {
   ];
 
   pythonPath = with python3Packages; [
+    beautifulsoup4
+    gst-python
     dbus-python
     isounidecode
     musicbrainzngs
     mutagen
     pillow
+    plexapi
     pulsectl
     pycairo
     pylast
@@ -83,6 +89,7 @@ stdenv.mkDerivation rec {
     pysdl2
     requests
     send2trash
+    setproctitle
   ] ++ lib.optional withDiscordRPC pypresence;
 
   makeWrapperArgs = [
@@ -98,7 +105,12 @@ stdenv.mkDerivation rec {
     cp -r assets input.txt t_modules theme $out/share/tauon
 
     wrapPythonPrograms
-  '';
+
+    mkdir -p $out/share/applications
+    install -Dm755 extra/tauonmb.desktop $out/share/applications/tauonmb.desktop
+    mkdir -p $out/share/icons/hicolor/scalable/apps
+    install -Dm644 extra/tauonmb{,-symbolic}.svg $out/share/icons/hicolor/scalable/apps
+'';
 
   meta = with lib; {
     description = "The Linux desktop music player from the future";
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
index e7db1cb1cf5..2004f607fe0 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@@ -234,10 +234,10 @@
       elpaBuild {
         pname = "auctex";
         ename = "auctex";
-        version = "13.0.15";
+        version = "13.0.16";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/auctex-13.0.15.tar";
-          sha256 = "1rm8s02d1mx5sw7yj65zlr07xhimnmvqav7f45nz2h8bwka02c3c";
+          url = "https://elpa.gnu.org/packages/auctex-13.0.16.tar";
+          sha256 = "1r9piq4js45knw8sf73kk8jjinmx4m2mdinc98xrklnwcffw7hjf";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -459,6 +459,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    cape = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "cape";
+        ename = "cape";
+        version = "0.6";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/cape-0.6.tar";
+          sha256 = "0pc0vvdb0pczz9n50wry6k6wkdaz3bqin07nmlxm8w1aqvapb2pr";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/cape.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     capf-autosuggest = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "capf-autosuggest";
@@ -696,10 +711,10 @@
       elpaBuild {
         pname = "consult";
         ename = "consult";
-        version = "0.14";
+        version = "0.15";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/consult-0.14.tar";
-          sha256 = "0lb72j4nxvaar2vip6jlyn62b9z2p2vsmijk3m9nsrshbqnlf0rc";
+          url = "https://elpa.gnu.org/packages/consult-0.15.tar";
+          sha256 = "0hsmxaiadb8smi1hk90n9napqrygh9rvj7g9a3d9isi47yrbg693";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -726,10 +741,10 @@
       elpaBuild {
         pname = "corfu";
         ename = "corfu";
-        version = "0.17";
+        version = "0.18";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/corfu-0.17.tar";
-          sha256 = "13nmbyrsvglzv57n9srl0kz75y07v8imr6c99nbf1mssli3h6n7y";
+          url = "https://elpa.gnu.org/packages/corfu-0.18.tar";
+          sha256 = "1g1b05wc9qql5qw3diprx0ay2rmq7963gdgyh7bi5i0xlfaspbgi";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -741,10 +756,10 @@
       elpaBuild {
         pname = "coterm";
         ename = "coterm";
-        version = "1.3";
+        version = "1.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/coterm-1.3.tar";
-          sha256 = "078rrc776mdzb4nczp1h8p0pymzds76kz3g2h78ri95k3wpy5ksj";
+          url = "https://elpa.gnu.org/packages/coterm-1.4.tar";
+          sha256 = "0cs9hqffkzlkkpcfhdh67gg3vzvffrjawmi89q7x9p52fk9rcxp6";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -906,10 +921,10 @@
       elpaBuild {
         pname = "debbugs";
         ename = "debbugs";
-        version = "0.29";
+        version = "0.30";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/debbugs-0.29.tar";
-          sha256 = "1bn21d9dr9pb3vdak3v07x056xafym89kdpxavjf4avy6bry6s4d";
+          url = "https://elpa.gnu.org/packages/debbugs-0.30.tar";
+          sha256 = "05yy1hhxd59rhricb14iai71w681222sv0i703yrgg868mphl7sb";
         };
         packageRequires = [ emacs soap-client ];
         meta = {
@@ -992,6 +1007,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    diminish = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "diminish";
+        ename = "diminish";
+        version = "0.46";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/diminish-0.46.tar";
+          sha256 = "17lsm5khp7cqrva13kn252ab57lw28sibf14615wdjvfqwlwwha4";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/diminish.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     dired-du = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "dired-du";
@@ -1082,6 +1112,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    dtache = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "dtache";
+        ename = "dtache";
+        version = "0.5";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/dtache-0.5.tar";
+          sha256 = "10gcnkajpw7szd41l6ykkysv00yp93y1z9ajhcmk4wzni93w21z2";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/dtache.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     dts-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "dts-mode";
@@ -1131,10 +1176,10 @@
       elpaBuild {
         pname = "ebdb";
         ename = "ebdb";
-        version = "0.8.8";
+        version = "0.8.10";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ebdb-0.8.8.tar";
-          sha256 = "035xakji5vypdpc06qp9yhg8ny7qn80h8kax6cl80p0lljplzrnn";
+          url = "https://elpa.gnu.org/packages/ebdb-0.8.10.tar";
+          sha256 = "1763zk75a85803wbn68sz4n3yvkhzh3a8571syd1r2npb59b40ad";
         };
         packageRequires = [ emacs seq ];
         meta = {
@@ -1191,10 +1236,10 @@
       elpaBuild {
         pname = "eev";
         ename = "eev";
-        version = "20211226";
+        version = "20220120";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/eev-20211226.tar";
-          sha256 = "15ggg7sv4m5yc8ldyyffz7vgaj00xbw15zga0x2lpdfmahh6y2as";
+          url = "https://elpa.gnu.org/packages/eev-20220120.tar";
+          sha256 = "0wbm7bd48vl66vhraqfwycz989hd36whris1xa5rbhfbxgz2d1sx";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1214,10 +1259,10 @@
       elpaBuild {
         pname = "eglot";
         ename = "eglot";
-        version = "1.7";
+        version = "1.8";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/eglot-1.7.tar";
-          sha256 = "1zvs144hxq2mmq1h0ynx9hy7yyccb46f3pjg9mgq8v9cw5y678vk";
+          url = "https://elpa.gnu.org/packages/eglot-1.8.tar";
+          sha256 = "1n04jnf3wwpxafrzfd02l53wf90brjc8p835f84k0n0rjxin99k5";
         };
         packageRequires = [ eldoc emacs flymake jsonrpc project xref ];
         meta = {
@@ -1264,10 +1309,10 @@
       elpaBuild {
         pname = "eldoc-eval";
         ename = "eldoc-eval";
-        version = "0.1";
+        version = "0.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/eldoc-eval-0.1.el";
-          sha256 = "1mnhxdsn9h43iq941yqmg92v3hbzwyg7acqfnz14q5g52bnagg19";
+          url = "https://elpa.gnu.org/packages/eldoc-eval-0.2.tar";
+          sha256 = "09g9y1w1dlq3s8sqzczgaj02y53x616ak9w3kynq53pwgaxq14j4";
         };
         packageRequires = [];
         meta = {
@@ -1309,10 +1354,10 @@
       elpaBuild {
         pname = "embark";
         ename = "embark";
-        version = "0.14";
+        version = "0.15";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/embark-0.14.tar";
-          sha256 = "12d4lza54sf493z9hx1fqlrhrx19girrdh560syi4gg03kg8s7nr";
+          url = "https://elpa.gnu.org/packages/embark-0.15.tar";
+          sha256 = "0dr97549xrs9j1fhnqpdspvbfxnzqvzvpi8qc91fd2v4jsfwlklh";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1329,10 +1374,10 @@
       elpaBuild {
         pname = "embark-consult";
         ename = "embark-consult";
-        version = "0.3";
+        version = "0.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/embark-consult-0.3.tar";
-          sha256 = "1l38bnphfq65r2fjy8zi7a8l4h361bfz756sswa3r7446jhd48rv";
+          url = "https://elpa.gnu.org/packages/embark-consult-0.4.tar";
+          sha256 = "1z0xc11y59lagfsd2raps4iz68hvw132ff0qynbmvgw63mp1w4yy";
         };
         packageRequires = [ consult emacs embark ];
         meta = {
@@ -1349,10 +1394,10 @@
       elpaBuild {
         pname = "emms";
         ename = "emms";
-        version = "8";
+        version = "9";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/emms-8.tar";
-          sha256 = "1iffh6n8q9xag25m9bgnpywa27bkdvvz2gr500hdgwwddgdm4pq8";
+          url = "https://elpa.gnu.org/packages/emms-9.tar";
+          sha256 = "12p9nigzyrlpkfvg7v76jmcfs08z84gggnx7h4frdaim3kx5y6xf";
         };
         packageRequires = [ cl-lib nadvice seq ];
         meta = {
@@ -2168,10 +2213,10 @@
       elpaBuild {
         pname = "jsonrpc";
         ename = "jsonrpc";
-        version = "1.0.14";
+        version = "1.0.15";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/jsonrpc-1.0.14.el";
-          sha256 = "069l0sqkambam4ikj9id36kdw1jdjna8v586d51m64hiz96rmvm6";
+          url = "https://elpa.gnu.org/packages/jsonrpc-1.0.15.tar";
+          sha256 = "1hx378rg12jz2zm105cvrqk0nqyzsn04l59d903l98d6lbd96rsw";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2258,10 +2303,10 @@
       elpaBuild {
         pname = "leaf";
         ename = "leaf";
-        version = "4.5.2";
+        version = "4.5.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/leaf-4.5.2.tar";
-          sha256 = "0i90shhhkpdcwmfi8zv0008qgmg4g3cqd2yvpycfv9n2axvhag54";
+          url = "https://elpa.gnu.org/packages/leaf-4.5.5.tar";
+          sha256 = "1rdbrf84ijapiqhq72gy8r5xgk54sf0jy31pgd3w4rl1wywh5cas";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2393,10 +2438,10 @@
       elpaBuild {
         pname = "marginalia";
         ename = "marginalia";
-        version = "0.11";
+        version = "0.12";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/marginalia-0.11.tar";
-          sha256 = "0mri8awary11hwg6lib903q5jcv2isnf8mi62mgndiki5s9cgrbs";
+          url = "https://elpa.gnu.org/packages/marginalia-0.12.tar";
+          sha256 = "01dy9dg2ac6s84ffcxn2pw1y75pinkdvxg1j2g3vijwjd5hpfakq";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2438,10 +2483,10 @@
       elpaBuild {
         pname = "mct";
         ename = "mct";
-        version = "0.3.0";
+        version = "0.4.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/mct-0.3.0.tar";
-          sha256 = "07wywk5zadcinjpx9hvag8ndzb426lq5jlg42rqdgrv92ka7n16b";
+          url = "https://elpa.gnu.org/packages/mct-0.4.2.tar";
+          sha256 = "0as8298mb136az555zag5q3xvc7d0z508d3siii60wmzs9dyb8dx";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2751,10 +2796,10 @@
       elpaBuild {
         pname = "nano-theme";
         ename = "nano-theme";
-        version = "0.2.1";
+        version = "0.3.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/nano-theme-0.2.1.tar";
-          sha256 = "0m98kq40dhbrn55x4bp2x5d5j1gps4y7z4086mgnj8wr1y3w8kdl";
+          url = "https://elpa.gnu.org/packages/nano-theme-0.3.0.tar";
+          sha256 = "1nq5x46467vnsfg3fzb0qyg97xpnwsvbqg8frdjil5zq5fhsgmrz";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -2916,6 +2961,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    orderless = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "orderless";
+        ename = "orderless";
+        version = "0.7";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/orderless-0.7.tar";
+          sha256 = "0hvfqxpazan1djpn0qxh609r53jgddpcdih6chkn2zvx29mhdkgg";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/orderless.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     org = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "org";
@@ -2965,10 +3025,10 @@
       elpaBuild {
         pname = "org-transclusion";
         ename = "org-transclusion";
-        version = "1.1.1";
+        version = "1.2.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-transclusion-1.1.1.tar";
-          sha256 = "12dp5fc7iw78qx2f501ch8mvhvw90bxg8hhvx0kz3y24gf2h8d4d";
+          url = "https://elpa.gnu.org/packages/org-transclusion-1.2.0.tar";
+          sha256 = "1q36nqxynzh8ygvgw5nmg49c4yq8pgp6lcb6mdqs9paw8pglxcjf";
         };
         packageRequires = [ emacs org ];
         meta = {
@@ -3145,10 +3205,10 @@
       elpaBuild {
         pname = "phps-mode";
         ename = "phps-mode";
-        version = "0.4.13";
+        version = "0.4.16";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/phps-mode-0.4.13.tar";
-          sha256 = "03j5ck0pk88kdl7br1rkdqmnjd8418y9w9m27gk63hqbi3p8diy6";
+          url = "https://elpa.gnu.org/packages/phps-mode-0.4.16.tar";
+          sha256 = "0k8n2pa20nkqd8w4c86p1f5cgn93favxxhws62i4w16934x6w07j";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3190,10 +3250,10 @@
       elpaBuild {
         pname = "posframe";
         ename = "posframe";
-        version = "1.1.5";
+        version = "1.1.7";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/posframe-1.1.5.tar";
-          sha256 = "1kyd3r926hhs03mmpyvbjjyqcbvqrxk62rrscgfyl7rqi9ar56i0";
+          url = "https://elpa.gnu.org/packages/posframe-1.1.7.tar";
+          sha256 = "13i2wxx079gfq0vbq0iwmsig5b7x4aspd1q02yqc79846f1dsx4w";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -3250,10 +3310,10 @@
       elpaBuild {
         pname = "pyim";
         ename = "pyim";
-        version = "4.0.3";
+        version = "4.1.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/pyim-4.0.3.tar";
-          sha256 = "110d9d8xglnyv0cn0slwk3msgqq8rs01xq2qmx5ya7i2v77gd5ql";
+          url = "https://elpa.gnu.org/packages/pyim-4.1.0.tar";
+          sha256 = "1q4b3y72gbkl5z31brlnjqjl30lgqm2d1zlqrbkqnnfy5hjgazk9";
         };
         packageRequires = [ async emacs xr ];
         meta = {
@@ -3560,10 +3620,10 @@
       elpaBuild {
         pname = "relint";
         ename = "relint";
-        version = "1.19";
+        version = "1.20";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/relint-1.19.tar";
-          sha256 = "14z3i01pq5ljhjf5yfcjw7hxljcrwjnizkrdc1qyh9b6h3ic1bbi";
+          url = "https://elpa.gnu.org/packages/relint-1.20.tar";
+          sha256 = "0r20dim2r4a4bv0fmgbnq3graa7hhlai55h9qyknapqbr2j1v1h7";
         };
         packageRequires = [ emacs xr ];
         meta = {
@@ -3620,10 +3680,10 @@
       elpaBuild {
         pname = "rt-liberation";
         ename = "rt-liberation";
-        version = "2.4";
+        version = "4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rt-liberation-2.4.tar";
-          sha256 = "1qfd0dy4n04gf3vx0pbwfgmp4wm2a64sh3m6mlfhinqgmasajh6r";
+          url = "https://elpa.gnu.org/packages/rt-liberation-4.tar";
+          sha256 = "15vs982cxpc3g8cq2gj3a6dfn9i2r9b44x38ydvcmiy2brkd3psj";
         };
         packageRequires = [];
         meta = {
@@ -3742,6 +3802,7 @@
           license = lib.licenses.free;
         };
       }) {};
+    # removed duplicated shell-command-plus
     shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "shell-command-plus";
@@ -3892,16 +3953,20 @@
           license = lib.licenses.free;
         };
       }) {};
-    soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    soap-client = callPackage ({ cl-lib ? null
+                               , elpaBuild
+                               , emacs
+                               , fetchurl
+                               , lib }:
       elpaBuild {
         pname = "soap-client";
         ename = "soap-client";
-        version = "3.2.0";
+        version = "3.2.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/soap-client-3.2.0.tar";
-          sha256 = "1s0bwnip22nj6kgjadd4zlj9j729hiyyjb66sr51i2mddnf9i95s";
+          url = "https://elpa.gnu.org/packages/soap-client-3.2.1.tar";
+          sha256 = "0ajv6l1p8dinnlybwzvv4c2i6291is6isjxb2h4apg27g66qbcki";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/soap-client.html";
           license = lib.licenses.free;
@@ -4046,10 +4111,10 @@
       elpaBuild {
         pname = "svg-lib";
         ename = "svg-lib";
-        version = "0.2.4";
+        version = "0.2.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/svg-lib-0.2.4.tar";
-          sha256 = "0vcf3vbrzhgwssf6mi4xyic32yzjsrllp2zaqdk3c0qjvq9w4wxa";
+          url = "https://elpa.gnu.org/packages/svg-lib-0.2.5.tar";
+          sha256 = "022jp54w14sv0d71j0z76bnir9bgvysmcpcxpzpiiz77da6rg393";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4147,6 +4212,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    tempel = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "tempel";
+        ename = "tempel";
+        version = "0.2";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/tempel-0.2.tar";
+          sha256 = "0xn2vqaxqv04zmlp5hpb9vxkbs3bv4dk22xs5j5fqjid2hcv3714";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/tempel.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     test-simple = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "test-simple";
@@ -4200,10 +4280,10 @@
       elpaBuild {
         pname = "tramp";
         ename = "tramp";
-        version = "2.5.2";
+        version = "2.5.2.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tramp-2.5.2.tar";
-          sha256 = "1j71x3q6x9xyf21capjxcp85b7z2x9khrqsd2sy2s3qwxz3jbg5n";
+          url = "https://elpa.gnu.org/packages/tramp-2.5.2.1.tar";
+          sha256 = "1101nb0raiivrv1z4w442688cxj5mpf4h4zxzy6mhirgsbayk91p";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4290,10 +4370,10 @@
       elpaBuild {
         pname = "uni-confusables";
         ename = "uni-confusables";
-        version = "0.2";
+        version = "0.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/uni-confusables-0.2.tar";
-          sha256 = "1an2l7f8lqhp3hq511a371isv1q00nx431g2a7266pp6pn2sndj1";
+          url = "https://elpa.gnu.org/packages/uni-confusables-0.3.tar";
+          sha256 = "1grmppbyzvjjz0yiv5vvgpykhalisj9jnh6p9ip9vbnnll63iz4w";
         };
         packageRequires = [];
         meta = {
@@ -4389,10 +4469,10 @@
       elpaBuild {
         pname = "vc-got";
         ename = "vc-got";
-        version = "1.0";
+        version = "1.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/vc-got-1.0.tar";
-          sha256 = "1lx52g261zr52gy63vjll8mvczcbdzbsx3wa47qdajrq9bwmj99j";
+          url = "https://elpa.gnu.org/packages/vc-got-1.1.tar";
+          sha256 = "1myck30ybq8ggf4yk3s2sqjqj8m1kfl8qxygkk3ynfa6jxxy4x1r";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4481,10 +4561,10 @@
       elpaBuild {
         pname = "vertico";
         ename = "vertico";
-        version = "0.19";
+        version = "0.20";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/vertico-0.19.tar";
-          sha256 = "1i9aqxsplmzyy7nv4czspa66a6v33lnng1d8zsgjf1m9sz0kyzxp";
+          url = "https://elpa.gnu.org/packages/vertico-0.20.tar";
+          sha256 = "1hg91f74klbwisxzp74d020v42l28wik9y1lg3hrbdspnhlhsdrl";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -4501,10 +4581,10 @@
       elpaBuild {
         pname = "vertico-posframe";
         ename = "vertico-posframe";
-        version = "0.4.8";
+        version = "0.5.2";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/vertico-posframe-0.4.8.tar";
-          sha256 = "1cvihfj59qycd3kifxbg9ndrmiihc62si8q5b8fxc1p20acw4f69";
+          url = "https://elpa.gnu.org/packages/vertico-posframe-0.5.2.tar";
+          sha256 = "0gzvm0la706kg3aqgrd6crz6353sp47dnpxdj9l2avb31avyqmv9";
         };
         packageRequires = [ emacs posframe vertico ];
         meta = {
@@ -4749,10 +4829,10 @@
       elpaBuild {
         pname = "xclip";
         ename = "xclip";
-        version = "1.10";
+        version = "1.11";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xclip-1.10.el";
-          sha256 = "0i3i9kwfg8qmhcmqhhnrb1kljgwkccv63s9q1mjwqfjldyfh8j8i";
+          url = "https://elpa.gnu.org/packages/xclip-1.11.tar";
+          sha256 = "0hgblj8ng7vfsdb7g1mm9m2qhzfprycdd77836l59prpak5kp55q";
         };
         packageRequires = [];
         meta = {
@@ -4794,10 +4874,10 @@
       elpaBuild {
         pname = "xr";
         ename = "xr";
-        version = "1.21";
+        version = "1.22";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xr-1.21.tar";
-          sha256 = "0mc10d33lsqs0ihcja8w78jzh2pk0dfm9m86kap6r3hi6wkr1cmi";
+          url = "https://elpa.gnu.org/packages/xr-1.22.tar";
+          sha256 = "1l3bqgzvbamfs4n628kg789g7vjn4v81q570gzbw2cwjgk4s6xbj";
         };
         packageRequires = [ emacs ];
         meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
index a6b732d6a05..89f2eb07d7d 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
@@ -45,6 +45,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    annotate = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "annotate";
+        ename = "annotate";
+        version = "1.5.0";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/annotate-1.5.0.tar";
+          sha256 = "0ba91yy2id5jsl9bg8cfjm2sqbqp9jwwdikwkdj5v6xz6ggh134b";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/annotate.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     anti-zenburn-theme = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "anti-zenburn-theme";
@@ -155,6 +170,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    bind-map = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "bind-map";
+        ename = "bind-map";
+        version = "1.1.2";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/bind-map-1.1.2.tar";
+          sha256 = "1x98pgalnpl45h63yw6zz6q16x00phijyx2pf4jrf93s18lx33z5";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/bind-map.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     bison-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "bison-mode";
@@ -340,6 +370,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    dockerfile-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "dockerfile-mode";
+        ename = "dockerfile-mode";
+        version = "1.5";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/dockerfile-mode-1.5.tar";
+          sha256 = "0dz91i4ak3v0x1v75ibhjjz211k9g6qimz4lxn3x424j7dlpa9f3";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/dockerfile-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     dracula-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "dracula-theme";
@@ -355,6 +400,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    drupal-mode = callPackage ({ elpaBuild, fetchurl, lib, php-mode }:
+      elpaBuild {
+        pname = "drupal-mode";
+        ename = "drupal-mode";
+        version = "0.7.4";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/drupal-mode-0.7.4.tar";
+          sha256 = "1cglipmwx5v8vaqkkc7f5ka3dpxlrmmqrqhi885mm625kh2r27j1";
+        };
+        packageRequires = [ php-mode ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/drupal-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     editorconfig = callPackage ({ cl-lib ? null
                                 , elpaBuild
                                 , emacs
@@ -375,6 +435,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    elixir-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "elixir-mode";
+        ename = "elixir-mode";
+        version = "2.4.0";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/elixir-mode-2.4.0.tar";
+          sha256 = "0h3ypyxmcpfh8kcwd08rsild4jy8s4mr3zr8va03bbh81pd3nm1m";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/elixir-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elpher = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "elpher";
+        ename = "elpher";
+        version = "3.3.1";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/elpher-3.3.1.tar";
+          sha256 = "056z3ryj2288wgl8h4b33v9hybm8n2kfrqyb22bmlq1npcixyjl7";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/elpher.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "evil";
@@ -405,6 +495,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    evil-args = callPackage ({ elpaBuild, evil, fetchurl, lib }:
+      elpaBuild {
+        pname = "evil-args";
+        ename = "evil-args";
+        version = "1.1";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/evil-args-1.1.tar";
+          sha256 = "0lgwrhjsy098h2lhsiasm39kzkdfqcjnapc2q6f2gyf7zll37761";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/evil-args.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil-exchange = callPackage ({ cl-lib ? null
                                  , elpaBuild
                                  , evil
@@ -553,14 +658,44 @@
           license = lib.licenses.free;
         };
       }) {};
+    forth-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "forth-mode";
+        ename = "forth-mode";
+        version = "0.2";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/forth-mode-0.2.tar";
+          sha256 = "0qk6kg8d38fcvbxa4gfsdyllzrrp9712w74sj29b90fppa11b530";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/forth-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    free-keys = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "free-keys";
+        ename = "free-keys";
+        version = "1.0";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/free-keys-1.0.tar";
+          sha256 = "1w0dslygz098bddap1shwa8pn55ggavz2jn131rmdnbfjy6plglv";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/free-keys.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib, transient }:
       elpaBuild {
         pname = "geiser";
         ename = "geiser";
-        version = "0.22";
+        version = "0.22.2";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/geiser-0.22.tar";
-          sha256 = "0jcxjfn9d7cnsir2pva0axaz180d01sn0l9f175sj57ws8spj2h2";
+          url = "https://elpa.nongnu.org/nongnu/geiser-0.22.2.tar";
+          sha256 = "0mva8arcxj1kf6g7s6f6ik70gradmbnhhiaf7rdkycxdd8kdqn7i";
         };
         packageRequires = [ emacs transient ];
         meta = {
@@ -647,10 +782,10 @@
       elpaBuild {
         pname = "geiser-guile";
         ename = "geiser-guile";
-        version = "0.21.1";
+        version = "0.21.2";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.21.1.tar";
-          sha256 = "1sm19jmaxzxkxd4jksgvc064jv90bc6q0yf8zz0s77y0aldw8sf5";
+          url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.21.2.tar";
+          sha256 = "06mr8clsk8fj73q4ln90i28xs8axl4sd68wiyl41kgg9w5y78cb7";
         };
         packageRequires = [ emacs geiser ];
         meta = {
@@ -814,6 +949,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    graphql-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "graphql-mode";
+        ename = "graphql-mode";
+        version = "1.0.0";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/graphql-mode-1.0.0.tar";
+          sha256 = "11vn02vwiqbkzl9gxsm3gvybkbac13xnzzv2y227j3y8aq5kbwss";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/graphql-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     gruvbox-theme = callPackage ({ autothemer, elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "gruvbox-theme";
@@ -889,6 +1039,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "helm";
+        ename = "helm";
+        version = "3.8.3";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/helm-3.8.3.tar";
+          sha256 = "00qjcv4qxjw50zp5dzvn79c0xpyla4h41fxkr2jjszq6qzgd92cv";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/helm.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-core = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "helm-core";
+        ename = "helm-core";
+        version = "3.8.3";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.3.tar";
+          sha256 = "11ggn1fmi8wbg2igs5lqppyccgpz8kyfzl17wqkr5xy69lr1jn5g";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/helm-core.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     highlight-parentheses = callPackage ({ elpaBuild
                                          , emacs
                                          , fetchurl
@@ -991,6 +1171,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    jade-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "jade-mode";
+        ename = "jade-mode";
+        version = "1.0.1";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/jade-mode-1.0.1.tar";
+          sha256 = "1kkf5ayqzs1rs7b3jqwb21r2mikds3lillfrs3pkcca7lj76313n";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/jade-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     jinja2-mode = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "jinja2-mode";
@@ -1036,6 +1231,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    kotlin-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "kotlin-mode";
+        ename = "kotlin-mode";
+        version = "1.0.0";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/kotlin-mode-1.0.0.tar";
+          sha256 = "0ajnnsh6a8psfh7gd34d2wfii08jxr7x7k6na0assjldsxy7afwj";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/kotlin-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     lua-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "lua-mode";
@@ -1259,6 +1469,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    nix-mode = callPackage ({ elpaBuild
+                            , emacs
+                            , fetchurl
+                            , lib
+                            , magit-section
+                            , transient }:
+      elpaBuild {
+        pname = "nix-mode";
+        ename = "nix-mode";
+        version = "1.4.4";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/nix-mode-1.4.4.tar";
+          sha256 = "1nn74671273s5mjxzbdqvpwqx6w12zya21sxhzw51k2fs68vwh23";
+        };
+        packageRequires = [ emacs magit-section transient ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/nix-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-contrib = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
       elpaBuild {
         pname = "org-contrib";
@@ -1314,10 +1544,10 @@
       elpaBuild {
         pname = "org-mime";
         ename = "org-mime";
-        version = "0.2.4";
+        version = "0.2.6";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/org-mime-0.2.4.tar";
-          sha256 = "048psi5h8ln83pra4f24iq794w00b8p8pk67cylbd8afjdhh2x1r";
+          url = "https://elpa.nongnu.org/nongnu/org-mime-0.2.6.tar";
+          sha256 = "1l6mniyhmw3vbkvahw24038isd4ysbx505c3r0ar1rh7fbdf58cf";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1436,6 +1666,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    pcmpl-args = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "pcmpl-args";
+        ename = "pcmpl-args";
+        version = "0.1.3";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/pcmpl-args-0.1.3.tar";
+          sha256 = "1p9y80k2rb9vlkqbmwdmzw279wlk8yk8ii5kqgkyr1yg224qpaw7";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/pcmpl-args.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     pdf-tools = callPackage ({ elpaBuild
                              , emacs
                              , fetchurl
@@ -1531,6 +1776,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    raku-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+      elpaBuild {
+        pname = "raku-mode";
+        ename = "raku-mode";
+        version = "0.2.1";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/raku-mode-0.2.1.tar";
+          sha256 = "01ygn20pbq18rciczbb0mkszr33pifs6i74rajxz03bcgx2j3q6f";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/raku-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     request = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
       elpaBuild {
         pname = "request";
@@ -1715,14 +1975,29 @@
           license = lib.licenses.free;
         };
       }) {};
+    stylus-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "stylus-mode";
+        ename = "stylus-mode";
+        version = "1.0.1";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/stylus-mode-1.0.1.tar";
+          sha256 = "0vihp241msg8f0ph8w3w9fkad9b12pmpwg0q5la8nbw7gfy41mz5";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/stylus-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     subatomic-theme = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "subatomic-theme";
         ename = "subatomic-theme";
-        version = "1.8.1";
+        version = "1.8.2";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/subatomic-theme-1.8.1.tar";
-          sha256 = "0j496l7c2rwgxk2srcf1a70z63y48q5bs9cpx95212q7rl20zhip";
+          url = "https://elpa.nongnu.org/nongnu/subatomic-theme-1.8.2.tar";
+          sha256 = "0h2ln37ir6w4q44vznlkw4kzaisfpvkgs02dnb2x9b1wdg5qfqw4";
         };
         packageRequires = [];
         meta = {
@@ -1734,10 +2009,10 @@
       elpaBuild {
         pname = "subed";
         ename = "subed";
-        version = "0.0.3";
+        version = "1.0.2";
         src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/subed-0.0.3.tar";
-          sha256 = "1qwpzj9j5fbis6vlgnqyilc49gbnxf48wcrjl8kljwzna3hsk7bx";
+          url = "https://elpa.nongnu.org/nongnu/subed-1.0.2.tar";
+          sha256 = "187ksczrqqzjnbvh8px3xvqyf38i7ac24z1qxzybd4vx2n071v64";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1826,6 +2101,21 @@
           license = lib.licenses.free;
         };
       }) {};
+    textile-mode = callPackage ({ elpaBuild, fetchurl, lib }:
+      elpaBuild {
+        pname = "textile-mode";
+        ename = "textile-mode";
+        version = "1.0.0";
+        src = fetchurl {
+          url = "https://elpa.nongnu.org/nongnu/textile-mode-1.0.0.tar";
+          sha256 = "14ssqiw8x1pvjlw76h12vrk2w5qmhvp11v4h3cddqi96fddr95sq";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/textile-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     toc-org = callPackage ({ elpaBuild, fetchurl, lib }:
       elpaBuild {
         pname = "toc-org";
diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
index 6eadee0da22..fc60a6916c4 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
@@ -1035,8 +1035,8 @@
     "auto-complete",
     "yasnippet"
    ],
-   "commit": "92d559309d0c7614e2ccc982002b7ff963f3c9dd",
-   "sha256": "0aidj0hz97qw8jpwcbdmhjqk8wsdls3jiq9j6bbrqh458j6p317h"
+   "commit": "f44c5c6a23829e53bcb0712adcad406a8e9498ce",
+   "sha256": "1k3919v7mczwzk50dhrfnx2sbzlcm192c6ks4wzajr5hzvd448qc"
   },
   "stable": {
    "version": [
@@ -1061,8 +1061,8 @@
   "repo": "xcwen/ac-php",
   "unstable": {
    "version": [
-    20211220,
-    219
+    20220120,
+    754
    ],
    "deps": [
     "dash",
@@ -1072,8 +1072,8 @@
     "s",
     "xcscope"
    ],
-   "commit": "92d559309d0c7614e2ccc982002b7ff963f3c9dd",
-   "sha256": "0aidj0hz97qw8jpwcbdmhjqk8wsdls3jiq9j6bbrqh458j6p317h"
+   "commit": "f44c5c6a23829e53bcb0712adcad406a8e9498ce",
+   "sha256": "1k3919v7mczwzk50dhrfnx2sbzlcm192c6ks4wzajr5hzvd448qc"
   },
   "stable": {
    "version": [
@@ -1250,6 +1250,24 @@
   }
  },
  {
+  "ename": "accent",
+  "commit": "86fe3baa514cf81f4b031ab55d94555fba2c1a55",
+  "sha256": "191mhb57gj7zcgcb4h99jv8ac08l90wzsmy4aq22pz8sw56bvzpa",
+  "fetcher": "github",
+  "repo": "elias94/accent",
+  "unstable": {
+   "version": [
+    20220202,
+    1312
+   ],
+   "deps": [
+    "popup"
+   ],
+   "commit": "6b502df6940587dae2dfbd349c22dfd44c803a86",
+   "sha256": "0q4cf4w0gm933ph4r2glw40vgfiz1v9r043w6lms3z2a0b3p6sdb"
+  }
+ },
+ {
   "ename": "ace-flyspell",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
   "sha256": "1zgywb90cg64nllbbk0x9ipm6znyc5yh7vkajrrnw06r5vabyp9y",
@@ -2521,14 +2539,14 @@
   "repo": "seagle0128/all-the-icons-ibuffer",
   "unstable": {
    "version": [
-    20220104,
-    1421
+    20220122,
+    2206
    ],
    "deps": [
     "all-the-icons"
    ],
-   "commit": "df9822a782c409f7e19481921c985d4290882c65",
-   "sha256": "1906z26h84zz9f7zj1lzqgr92i05h2vgkx2mg5aa2k8kiv4v8p3j"
+   "commit": "8a914b100348493a665f0d53de4e22bf5b30a2a5",
+   "sha256": "02rymhafqd2amazi2ds39vf5p01lfa75k5vyary3zrk2q01x1ba3"
   },
   "stable": {
    "version": [
@@ -2583,15 +2601,15 @@
   "repo": "seagle0128/all-the-icons-ivy-rich",
   "unstable": {
    "version": [
-    20220104,
-    1420
+    20220125,
+    1547
    ],
    "deps": [
     "all-the-icons",
     "ivy-rich"
    ],
-   "commit": "f7d3d1bb69c86087f8b05fa672dd62e096370bfa",
-   "sha256": "0xnrhrc51hvjxn1mc53jdz868a7gbr6frkl2vgcdbbm2v41jqxlv"
+   "commit": "1365b83824614656278b0b818fadf293e8ec0973",
+   "sha256": "0xx0ls0i6rhnacyscxzpnpdm9vy79lj634jvi9cp572y742l7cpx"
   },
   "stable": {
    "version": [
@@ -2654,11 +2672,11 @@
   "repo": "jcs-elpa/alt-codes",
   "unstable": {
    "version": [
-    20200723,
-    1037
+    20220205,
+    722
    ],
-   "commit": "2219a8326f8cd8ea5cd91583ba84cae7557b6fd7",
-   "sha256": "1sx8mp875dfbrir26fl33hql2ypjx2alqzn55qrkhyafyn6lmcmv"
+   "commit": "a1671339bde3dec273b367bf7dc849d1c306dac6",
+   "sha256": "17n11prkp1d1ln16jcfyy1m6wp6i8qi57zwy8g9cr13xwgq9f324"
   },
   "stable": {
    "version": [
@@ -3190,20 +3208,20 @@
   "repo": "bastibe/annotate.el",
   "unstable": {
    "version": [
-    20211001,
-    946
+    20220128,
+    1118
    ],
-   "commit": "b9c908f24c2119d99cd93c86a0920223ef0568e9",
-   "sha256": "169nwa7jfsdcjk6mbm3yabk3j8iwfixfkypwk5336dy2ncf90cjc"
+   "commit": "0cfad246ee4c1297efa399e3d2c6ebb8bb46288b",
+   "sha256": "1g4gyf087h98njzzjj23n114zhrlg2z1ab7d3v4438wph6c7my14"
   },
   "stable": {
    "version": [
-    0,
-    8,
+    1,
+    4,
     3
    ],
-   "commit": "4cc32fc2fb403dd0c501ffe7c23ba13fd23fd6ec",
-   "sha256": "0wjrmy2qsndfg7lwql6xw5b88j468cz365jx1sgpsplkgm25xsk2"
+   "commit": "b9c908f24c2119d99cd93c86a0920223ef0568e9",
+   "sha256": "169nwa7jfsdcjk6mbm3yabk3j8iwfixfkypwk5336dy2ncf90cjc"
   }
  },
  {
@@ -3232,8 +3250,8 @@
     20200914,
     644
    ],
-   "commit": "382861b1967b7ced0806343b8410709b2ce91df0",
-   "sha256": "05w4wmbdzg4j3nppix6gb2knf9wfyzqjcf0i1adbk7rawgcymq1x"
+   "commit": "9911f73061e21a87fad76c662463257afe02c861",
+   "sha256": "1sma8i82g9kv6b5mmvfxgr70pbjgy9m2f8ynh1gr2mq0b1jkgxjk"
   },
   "stable": {
    "version": [
@@ -4004,26 +4022,26 @@
   "repo": "fizban007/arxiv-mode",
   "unstable": {
    "version": [
-    20211231,
-    100
+    20220128,
+    920
    ],
    "deps": [
     "hydra"
    ],
-   "commit": "209a026f528d5b8de0da996d46fddc47ce0749fd",
-   "sha256": "1kaikdh2mcp6qg45wlhi3ffq9ws2n07i26byxjvxbwwpd5f0335v"
+   "commit": "f550583d2da8bd9600bd26bb4028fe22a9744da2",
+   "sha256": "1hrrpll7yhqdf4jin28dnbv2a1yccn0f1a4hmay7f8yxmp42r1ln"
   },
   "stable": {
    "version": [
     0,
     3,
-    0
+    1
    ],
    "deps": [
     "hydra"
    ],
-   "commit": "74105e665758bad77bd67c00435dbee95c83d791",
-   "sha256": "1d9aw5x2ypx6d5dyjrnmlrfdj0k5a6z6nqvrllb1n38a8gsr47ym"
+   "commit": "f550583d2da8bd9600bd26bb4028fe22a9744da2",
+   "sha256": "1hrrpll7yhqdf4jin28dnbv2a1yccn0f1a4hmay7f8yxmp42r1ln"
   }
  },
  {
@@ -4075,6 +4093,36 @@
   }
  },
  {
+  "ename": "asm-blox",
+  "commit": "78949c0632b01b70385947c69490097e9c3c5cc4",
+  "sha256": "0cgc6r3l2q4afdpwh632ykac6cpxcxs0lkazzbfd4bagzbl69jdz",
+  "fetcher": "github",
+  "repo": "zkry/asm-blox",
+  "unstable": {
+   "version": [
+    20220124,
+    1430
+   ],
+   "deps": [
+    "yaml"
+   ],
+   "commit": "ad00c5eb90f189223ef8a0b49c1dc5fef1ef26b0",
+   "sha256": "0wrwqr79swsj4jmvnn0ljzymjmp1rr4al37qibagl6pj8vfdqim0"
+  },
+  "stable": {
+   "version": [
+    0,
+    2,
+    3
+   ],
+   "deps": [
+    "yaml"
+   ],
+   "commit": "8bc20ab442765dffc6c710c1922757c2df3675a4",
+   "sha256": "1b9iqbwc7g2z9k413mb01s1qzzshfmxs25pn2m0l1z26fc81dch0"
+  }
+ },
+ {
   "ename": "asn1-mode",
   "commit": "b694baceceb54810be8f8c7152b2ac0b4063f01c",
   "sha256": "0iswisb08dqz7jc5ra4wcdhbmglildgyrb547dm5362xmvm9ifmy",
@@ -4217,11 +4265,11 @@
   "url": "https://tildegit.org/contrapunctus/async-backup.git",
   "unstable": {
    "version": [
-    20211128,
-    1603
+    20220131,
+    1438
    ],
-   "commit": "ba927feec1b568eb2b0a647b3eb7adf2d4a061e8",
-   "sha256": "0y88wj7p4amsqbj19rxxvhpffw43yganp1cxmzrmhbi5v66jikpr"
+   "commit": "6ddb39fe77d66cdef48b87cb0d0554ad7d132308",
+   "sha256": "14clnfjn4wwi0kza5d98d2iv9sjfnxs28cabm9psjvi239lx0f9d"
   }
  },
  {
@@ -4383,8 +4431,8 @@
   "repo": "jyp/attrap",
   "unstable": {
    "version": [
-    20220113,
-    823
+    20220124,
+    1253
    ],
    "deps": [
     "dash",
@@ -4392,8 +4440,8 @@
     "flycheck",
     "s"
    ],
-   "commit": "70d15ebaf68d613134a1651bfb3118b57264a3db",
-   "sha256": "0p3d39d0vhb0c9lr6q4fz1g1jwvap5ym7kwfkk1m4dg16c2a0p60"
+   "commit": "19a520ecb99529790906a1fb5599acdf2b4f005f",
+   "sha256": "15jv6bng8xnkng005n1qbbg5lngjyq7mb5q6x3j77bkb3l8pnr9d"
   },
   "stable": {
    "version": [
@@ -5418,11 +5466,11 @@
   "url": "https://git.sr.ht/~pkal/autocrypt",
   "unstable": {
    "version": [
-    20211218,
-    1848
+    20220201,
+    2102
    ],
-   "commit": "222954754ace827a80999955f02008841b260325",
-   "sha256": "01xg2g7fr6l495yvxsrln4q1i6v626spdy2yw9jkbc2jzpx34v0q"
+   "commit": "8965ce57c7d206e5d28167a37c11b9713576b009",
+   "sha256": "13ccb1r646c0k9vgr1h9r4xfn27yqw1489dj76nwq13awg81pjyr"
   }
  },
  {
@@ -5626,8 +5674,8 @@
     "avy",
     "embark"
    ],
-   "commit": "2f147726fef37b085e3f4ee2d94d953480544552",
-   "sha256": "10flx40bwkghziypp5spggcpjd731b150jvp9qri5vlaii98ays9"
+   "commit": "e8ef9424b3d8852935f7c547093bc2ebc23aeab5",
+   "sha256": "0k2mdjp473pzifk3p83xybqd05gyw1kak4bkapjziqk8061ab27f"
   },
   "stable": {
    "version": [
@@ -7528,8 +7576,8 @@
     20200404,
     1550
    ],
-   "commit": "8f7cd388abccdf25baeca99c07ef2dfe264e8f2f",
-   "sha256": "16c4scmc7csb34c237m04fc2w252lvqiwjcz65bjmf077g1ipd7q"
+   "commit": "9a208d395db66aebadf663344f18effffaac59fe",
+   "sha256": "1c8i82wxhldzbczhcdfnk9cggsfqpqbg9zar426drvn7vcz6xs3m"
   },
   "stable": {
    "version": [
@@ -7548,26 +7596,26 @@
   "repo": "Artawower/blamer.el",
   "unstable": {
    "version": [
-    20211206,
-    2137
+    20220122,
+    2332
    ],
    "deps": [
     "a"
    ],
-   "commit": "9e7517cfee9272e9e4822b4efc3fac7e32d7bb38",
-   "sha256": "00b8pnm1990fjiznz568mf3680cb2wq2qphbd3h0kdbzzanfn1fl"
+   "commit": "f5c0fc350db07ca89839c6bec7196945dba495eb",
+   "sha256": "0phmisdckdq706wjhici8pnvvslq77dvv8pph5yawy7lvh07va6k"
   },
   "stable": {
    "version": [
     0,
     3,
-    6
+    8
    ],
    "deps": [
     "a"
    ],
-   "commit": "d452006a31895a79216bf35a64482631a83cfc2d",
-   "sha256": "0gi0q60q9r5nx5wzavxywajmh9gw4nl20msgh9k9k9ilj4jy3a1b"
+   "commit": "f5c0fc350db07ca89839c6bec7196945dba495eb",
+   "sha256": "0phmisdckdq706wjhici8pnvvslq77dvv8pph5yawy7lvh07va6k"
   }
  },
  {
@@ -7973,11 +8021,11 @@
   "repo": "ideasman42/emacs-bookmark-in-project",
   "unstable": {
    "version": [
-    20220119,
-    949
+    20220201,
+    544
    ],
-   "commit": "1033822db4ebf675bd55cfe490b39602e7c3c2d3",
-   "sha256": "1wkh084i62kssx47x154rlsmswqljj7k5nkj0icmdnxlf4ynx71a"
+   "commit": "ff0d1c3531352a6c54bb48ced797f41bda95939e",
+   "sha256": "06cprpbff06q98d06vljcrmvixvdnvjmwqgxvpz9yx7s14ml289l"
   }
  },
  {
@@ -8068,15 +8116,15 @@
   "repo": "emacscollective/borg",
   "unstable": {
    "version": [
-    20220111,
-    1150
+    20220131,
+    1421
    ],
    "deps": [
     "epkg",
     "magit"
    ],
-   "commit": "0161a03720f11eb7f0a326612e6e2fa3695bb369",
-   "sha256": "1m0afgr2dbhr2db33cd2s4r7b3ysk0ki44xsbfha2536qwzrkncb"
+   "commit": "0bad132b4eb25ae9a1e26360e7b87771ab3208d3",
+   "sha256": "134cirgaxypsr39dlhshw3db4d9cz56dhl4d7d41lbzysih472km"
   },
   "stable": {
    "version": [
@@ -9845,19 +9893,19 @@
   "repo": "minad/cape",
   "unstable": {
    "version": [
-    20220119,
-    2013
+    20220201,
+    2018
    ],
-   "commit": "e01162ab1007457aba788916c1d59de8d6083b25",
-   "sha256": "18w1xq3q9jc43krvmgc1ic3m09r7am0acwhcgc9xs1jyaxwcg5pi"
+   "commit": "dba8492f70a46fde51d6269ae971693fd1777575",
+   "sha256": "1jaygxplh2y8lqq7p0yynql5zrb6yf0vyrcbwi1dvllq0clncnwn"
   },
   "stable": {
    "version": [
     0,
-    5
+    6
    ],
-   "commit": "9567f1ca09a3867e50ef8f990b486e916460df9d",
-   "sha256": "0780qymlrg3glyxypizqzwicp5ly5xavxgpmayhx8cxlgp2zlkjh"
+   "commit": "92c3168283c6d9faa3fcf2e72d0d71afbfa5d6e1",
+   "sha256": "1bmxpfp0zs24lbp1mlcc66f4s5gxgrj78001h241mzndc3kaiqfk"
   }
  },
  {
@@ -9871,8 +9919,8 @@
     20210707,
     2310
    ],
-   "commit": "82b29296f76c583856511f645d9ab4e427a6d218",
-   "sha256": "03s00fqsw4nxijkfpq0ysqi88d848lgy8xbj13aa4xfygnzx80x0"
+   "commit": "55a368beb987abf9eeb9b3843e9c5423ad37ab29",
+   "sha256": "1cnc69ny4icjz9rzqj5sli5vbqkrv3sbahbsl1c0ma28rbqasw0w"
   },
   "stable": {
    "version": [
@@ -10471,11 +10519,11 @@
   "repo": "anler/centered-window-mode",
   "unstable": {
    "version": [
-    20200426,
-    1053
+    20220125,
+    804
    ],
-   "commit": "f50859941ab5c7cbeaee410f2d38716252b552ac",
-   "sha256": "1l7m3gfn7j1mxs0rj1pm5avknplw2f34dd2k24n5rldfm41pf8i8"
+   "commit": "80965f6c6afe8d918481433984b493de72af5399",
+   "sha256": "0zmq84gvkyj20l9gv5wwraa6zis2vk7hadagkmyqg1w6vs25n2mh"
   }
  },
  {
@@ -10560,8 +10608,8 @@
     20171115,
     2108
    ],
-   "commit": "ba547dafdcbc6492e4bcfa462942126b2d1b8457",
-   "sha256": "063pnr6l7ryviw24y0pdkx2sj3piijdard6lszwcr8h3h3k063fm"
+   "commit": "049018b8f756a41643fdbaa45372b310d56e4211",
+   "sha256": "1gb7dz2jd0fvxzc4spp3c3hmpwcy8cqkw2qspnhkbxc7q7hirski"
   },
   "stable": {
    "version": [
@@ -10679,30 +10727,30 @@
   "repo": "Alexander-Miller/cfrs",
   "unstable": {
    "version": [
-    20211013,
-    1802
+    20220129,
+    1149
    ],
    "deps": [
     "dash",
     "posframe",
     "s"
    ],
-   "commit": "c1f639d7bfd3e728cf85dbe224b06a4be76158f4",
-   "sha256": "1bic67769xvjdhinq88jqxnb4dql8gssmnx1wvrl69338zjqqjzg"
+   "commit": "f3a21f237b2a54e6b9f8a420a9da42b4f0a63121",
+   "sha256": "1vf5zm82sx3m1yvq73km8ajapv6rnz41b1jrsif7kh0ijh9vk3qi"
   },
   "stable": {
    "version": [
     1,
-    5,
-    6
+    6,
+    0
    ],
    "deps": [
     "dash",
     "posframe",
     "s"
    ],
-   "commit": "8e9b79e38306b11411543d31cb483201131ba42a",
-   "sha256": "1sa0klkyr55xmshzxm9hz3j5vdkisxg67w8q00z7zbsald0imxbx"
+   "commit": "f3a21f237b2a54e6b9f8a420a9da42b4f0a63121",
+   "sha256": "1vf5zm82sx3m1yvq73km8ajapv6rnz41b1jrsif7kh0ijh9vk3qi"
   }
  },
  {
@@ -11025,6 +11073,24 @@
   }
  },
  {
+  "ename": "chezmoi",
+  "commit": "36f51f076004452aff618e401984f70750f2505a",
+  "sha256": "09mzv7pi849ad2mlk8r3dnwh51jvx6qyycwy6dx42faq06i9x1ci",
+  "fetcher": "github",
+  "repo": "tuh8888/chezmoi.el",
+  "unstable": {
+   "version": [
+    20220131,
+    1935
+   ],
+   "deps": [
+    "magit"
+   ],
+   "commit": "3d7f6bf3abaf0f236e159bde4751b55bc803a7d6",
+   "sha256": "0xyn59r3m453vy2x1gm7cmw6pd8ws1jiq5979cb8cr068g8pkp18"
+  }
+ },
+ {
   "ename": "chinese-conv",
   "commit": "a798158829f8fd84dd3e5e3ec5987d98ff54e641",
   "sha256": "1lqpq7pg0nqqqj29f8is6c724vl75wscmm1v08j480pfks3l8cnr",
@@ -11191,16 +11257,16 @@
   "url": "https://tildegit.org/contrapunctus/chronometrist.git",
   "unstable": {
    "version": [
-    20220113,
-    1718
+    20220123,
+    739
    ],
    "deps": [
     "dash",
     "seq",
     "ts"
    ],
-   "commit": "fe9f2b494f7f78a21b54d43f2546a6da5818b3d3",
-   "sha256": "1d21y00c5nq6pj2rpbn0jmfghm2fpvq0n1jnq3vqqjy467jwzz2a"
+   "commit": "406c23275ca3aef4a19958b882484ed7e5a4f12e",
+   "sha256": "1fdpzgw0cks5lqddk5y0r2yx7a2pwggy2401l57bkw5ag90g3qwh"
   },
   "stable": {
    "version": [
@@ -11244,14 +11310,14 @@
   "url": "https://tildegit.org/contrapunctus/chronometrist.git",
   "unstable": {
    "version": [
-    20211118,
-    1235
+    20220123,
+    2006
    ],
    "deps": [
     "chronometrist"
    ],
-   "commit": "fe9f2b494f7f78a21b54d43f2546a6da5818b3d3",
-   "sha256": "1d21y00c5nq6pj2rpbn0jmfghm2fpvq0n1jnq3vqqjy467jwzz2a"
+   "commit": "406c23275ca3aef4a19958b882484ed7e5a4f12e",
+   "sha256": "1fdpzgw0cks5lqddk5y0r2yx7a2pwggy2401l57bkw5ag90g3qwh"
   },
   "stable": {
    "version": [
@@ -11267,6 +11333,38 @@
   }
  },
  {
+  "ename": "chronometrist-spark",
+  "commit": "14000772028841fc06aa3baf3545ea193d5705c6",
+  "sha256": "04gm5srg62zb80av5b5i2k1d790cf9xb6zn0bisf7l4i7cvjxafk",
+  "fetcher": "git",
+  "url": "https://tildegit.org/contrapunctus/chronometrist.git",
+  "unstable": {
+   "version": [
+    20220123,
+    739
+   ],
+   "deps": [
+    "chronometrist",
+    "spark"
+   ],
+   "commit": "406c23275ca3aef4a19958b882484ed7e5a4f12e",
+   "sha256": "1fdpzgw0cks5lqddk5y0r2yx7a2pwggy2401l57bkw5ag90g3qwh"
+  },
+  "stable": {
+   "version": [
+    0,
+    9,
+    0
+   ],
+   "deps": [
+    "chronometrist",
+    "spark"
+   ],
+   "commit": "73e6d98612187aa64f4adacd26e058349cf131c6",
+   "sha256": "156hj3sxjcfpwimnrykh4n3krkbzas9jg8m6xzy42rnzhx28ja6k"
+  }
+ },
+ {
   "ename": "chronos",
   "commit": "53648c5699fc03e50774270f9560c727e2c22873",
   "sha256": "1fwpll0mk6pc37qagbq3b3z32d2qwz993nxp9pjw4qbmlnq6sy9d",
@@ -11322,8 +11420,8 @@
   "repo": "clojure-emacs/cider",
   "unstable": {
    "version": [
-    20220113,
-    610
+    20220204,
+    917
    ],
    "deps": [
     "clojure-mode",
@@ -11333,8 +11431,8 @@
     "sesman",
     "spinner"
    ],
-   "commit": "8bb67174ffa0cd7ae01f544926b4ed5a17965d76",
-   "sha256": "1fh95x4gabmm95ligy30lhqgay5snlp9d4m21l5zmk64klfyrpfb"
+   "commit": "e8b582e1f28b27cdb0574e0f9361cbb9eb62afd0",
+   "sha256": "1dazvxk5fbqgipkwvk35b5hdbfakq0f7mn8nmqzaj03nd66dn55m"
   },
   "stable": {
    "version": [
@@ -11633,8 +11731,8 @@
   "repo": "bdarcus/citar",
   "unstable": {
    "version": [
-    20220119,
-    2244
+    20220204,
+    1902
    ],
    "deps": [
     "citeproc",
@@ -11642,8 +11740,8 @@
     "parsebib",
     "s"
    ],
-   "commit": "46da9225a852a8f37399462add58419346c09eb0",
-   "sha256": "0sf8sv1wasv4bbis2x8dz9d7g4d0rqbfsxa8knjqvcy6gqpssj1c"
+   "commit": "903dcd3d21be58ec2f7ac61432ff26f037373180",
+   "sha256": "1danf825jj5ahsicwnb8szis0ixqysy0k4vflvhbjwhl9n38rwg6"
   },
   "stable": {
    "version": [
@@ -11667,8 +11765,8 @@
   "repo": "andras-simonyi/citeproc-el",
   "unstable": {
    "version": [
-    20220118,
-    2057
+    20220124,
+    721
    ],
    "deps": [
     "dash",
@@ -11679,8 +11777,8 @@
     "s",
     "string-inflection"
    ],
-   "commit": "470ecfb761062cbb546293e21cd5aa56dd77f528",
-   "sha256": "0pn6f5hi3ldqzx2p53365arcixxqyrmhvqd2cl0nlz0g0q5wzwhm"
+   "commit": "ba49516265fa24b138346c4918d39d19b4de8a62",
+   "sha256": "1zxrzx537ar35i32g7y76k8w5z4x2nip2vw6lr4xwvzl6bwxnfqv"
   },
   "stable": {
    "version": [
@@ -11746,11 +11844,11 @@
   "repo": "universal-ctags/citre",
   "unstable": {
    "version": [
-    20211225,
-    1020
+    20220130,
+    538
    ],
-   "commit": "641f2f7f69de2c0f4f055efe55b3ecd899a60b24",
-   "sha256": "052b0zwxn7cnm9l9hb8nv794fbl9vds39f1a9xp0grg5q70qy3k3"
+   "commit": "d7b6428da289c2f63a7a97f4eaba5b76616a09ce",
+   "sha256": "0kg64va0iqjzwswzs4z9sx278w20c35pg4ysp9x198z0575lvpid"
   },
   "stable": {
    "version": [
@@ -11815,11 +11913,11 @@
   "url": "https://git.sr.ht/~pkal/clang-capf",
   "unstable": {
    "version": [
-    20211204,
-    1351
+    20220122,
+    1219
    ],
-   "commit": "147be0e908f09ab2346443d48457f9624a404019",
-   "sha256": "1qwlafw28axrnhk9zrhpgww22964j9s0ys43dndmmh16ykyzaxgc"
+   "commit": "b1765719288a138e125cc5ce624ef561c80015bf",
+   "sha256": "1v8h916rqylz98v1xi1bqdcakgjjl3l1f51xcvyd41wn1kfiaxnf"
   },
   "stable": {
    "version": [
@@ -12117,8 +12215,8 @@
   "repo": "clojure-emacs/clj-refactor.el",
   "unstable": {
    "version": [
-    20220109,
-    244
+    20220206,
+    1011
    ],
    "deps": [
     "cider",
@@ -12131,14 +12229,14 @@
     "seq",
     "yasnippet"
    ],
-   "commit": "bfd83d142f1a05bad779fa7ccbaec8bd24dae177",
-   "sha256": "0010db9xagz5dykh377z9r6vn50wk9ffvgq8410ppcymdaq1syx9"
+   "commit": "d1b68c7807476de95a684fa52de294c96b3e8523",
+   "sha256": "0rckg0pwq6dvh4zn62r599pc32p436ybiy1wmj14ink0ywk3bqay"
   },
   "stable": {
    "version": [
     3,
     2,
-    2
+    3
    ],
    "deps": [
     "cider",
@@ -12151,8 +12249,8 @@
     "seq",
     "yasnippet"
    ],
-   "commit": "e0d83c845014a24c2604a08f9c9931c63ea809c4",
-   "sha256": "1iyivn7x5bcnp4g7k0k2b0jdcph84pbldlk83qqfzix6h4sp1k1f"
+   "commit": "d1b68c7807476de95a684fa52de294c96b3e8523",
+   "sha256": "0rckg0pwq6dvh4zn62r599pc32p436ybiy1wmj14ink0ywk3bqay"
   }
  },
  {
@@ -12231,11 +12329,11 @@
   "repo": "ataka/clmemo",
   "unstable": {
    "version": [
-    20160326,
-    1623
+    20220204,
+    1345
    ],
-   "commit": "846a81b984d71edf8278a4d9f9b886e44d5b8365",
-   "sha256": "152qf7i5bf7xvr35gyawl8abkh7v5dsz957zxslrbbnc8bb1k6bz"
+   "commit": "f695c38c551f72f6ac5e1a82badc540c80d3b33b",
+   "sha256": "19lzrbkkabyw2pha005vpkgn42bs3b52nij1x2wr7v35bvpsck2q"
   }
  },
  {
@@ -12379,11 +12477,11 @@
   "repo": "clojure-emacs/clojure-mode",
   "unstable": {
    "version": [
-    20211119,
-    1904
+    20220202,
+    1341
    ],
-   "commit": "e31186843d06ea86f3771244d1cde0112f9e2079",
-   "sha256": "0dlbwz0vkn2sf394r86s7vbc78jkq7wd3ldziqkwf57ci2068nyi"
+   "commit": "913e2450a77a6ddda051f55ac651c99337147db1",
+   "sha256": "0b8iga2wz5xyqfwwxznsjh71bwgjvvj9yjsamvwfrlsj0wh6zk1w"
   },
   "stable": {
    "version": [
@@ -12409,8 +12507,8 @@
    "deps": [
     "clojure-mode"
    ],
-   "commit": "e31186843d06ea86f3771244d1cde0112f9e2079",
-   "sha256": "0dlbwz0vkn2sf394r86s7vbc78jkq7wd3ldziqkwf57ci2068nyi"
+   "commit": "913e2450a77a6ddda051f55ac651c99337147db1",
+   "sha256": "0b8iga2wz5xyqfwwxznsjh71bwgjvvj9yjsamvwfrlsj0wh6zk1w"
   },
   "stable": {
    "version": [
@@ -12574,11 +12672,11 @@
   "repo": "vallyscode/cloud-theme",
   "unstable": {
    "version": [
-    20211229,
-    2131
+    20220205,
+    1336
    ],
-   "commit": "72f1f430c94b93701851567853097b2df7cdd19a",
-   "sha256": "14jqq522hdy2zy3iqh3r5ql5wgc5jh7mlz9m7h8pgcrwh9h7zjk2"
+   "commit": "16372ea1f527917102ac302afaec3ef09e289d24",
+   "sha256": "0wyrc532iqviq1r8pa3qnz10bd66qnvac3qcgcwvjhd5h772y0dh"
   }
  },
  {
@@ -12712,17 +12810,17 @@
     20210104,
     1831
    ],
-   "commit": "410dd6cf611f31ebca74e1db4dc439e6fcaf34b4",
-   "sha256": "1qfpps3mw4gbi59kia89s0hn8snwsfx5vxbw548a2mncm1lmsml9"
+   "commit": "3d91571f795e7cf2a0e74af1f72398fcd529703b",
+   "sha256": "0vd0my900iyg7xzccnlml3qg2lgrvyqgagp7zrn33k1sbxsnzcxi"
   },
   "stable": {
    "version": [
     3,
     22,
-    1
+    2
    ],
-   "commit": "aa6a33fe54918967f6ffcad30773e01664e8a2b2",
-   "sha256": "1b5afd4ryqmkdkwpr1xb6g31d8xlkbjg9ql191rvnp5rsmb9a75w"
+   "commit": "8428e39ed9cddb3b7f1a6f7a58cb8617503183d2",
+   "sha256": "1c2rczn67bpyhpacyn4qpg71p8dnqvvqndfgqjfd94h4zafcygjv"
   }
  },
  {
@@ -14263,21 +14361,21 @@
   "repo": "jcs-elpa/company-fuzzy",
   "unstable": {
    "version": [
-    20211104,
-    1200
+    20220127,
+    817
    ],
    "deps": [
     "company",
     "ht",
     "s"
    ],
-   "commit": "ca52f1bf0a2ad927d629274f648726769ce770de",
-   "sha256": "0wfryqkvj9xcka2j22mzxjr8cb9f2llyqkxjz9l2zvpijqfp1n49"
+   "commit": "50b4fbc0d812e12aab21267f78a1acfb1d863943",
+   "sha256": "1175vfy3ilac73xyj3y644q3rfq0v5vjpjakdahkz337di7cxd73"
   },
   "stable": {
    "version": [
     1,
-    3,
+    4,
     0
    ],
    "deps": [
@@ -14285,8 +14383,8 @@
     "ht",
     "s"
    ],
-   "commit": "7067175ebf56c5110edf1475b03e2e242a00e66b",
-   "sha256": "1sfzj5qbpc1j1blg6rq5lmimgy1yfwyg7ixgp7psf53nq0cbq9jd"
+   "commit": "3aeb0bdcc15e969964b73e695aca8e0df60e3a1a",
+   "sha256": "1yfl1c92i0xn6imgvvj6h5zpadqp96akm69cmccxs7khfall5lmj"
   }
  },
  {
@@ -14502,8 +14600,8 @@
     "lean-mode",
     "s"
    ],
-   "commit": "a4205749d20a09871f0951c34f919d4ee5fbdb55",
-   "sha256": "0jqfnwjwn5payjj1lfl1zvw8gpcdlc6k3lqbw6iwpzlyal7y0nyb"
+   "commit": "c1c68cc946eb31b6ba8faefdceffce1f77ca52df",
+   "sha256": "0qb5j50qi9b04jrfk6fryllpf0i9s2h4kp93fyk53sjczm52kh7p"
   }
  },
  {
@@ -14677,8 +14775,8 @@
     "company",
     "native-complete"
    ],
-   "commit": "20e1dceb459856c8c4f903e6d8562991069bb8c1",
-   "sha256": "11m3y6kbjm0nqmdqbcv4xrchcabh4x1w4gy1p8gp36k600s1h7zj"
+   "commit": "5f94022fc9168971c77f8c12f9efd569c45f4850",
+   "sha256": "0lfqvm71lxxga06pjzcdydjpgd3548rql7bsjdvbknkwx2p54w4g"
   }
  },
  {
@@ -14801,8 +14899,8 @@
     "cl-lib",
     "company"
    ],
-   "commit": "92d559309d0c7614e2ccc982002b7ff963f3c9dd",
-   "sha256": "0aidj0hz97qw8jpwcbdmhjqk8wsdls3jiq9j6bbrqh458j6p317h"
+   "commit": "f44c5c6a23829e53bcb0712adcad406a8e9498ce",
+   "sha256": "1k3919v7mczwzk50dhrfnx2sbzlcm192c6ks4wzajr5hzvd448qc"
   },
   "stable": {
    "version": [
@@ -14834,8 +14932,8 @@
     "company",
     "phpactor"
    ],
-   "commit": "272217fbb6b7e7f70615fc518d77c6d75f33a44f",
-   "sha256": "0hm96i9vdbkcq6mypjpl94dn3gzyk23iql5zzy2d221vmjhqvn7d"
+   "commit": "585862496e8ac9f496c0c99c5b97af456cb1f73c",
+   "sha256": "1y5g5g2d5g9xiw3vwxqnmz58gyfn9hybpfzcjhyjhnjma74jkqfr"
   },
   "stable": {
    "version": [
@@ -15916,19 +16014,19 @@
   "repo": "minad/consult",
   "unstable": {
    "version": [
-    20220115,
-    1548
+    20220201,
+    1112
    ],
-   "commit": "a899e183d3f85741e6bf92a55a57afe9b9a4c7ae",
-   "sha256": "1rd4gfzn43g8gzv3v9fl7jbyj8wdn3nkz5l35qlqr0iyz5cd5bzz"
+   "commit": "1a6ed29e92f00266daff4ff5f62602f53ef7d158",
+   "sha256": "137s984r5nf9j5padha45n9jhyh82ik4yybcr9nljg86l065s3nz"
   },
   "stable": {
    "version": [
     0,
-    14
+    15
    ],
-   "commit": "f9170bb75f9b4362b42cebee9cd8643b04093342",
-   "sha256": "051fjp03lj3b5kkzpdhk78g2lj37v973q0f012zld1n6937srj6h"
+   "commit": "e1e17965a98515a620c439be1eb28cd125f984a0",
+   "sha256": "0cfj8h0k05947cazsr95yy75shs0vpy59sa41f31xbw00q9l48q6"
   }
  },
  {
@@ -15967,6 +16065,18 @@
    ],
    "commit": "08f543ae6acbfc1ffe579ba1d00a5414012d5c0b",
    "sha256": "1cff4ssrn1mw2s5n090pdmwdirnfih8idg5f0ll2bi2djc4hq5kn"
+  },
+  "stable": {
+   "version": [
+    0,
+    1
+   ],
+   "deps": [
+    "consult",
+    "project"
+   ],
+   "commit": "08f543ae6acbfc1ffe579ba1d00a5414012d5c0b",
+   "sha256": "1cff4ssrn1mw2s5n090pdmwdirnfih8idg5f0ll2bi2djc4hq5kn"
   }
  },
  {
@@ -16191,8 +16301,8 @@
     "consult",
     "espotify"
    ],
-   "commit": "5c1dcf0182135cda4191d4ba206fe2f265100293",
-   "sha256": "06wj2pixhjgqddl9g2wkv7cq9gz9yjb46cb1jrlbya3rdjyfb6h5"
+   "commit": "ea6d6021e5acc550560325db2f09198839ee702f",
+   "sha256": "1jlm7mka1ilaw8z1a91vy8k1hz27g4iyk33fpmiab7856j8ry32b"
   }
  },
  {
@@ -18019,11 +18129,11 @@
   "repo": "raxod502/ctrlf",
   "unstable": {
    "version": [
-    20211228,
-    415
+    20220130,
+    2307
    ],
-   "commit": "282eaa836d2198bb5947dfd3c454ae5305f55efb",
-   "sha256": "04w708g7d1pnsc18h8fjyqkhk08jkq853alaidriamxyycvdwk0i"
+   "commit": "38b5e94bf718eeea0b880a78ed52926dec89fea9",
+   "sha256": "0yc89vfca2q9bii4145wkyb5g4nil3n14b8af08npjhmb2i85aw1"
   },
   "stable": {
    "version": [
@@ -18466,17 +18576,17 @@
     20211111,
     1407
    ],
-   "commit": "a448db45c9f638c384f869ec726ca8bc6e85a1ec",
-   "sha256": "0czdnpmzxq07rdqb5227y6p24ssh1vr7j6whi79mf46dnzd1p7zd"
+   "commit": "2a304b0f9e6c9a98f2a8a38d80404a34e6623cd8",
+   "sha256": "1mqd1594y7spnbwq5y3xgj3wsllzc2gqgg4dns2afp10xiv0l23y"
   },
   "stable": {
    "version": [
     0,
     29,
-    26
+    27
    ],
-   "commit": "3028e8c7ac296bc848d996e397c3354b3dbbd431",
-   "sha256": "175k9f5dzrpg1xqc941n0xa1frxq8vnqlw6ccx59xf9p43ws9rc1"
+   "commit": "229a4531780863c8a5c311d6b3c70a545988f85f",
+   "sha256": "1pvfamxnvh9by6658wmqyvm30af3ykhks9mwkqfz9ww161avxzd8"
   }
  },
  {
@@ -19038,11 +19148,11 @@
   "repo": "emacs-dashboard/emacs-dashboard",
   "unstable": {
    "version": [
-    20220117,
-    1613
+    20220129,
+    533
    ],
-   "commit": "c51d94778fd5806ff1b37339f97ec94cfd9d390a",
-   "sha256": "0cl9cnsw1gp6w1kv6bf719ykczzf41ck4vzzr3lpixn0jkv1q9cz"
+   "commit": "d6e9f4df42815de467765e78b7c27125f35d30bb",
+   "sha256": "02lhkk4z8va95fnv5x4sd3xdas28gf3ykbl7gry015sms9jxj7w3"
   },
   "stable": {
    "version": [
@@ -20063,11 +20173,11 @@
   "repo": "astoff/devdocs.el",
   "unstable": {
    "version": [
-    20220107,
-    1051
+    20220128,
+    1441
    ],
-   "commit": "8abcac28030c0f770b214823b4a1a5024f121b30",
-   "sha256": "1717y9fkvppbd1cyf9bhr32cjy0n1zd0vrjs1ynal40ymrv9jnpp"
+   "commit": "a632b3cddc88bc1ed5f323afba03d91c34453194",
+   "sha256": "08z1i260r3i7shybcwyiq5michwwfpmzvvnqpppcasazrgpz6vyz"
   }
  },
  {
@@ -20273,6 +20383,21 @@
   }
  },
  {
+  "ename": "diff-ansi",
+  "commit": "6bbfb72c3db4f774ffab9cf273b26e23fb027ee8",
+  "sha256": "0k25pfxm0w7i84z1qfzd87l75hv43m89ajaq7bl2ppq2h1fwf880",
+  "fetcher": "gitlab",
+  "repo": "ideasman42/emacs-diff-ansi",
+  "unstable": {
+   "version": [
+    20220130,
+    2254
+   ],
+   "commit": "f2207a67e3cc79433b43deeb463d0768357c350f",
+   "sha256": "1avfss2syaqsrdb4nlgsd49xyiy6bjqsf17r2is5il8g4yj1jabs"
+  }
+ },
+ {
   "ename": "diff-at-point",
   "commit": "d342698c94e145ecfebf204c1099dbe765b39c71",
   "sha256": "1gjjnxafsxrhpxz3zs5kbdmy5wmhcqqfkgryzzc0mmm9iqbskd3j",
@@ -20295,14 +20420,14 @@
   "repo": "dgutov/diff-hl",
   "unstable": {
    "version": [
-    20211106,
-    2353
+    20220124,
+    323
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "e628ba35b8fa6f9fe13dc2525bd82532dc9bd864",
-   "sha256": "1kpwivjr362iiwph8db6maxl1mbcd0xf8md61nbz73ndrbv9xkcv"
+   "commit": "4a08b02afec1fc6b1e84de46cc34f75f6c9c3bcc",
+   "sha256": "1c8v4c9cz9mcn70dws79yh1fd3nxkbb6mdrlqs5nwy7m3d2l567a"
   },
   "stable": {
    "version": [
@@ -20616,8 +20741,8 @@
     20220104,
     1539
    ],
-   "commit": "fd486ef76e4c1d8211ae337a43b8bba106d4bca7",
-   "sha256": "1vlgn7swwfzy6yr880698h3qsmfcqprcb1jvffkzmbvhvf458szf"
+   "commit": "6b7e837b0cf0129e9d7d6abae48093cf599bb9e8",
+   "sha256": "0d944fmxnbcqpafcb419i6zv46lh78w9ailbxrzhxrb69ii3fnwh"
   },
   "stable": {
    "version": [
@@ -21457,15 +21582,15 @@
   "repo": "ShuguangSun/dired-view-data",
   "unstable": {
    "version": [
-    20210810,
-    1533
+    20220129,
+    339
    ],
    "deps": [
     "ess",
     "ess-view-data"
    ],
-   "commit": "75d5f961926392feb408049d416ed5c4c2213f07",
-   "sha256": "19ygbq9gibl0pj9663r77w3y00wpw7dpr1zh983w5nj57fa0im3p"
+   "commit": "96d4cb6569fd2be90a516dedd98263374bbc6ead",
+   "sha256": "1i1prpzp10irshv42lwv08lzwvm0r9amapbbki07qhmqd5q0av06"
   },
   "stable": {
    "version": [
@@ -21682,11 +21807,11 @@
   "repo": "alexluigit/dirvish",
   "unstable": {
    "version": [
-    20220120,
-    504
+    20220203,
+    1118
    ],
-   "commit": "762db50fa84decf5ec2b87ea51f5c8b70680a0af",
-   "sha256": "06b32sgbnfadanarihgsffcqbbbz0ccrcf6v1p59a2kw432jx5kz"
+   "commit": "bc278f42110fe34e14ebfce0cda036b3ce17730a",
+   "sha256": "16rqyfj7lsrkp7a406z23dkcz7c6vb0gh6243ywjiwiqj7qdzcqc"
   }
  },
  {
@@ -22601,11 +22726,11 @@
   "repo": "progfolio/doct",
   "unstable": {
    "version": [
-    20220106,
-    709
+    20220121,
+    2018
    ],
-   "commit": "e92ccc084f164ed87b7ae325669ce5720044179e",
-   "sha256": "0r53f580grrxgl839l7lrhg8vcrjxy7n2qw10z9bkabmkvbcl20d"
+   "commit": "9ed9b8c7f7e2ea2d2fb739d65ae4626a1cf16b9f",
+   "sha256": "11rzq8qbvivmi2sj5gw4g4n7qf8zjjypqz8xvn6s3w4ahz8n5nmd"
   }
  },
  {
@@ -22738,16 +22863,16 @@
   "repo": "seagle0128/doom-modeline",
   "unstable": {
    "version": [
-    20220104,
-    1417
+    20220129,
+    1017
    ],
    "deps": [
     "all-the-icons",
     "dash",
     "shrink-path"
    ],
-   "commit": "bd21ee28cc25da400fb32b1e9e65b09514fa7f57",
-   "sha256": "1k9addpiyk2x56b317awbrmj5d0wlc9fjzp02yicjqzsslakb7hf"
+   "commit": "b1726bf6b3328763851dfa1d343e4b2f1ccad125",
+   "sha256": "1qalk74l8vkv69ph642m6m2rvqq5pfvx8jfr40kpf83lx5amrch2"
   },
   "stable": {
    "version": [
@@ -22791,14 +22916,14 @@
   "repo": "doomemacs/themes",
   "unstable": {
    "version": [
-    20220105,
-    1406
+    20220127,
+    2136
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "56e8a93b2dd8f2c10a693f36c3317833211201f2",
-   "sha256": "0ph2slvcf5fncw3s6mc3hmgs02g8prljycqymqz813fcqrbdsmqb"
+   "commit": "f55e32cebb2c756c1c0019cad5aff59abb5882bb",
+   "sha256": "10bcg2yi0axccp2nks4di2by5y4d7j4vhjg1h692qkc908gb9irs"
   },
   "stable": {
    "version": [
@@ -23200,14 +23325,14 @@
   "repo": "arnested/drupal-mode",
   "unstable": {
    "version": [
-    20220117,
-    1142
+    20220125,
+    1044
    ],
    "deps": [
     "php-mode"
    ],
-   "commit": "5b90a053f73849db77e4c89a030acd81b53712d1",
-   "sha256": "0pl00a0gr6xgyrf8fhdk6s79kr1l4fimszmwhr05zdya70jlav7i"
+   "commit": "17927723adc5921e8058f7c29e5e50e88b975639",
+   "sha256": "1j0zlcjrz0pswcc8wh476vx503qvlyzjscwh0gs3cfss8j6r6gd5"
   },
   "stable": {
    "version": [
@@ -23262,6 +23387,29 @@
   }
  },
  {
+  "ename": "dtache",
+  "commit": "6e0f64b768c13fb873dc1dcb849770b7b401603d",
+  "sha256": "1sw5wciadijskzp4cczik36ak08xx7491bqgjhbg2vf2yyg09sbz",
+  "fetcher": "gitlab",
+  "repo": "niklaseklund/dtache",
+  "unstable": {
+   "version": [
+    20220206,
+    1134
+   ],
+   "commit": "948c110bbdd802a530f393580d74f3dc8bbdda1e",
+   "sha256": "1ii8zggw3db5nrkfnfhqsa7w7676bq3vl0z8larwhb34q6shi655"
+  },
+  "stable": {
+   "version": [
+    0,
+    5
+   ],
+   "commit": "ecf4c57d96eda400d9b2d5cfeaa9244993ae3603",
+   "sha256": "1ii8zggw3db5nrkfnfhqsa7w7676bq3vl0z8larwhb34q6shi655"
+  }
+ },
+ {
   "ename": "dtb-mode",
   "commit": "0c33d49a8d79ee60571775fc224453a351b0ff48",
   "sha256": "0s8jwmg2kafg31scl04swbx56dnxr2y3j56g95a4k4ffnb0q28n3",
@@ -23454,8 +23602,8 @@
     20210909,
     1010
    ],
-   "commit": "7333e33a3fa7d9be93d7e32b0d12a5940b803a4f",
-   "sha256": "08g5saf7cwiizkg4h75bqa1lgcq3vx5b8vrhy9rjilr45cim8gkm"
+   "commit": "8e155da034f1f1c10fed88bdba4887ac26be9bcf",
+   "sha256": "1j3i8sikcpywzr0syrq70qf00cyk0kgcdqcp579v3sgm9p0mgnfg"
   },
   "stable": {
    "version": [
@@ -24220,14 +24368,14 @@
   "repo": "joostkremers/ebib",
   "unstable": {
    "version": [
-    20220118,
-    739
+    20220121,
+    2236
    ],
    "deps": [
     "parsebib"
    ],
-   "commit": "c854cd0ba979085178b797adb72ad42eed2f87f7",
-   "sha256": "05lihrrbflr63cbp342g8s2y2i0l3hd4z6q88yvwirfmdv9hlmz9"
+   "commit": "4aed0c3a34e5faa95435e03be043f9a843971560",
+   "sha256": "13h94383lqfk2gcrfd7czdm46q38zg8bm8dyk8lcbyi7b60rczbg"
   },
   "stable": {
    "version": [
@@ -24715,8 +24863,8 @@
     "cl-lib",
     "nadvice"
    ],
-   "commit": "2ab86dc9a8ed7a669ca348252d4af46522b5c411",
-   "sha256": "1ii93vw55vqik765sm79gvlhlnp9xgqzml2ibwwkrfgz7gip9i0m"
+   "commit": "3c03cef3110024016c688553733cdc3694a8a799",
+   "sha256": "1vyl3i6dgi8y3rc5a4n2hhghiri0914k2j7w7zkji8brpl8i5f0g"
   },
   "stable": {
    "version": [
@@ -25079,18 +25227,19 @@
   "repo": "joaotavora/eglot",
   "unstable": {
    "version": [
-    20220119,
-    2106
+    20220123,
+    1406
    ],
    "deps": [
     "eldoc",
     "flymake",
     "jsonrpc",
     "project",
+    "seq",
     "xref"
    ],
-   "commit": "0fcab44367a362c1ddc73780b6a40eea6d1934b9",
-   "sha256": "1365zkilbqwah403j56lcw576ql61wai5xy51ny54i1hlck4bnak"
+   "commit": "0f352213fcfa9f9e8406771fbc8629f2885e80ee",
+   "sha256": "0ly76fddl2r8hrhqm5jlpsmj5nvggdxl5mxqvb9f6jv82p0bvxbn"
   },
   "stable": {
    "version": [
@@ -25543,8 +25692,8 @@
     "hercules",
     "org-ql"
    ],
-   "commit": "aaf183877156c69bf5eb02832dc33a1908eb1091",
-   "sha256": "0nj4axympsls5hnhkwlm0v2pnbm82yks03ndk5iqyf261x7rbhna"
+   "commit": "99f4d9d38b8e6a5b3f32bd4f6a3c7f68c2523dd9",
+   "sha256": "1lf74clkv1iq14xd07ar0k1nl7ws5111d6lh8yqn34c80gbj10hn"
   }
  },
  {
@@ -25562,8 +25711,8 @@
     "el-secretario",
     "elfeed"
    ],
-   "commit": "aaf183877156c69bf5eb02832dc33a1908eb1091",
-   "sha256": "0nj4axympsls5hnhkwlm0v2pnbm82yks03ndk5iqyf261x7rbhna"
+   "commit": "99f4d9d38b8e6a5b3f32bd4f6a3c7f68c2523dd9",
+   "sha256": "1lf74clkv1iq14xd07ar0k1nl7ws5111d6lh8yqn34c80gbj10hn"
   }
  },
  {
@@ -25581,8 +25730,8 @@
     "el-secretario",
     "org-ql"
    ],
-   "commit": "aaf183877156c69bf5eb02832dc33a1908eb1091",
-   "sha256": "0nj4axympsls5hnhkwlm0v2pnbm82yks03ndk5iqyf261x7rbhna"
+   "commit": "99f4d9d38b8e6a5b3f32bd4f6a3c7f68c2523dd9",
+   "sha256": "1lf74clkv1iq14xd07ar0k1nl7ws5111d6lh8yqn34c80gbj10hn"
   }
  },
  {
@@ -25600,8 +25749,8 @@
     "el-secretario",
     "notmuch"
    ],
-   "commit": "aaf183877156c69bf5eb02832dc33a1908eb1091",
-   "sha256": "0nj4axympsls5hnhkwlm0v2pnbm82yks03ndk5iqyf261x7rbhna"
+   "commit": "99f4d9d38b8e6a5b3f32bd4f6a3c7f68c2523dd9",
+   "sha256": "1lf74clkv1iq14xd07ar0k1nl7ws5111d6lh8yqn34c80gbj10hn"
   }
  },
  {
@@ -25620,8 +25769,8 @@
     "el-secretario",
     "org-ql"
    ],
-   "commit": "aaf183877156c69bf5eb02832dc33a1908eb1091",
-   "sha256": "0nj4axympsls5hnhkwlm0v2pnbm82yks03ndk5iqyf261x7rbhna"
+   "commit": "99f4d9d38b8e6a5b3f32bd4f6a3c7f68c2523dd9",
+   "sha256": "1lf74clkv1iq14xd07ar0k1nl7ws5111d6lh8yqn34c80gbj10hn"
   }
  },
  {
@@ -26289,15 +26438,15 @@
   "repo": "fasheng/elfeed-protocol",
   "unstable": {
    "version": [
-    20210430,
-    846
+    20220126,
+    1404
    ],
    "deps": [
     "cl-lib",
     "elfeed"
    ],
-   "commit": "c88bb246a40c2f8ec2cb36bc16690d1ed43f8b14",
-   "sha256": "0aq1rp46dr2hdkzm8aapb1xlcbdpa0nbrgb8b5avkihmyx7nkwkb"
+   "commit": "d2e22f5506bc75dbf4ca42ac87257fd1b259dd66",
+   "sha256": "0zmalhdd4xbn9wc5dmk4511ha955smrjpmzknwkwhqn8npgbj4m5"
   },
   "stable": {
    "version": [
@@ -26321,26 +26470,26 @@
   "repo": "sp1ff/elfeed-score",
   "unstable": {
    "version": [
-    20211231,
-    54
+    20220202,
+    201
    ],
    "deps": [
     "elfeed"
    ],
-   "commit": "38988ebdbc335f990e9a90042141f18e3fc3ddb1",
-   "sha256": "19g98xpb0kk8i0js4syb2k7sfj0lia3xmywzn9dmrxkpslhfsyms"
+   "commit": "3448413280d5e8fce0d8098476d246c6c584771d",
+   "sha256": "0rkm3vyyklpcyaz7zs2a5azyf20bnbj9nd8ik3jgcg2lsd6jgj5m"
   },
   "stable": {
    "version": [
     1,
     2,
-    1
+    2
    ],
    "deps": [
     "elfeed"
    ],
-   "commit": "dc9901aabf6f6659beef1c876bd3c9cc4c7d17b6",
-   "sha256": "10wsjq2zd6kz9182gnkjzlzywx16j29dgm1gzwynr79xmvgs4r2b"
+   "commit": "3448413280d5e8fce0d8098476d246c6c584771d",
+   "sha256": "0rkm3vyyklpcyaz7zs2a5azyf20bnbj9nd8ik3jgcg2lsd6jgj5m"
   }
  },
  {
@@ -26595,28 +26744,27 @@
   "repo": "Wilfred/elisp-refs",
   "unstable": {
    "version": [
-    20211009,
-    1531
+    20220128,
+    1736
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "c06aec4486c034d0d4efae98cb7054749f9cc0ec",
-   "sha256": "0dhflhgc1px9kj2bhv9m646ab08a6qjcqdd1a6wd5psj047bkj9p"
+   "commit": "fa1de199e07fb020b776fb585613682901962ed6",
+   "sha256": "0nw1h9iif0amak4wx985vqfv2a45yla2bhi3bb8bjlsxaixzh46a"
   },
   "stable": {
    "version": [
     1,
-    3
+    4
    ],
    "deps": [
     "dash",
-    "loop",
     "s"
    ],
-   "commit": "0b6fcdee29d8156ef37477f4e128a148e295c62b",
-   "sha256": "0w7k91xf69zc0zkjrw8h8sjdjf9xq9qs5zhvajhd718lzf93564b"
+   "commit": "0d0318b3e80aa8d045ed6906111701153b797321",
+   "sha256": "03p95kwvwb3apb3lhhdlaxs952x7sdlxa2qc1c77cjwrm5xzdg9z"
   }
  },
  {
@@ -27040,20 +27188,20 @@
   "repo": "redguardtoo/elpa-mirror",
   "unstable": {
    "version": [
-    20210614,
-    302
+    20220123,
+    1237
    ],
-   "commit": "a3e5b974ca9a7004ed6cf72f9d831ba525432c67",
-   "sha256": "19hmvrck77pxxm2pq6a6hfdk2azl6nlhffwyzymr80rqcpx0hysx"
+   "commit": "3e0fe0f91d1c5798752c255b89950617f88b8d9e",
+   "sha256": "1vfhxbn9m3412hpgpnpf523lm9cl4lkbk1fgjvqldlknwks376jh"
   },
   "stable": {
    "version": [
     2,
-    1,
-    6
+    2,
+    0
    ],
-   "commit": "abc8d7b7de12e4eb06efa2dbb1cc77a714f14479",
-   "sha256": "0p5jbdbl7bmx94fj7qyqqsy0clvkzjgczbgvhx4ay9wyq83wdaav"
+   "commit": "3e0fe0f91d1c5798752c255b89950617f88b8d9e",
+   "sha256": "1vfhxbn9m3412hpgpnpf523lm9cl4lkbk1fgjvqldlknwks376jh"
   }
  },
  {
@@ -27064,20 +27212,20 @@
   "url": "https://thelambdalab.xyz/git/elpher.git",
   "unstable": {
    "version": [
-    20220117,
-    1445
+    20220202,
+    2138
    ],
-   "commit": "a9137269875a8e79ce238280227297061d6e246f",
-   "sha256": "1665pmfi45x0jiccl9dhdi3rdv2mqyd8njiwvl7rn9jnjbwhsxqy"
+   "commit": "68388182b99d7e12ec649826cf0a8d167be57a88",
+   "sha256": "1ylxkdhln63g0pli51r7jxp07g7r09agi72dw5mgxld1kgxln9m6"
   },
   "stable": {
    "version": [
     3,
-    2,
-    2
+    3,
+    1
    ],
-   "commit": "7b52709ddf798fe53db3855eef52ca8862e7700d",
-   "sha256": "0fzqm5gpadqzsl71r1bq72ki8dw8125v4nmhdd3b4rz9jy1rqm2g"
+   "commit": "22649fd442d505af3367a6386fa7f0da9a82c9e8",
+   "sha256": "121hkssy6c15gdr76k3fmdpk82354hk597gvkap6dc9y5j5968mk"
   }
  },
  {
@@ -27103,8 +27251,8 @@
   "repo": "jorgenschaefer/elpy",
   "unstable": {
    "version": [
-    20220113,
-    430
+    20220203,
+    108
    ],
    "deps": [
     "company",
@@ -27113,8 +27261,8 @@
     "s",
     "yasnippet"
    ],
-   "commit": "edea3321e6cd44e466c1b56672324ac7bd28f011",
-   "sha256": "1ws8pxh3djdfdarpii777fyjwphv5v67v5ch3l3gjmkgx7acz2sz"
+   "commit": "9b458c80dc1bcecb6345e157d8e921c1e4e8a7ea",
+   "sha256": "1dniwj4lbmmwk715gi8kykp3c953migh0bs1br3vk1w2n8d6lax4"
   },
   "stable": {
    "version": [
@@ -27178,17 +27326,18 @@
   "repo": "emacs-elsa/Elsa",
   "unstable": {
    "version": [
-    20211129,
-    38
+    20220205,
+    2040
    ],
    "deps": [
     "cl-lib",
     "dash",
     "f",
+    "seq",
     "trinary"
    ],
-   "commit": "5b8848fd7d87ee4927adda12a6cf5ed2a7e0c186",
-   "sha256": "08h86wpgr71xbxpqgbv2jikyzfh1fm33kfb6nxir001inzj0h7aq"
+   "commit": "ea2d2afee38af1511728f61083b22a3e688c7570",
+   "sha256": "0xp7dgn5llh58v9mkj9wd6wx81q26bgxxf8vdrllyz35rkwb1sq4"
   }
  },
  {
@@ -27440,14 +27589,14 @@
   "repo": "tecosaur/emacs-everywhere",
   "unstable": {
    "version": [
-    20220117,
-    1826
+    20220130,
+    457
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "9e24e4e8e81ac93c9e13748759a15436ea565966",
-   "sha256": "1r23l5i63h9k697bq199nzpyzifbrb7lph53w0yi6w6a54yy6dan"
+   "commit": "ace53396a66ed4b753f42c04a5a0db2bcd770423",
+   "sha256": "0p55shxvqm1713af33mfglny7rpi31d42wvgwylcsfy4jvnsq8bb"
   }
  },
  {
@@ -27521,30 +27670,30 @@
   "repo": "emacscollective/emacsql-libsqlite3",
   "unstable": {
    "version": [
-    20211209,
-    1243
+    20220129,
+    2241
    ],
    "deps": [
     "emacsql",
     "emacsql-sqlite",
-    "sqlite"
+    "sqlite3"
    ],
-   "commit": "d3e401750410979be50cab3fee0ec8d0d2a9998c",
-   "sha256": "07c9dc49sh1vh1rzw80sqk4nivc4mwkjq3amhx3knm8dpysa1208"
+   "commit": "2aca80a3869d4fd654e79c4a1e20b5227fc2ba39",
+   "sha256": "0x0fmxgjs17hckx2a32y96nlqdcsx42wcw4lpyc6nk98ikraipgq"
   },
   "stable": {
    "version": [
     0,
-    2,
+    3,
     0
    ],
    "deps": [
     "emacsql",
     "emacsql-sqlite",
-    "sqlite"
+    "sqlite3"
    ],
-   "commit": "d3e401750410979be50cab3fee0ec8d0d2a9998c",
-   "sha256": "07c9dc49sh1vh1rzw80sqk4nivc4mwkjq3amhx3knm8dpysa1208"
+   "commit": "2aca80a3869d4fd654e79c4a1e20b5227fc2ba39",
+   "sha256": "0x0fmxgjs17hckx2a32y96nlqdcsx42wcw4lpyc6nk98ikraipgq"
   }
  },
  {
@@ -27771,11 +27920,11 @@
   "repo": "oantolin/embark",
   "unstable": {
    "version": [
-    20220115,
-    1923
+    20220205,
+    1643
    ],
-   "commit": "2f147726fef37b085e3f4ee2d94d953480544552",
-   "sha256": "10flx40bwkghziypp5spggcpjd731b150jvp9qri5vlaii98ays9"
+   "commit": "e8ef9424b3d8852935f7c547093bc2ebc23aeab5",
+   "sha256": "0k2mdjp473pzifk3p83xybqd05gyw1kak4bkapjziqk8061ab27f"
   },
   "stable": {
    "version": [
@@ -27801,8 +27950,8 @@
     "consult",
     "embark"
    ],
-   "commit": "2f147726fef37b085e3f4ee2d94d953480544552",
-   "sha256": "10flx40bwkghziypp5spggcpjd731b150jvp9qri5vlaii98ays9"
+   "commit": "e8ef9424b3d8852935f7c547093bc2ebc23aeab5",
+   "sha256": "0k2mdjp473pzifk3p83xybqd05gyw1kak4bkapjziqk8061ab27f"
   },
   "stable": {
    "version": [
@@ -27950,28 +28099,28 @@
   "url": "https://git.savannah.gnu.org/git/emms.git",
   "unstable": {
    "version": [
-    20220104,
-    2105
+    20220131,
+    501
    ],
    "deps": [
     "cl-lib",
     "nadvice",
     "seq"
    ],
-   "commit": "2c24a16fa2e57ccedf4b502c887213c8f4eeb872",
-   "sha256": "1qsshfnrkimpvz6w5hy1wrx9s70ffbfcqzrdlwcvaly66zna7zq1"
+   "commit": "d32a9bbc8ffcd736c4aa33a6dcea819a01b8e808",
+   "sha256": "1bsdwp4h5b3xbigaaa8mx3sx9650xn34b1w4l47r8a4c5imkxspi"
   },
   "stable": {
    "version": [
-    8
+    9
    ],
    "deps": [
     "cl-lib",
     "nadvice",
     "seq"
    ],
-   "commit": "32ff8a70ca9726dd0e3b8ad68430bc6fd66bf387",
-   "sha256": "127xvjsqqk1a5m5qf06ksr3y378fm5h2vyckvm38y3mgrx1kvxx0"
+   "commit": "c3596ae7166db2de004c57da303b5eb8d3e1f2e8",
+   "sha256": "09fs05cgvxxsqcbswrdr5fi8g0m0y2iq2w19ks7a102zqpfp2bml"
   }
  },
  {
@@ -28555,15 +28704,15 @@
   "repo": "purcell/envrc",
   "unstable": {
    "version": [
-    20220103,
-    1759
+    20220130,
+    1525
    ],
    "deps": [
     "inheritenv",
     "seq"
    ],
-   "commit": "456c4100de41d2cb50813058a9e727b6e83c5d1e",
-   "sha256": "1l80sr74lb275i49xna5li64v2ip598xs0fdqcnhc449b1zpazm3"
+   "commit": "12485e71d5154b02858628fce84396ac03f95630",
+   "sha256": "0vpwzs6yz6cmqcawil42wxdljkncnx85snk1p9pdfk3aghrrws4x"
   },
   "stable": {
    "version": [
@@ -28700,14 +28849,14 @@
   "repo": "emacscollective/epkg",
   "unstable": {
    "version": [
-    20220112,
-    1745
+    20220130,
+    1922
    ],
    "deps": [
     "closql"
    ],
-   "commit": "9b3fded4c6904268fbdf84fb457aa195b2c90cba",
-   "sha256": "0rlq18853q53nghinzk73xsrq38j4mm8yahgwlpkxycysnl99l0l"
+   "commit": "c18a2fc8b4a83ceea6a1128d7a77107983301e56",
+   "sha256": "0ykjv4xaz95syiw3dbf91c2c8716psc53f2l36xzkaxzj8nsz3vw"
   },
   "stable": {
    "version": [
@@ -28730,14 +28879,15 @@
   "repo": "emacscollective/epkg-marginalia",
   "unstable": {
    "version": [
-    20210802,
-    1740
+    20220131,
+    1328
    ],
    "deps": [
-    "epkg"
+    "epkg",
+    "marginalia"
    ],
-   "commit": "0879f5b2cf87fff17dcfb74009d289d6a89c9816",
-   "sha256": "11sbf363qy3i87hppv4admqd2sy0kwpvjgih51hn3rbimbswkwab"
+   "commit": "d41cfe1a00d01a45938d2af2fb311fdb17d3c381",
+   "sha256": "0i295rr9fslhxrqh8967whq1h903i3a45c4x6ycff1fhrxb87frf"
   }
  },
  {
@@ -29354,8 +29504,8 @@
     20200914,
     644
    ],
-   "commit": "382861b1967b7ced0806343b8410709b2ce91df0",
-   "sha256": "05w4wmbdzg4j3nppix6gb2knf9wfyzqjcf0i1adbk7rawgcymq1x"
+   "commit": "9911f73061e21a87fad76c662463257afe02c861",
+   "sha256": "1sma8i82g9kv6b5mmvfxgr70pbjgy9m2f8ynh1gr2mq0b1jkgxjk"
   },
   "stable": {
    "version": [
@@ -29379,16 +29529,17 @@
     20220110,
     807
    ],
-   "commit": "41ef8097d2b6f891e5c3bd9e8084d9ffb9f7ed75",
-   "sha256": "1g460czxrjjv9sgnidrj6w6fnrmhfvj9l3g55ndpsxmnp9y2ps44"
+   "commit": "1652f3ff90e22841a42381886709b0db369b1c3c",
+   "sha256": "1hlf7b3y3jyc99dxis2sf7n8na1rkfmxwmls2ryrqiwdcgsk7cgb"
   },
   "stable": {
    "version": [
     24,
-    2
+    2,
+    1
    ],
-   "commit": "df48c260e74c3e9058ff8681ce9f554e6fa0fe34",
-   "sha256": "10s57v2i2qqyg3gddm85n3crzrkikl4zfwgzqmxjzdynsyb4xg68"
+   "commit": "7bf7f01683acf9b8f09bd8c7331854a9abc17f7d",
+   "sha256": "1wcl60gclg5syi3zr9n23wk9x6l6w8w2ng7v6ibmsr1g1svhlkk5"
   }
  },
  {
@@ -29878,15 +30029,15 @@
   "repo": "xuchunyang/eshell-git-prompt",
   "unstable": {
    "version": [
-    20210817,
-    553
+    20220206,
+    458
    ],
    "deps": [
     "cl-lib",
     "dash"
    ],
-   "commit": "f638ba32b661d15895e767305f59f41eb01197ae",
-   "sha256": "1hn05bgznc1az4fb4grg8d9acwpmwr4bp6ibch901c79hp79qlkv"
+   "commit": "1eb1fd56649f291cac482fbf06dd43ef867873bc",
+   "sha256": "1l3dlzzkx3k532ig2hmpky50zcz73p7vsnlxr24ichq5sn2lwfg2"
   },
   "stable": {
    "version": [
@@ -30172,11 +30323,11 @@
   "url": "https://codeberg.org/jao/espotify.git",
   "unstable": {
    "version": [
-    20211114,
-    2251
+    20220121,
+    2057
    ],
-   "commit": "5c1dcf0182135cda4191d4ba206fe2f265100293",
-   "sha256": "06wj2pixhjgqddl9g2wkv7cq9gz9yjb46cb1jrlbya3rdjyfb6h5"
+   "commit": "ea6d6021e5acc550560325db2f09198839ee702f",
+   "sha256": "1jlm7mka1ilaw8z1a91vy8k1hz27g4iyk33fpmiab7856j8ry32b"
   }
  },
  {
@@ -30288,11 +30439,11 @@
   "repo": "emacs-ess/ESS",
   "unstable": {
    "version": [
-    20220118,
-    1855
+    20220201,
+    816
    ],
-   "commit": "3a919560e701c3fc19dc7e03e49f0950eb120b6c",
-   "sha256": "0iizk76py74m9gm39x57dfjnaz745knmpddcwnh6xqmhsh4wgqar"
+   "commit": "5ff4fa8da09c5e408bc8a2a8e42e7c1fb93a3819",
+   "sha256": "0wr6j58fm4zbihmlrnlgc6n5wlpkx2a0xpdw0hjdxylag29d52z7"
   },
   "stable": {
    "version": [
@@ -30456,15 +30607,15 @@
   "repo": "ShuguangSun/ess-view-data",
   "unstable": {
    "version": [
-    20211206,
-    916
+    20220124,
+    1430
    ],
    "deps": [
     "csv-mode",
     "ess"
    ],
-   "commit": "05888711212f9a9d72ecd48904de0c66adf6575a",
-   "sha256": "1nm1vzjby8ind8pvqzyy5yjcf0la72azjf55pwr46rzrjgia0s1a"
+   "commit": "6277684e06d5c3a2cbd340f656b7ffca4046e45b",
+   "sha256": "1ijxrcfbk8l1jbij9nc7b9j2nk3k5imvjbs5319z85q10k5cz7f9"
   },
   "stable": {
    "version": [
@@ -30487,15 +30638,15 @@
   "repo": "jschaf/esup",
   "unstable": {
    "version": [
-    20200814,
-    1400
+    20220202,
+    2335
    ],
    "deps": [
     "cl-lib",
     "s"
    ],
-   "commit": "5169dd7fc8765a7377b0ab93aa63b7f0f934689a",
-   "sha256": "0mn9pffw7kzdzwv3jkhygdkmlqax9fsrbjznbck90ydiv095fmp6"
+   "commit": "4b49c8d599d4cc0fbf994e9e54a9c78e5ab62a5f",
+   "sha256": "1zyix297qpgx0l90afg1pxalsjph6yb7b2qxy2rxmbl9fkn4b774"
   },
   "stable": {
    "version": [
@@ -30883,15 +31034,15 @@
   "repo": "emacs-evil/evil",
   "unstable": {
    "version": [
-    20220118,
-    2201
+    20220202,
+    1351
    ],
    "deps": [
     "cl-lib",
     "goto-chg"
    ],
-   "commit": "be97395e31861fa7b84e7440a87db455e2089107",
-   "sha256": "11mcf6461z1v7asaa7kxa88y0x16m51g1lixkx7ggjdls21nbwf6"
+   "commit": "787455068f56f29493cc1e33d4e5c2986ea25577",
+   "sha256": "01wfhaz16d1w0jzcj5l57r6nl17lmmli7gg6mzlnsqc8ccgfhcfp"
   },
   "stable": {
    "version": [
@@ -30947,14 +31098,14 @@
   "repo": "wcsmith/evil-args",
   "unstable": {
    "version": [
-    20180908,
-    2157
+    20220125,
+    1626
    ],
    "deps": [
     "evil"
    ],
-   "commit": "758ad5ae54ad34202064fec192c88151c08cb387",
-   "sha256": "0k35glgsirc3cph8v5hhjrqfh4ndwh8a28qbr03y3jl8s453xcj7"
+   "commit": "2671071a4a57eaee7cc8c27b9e4b6fc60fd2ccd3",
+   "sha256": "13avgl0whfp1xdsmp0j7qr5p2nh59swb2lyfpr7fz6bkgifrn212"
   },
   "stable": {
    "version": [
@@ -31085,15 +31236,15 @@
   "repo": "emacs-evil/evil-collection",
   "unstable": {
    "version": [
-    20220118,
-    49
+    20220124,
+    225
    ],
    "deps": [
     "annalist",
     "evil"
    ],
-   "commit": "5cc50418d0654c4dae1b312f327493e96724cd5e",
-   "sha256": "014isydh72wynk5pfbxv9yc9vgxmzzhn8iywqpd73jps42q7kn5x"
+   "commit": "e69abfcb1cc0dd59dfe7c055b0779a6622f8282d",
+   "sha256": "1gsrh5scp8yksilx14cn3h2hy68xh8jhmm15wwzwlg457kc3jcm4"
   },
   "stable": {
    "version": [
@@ -31421,8 +31572,8 @@
    "deps": [
     "evil"
    ],
-   "commit": "1b66053ea5f06b08a52bebdd42bffd8eff82032b",
-   "sha256": "1z0qdgvrjajf027zibvwwaa2ia1zczbw68mc67ihhdc2zdsmz5ik"
+   "commit": "8f20a16e74016f37ad76dc4f2230d9b00c6df3c2",
+   "sha256": "1g07vlqizsm9lfjibidbfb0krqx8qyxbvqrrccgqfmcsxqgyfyic"
   }
  },
  {
@@ -32411,8 +32562,8 @@
    "deps": [
     "evil"
    ],
-   "commit": "be97395e31861fa7b84e7440a87db455e2089107",
-   "sha256": "11mcf6461z1v7asaa7kxa88y0x16m51g1lixkx7ggjdls21nbwf6"
+   "commit": "787455068f56f29493cc1e33d4e5c2986ea25577",
+   "sha256": "01wfhaz16d1w0jzcj5l57r6nl17lmmli7gg6mzlnsqc8ccgfhcfp"
   },
   "stable": {
    "version": [
@@ -32442,8 +32593,8 @@
     "auctex",
     "evil"
    ],
-   "commit": "a4b8a4769efb4cf38d91f51145b275f64bdd832e",
-   "sha256": "00mrxmf6s3fss6jb0aic09vk2sk6zpy367nzy8i4r4s7zlnv4wsh"
+   "commit": "0fa85c3fc88d96621002b5a1b79efcc06776642f",
+   "sha256": "0r38d1z7xdmiwxvpkzfbisd8scjj5i4v1y629j5n73f2xapk83df"
   },
   "stable": {
    "version": [
@@ -32614,15 +32765,15 @@
   "repo": "meain/evil-textobj-tree-sitter",
   "unstable": {
    "version": [
-    20220116,
-    1346
+    20220204,
+    417
    ],
    "deps": [
     "evil",
     "tree-sitter"
    ],
-   "commit": "1f1decd46d1cd6e1551c25101428966d8c4a87af",
-   "sha256": "1dsvivdyp75ivrhpsd7fwddx25p5vg7q4a7mijba68cns7x39bxr"
+   "commit": "ff733576d1dc5395c08d8f0e396b7a7073e39674",
+   "sha256": "1pa6ffz5wssnrs2x81p06w4c7iba4jx4man0h8qgl3qfsl2nkchw"
   }
  },
  {
@@ -32651,8 +32802,8 @@
   "repo": "ethan-leba/tree-edit",
   "unstable": {
    "version": [
-    20220120,
-    123
+    20220129,
+    446
    ],
    "deps": [
     "avy",
@@ -32661,8 +32812,8 @@
     "tree-edit",
     "tree-sitter"
    ],
-   "commit": "ad5d3c5060d8cf43d2053c2bc74b0beda1e664a1",
-   "sha256": "0az5p42vhpbrqhgavfk3jyp1izillvqsik9rpwh5g48c3qm42bjh"
+   "commit": "a94e4a645988a2c0e2369e27a2635f6555d321d8",
+   "sha256": "1pszg8vlhdbpl3q6wr60jv1pn52dpxl8lzmvrvsy5jwvlmiwy91y"
   }
  },
  {
@@ -33450,14 +33601,14 @@
   "repo": "SqrtMinusOne/exwm-modeline",
   "unstable": {
    "version": [
-    20220109,
-    804
+    20220131,
+    1520
    ],
    "deps": [
     "exwm"
    ],
-   "commit": "4c77d4e3df851ea96eac627bfd580f313e2860f3",
-   "sha256": "1jdmmncmyhivn83xj7arapww5yp8iqcbfffhlbhl8aiq0dc8lgdg"
+   "commit": "3225ec1803c3da9aee3f53562278c3558c179c26",
+   "sha256": "1hnap58i90nsajp6a0ib5z96ifykw85p2g21vbij827v419mq1mw"
   },
   "stable": {
    "version": [
@@ -34293,11 +34444,11 @@
   "repo": "technomancy/fennel-mode",
   "unstable": {
    "version": [
-    20211126,
-    1803
+    20220131,
+    627
    ],
-   "commit": "a622c110a2ae6ababfaab0506647a7fbc81e623a",
-   "sha256": "1bfd983zdhq097bb101k8p7x4jkmkgaxfj7s7aiyf4s3zq84v6xy"
+   "commit": "824d330c32637d8e0ef349ffaa8e002aca56991a",
+   "sha256": "1f1i28jlghzm7fa4998izakasmr6jvzghx96shahc6walcr8zb2h"
   },
   "stable": {
    "version": [
@@ -34443,8 +34594,8 @@
   "repo": "knpatel401/filetree",
   "unstable": {
    "version": [
-    20220120,
-    630
+    20220130,
+    9
    ],
    "deps": [
     "dash",
@@ -34452,8 +34603,8 @@
     "seq",
     "transient"
    ],
-   "commit": "0187be7e538f89eacc06324a0e712cde2fe7d8a6",
-   "sha256": "1p0rpawqb0rc0fqg5yr4mnqiwi62frvlbkdfqv6xk3rmy4hsi0mz"
+   "commit": "953f0b2d130d3944557d2c909328afd8c8097e8c",
+   "sha256": "09r3k0ba89iv6vzhyzgl7aa496ycld0ab18z45qvp7m8aqkvf3jw"
   }
  },
  {
@@ -34660,11 +34811,11 @@
   "repo": "redguardtoo/find-file-in-project",
   "unstable": {
    "version": [
-    20210924,
-    952
+    20220125,
+    726
    ],
-   "commit": "a62eaa0b07d8d22f309ec07992283f0fc340ce17",
-   "sha256": "1bg3a840ifcyhs6n353zg3bfrd133s81kw1gnmi44bc2v4pwh1hi"
+   "commit": "204b3d489a606c6e7b83518e46be3bbcef1bcb3d",
+   "sha256": "0h22rh88i11sz0kh1pq9fc9w58lja00xrany6mcy1hr6l0wy2g5h"
   },
   "stable": {
    "version": [
@@ -34782,8 +34933,8 @@
   "repo": "LaurenceWarne/finito.el",
   "unstable": {
    "version": [
-    20211130,
-    1023
+    20220111,
+    1121
    ],
    "deps": [
     "async",
@@ -34794,8 +34945,8 @@
     "s",
     "transient"
    ],
-   "commit": "b547ff8b81aa956d582c1c8edbf4c52ba017265d",
-   "sha256": "000szg9gg0ma61s0kx7ab1gnywbbi6w43csrprjyrhbgldb2bwbk"
+   "commit": "57d3e873a5a5fde4f8dfdd99608780b7020c7b9d",
+   "sha256": "18li3w3qf9j1lb90p3vsn28wlqqad05rq7nhd988nzf7izxir094"
   },
   "stable": {
    "version": [
@@ -35309,27 +35460,27 @@
   "repo": "plandes/flex-compile",
   "unstable": {
    "version": [
-    20211203,
-    849
+    20220205,
+    205
    ],
    "deps": [
     "buffer-manage",
     "dash"
    ],
-   "commit": "7d0421805e4a287358a5c188ff868bd93be2192a",
-   "sha256": "0hv9lp4ybcl7vn27cx3iq64rk0fydinq6sgyslhc2616kll6fdb7"
+   "commit": "2da0e5e791896810747c710276ff3a1d0465d843",
+   "sha256": "0xix6j99hb1l0ml8ry2zcz74n86572bnq5czr0xni8hvrgxa9b61"
   },
   "stable": {
    "version": [
-    0,
-    10
+    1,
+    0
    ],
    "deps": [
     "buffer-manage",
     "dash"
    ],
-   "commit": "7d0421805e4a287358a5c188ff868bd93be2192a",
-   "sha256": "0hv9lp4ybcl7vn27cx3iq64rk0fydinq6sgyslhc2616kll6fdb7"
+   "commit": "c1c696433a650b0273f28da4f57bde7960395386",
+   "sha256": "0ls1ghh7j0lmp3l03d5pmczqs54rxwd8p5wpf28mvy0w28vw2m33"
   }
  },
  {
@@ -35750,14 +35901,14 @@
   "repo": "leotaku/flycheck-aspell",
   "unstable": {
    "version": [
-    20210618,
-    920
+    20220128,
+    1518
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "576e7f3e96ef8757a45106346a5f45831a8fee13",
-   "sha256": "1680qkn6n145ib0q039081k9iwgl81i81d1wmy1myifq8h9pgjzc"
+   "commit": "ffe905560bb917ae4bbbbb8ad2d7e2c70664225a",
+   "sha256": "1rk5vlw8c2d0jycp1i7r030gldwg0fikj23fj7z3sw5x254p7waq"
   }
  },
  {
@@ -37534,8 +37685,8 @@
    "deps": [
     "flycheck"
    ],
-   "commit": "5331235970e5bc7906e328b07e11ebc95b974d05",
-   "sha256": "1y54xg9faakcmajc5c0v6i1sq5fjxfhss2lshk895iql78xfjcxg"
+   "commit": "2d5b72903e69e1e5eec2d03b9006a62fbbf75233",
+   "sha256": "10s5v97sg0mb8wls9j0vvi626v2ay05f98xjxymfm7n6957k2wm6"
   },
   "stable": {
    "version": [
@@ -38296,11 +38447,11 @@
   "repo": "leotaku/flycheck-aspell",
   "unstable": {
    "version": [
-    20210411,
-    2342
+    20220128,
+    1518
    ],
-   "commit": "576e7f3e96ef8757a45106346a5f45831a8fee13",
-   "sha256": "1680qkn6n145ib0q039081k9iwgl81i81d1wmy1myifq8h9pgjzc"
+   "commit": "ffe905560bb917ae4bbbbb8ad2d7e2c70664225a",
+   "sha256": "1rk5vlw8c2d0jycp1i7r030gldwg0fikj23fj7z3sw5x254p7waq"
   }
  },
  {
@@ -39421,11 +39572,11 @@
   "repo": "d12frosted/flyspell-correct",
   "unstable": {
    "version": [
-    20210724,
-    1042
+    20220131,
+    834
    ],
-   "commit": "2e098db03cba74149257e31213097d043780e80a",
-   "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7"
+   "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af",
+   "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq"
   },
   "stable": {
    "version": [
@@ -39452,8 +39603,8 @@
     "avy-menu",
     "flyspell-correct"
    ],
-   "commit": "2e098db03cba74149257e31213097d043780e80a",
-   "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7"
+   "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af",
+   "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq"
   },
   "stable": {
    "version": [
@@ -39484,8 +39635,8 @@
     "flyspell-correct",
     "helm"
    ],
-   "commit": "2e098db03cba74149257e31213097d043780e80a",
-   "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7"
+   "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af",
+   "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq"
   },
   "stable": {
    "version": [
@@ -39516,8 +39667,8 @@
     "flyspell-correct",
     "ivy"
    ],
-   "commit": "2e098db03cba74149257e31213097d043780e80a",
-   "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7"
+   "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af",
+   "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq"
   },
   "stable": {
    "version": [
@@ -39548,8 +39699,8 @@
     "flyspell-correct",
     "popup"
    ],
-   "commit": "2e098db03cba74149257e31213097d043780e80a",
-   "sha256": "0rqp06bk260ms63sidl4x2gsnfc7hb77isjb3lm8qih98376mps7"
+   "commit": "e9fde6f93af991b0528d6ed47d44bed470dc70af",
+   "sha256": "1sjdd9ixvp84fzx2zkz6kxlkwnd7v95jl2ilx5jf5r6l1118iakq"
   },
   "stable": {
    "version": [
@@ -40056,8 +40207,8 @@
   "repo": "magit/forge",
   "unstable": {
    "version": [
-    20220112,
-    1745
+    20220130,
+    1941
    ],
    "deps": [
     "closql",
@@ -40070,8 +40221,8 @@
     "transient",
     "yaml"
    ],
-   "commit": "ab637b74d1a72432bba1f960f30d987a3dc07057",
-   "sha256": "18689lfsrvr6p11mkqrmkcnf9dmxn6npa4a8q30302hsxls14416"
+   "commit": "43055ac34f9de045e7f878e4be7a7f04b172f498",
+   "sha256": "1ds4ikqddnf4k25p6ng8g2vdxi2gl4qa6s0w0kxklgh3di8zmppn"
   },
   "stable": {
    "version": [
@@ -40753,16 +40904,16 @@
   "repo": "waymondo/frog-jump-buffer",
   "unstable": {
    "version": [
-    20210906,
-    1634
+    20220129,
+    539
    ],
    "deps": [
     "avy",
     "dash",
     "frog-menu"
    ],
-   "commit": "387fa2a61a9e4b50701aece19dd798361f51d366",
-   "sha256": "104nhnix34ymkkgdvxn612d1k4iy95swrmb5isknd48c5mys94gq"
+   "commit": "d82cc1a449d368f5a3dac61695400926da222a84",
+   "sha256": "0c8x5a0rlyys8dqxsliy4m35c338srffl5387bmyzj68dj43vbfh"
   }
  },
  {
@@ -40773,8 +40924,8 @@
   "repo": "thefrontside/frontmacs",
   "unstable": {
    "version": [
-    20210515,
-    1811
+    20220201,
+    2048
    ],
    "deps": [
     "add-node-modules-path",
@@ -40782,12 +40933,13 @@
     "flycheck",
     "js2-mode",
     "js2-refactor",
+    "lsp-mode",
     "rjsx-mode",
     "tide",
     "web-mode"
    ],
-   "commit": "315d23d23b32f413ea5a4dcc6f4e270b7bef7b67",
-   "sha256": "08bhsad0fmlydl47iaqj10j1r815qiy3jnm29sk5v5xjzrpby65k"
+   "commit": "774b4b3a1f24c46c91f189a2c67d5fcf0785e2be",
+   "sha256": "0ks55xp65qg96vsj1nsrifbpvfz0k45glis4wsl6wyc7pfiss11y"
   }
  },
  {
@@ -40894,8 +41046,8 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "287587048730ab0e33c8682d381967e785fff74d",
-   "sha256": "1njg1lnyhjlmywbfandlqq6xf17hk9jlpg9bf8zd89fvrn7dxrk9"
+   "commit": "9e08ee114e5d99dba0360a52795ba191ae0f8ec1",
+   "sha256": "0kizzwqkrdy8d73xf5w19gxiicj5xi4bpy5j4zr338bsd44rh89y"
   },
   "stable": {
    "version": [
@@ -41494,25 +41646,26 @@
   "repo": "emacs-geiser/geiser",
   "unstable": {
    "version": [
-    20220118,
-    2341
+    20220203,
+    2107
    ],
    "deps": [
     "transient"
    ],
-   "commit": "0f2cb17dd6cad1eb5c1447a1b5f80c933309a153",
-   "sha256": "11sl3bbnx10yjndszhr4fk3asjyz27fxf7igh2vi7vmahby52ckf"
+   "commit": "c1cc4da1edc46b763e0342ab4aa971e54f48658d",
+   "sha256": "11vc57nkgbsyl1wrjikxs0ixzkp7dksj51p4aa9girsm2hs3bs6v"
   },
   "stable": {
    "version": [
     0,
-    22
+    22,
+    2
    ],
    "deps": [
     "transient"
    ],
-   "commit": "e204771601e5c985bb0d6b373666be4bc22582f9",
-   "sha256": "0rg15hhf0yzcacyk1bx93fn4g60vgnzyi0a677dqgm240dasp02g"
+   "commit": "c1cc4da1edc46b763e0342ab4aa971e54f48658d",
+   "sha256": "11vc57nkgbsyl1wrjikxs0ixzkp7dksj51p4aa9girsm2hs3bs6v"
   }
  },
  {
@@ -41665,26 +41818,26 @@
   "repo": "emacs-geiser/guile",
   "unstable": {
    "version": [
-    20220113,
-    2232
+    20220131,
+    1758
    ],
    "deps": [
     "geiser"
    ],
-   "commit": "de2260883726d23eb964050797fdcf48655f0dc4",
-   "sha256": "0fk5rr7mjmb4waiagi80dhddas5mrsgqr0flag5v5b0piblixxq6"
+   "commit": "ecd118171a111e04120d11c0d72345ce1d0f8066",
+   "sha256": "1ri1l203vp5nnl7chmmvvj3b03315fpzjjkisv55m6xs77ig2cl7"
   },
   "stable": {
    "version": [
     0,
     21,
-    1
+    2
    ],
    "deps": [
     "geiser"
    ],
-   "commit": "de2260883726d23eb964050797fdcf48655f0dc4",
-   "sha256": "0fk5rr7mjmb4waiagi80dhddas5mrsgqr0flag5v5b0piblixxq6"
+   "commit": "ecd118171a111e04120d11c0d72345ce1d0f8066",
+   "sha256": "1ri1l203vp5nnl7chmmvvj3b03315fpzjjkisv55m6xs77ig2cl7"
   }
  },
  {
@@ -41985,16 +42138,16 @@
   "repo": "thisch/gerrit.el",
   "unstable": {
    "version": [
-    20220109,
-    2053
+    20220205,
+    845
    ],
    "deps": [
     "dash",
     "magit",
     "s"
    ],
-   "commit": "86b996061503aa7811d48fe27081bdc33afacb99",
-   "sha256": "0p9nhq5sv55dgrav9sjv335wwq2x9gbgg0qcji9qrc75r0b261rn"
+   "commit": "c2d9f3c0beef75ce2ca8e1e4b582980f2ffaef34",
+   "sha256": "1ayk60r3g6v8v8mdaxrv8psk5dhw8ss9rzglw8qzgxhj2dih73d6"
   }
  },
  {
@@ -42284,15 +42437,15 @@
   "repo": "magit/ghub",
   "unstable": {
    "version": [
-    20220101,
-    1019
+    20220130,
+    1941
    ],
    "deps": [
     "let-alist",
     "treepy"
    ],
-   "commit": "d36c2b2419b04d7bc559756d37d39d615add6395",
-   "sha256": "1029yzlimcbsxybwbajswh6ihy81wh4c7vbycnx2kzm7kjz4k4wv"
+   "commit": "38be4a4bd92f4cddcd93b6784007774ce892a6c7",
+   "sha256": "1as7cmpb7lrkcy25cp541hzc57260czkin2wpl48ng4qg8502ypj"
   },
   "stable": {
    "version": [
@@ -42650,16 +42803,15 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20220101,
-    841
+    20220130,
+    2254
    ],
    "deps": [
-    "dash",
     "transient",
     "with-editor"
    ],
-   "commit": "2a7812705f5cf4b864bb162576415863f4116285",
-   "sha256": "02rnk0c3yc5ws7phiywkmak7d3zi9w4krxqalzbdhj22nhh0l7pq"
+   "commit": "16b313ba47872613c735863e9ece4193d4fc0ec4",
+   "sha256": "0y8jmjbx8k1kgwxkqw7wih19xyydjw6cwi9045l83qh534s9y9kg"
   },
   "stable": {
    "version": [
@@ -42943,11 +43095,11 @@
   "repo": "sshaw/git-link",
   "unstable": {
    "version": [
-    20211208,
-    312
+    20220129,
+    2006
    ],
-   "commit": "09961648e654ba0f7239eedf5cbaea0f0cc0ccf1",
-   "sha256": "0zwbcp2881n92nd0y40sw6id6qbidprzr0bsh9vn64gmvch6jlnd"
+   "commit": "28e937fe4229e93ab3fe3dc31c22e390a42329ba",
+   "sha256": "1qp5f483szngx67386ladd9nxyydx3k9a540y34sgrwbyssx4qc3"
   },
   "stable": {
    "version": [
@@ -43902,11 +44054,11 @@
   "repo": "cute-jumper/gmpl-mode",
   "unstable": {
    "version": [
-    20171031,
-    2054
+    20220121,
+    631
    ],
-   "commit": "c5d362169819ee8b8e8954145daee7e260c54921",
-   "sha256": "00p2z6kbyc0bas21d1zygx7z49w6mf22y9kf1rcm9gqsnnadb4j9"
+   "commit": "97b103eea8b18f7e27b0f0be6cb4809a4156c032",
+   "sha256": "1592sn1wzlmg65wc05103dyklprrwn048qgfhlims9618zapk5yr"
   },
   "stable": {
    "version": [
@@ -44414,26 +44566,26 @@
   "repo": "benma/go-dlv.el",
   "unstable": {
    "version": [
-    20211015,
-    816
+    20220126,
+    1436
    ],
    "deps": [
     "go-mode"
    ],
-   "commit": "8811c0aa79fcbc0d495ed8c68f49a3c42d1a0d4b",
-   "sha256": "1h4p0i13fxsr4rgxh4grn5p24sbwb9c6mszwdajnlf8yjz65prf9"
+   "commit": "0a296bc3b7b4dcf0c140a78c5ca3e1a8c6b7ea1a",
+   "sha256": "0dql0c272n6zmfgbk30abipkhhdfncm4kj6wb9pslfi4fmrk7czq"
   },
   "stable": {
    "version": [
     0,
-    5,
+    6,
     0
    ],
    "deps": [
     "go-mode"
    ],
-   "commit": "8811c0aa79fcbc0d495ed8c68f49a3c42d1a0d4b",
-   "sha256": "1h4p0i13fxsr4rgxh4grn5p24sbwb9c6mszwdajnlf8yjz65prf9"
+   "commit": "0a296bc3b7b4dcf0c140a78c5ca3e1a8c6b7ea1a",
+   "sha256": "0dql0c272n6zmfgbk30abipkhhdfncm4kj6wb9pslfi4fmrk7czq"
   }
  },
  {
@@ -44912,11 +45064,11 @@
   "repo": "lorniu/go-translate",
   "unstable": {
    "version": [
-    20220114,
-    328
+    20220130,
+    138
    ],
-   "commit": "8b635f07b3b77e84999eeea75b194d95b6457561",
-   "sha256": "06la461j3zv460dkyc2mhab3ha9zyb6wim3m4sms84dj2ifnzljf"
+   "commit": "b6a5842fdd08872d9243375c46cd549f1399e5b8",
+   "sha256": "1570b0v4dr745hwvw20byzhkhn4cr1v2g0n3zalh4j8wq1qkb0cw"
   },
   "stable": {
    "version": [
@@ -45185,8 +45337,8 @@
     20180130,
     1736
    ],
-   "commit": "e6233c7428f061498e71827ccefe9d0c72084ad5",
-   "sha256": "0bx6rhmg2wii2kmf5lq1zbzqizlkff80iz8mjkkr8z6vq2iibf6w"
+   "commit": "31c830a22def856285b6a761c524f8d2d0657bcf",
+   "sha256": "1vv40cnvs985b84sqrpwhgr2ml2xgnlfi9727qaxg5g9wnxckvlq"
   }
  },
  {
@@ -45527,14 +45679,14 @@
     "magit-popup",
     "s"
    ],
-   "commit": "e4049844d2bd47baca207a87f49063255221f503",
-   "sha256": "05mmxdyvxdwfpmvwmijvxklqr47yvm6mlypcbi8vxbrcmvm8p5x4"
+   "commit": "5cd154fb15348403bdd5ad55cbd33871c9a8a8d8",
+   "sha256": "0l9c8k765cksjlmmdvyrci3d0aqiq1rvv4vgfm1jfwjq60dfvnhx"
   },
   "stable": {
    "version": [
     0,
     27,
-    2
+    3
    ],
    "deps": [
     "dash",
@@ -45542,8 +45694,8 @@
     "magit-popup",
     "s"
    ],
-   "commit": "f04d77d687dcd5f2dbc546a92ab46a14b5c00d84",
-   "sha256": "1ig7ss0i4r7nsj1qffanlky17lka7328zx6386li0jikfz34jffv"
+   "commit": "6b4e239111e6284b3f9ac583de505c4fbf18b2da",
+   "sha256": "0980dq688xz07msh0rqc7l7qq3qkkkwxg7ymz3jfcdics6cvw90z"
   }
  },
  {
@@ -46795,14 +46947,14 @@
   "repo": "abrochard/emacs-habitica",
   "unstable": {
    "version": [
-    20201210,
-    1933
+    20220123,
+    1424
    ],
    "deps": [
     "org"
    ],
-   "commit": "eeb0209fd638192f0b833526deb222f9f61361cb",
-   "sha256": "10z24hh1g9bf00maiwkjs324da55qqzxrz196rzs53i8lkli0xkd"
+   "commit": "cbb5a0f11a8a91111d753c25c59582741ae49f2e",
+   "sha256": "1chykvq41ivmyg85ixh09q1wl4ayqdpbzacj4npy3jiafh6sksz4"
   }
  },
  {
@@ -47136,6 +47288,24 @@
   }
  },
  {
+  "ename": "harpoon",
+  "commit": "1b8efde9e17f716c518a0cfe8e65ba57cf662b48",
+  "sha256": "006b5919zdjbzfl0jdagnmalz5zapp4bj9l2fxphzn6isyw807r0",
+  "fetcher": "github",
+  "repo": "otavioschwanck/harpoon.el",
+  "unstable": {
+   "version": [
+    20220131,
+    1558
+   ],
+   "deps": [
+    "f"
+   ],
+   "commit": "9bbca44630cd23dda8595e13f8d3cc9af28c85db",
+   "sha256": "1a6mlga3k2816gi7s0lmjdbbflinpbcg3pzpx1zr1aknxi8ciw91"
+  }
+ },
+ {
   "ename": "harvest",
   "commit": "c97d3f653057eab35c612109792884334be556fe",
   "sha256": "1r6brld6iq03wsr1b3jhdkxwrcxa6g6fwa1jiy1kgjsr9dq1m51c",
@@ -47571,30 +47741,30 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20220114,
-    1641
+    20220205,
+    1456
    ],
    "deps": [
     "async",
     "helm-core",
     "popup"
    ],
-   "commit": "837e5b8c99715791023dd47911f5f280808cb3c4",
-   "sha256": "17gb25yk04cc7vnpw9h3pj99bj1al9m1lw20gidg0mvdbq09sypz"
+   "commit": "08c4ad8e80394c8bc2c0d50429bce765f03826db",
+   "sha256": "0kfw83jz44b30v5rzvrx4ish62rkvacxd4s64xmf18h2342nrzi0"
   },
   "stable": {
    "version": [
     3,
     8,
-    2
+    4
    ],
    "deps": [
     "async",
     "helm-core",
     "popup"
    ],
-   "commit": "94cf15d64bd1dbc7dc3194ab323e0f0ef263ea77",
-   "sha256": "1xkxlbjpqhfhakmfi664cq7i5968941vpngq94napmhbgqydp4qn"
+   "commit": "08c4ad8e80394c8bc2c0d50429bce765f03826db",
+   "sha256": "0kfw83jz44b30v5rzvrx4ish62rkvacxd4s64xmf18h2342nrzi0"
   }
  },
  {
@@ -48479,26 +48649,26 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20220104,
-    1344
+    20220205,
+    1456
    ],
    "deps": [
     "async"
    ],
-   "commit": "837e5b8c99715791023dd47911f5f280808cb3c4",
-   "sha256": "17gb25yk04cc7vnpw9h3pj99bj1al9m1lw20gidg0mvdbq09sypz"
+   "commit": "08c4ad8e80394c8bc2c0d50429bce765f03826db",
+   "sha256": "0kfw83jz44b30v5rzvrx4ish62rkvacxd4s64xmf18h2342nrzi0"
   },
   "stable": {
    "version": [
     3,
     8,
-    2
+    4
    ],
    "deps": [
     "async"
    ],
-   "commit": "94cf15d64bd1dbc7dc3194ab323e0f0ef263ea77",
-   "sha256": "1xkxlbjpqhfhakmfi664cq7i5968941vpngq94napmhbgqydp4qn"
+   "commit": "08c4ad8e80394c8bc2c0d50429bce765f03826db",
+   "sha256": "0kfw83jz44b30v5rzvrx4ish62rkvacxd4s64xmf18h2342nrzi0"
   }
  },
  {
@@ -50041,8 +50211,8 @@
     "helm",
     "lean-mode"
    ],
-   "commit": "a4205749d20a09871f0951c34f919d4ee5fbdb55",
-   "sha256": "0jqfnwjwn5payjj1lfl1zvw8gpcdlc6k3lqbw6iwpzlyal7y0nyb"
+   "commit": "c1c68cc946eb31b6ba8faefdceffce1f77ca52df",
+   "sha256": "0qb5j50qi9b04jrfk6fryllpf0i9s2h4kp93fyk53sjczm52kh7p"
   }
  },
  {
@@ -52007,6 +52177,25 @@
   }
  },
  {
+  "ename": "helm-tree-sitter",
+  "commit": "866abc2f4ea48fbc1782ce40b0f16873825f65be",
+  "sha256": "11y7ssx0fj64r249g92a84ssyacf3ldkj6rd3zc0z3bk2zaznw5b",
+  "fetcher": "github",
+  "repo": "Giedriusj1/helm-tree-sitter",
+  "unstable": {
+   "version": [
+    20220124,
+    2246
+   ],
+   "deps": [
+    "helm",
+    "tree-sitter"
+   ],
+   "commit": "1cace1f9a8c5c519b985f7ee542ba3375eabd0e1",
+   "sha256": "1ka0xq5ghhn4r82k1aq5v4scariwvpwbr7c179j36axxlyvr6zkn"
+  }
+ },
+ {
   "ename": "helm-unicode",
   "commit": "f720b9f9b667bf9ff3080938beab36aa0036dc92",
   "sha256": "1j95qy2zwdb46dl30ankfx7013l0akc61m14s473j93w320j5224",
@@ -53286,11 +53475,11 @@
   "repo": "ideasman42/emacs-hl-prog-extra",
   "unstable": {
    "version": [
-    20211025,
-    2138
+    20220131,
+    358
    ],
-   "commit": "121f24c12c6711f65157259d90cbe88a53c10336",
-   "sha256": "0mwhqhf84kf76wrqz6l9rp4majfl7dnxs1dg49qls32lv44ihs2x"
+   "commit": "8275de778fa273f63a6254a17f80c83c6780cac2",
+   "sha256": "1i94x08fdkbcixfj5mq0mvdlnwgbc6a0gjdska58icksalc6814v"
   }
  },
  {
@@ -53681,14 +53870,14 @@
   "repo": "ericdallo/hover.el",
   "unstable": {
    "version": [
-    20201206,
-    2227
+    20220129,
+    1935
    ],
    "deps": [
     "dash"
    ],
-   "commit": "d0f03552c30e31193d3dcce7e927ce24b207cbf6",
-   "sha256": "0ynf26gaj7n6cg0vgykq80hg21lxlwffwcssk9ppin0rqmc74m06"
+   "commit": "2b826735bb8d3bcfced489a1e0fa21b10fbc967e",
+   "sha256": "1ihpwl8rlpxmalpccnkd3xk6ngd4gxz29gjyyhka7p825as5nywm"
   },
   "stable": {
    "version": [
@@ -54821,11 +55010,11 @@
   "repo": "ideasman42/emacs-idle-highlight-mode",
   "unstable": {
    "version": [
-    20220120,
-    133
+    20220121,
+    2251
    ],
-   "commit": "03b5de12a6414f6e4299fc166f1dcd7ce12b37fb",
-   "sha256": "0qhifxkz2kn4cnd9wyrvxy7784r47v233rsvr20xf80xzxdnf4a7"
+   "commit": "5881f796ad167a5fd46e8e964733725aa825516f",
+   "sha256": "1a1pkq0q8g40s033ldlyvbn1s83lw9irc9hskv78pjgch1k3qz8y"
   }
  },
  {
@@ -55683,11 +55872,11 @@
   "repo": "petergardfjall/emacs-immaterial-theme",
   "unstable": {
    "version": [
-    20211208,
-    729
+    20220203,
+    1519
    ],
-   "commit": "1c576624758429118794db9407c9627dfff7c975",
-   "sha256": "0a704nk7ly4wy5nmgqkdrg3lp3lpyk701myp9b72dn6diiv9r4nd"
+   "commit": "90a0f4e6992a99d000d016b5a82fe1a10fcc5e1a",
+   "sha256": "0s7vvn300x7cazsp13jzp28r1jrf9bg3asvxm92xi64d45pkki4q"
   },
   "stable": {
    "version": [
@@ -56230,11 +56419,11 @@
   "repo": "nonsequitur/inf-ruby",
   "unstable": {
    "version": [
-    20220118,
-    125
+    20220203,
+    153
    ],
-   "commit": "d6aa7d32aee6665784766858e40b5e4e13190652",
-   "sha256": "08sizq24n2w6cr22hmnlprdvnvkslgj8rlv41zb9g75yjn5sd9gy"
+   "commit": "f892e6e74ffdf9f80019cf85f4e128dc66359266",
+   "sha256": "09kzmw9i4d77qjz1i37v40g683d9q7rw79bnxkj56acpd7h9dvk0"
   },
   "stable": {
    "version": [
@@ -57488,8 +57677,8 @@
   "repo": "wpcarro/ivy-clipmenu.el",
   "unstable": {
    "version": [
-    20200302,
-    1419
+    20220202,
+    2122
    ],
    "deps": [
     "dash",
@@ -57497,8 +57686,8 @@
     "ivy",
     "s"
    ],
-   "commit": "ef25acf3f058fe1ede3a29fae2e9cdac8b08cd17",
-   "sha256": "1yzvaf95pncfi1r3xj8h6393dfvx291q3ahdwpp7qn3jh71kjx6k"
+   "commit": "7c200cd4732821187084fad23547ee3f58365062",
+   "sha256": "1zf0xx3j0mcyppx1a8dhx8h80xi3dxl4fsc6y9pkhrlimlz36qv6"
   }
  },
  {
@@ -58160,8 +58349,8 @@
     "espotify",
     "ivy"
    ],
-   "commit": "5c1dcf0182135cda4191d4ba206fe2f265100293",
-   "sha256": "06wj2pixhjgqddl9g2wkv7cq9gz9yjb46cb1jrlbya3rdjyfb6h5"
+   "commit": "ea6d6021e5acc550560325db2f09198839ee702f",
+   "sha256": "1jlm7mka1ilaw8z1a91vy8k1hz27g4iyk33fpmiab7856j8ry32b"
   }
  },
  {
@@ -58391,11 +58580,11 @@
   "url": "https://bitbucket.org/sbarbit/jack-connect",
   "unstable": {
    "version": [
-    20200519,
-    1027
+    20220201,
+    1417
    ],
-   "commit": "fae8c5f9b383f7606f3883badfd1294e8affb0db",
-   "sha256": "0r6dihw5dar7w6h5xvif25fv9alwarb74mmaxq2ld8rbhv4il66c"
+   "commit": "1acaebfe8f37f0194e95c3e812c9515a6f688eee",
+   "sha256": "1f55fkmhs4vjjsvf4mvhmqp7qjjl0m2qdgz2gbrkgx45v8hzzyx0"
   }
  },
  {
@@ -58949,11 +59138,11 @@
   "repo": "rymndhng/jest-test-mode",
   "unstable": {
    "version": [
-    20210615,
-    41
+    20220131,
+    304
    ],
-   "commit": "73aebe62e8adf8e737c9a94361cce45063d05ae4",
-   "sha256": "1zagxpz598ssn88mch1mzc2aqa7sx29q7y1ifw4mrglsicgrxlv7"
+   "commit": "e08326a467ccb1ec9ddf99c1f5d53f55c50e52b4",
+   "sha256": "1rgi5qwrd9pfz6yqmfgmx2inlxqykq615aay5vi7wajdiss36i3f"
   }
  },
  {
@@ -59725,14 +59914,14 @@
   "repo": "taku0/json-par",
   "unstable": {
    "version": [
-    20211219,
-    829
+    20220122,
+    352
    ],
    "deps": [
     "json-mode"
    ],
-   "commit": "255e99ba789fc69f977129a1ea22e57334874cb8",
-   "sha256": "09674zsxlza4b1p6z2r73zhmfa08v2ywkn388qa7lkpyjvd0n09j"
+   "commit": "962e5a2221136aa07f512834925c381cfeed2d92",
+   "sha256": "0pxcya18gbgzx772sh68803dbhxpss4smh6ar9vlc87mqwg5cqnk"
   },
   "stable": {
    "version": [
@@ -59833,20 +60022,20 @@
   "repo": "jcaw/json-rpc-server.el",
   "unstable": {
    "version": [
-    20190714,
-    1521
+    20220205,
+    1503
    ],
-   "commit": "2f41d292b87916f6989e7ff5dc94da18ae6a9e4e",
-   "sha256": "1z5v7z98dinlayxzik45gjja93daxym75mh2shsy4wz8yclkw22p"
+   "commit": "9bf7efd5c69f429acbac41f33a1c9fdaddcb9914",
+   "sha256": "1zpgc20b0rdfl7kr1smm8xww4j852w341hxl7awi4ixapgjpd0h0"
   },
   "stable": {
    "version": [
     0,
-    2,
-    0
+    3,
+    1
    ],
-   "commit": "1623346b308dc8f593346dc947fdc4092d674834",
-   "sha256": "1kkn4xjn9i207x580902jfpcrhpkvpyzxk4jh1bclbryki9602zv"
+   "commit": "349e1f4722474bf1f75dbc8eb9d9c59d790b8083",
+   "sha256": "11911dk8nkacml6p29m5kpcxhjyas5ymarjsi802s426gpn8wj94"
   }
  },
  {
@@ -59896,14 +60085,14 @@
   "repo": "tminor/jsonnet-mode",
   "unstable": {
    "version": [
-    20211228,
-    1346
+    20220121,
+    2109
    ],
    "deps": [
     "dash"
    ],
-   "commit": "440655734197472c9404a051edd8ea066b07c120",
-   "sha256": "0xmdkgyzx1mz3aqj8wxscdv26nddw42gdjvfcjfbhl8is8v9l9wx"
+   "commit": "7c9961b084b1ea352555317076bc27a512dd341f",
+   "sha256": "1x752dr3qzgmmzxf2lz77ikd44l1fc00qfds9nzkwxm9l4s48xhz"
   },
   "stable": {
    "version": [
@@ -60077,8 +60266,8 @@
     "spinner",
     "vterm"
    ],
-   "commit": "ec9b332e78e146a6dbd348574190b2e7887133ab",
-   "sha256": "1gnzylfdp0n08g4psbrns6g3pki2m6kck6rsyf7d60ba0jpfyliw"
+   "commit": "92b47f1d4afa1d4ddffd432e23ad35e55c64a7a4",
+   "sha256": "0grr50ym834p73w1k7abbiswf1qviydm12f803v4i15l6miwvwpn"
   },
   "stable": {
    "version": [
@@ -60674,28 +60863,28 @@
   "repo": "ogdenwebb/emacs-kaolin-themes",
   "unstable": {
    "version": [
-    20211023,
-    1347
+    20220131,
+    1652
    ],
    "deps": [
     "autothemer",
     "cl-lib"
    ],
-   "commit": "ea6394619219b6d54b843836e3a6b2e7d8aaecec",
-   "sha256": "1awgh70g7k7bjjga8kd6rfd8k3fqzkswgxyf4qgrsjci80is8jcn"
+   "commit": "ff7f31b100421328b6b8c57a5b640a26b9d914c2",
+   "sha256": "066iqbyvapc7i41xlci2jlnvdkdhkv7c8rj4ambz8rbj6i2sjb5s"
   },
   "stable": {
    "version": [
     1,
     6,
-    6
+    7
    ],
    "deps": [
     "autothemer",
     "cl-lib"
    ],
-   "commit": "f17f29d63cfbe2c9203bff1877db983c5663825e",
-   "sha256": "1r6bi26c6hqx64s54vjzm86q7bdn6x7m03g07x8v7h9v3xvlpdpf"
+   "commit": "ff7f31b100421328b6b8c57a5b640a26b9d914c2",
+   "sha256": "066iqbyvapc7i41xlci2jlnvdkdhkv7c8rj4ambz8rbj6i2sjb5s"
   }
  },
  {
@@ -61013,11 +61202,11 @@
   "repo": "tarsius/keycast",
   "unstable": {
    "version": [
-    20220117,
-    1747
+    20220126,
+    2100
    ],
-   "commit": "72d9add8ba16e0cae8cfcff7fc050fa75e493b4e",
-   "sha256": "07lwnz2i063v517lw739xpqgh04mq3ri060xni7qvvm3baiqjlry"
+   "commit": "ebe6ea5e4ce73fb7b30f9d6647d7635396410837",
+   "sha256": "02izx6cgdzi5882zny38gwsc6frdry854f6ihfspfv53qiwslxzd"
   },
   "stable": {
    "version": [
@@ -61504,17 +61693,19 @@
     20210318,
     2106
    ],
-   "commit": "31308184cf2c127e77b3f61c100179f854d4df3f",
-   "sha256": "1mw883x1c6gngdajnycymyr7v4pqm1vqaa1429nf7y0wqh9xi3y3"
+   "commit": "6bb8fe8e3e581bb30ebb584d9079a2ca83a30b6d",
+   "sha256": "1nf9lz0lj82z945h0rknl6wk0kblmrlc68gnjlr74lh62hg6gih3"
   },
   "stable": {
    "version": [
     2,
+    1,
     0,
-    0
+    -1,
+    1
    ],
-   "commit": "dedcb6bcabe3d8d6758dcee607e8c33b174d782b",
-   "sha256": "1v3iqh13lcn9jvw8ldymyp35j1k44wrqnhdmki220q940mar5cgz"
+   "commit": "8451d298c1260ba488545194d9111d48c224a5b1",
+   "sha256": "0hd38xb13b9k76lirmflr1xlqya6q6kl56qy0apk01cv8dkqh4ga"
   }
  },
  {
@@ -61582,6 +61773,21 @@
   }
  },
  {
+  "ename": "kmacro-mc",
+  "commit": "08973ee8f00035da7092e9eb8b850323ae83a916",
+  "sha256": "0ysgfrv0y4i4v6nppcs3gflx5qyx3jnkgygv0y24f833qnrnjgkd",
+  "fetcher": "github",
+  "repo": "vifon/kmacro-mc.el",
+  "unstable": {
+   "version": [
+    20220123,
+    2254
+   ],
+   "commit": "c7fe2f8200ae993787246ad6c8a5021b4946b118",
+   "sha256": "0q3gwf42fsii6c1ql8imjryv0a47gam72yw5gbqsrhwiqr81lyll"
+  }
+ },
+ {
   "ename": "know-your-http-well",
   "commit": "2ab50ae6278022281b2b7297c086089e5e669c7a",
   "sha256": "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q",
@@ -62027,11 +62233,11 @@
   "repo": "reactormonk/kwin-minor-mode",
   "unstable": {
    "version": [
-    20220115,
-    1522
+    20220120,
+    2125
    ],
-   "commit": "ec1e794168692c71e5bf89e124981f790b2a726b",
-   "sha256": "1c9jq6msrvw9mh2rhcrr402k4c0hhn3d3i7cr1zmiz1r3nffmm5p"
+   "commit": "20fac6508e5535a26df783ba05f04d1800b7382c",
+   "sha256": "1zs0wn0ff5hbv4rgqa7137s3269dqi7fg9bam56rw5qrr72lq5a2"
   }
  },
  {
@@ -62205,8 +62411,8 @@
     "highlight",
     "math-symbol-lists"
    ],
-   "commit": "215a0e2434811f026c357f92ca15652e31a945a5",
-   "sha256": "026vp7h5i6yqvafap9n1g3sh0a3zz8pgbxy4nkhnfg7spdr29svm"
+   "commit": "3629d0081b3b1ded717c2dd8611132d45c0e8cc4",
+   "sha256": "11kw2ns1y636h50d44frbycv8q619ysvaz55dccbsxwbcpha0lnn"
   },
   "stable": {
    "version": [
@@ -62369,32 +62575,32 @@
  },
  {
   "ename": "languagetool",
-  "commit": "ce91d4013963eacf1525809684e64ca52239fb73",
-  "sha256": "1cbhamz8yhfnyhzbn4j0kp9sbsycq1hi0j2kr3yhbf66fgi6x9f6",
+  "commit": "a13cea5ae978736cd2ab2752c5b49a360559f6fa",
+  "sha256": "0996wf63amacp7c73bxsysmkl7v536433ll61yd7h9zi2kysjzfd",
   "fetcher": "github",
-  "repo": "PillFall/Emacs-LanguageTool.el",
+  "repo": "PillFall/languagetool.el",
   "unstable": {
    "version": [
-    20210722,
-    702
+    20220127,
+    2215
    ],
    "deps": [
     "request"
    ],
-   "commit": "d3665a97cc87577f434a7476e1194b43f35408a8",
-   "sha256": "0gpnczvdwrcvvd162mi9nf55b0vzbpfmbhan1bqzc84rbjw0bzql"
+   "commit": "ea50c120ee3418489b43d51ed750288791d6eb95",
+   "sha256": "0xm6yh6aybz8mnf6lh0dx9qgbk05kr2chiw4pnk9w6n9apssx9xa"
   },
   "stable": {
    "version": [
+    1,
     0,
-    4,
-    3
+    0
    ],
    "deps": [
     "request"
    ],
-   "commit": "d3665a97cc87577f434a7476e1194b43f35408a8",
-   "sha256": "0gpnczvdwrcvvd162mi9nf55b0vzbpfmbhan1bqzc84rbjw0bzql"
+   "commit": "ea50c120ee3418489b43d51ed750288791d6eb95",
+   "sha256": "0xm6yh6aybz8mnf6lh0dx9qgbk05kr2chiw4pnk9w6n9apssx9xa"
   }
  },
  {
@@ -62881,8 +63087,8 @@
   "repo": "leanprover/lean-mode",
   "unstable": {
    "version": [
-    20211220,
-    917
+    20220124,
+    1813
    ],
    "deps": [
     "dash",
@@ -62890,8 +63096,8 @@
     "flycheck",
     "s"
    ],
-   "commit": "a4205749d20a09871f0951c34f919d4ee5fbdb55",
-   "sha256": "0jqfnwjwn5payjj1lfl1zvw8gpcdlc6k3lqbw6iwpzlyal7y0nyb"
+   "commit": "c1c68cc946eb31b6ba8faefdceffce1f77ca52df",
+   "sha256": "0qb5j50qi9b04jrfk6fryllpf0i9s2h4kp93fyk53sjczm52kh7p"
   }
  },
  {
@@ -62990,8 +63196,8 @@
     20211214,
     1449
    ],
-   "commit": "3ec65b8931e8989ac590e95921e46f9e2fac6821",
-   "sha256": "10dxcwl94192yhilp9dimm2zrxpcz48rayd9w0vzk874qmn5mzz3"
+   "commit": "f47df6a18060002b47352b9c4b502556204df61b",
+   "sha256": "0g7qxl8b6cazp4vlqr8r6pksmm9vlrl92142k18vmfbabnjgfdm9"
   },
   "stable": {
    "version": [
@@ -63224,11 +63430,11 @@
   "repo": "fniessen/emacs-leuven-theme",
   "unstable": {
    "version": [
-    20210602,
-    709
+    20220203,
+    947
    ],
-   "commit": "fb8f971c1b1b9d413399ccd3be8685fc5ed0a4c5",
-   "sha256": "013krafi3ki4h1g7kcdykgjs9ccbx6ys3zl6dvgvnvlkgcn5wyb1"
+   "commit": "d7dd9188a65e2ab7cf73c2e575a830baae38cb0c",
+   "sha256": "0wvx4wcn845v1fh5jlljlh7l28nwycpivaay7flqb52zz47xj116"
   }
  },
  {
@@ -63306,8 +63512,8 @@
     20220102,
     1653
    ],
-   "commit": "c196a9ba1f052f4fee68610a25ba43699ec432cb",
-   "sha256": "0c9mcqf5hl1x5hjwxlcdv5sngc0cgxfywfp6mc24ylqkqvf730bd"
+   "commit": "4c9f2ede47f710dfb0548d4e32793ad5766ca8fa",
+   "sha256": "1qcmcmi8s174v8549r86438smsxvnbfjhhq2iyhwwwxr3hxvr7l1"
   },
   "stable": {
    "version": [
@@ -63572,17 +63778,17 @@
     20211119,
     1813
    ],
-   "commit": "6d6dacd08ca9fc691acbee8bfad76887dea8914c",
-   "sha256": "1a03vrfb1wn4qigkslflm21v0fpzdl8g4r3mprr0vgi2w84zs5b9"
+   "commit": "222e084b09a8b95ff194d3e9e3d8b89941c2052c",
+   "sha256": "1d1smrn17ywarryj6hcdwrmsnzcd3r0x6hhpg16w5qi73riz61v6"
   },
   "stable": {
    "version": [
     0,
-    34,
+    35,
     0
    ],
-   "commit": "48d3f23922bfd36177562988fe7d1c63e8f893ed",
-   "sha256": "1a03vrfb1wn4qigkslflm21v0fpzdl8g4r3mprr0vgi2w84zs5b9"
+   "commit": "b7cfd2109934bc15967723dead5b98822af58473",
+   "sha256": "1d1smrn17ywarryj6hcdwrmsnzcd3r0x6hhpg16w5qi73riz61v6"
   }
  },
  {
@@ -63593,29 +63799,30 @@
   "repo": "emacs-vs/line-reminder",
   "unstable": {
    "version": [
-    20220102,
-    1539
+    20220204,
+    952
    ],
    "deps": [
     "fringe-helper",
     "ht",
     "indicators"
    ],
-   "commit": "ff58aceed180bb6bc0d4477620689c7656144055",
-   "sha256": "1sbvrnin5q178b72aaqpz47jf5gn3d3znjqs4j7ydv4g1pxj3960"
+   "commit": "8bf9e6d70347a99528bab56f90e0210f9a88dad8",
+   "sha256": "0f78dnz0qmmq2g4xsm3a9kqg4864lghv1nbz0hj2c8mz2c58laqs"
   },
   "stable": {
    "version": [
     0,
     5,
-    0
+    1
    ],
    "deps": [
     "fringe-helper",
+    "ht",
     "indicators"
    ],
-   "commit": "4d73b84a84227b01b7fbc6f717f6c380682cde2f",
-   "sha256": "0qkgmg60jfcwfsc693x9c066vgbclgqwzkqbmjrc32kcs57zhvni"
+   "commit": "8bf9e6d70347a99528bab56f90e0210f9a88dad8",
+   "sha256": "0f78dnz0qmmq2g4xsm3a9kqg4864lghv1nbz0hj2c8mz2c58laqs"
   }
  },
  {
@@ -63629,8 +63836,8 @@
     20180219,
     1024
    ],
-   "commit": "7f5f8d232a647e3966f84aaf35aca7cfb1ea15ca",
-   "sha256": "1bbqlgl955y24jsggzc763dagsv7vnlzcav98f15j9gh54p6h8ws"
+   "commit": "9aba9e57432873c2634ef504240e0a4431d3cadc",
+   "sha256": "001ljhsg7h3qxw3xd4c457dc2wrm1sybla04h78kq82cikmmnqgi"
   },
   "stable": {
    "version": [
@@ -63962,8 +64169,8 @@
   "repo": "abo-abo/lispy",
   "unstable": {
    "version": [
-    20220110,
-    1932
+    20220203,
+    1437
    ],
    "deps": [
     "ace-window",
@@ -63972,8 +64179,8 @@
     "swiper",
     "zoutline"
    ],
-   "commit": "9c03f3be2bae318363f1a35a01ab9906124610c5",
-   "sha256": "1jxc4pmlmsd7mca4x62kxyf7ynzr094m04bywmazh6yypb7nri5l"
+   "commit": "80a4f6e9a7fb39e514a5ddfa919fa14f73716b71",
+   "sha256": "0vkvsg0x24yabkhcal25xlz0r5zbvdhd4x0zni9w5wg3rcf2rvmj"
   },
   "stable": {
    "version": [
@@ -64313,8 +64520,8 @@
     20220103,
     717
    ],
-   "commit": "bbbcda1aa32c6c59b63e9593dd3477bc4da5c34a",
-   "sha256": "0dzk6sx3hqhkd9axp594yfl47hh8jqkp9wyx6m4hycz85sp83ndw"
+   "commit": "b17645f2dfdf8d6b945123cafc253b1fc71f336b",
+   "sha256": "1gqk2klypf4r6yx5lvlpsiwn9fb5w3lqm99rq1bkx0iq1qm5aa85"
   },
   "stable": {
    "version": [
@@ -64324,7 +64531,7 @@
    "deps": [
     "cl-lib"
    ],
-   "commit": "2c91d49be2450650236638a8100d9373ccd59d70",
+   "commit": "af7256e46b42cb954e16f9dec3511687697d9704",
    "sha256": "0i9468rh61l4xq918fgwk6li93lpm6zbn0lkpxr7pbvkgrl5xsr6"
   }
  },
@@ -64407,11 +64614,11 @@
   "repo": "donkirkby/live-py-plugin",
   "unstable": {
    "version": [
-    20220107,
-    329
+    20220130,
+    237
    ],
-   "commit": "27c81c6a28cefeaf20d6f00284a7b14d3ebf1001",
-   "sha256": "16sgd951mnp7g7hs8v24c85asfcwccdf6yafkd9qxhd048ngzdz9"
+   "commit": "d6efd5dbecd873b65da5c55270cfa8fe09ff6f07",
+   "sha256": "0lcdvf540dwsk5v3v17add2s6vv1yg24z479f6vngwssn281scqc"
   },
   "stable": {
    "version": [
@@ -64979,11 +65186,11 @@
   "repo": "petermao/look-mode",
   "unstable": {
    "version": [
-    20190212,
-    2346
+    20220206,
+    207
    ],
-   "commit": "d686e4cfafeac24e07e3efdb9763472f78d878f4",
-   "sha256": "1qh21z83qsvw1s9vhqcmwbvhd0q0lgj8hvpjb2rmn4kqkcvqbn2a"
+   "commit": "f1f4217b442fd52fb91cdbea34ff2c6af99ec8de",
+   "sha256": "145swf80935wq7pgz46f0g3ix4j0szi6r8cxwq5aw9fc8y1438n3"
   }
  },
  {
@@ -64997,8 +65204,8 @@
     20160813,
     1407
    ],
-   "commit": "e22807f83a0890dc8a904c51ee0742c34efccc6c",
-   "sha256": "1c89hsi0h783s96d322mvqwlf00ndm2qnrc165wpxrdbns38kbbv"
+   "commit": "9db6372791bbd0cf3fa907ed0ae3e6b7bcf6cc57",
+   "sha256": "0zvdbrr205p4wbm7zcs0f72w0jcs8zfyif9fl7x561nv2lylxnlw"
   },
   "stable": {
    "version": [
@@ -65017,20 +65224,20 @@
   "repo": "0x60df/loophole",
   "unstable": {
    "version": [
-    20220117,
-    1522
+    20220204,
+    1512
    ],
-   "commit": "453ad37fee78ff033a10c234085609a8288ab2b1",
-   "sha256": "0jd7bggydgfas7gd0bmf4q8dhfkza86imp99jhkap87qxpylsbkk"
+   "commit": "d2a48068c4ce29966229f128d50163762b685091",
+   "sha256": "0hx5x7mv98sr935v97j2zxzjcmvzkh6h2zxra5vjxvwgwykqk9am"
   },
   "stable": {
    "version": [
     0,
-    7,
-    6
+    8,
+    1
    ],
-   "commit": "3036a821193988ed5dba6fbcc0f5797c743856ec",
-   "sha256": "17wkp0hljpxj48bkjrg2ypwrgwrggd4asppyw8apbky9q8q2imgs"
+   "commit": "0b3bfd1dbb61f29d21b8aa17c60848456aad76c9",
+   "sha256": "043j28jrpifzqqdia4y2kdy0l0xw5cnh96mv3wr3sfbi3x33m44p"
   }
  },
  {
@@ -65161,8 +65368,8 @@
   "repo": "emacs-lsp/lsp-dart",
   "unstable": {
    "version": [
-    20220120,
-    202
+    20220129,
+    1427
    ],
    "deps": [
     "dap-mode",
@@ -65172,8 +65379,8 @@
     "lsp-mode",
     "lsp-treemacs"
    ],
-   "commit": "d20fda0477da5740c916614dc6e07deefc8b5835",
-   "sha256": "12lrw9ybddzjrqchvrg8d63mpfsq8fjnkp63algndw9clfn8haqi"
+   "commit": "5cef1b6a34327bf236c8b7b23c44bdd968b4585b",
+   "sha256": "0kvjkpv0yvahmlkqyzl9ayl3mmmr4gcmi3p5pp8092ah0xgys86p"
   },
   "stable": {
    "version": [
@@ -65596,8 +65803,8 @@
   "repo": "emacs-lsp/lsp-mode",
   "unstable": {
    "version": [
-    20220115,
-    1742
+    20220201,
+    852
    ],
    "deps": [
     "dash",
@@ -65607,8 +65814,8 @@
     "markdown-mode",
     "spinner"
    ],
-   "commit": "1d9da9f24fd477faa2a38b369842a27fe5bda160",
-   "sha256": "1p0jdfrn3v4qh0x29i5x6x5lkqd2y9wi6rx5w7kwbv5c5wfxcgw2"
+   "commit": "fbfaa80095a82f7473cb7e45fe73b32ecc1900ae",
+   "sha256": "0lg9sl5gfglx070230i4gszcp58b1s5pdgfq50hy6wanifvxsvah"
   },
   "stable": {
    "version": [
@@ -66175,16 +66382,16 @@
   "repo": "SqrtMinusOne/lyrics-fetcher.el",
   "unstable": {
    "version": [
-    20210828,
-    813
+    20220204,
+    916
    ],
    "deps": [
     "emms",
     "f",
     "request"
    ],
-   "commit": "f0212bea838f0c284ea97e051c9c6c63f1b527ff",
-   "sha256": "03mnj12b7y597p77066c979d0pbyz4a092vgjyb830dhihms2x5y"
+   "commit": "f6948259b388102208d8a29dabf383f10f801cab",
+   "sha256": "1p7dpnjspjcxs3wi7fmfnwxgl5ha3d420imhni4wlgdx2nyjqp8f"
   },
   "stable": {
    "version": [
@@ -66438,11 +66645,11 @@
   "repo": "roadrunner1776/magik",
   "unstable": {
    "version": [
-    20210907,
-    804
+    20220204,
+    1229
    ],
-   "commit": "6fe271f371ccb06b599a782839030bb8dee8535f",
-   "sha256": "178whq47zs055srly8wzdai5p0d0s1n3p349kb5wx2d9c2lg0pnm"
+   "commit": "0168a410ea2e25c1e98c9be6381ba0872d1e1ae1",
+   "sha256": "19v5902fij5q6cfzxx8b9lsm5kkgrzsd9lccj7di1aj2yf02n4jx"
   },
   "stable": {
    "version": [
@@ -66462,8 +66669,8 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20220116,
-    1908
+    20220203,
+    2302
    ],
    "deps": [
     "dash",
@@ -66472,8 +66679,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "2a7812705f5cf4b864bb162576415863f4116285",
-   "sha256": "02rnk0c3yc5ws7phiywkmak7d3zi9w4krxqalzbdhj22nhh0l7pq"
+   "commit": "16b313ba47872613c735863e9ece4193d4fc0ec4",
+   "sha256": "0y8jmjbx8k1kgwxkqw7wih19xyydjw6cwi9045l83qh534s9y9kg"
   },
   "stable": {
    "version": [
@@ -66552,14 +66759,14 @@
   "repo": "ideasman42/emacs-magit-commit-mark",
   "unstable": {
    "version": [
-    20211101,
-    948
+    20220124,
+    557
    ],
    "deps": [
     "magit"
    ],
-   "commit": "5b60f0c88c33b8dbf73a41b388f55bf8e73e1d8d",
-   "sha256": "03i4rjwdqw2hf6nl5vwgh5zm235svrrnrj0wq82yk25f58dgskb6"
+   "commit": "d02a69c0c1b411157e8ba34d6e986767c5ea758c",
+   "sha256": "1adqc4c9xqydmmk1zh4ar590hznfq4ls8g9x5xc0id7mc0pc9rjs"
   }
  },
  {
@@ -66570,15 +66777,15 @@
   "repo": "dandavison/magit-delta",
   "unstable": {
    "version": [
-    20210104,
-    1541
+    20220125,
+    50
    ],
    "deps": [
     "magit",
     "xterm-color"
    ],
-   "commit": "56cdffd377279589aa0cb1df99455c098f1848cf",
-   "sha256": "19q04y61hkzxkqw2xi1g7m4bwaxpfwza7if6cm41g72kdb8r68vb"
+   "commit": "5fc7dbddcfacfe46d3fd876172ad02a9ab6ac616",
+   "sha256": "1kph5r9dy21pgfknpcdzzqfn6rqig5nvp8ksh16y13k3axlzvkiw"
   }
  },
  {
@@ -66831,15 +67038,15 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20220101,
-    841
+    20220130,
+    2007
    ],
    "deps": [
     "libgit",
     "magit"
    ],
-   "commit": "2a7812705f5cf4b864bb162576415863f4116285",
-   "sha256": "02rnk0c3yc5ws7phiywkmak7d3zi9w4krxqalzbdhj22nhh0l7pq"
+   "commit": "16b313ba47872613c735863e9ece4193d4fc0ec4",
+   "sha256": "0y8jmjbx8k1kgwxkqw7wih19xyydjw6cwi9045l83qh534s9y9kg"
   },
   "stable": {
    "version": [
@@ -66987,14 +67194,14 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20220101,
-    841
+    20220130,
+    2007
    ],
    "deps": [
     "dash"
    ],
-   "commit": "2a7812705f5cf4b864bb162576415863f4116285",
-   "sha256": "02rnk0c3yc5ws7phiywkmak7d3zi9w4krxqalzbdhj22nhh0l7pq"
+   "commit": "16b313ba47872613c735863e9ece4193d4fc0ec4",
+   "sha256": "0y8jmjbx8k1kgwxkqw7wih19xyydjw6cwi9045l83qh534s9y9kg"
   },
   "stable": {
    "version": [
@@ -67057,14 +67264,14 @@
   "repo": "magit/magit-tbdiff",
   "unstable": {
    "version": [
-    20210525,
-    2329
+    20220204,
+    455
    ],
    "deps": [
     "magit"
    ],
-   "commit": "fef1b7772fe192c434089b67644ff93765e384d4",
-   "sha256": "1g5nsg6zb3jrm7w1ssawv109ai2l7dpnd1dqrjsry2dnx1mxd212"
+   "commit": "5fc67d0ca96d5db8f51ed9f2d9e3a7f69e7cd497",
+   "sha256": "1gzv5d1iar53b020qy17hrvqc5h0phx4hz22lkdmw0br554vyzgl"
   },
   "stable": {
    "version": [
@@ -67773,19 +67980,19 @@
   "repo": "minad/marginalia",
   "unstable": {
    "version": [
-    20220114,
-    2142
+    20220131,
+    738
    ],
-   "commit": "c66d301dd12e0346cbc6756895c6cfcf17d3e8ae",
-   "sha256": "1hs37r1hr1mdzh9h9bgs5rmr3z95xlqglw2nwc72ys35k90yk27z"
+   "commit": "e9540a7b80f9c4d044748b88720e5cba3e30c20a",
+   "sha256": "1a4k00g2pp7mk0x5zhqbxvv2igfjdz6bfy2g3hps2ygf4h12wbhg"
   },
   "stable": {
    "version": [
     0,
-    11
+    12
    ],
-   "commit": "9229d88ae4757f3439e81f51799758c009838cb4",
-   "sha256": "0gaqybj52skqcmxcx6k3zmw6lznzlr1fjvlaraic9m6n85xkvzki"
+   "commit": "e9540a7b80f9c4d044748b88720e5cba3e30c20a",
+   "sha256": "1a4k00g2pp7mk0x5zhqbxvv2igfjdz6bfy2g3hps2ygf4h12wbhg"
   }
  },
  {
@@ -68189,15 +68396,15 @@
   "url": "https://codeberg.org/martianh/mastodon.el",
   "unstable": {
    "version": [
-    20220111,
-    2155
+    20220130,
+    952
    ],
    "deps": [
     "request",
     "seq"
    ],
-   "commit": "6113fa77d1cceb5bfe06d016dc2c81850c4b498e",
-   "sha256": "00npr64vkc20w17hlcn6xcysj67m0ad8hk1nig0xjhg3mrb76z5v"
+   "commit": "5a0cc2fcc5fa0dad2d884dcc9989222d6df9e88e",
+   "sha256": "0ndawsh4gg2lcgs7php8660wvc2qbwrqnb6cbw7dkzhhcnyyi266"
   },
   "stable": {
    "version": [
@@ -68804,20 +69011,20 @@
   "repo": "meow-edit/meow",
   "unstable": {
    "version": [
-    20220119,
-    1855
+    20220202,
+    1100
    ],
-   "commit": "371f6554acfa4ecb9fc121f23539f77064f97115",
-   "sha256": "1csw64pva8x63v233v2rb2iv99139hv7yprjsmchbrjlakvs1df4"
+   "commit": "845c4693ade5aa24715d3c0e4da678ca3fa98b51",
+   "sha256": "124afg43kxlizn69hfhd7w157i3c59ifap1ilfcpga3dgvhn3ws7"
   },
   "stable": {
    "version": [
     1,
-    3,
+    4,
     0
    ],
-   "commit": "b01c6a968e8be9990b1306ee62737dbf13525177",
-   "sha256": "082f013f8gbd67s6q9636lqhlhwlbg6z6n7icrqfj9x6671phwgn"
+   "commit": "6bb3fee0b91a74622e891537307918e828a4ed89",
+   "sha256": "04vin23bmds8dp2i1xihph9r7v43lcfz6fm23f4nvcyka9rqxc0z"
   }
  },
  {
@@ -68831,8 +69038,8 @@
     20210720,
     950
    ],
-   "commit": "181a21085035a9b625021d8a79cb52cbdee7a7a4",
-   "sha256": "1vsckwj57rl6qxikmmps4yfj0s4vy8m3j3aj3y0d6707jaawrgia"
+   "commit": "2072c09232fbf7d44dcd7509c666801cb889e14e",
+   "sha256": "04228h39gs252s6mchirfw74h42rn02gl0bvhark7x0cp64a4c06"
   },
   "stable": {
    "version": [
@@ -68860,8 +69067,8 @@
     "auto-complete",
     "merlin"
    ],
-   "commit": "181a21085035a9b625021d8a79cb52cbdee7a7a4",
-   "sha256": "1vsckwj57rl6qxikmmps4yfj0s4vy8m3j3aj3y0d6707jaawrgia"
+   "commit": "2072c09232fbf7d44dcd7509c666801cb889e14e",
+   "sha256": "04228h39gs252s6mchirfw74h42rn02gl0bvhark7x0cp64a4c06"
   },
   "stable": {
    "version": [
@@ -68893,8 +69100,8 @@
     "company",
     "merlin"
    ],
-   "commit": "181a21085035a9b625021d8a79cb52cbdee7a7a4",
-   "sha256": "1vsckwj57rl6qxikmmps4yfj0s4vy8m3j3aj3y0d6707jaawrgia"
+   "commit": "2072c09232fbf7d44dcd7509c666801cb889e14e",
+   "sha256": "04228h39gs252s6mchirfw74h42rn02gl0bvhark7x0cp64a4c06"
   },
   "stable": {
    "version": [
@@ -68955,8 +69162,8 @@
     "iedit",
     "merlin"
    ],
-   "commit": "181a21085035a9b625021d8a79cb52cbdee7a7a4",
-   "sha256": "1vsckwj57rl6qxikmmps4yfj0s4vy8m3j3aj3y0d6707jaawrgia"
+   "commit": "2072c09232fbf7d44dcd7509c666801cb889e14e",
+   "sha256": "04228h39gs252s6mchirfw74h42rn02gl0bvhark7x0cp64a4c06"
   },
   "stable": {
    "version": [
@@ -69312,8 +69519,8 @@
     20210131,
     2152
    ],
-   "commit": "0652273fe1bfbeb165715613e00583b96ed07c2d",
-   "sha256": "1qr1zg0ppl6xlg91a21j4dlbysglwyjs8x139b2gyf95xlfkxpkw"
+   "commit": "bf7e45439b044d18d0fdf3151fbdd7994875edce",
+   "sha256": "1i8frxbqmq5qakl2gnrmz7v3kvbfz6jp45ayn9kk4mq1j2ync3lh"
   },
   "stable": {
    "version": [
@@ -70376,11 +70583,11 @@
   "repo": "protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20220120,
-    804
+    20220206,
+    751
    ],
-   "commit": "e3bbb6293ba243a8e1bf9d0b7167641a9f3b4cd7",
-   "sha256": "1bp52pfpgc2w52l80vly18bz6nhfg0xa6y0sawsk05fy84qq9bdh"
+   "commit": "6789e5790c8faec1cdac5036a5910d4644707eba",
+   "sha256": "18jw3dyf1mpfkq8rnqlzwp805kqqf3my0av72kbzynw5biggaqzk"
   },
   "stable": {
    "version": [
@@ -70723,11 +70930,11 @@
   "repo": "tarsius/moody",
   "unstable": {
    "version": [
-    20220115,
-    1428
+    20220120,
+    1155
    ],
-   "commit": "90503f872b42670d4dbe62ce033042cac7062aa4",
-   "sha256": "163lggazsic4ivxcky2k93l1qcax973yxd6594wx3s5gadkqsyv0"
+   "commit": "aa6666eb344947bf1eb9d14619f4249403048321",
+   "sha256": "09yyihx6cpa724z6cj2rqspajwj325ipgpmckklpgq6l4h5xnwy4"
   },
   "stable": {
    "version": [
@@ -71011,8 +71218,8 @@
     20210306,
     1053
    ],
-   "commit": "273be57ac69667558efc9548c3b50531f0027efa",
-   "sha256": "0pg8zcxi84gccyk5v2mq7ypcp8qhlcq2vs8ad2v2w0a19ipk7m5g"
+   "commit": "7329757e1ad30e327c1ae823a8302c79482d6b9c",
+   "sha256": "0pkar3dyc47vqalrsrzrsny81615v4yi5y5hr4gdkhnbb54hsw4r"
   },
   "stable": {
    "version": [
@@ -71937,13 +72144,13 @@
    "version": [
     0,
     4,
-    11
+    14
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "c34536186088f29d4e85631825e7c6d557a8d0fa",
-   "sha256": "0iqkgs3rrkhbj2mind4aa4qv7bf7vflnkdysd39b50jbwd7rv4fx"
+   "commit": "910f4c929e1d9c1844ddc467f72eef2e03aa3f97",
+   "sha256": "13lmhp2vm953s4phqdd119kp7s3p0kb3kqz4z6g3ga6m6py3gq3i"
   }
  },
  {
@@ -72657,11 +72864,11 @@
   "repo": "CeleritasCelery/emacs-native-shell-complete",
   "unstable": {
    "version": [
-    20220103,
-    1622
+    20220124,
+    1806
    ],
-   "commit": "20e1dceb459856c8c4f903e6d8562991069bb8c1",
-   "sha256": "11m3y6kbjm0nqmdqbcv4xrchcabh4x1w4gy1p8gp36k600s1h7zj"
+   "commit": "5f94022fc9168971c77f8c12f9efd569c45f4850",
+   "sha256": "0lfqvm71lxxga06pjzcdydjpgd3548rql7bsjdvbknkwx2p54w4g"
   }
  },
  {
@@ -72978,25 +73185,25 @@
   "repo": "SpringHan/netease-cloud-music.el",
   "unstable": {
    "version": [
-    20211030,
-    1339
+    20220206,
+    1052
    ],
    "deps": [
     "request"
    ],
-   "commit": "d821e0359883ae5ccc12a1cb0f684909cbde98a3",
-   "sha256": "0p595lfwzzmjzxx4mdzp47bab07ypxkk3jk3yzvd1dcf2lgd0h9k"
+   "commit": "c94ab2fc0beb80f4cb378dceba566b9314095152",
+   "sha256": "0s7inq1j053lnfgyn7nsh3s12bx1wc9f1fp001n5gj4qna8lbfw9"
   },
   "stable": {
    "version": [
     2,
-    0
+    1
    ],
    "deps": [
     "request"
    ],
-   "commit": "7cfa76d79b8432b0edb4c188c7a9b6634b78fe53",
-   "sha256": "0ikkg9llch1rh0infwcwf4104ahckxbsrhpbmy01p928rjkhvl3q"
+   "commit": "221d8705eab4b66b1a4fa42655ac38271dc7a6e4",
+   "sha256": "14cr4r360invcx0a7036gaa1dbrpxvsh1i7885nfkk9iwmnwjwbc"
   }
  },
  {
@@ -73404,8 +73611,8 @@
     20181024,
     1439
    ],
-   "commit": "e234b25bb51a4d3ce5376febb4ad9a11e77d5ca3",
-   "sha256": "0j0c4zdii67j6r69wjc726yjs5ad2nc75k93d6w9v9b7wxvjf4wb"
+   "commit": "f404f0059d71c8c86da7b56c48794266b5befd10",
+   "sha256": "10wk52s3ni9admzgm55vx6ci7f2dkwsh6z2rga63pyg52s88hj5b"
   },
   "stable": {
    "version": [
@@ -73503,14 +73710,15 @@
   "repo": "NixOS/nix-mode",
   "unstable": {
    "version": [
-    20211120,
-    1627
+    20220121,
+    1723
    ],
    "deps": [
-    "magit-section"
+    "magit-section",
+    "transient"
    ],
-   "commit": "3d04d92d9c3896d07bc9fed7e4f40032025fbe7b",
-   "sha256": "0rzgnr18gk37y8i4d7rgwjhrxwby0zpkam8k7rf4jq35jjhqr5a4"
+   "commit": "00b2b8da57dc411cbaa464521d6f6f5f1dd9eb87",
+   "sha256": "0rpz1rfvrkw43mjaviy8p865xnsqm76rfmhgs8945wkms54g6qky"
   },
   "stable": {
    "version": [
@@ -73741,8 +73949,8 @@
   "repo": "dickmao/nnreddit",
   "unstable": {
    "version": [
-    20211116,
-    1718
+    20220124,
+    351
    ],
    "deps": [
     "anaphora",
@@ -73752,8 +73960,8 @@
     "s",
     "virtualenvwrapper"
    ],
-   "commit": "7347ad1f3db7351c2e7f9a06d2ca8873130dbbfb",
-   "sha256": "178sq7rsghqhmhjdxixrybls00g7mp6wbmsx9lzg8c0ywpr9n332"
+   "commit": "ddb59e309018416d1f867b6dddca44f17a1b6bb9",
+   "sha256": "1qj1yzpgcdn550lb1c9hqc3wb46pah6h00y3m3q3n2v6cks8lnmc"
   }
  },
  {
@@ -73764,16 +73972,16 @@
   "repo": "dickmao/nntwitter",
   "unstable": {
    "version": [
-    20210911,
-    1751
+    20220125,
+    2030
    ],
    "deps": [
     "anaphora",
     "dash",
     "request"
    ],
-   "commit": "a802ef9b589dda41bcb5d6cfce2faf8948c20c8c",
-   "sha256": "0fcskdyapz59cvik117vzj7hyv8kvvp6kh0aing2bgndwvai4apg"
+   "commit": "221902b1acb3ed4f9527eaee6584c2d9ff0d309f",
+   "sha256": "0l6izdzsaxx0zfhm502blvrlvw012mld2niln404c7ca9b49ma19"
   }
  },
  {
@@ -73799,14 +74007,14 @@
   "repo": "emacscollective/no-littering",
   "unstable": {
    "version": [
-    20220109,
-    1843
+    20220129,
+    1234
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "3c6601f7f45dd42c8f951c2b160470c8dd33c949",
-   "sha256": "17lg31ln2dgjvpm4il4ibyd7ii5dhkv0jwikxazvxd7jiyjah6xh"
+   "commit": "ba3facc3f6204ca82fa5b139dc01d8ce9e202443",
+   "sha256": "0w2r49c94xaag4nyfzz8ga05b15nc5zgm8y6sw63vaxbzg291nmz"
   },
   "stable": {
    "version": [
@@ -74119,20 +74327,21 @@
   "url": "https://git.notmuchmail.org/git/notmuch",
   "unstable": {
    "version": [
-    20220114,
-    2112
+    20220126,
+    1122
    ],
-   "commit": "87d5a5a8aa323077c0b79fce42d062839eb2ff2d",
-   "sha256": "0xlqw79ahqz37dhgzlma9gwnm93vsnqg1vjzmzkcvkq3fjkbklsq"
+   "commit": "0c357ce78516ca176156a12eb362fb1d854074b6",
+   "sha256": "1aj749afw6nvq20wfmicwly9glv4mb4ga5dyiy92h6srkkf39y1a"
   },
   "stable": {
    "version": [
     0,
-    34,
-    3
+    35,
+    -1,
+    0
    ],
-   "commit": "51c287ead807b6e3830bc5d393a7e9a89f36db86",
-   "sha256": "03rivc1lg9bcggrz4y75nk3wz4s0mbyqwdpcy4bldka2c2kz9892"
+   "commit": "6a9f66ef324aa286d4fb8721a10837784e87ee98",
+   "sha256": "1s84gxiiicwrjijjdvz5vkgww3zay8m6xr0gxig749kd1dx9x6w6"
   }
  },
  {
@@ -74629,6 +74838,21 @@
   }
  },
  {
+  "ename": "numbex",
+  "commit": "127a0664d008e6a6219118d3e4852a46433b6147",
+  "sha256": "1kky6c5ff99byzmkash3kr1lh6fjq49ixy9769wmmqs2rmz1r3pk",
+  "fetcher": "github",
+  "repo": "enricoflor/numbex",
+  "unstable": {
+   "version": [
+    20220206,
+    251
+   ],
+   "commit": "21fb1d4c998c914a91302fd5dec85fc803393917",
+   "sha256": "146ln9wbmk9j62klh6yi4b7hfijnnfayr660hvjzyvd4jj0lr8wa"
+  }
+ },
+ {
   "ename": "nummm-mode",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
   "sha256": "1gdq00f3x0rxxj917x9381v2x7cl9yabj7559zr5vj1clwza8jn4",
@@ -74658,8 +74882,8 @@
     "dash",
     "s"
    ],
-   "commit": "7b803432ce62fc54a5c9d87294e3a499e55381ae",
-   "sha256": "0vmkfjd16v40gfh6w4lqn84jdljk5rz1rmh7sbb8dnfxfkvh9y9f"
+   "commit": "d57dc535cb19c42c969fef7184451918c91864bc",
+   "sha256": "0s2dx8xbyyscbx1swsl3j9drvlyf1mgk5vq3kfia7d2q8hg5z6sc"
   },
   "stable": {
    "version": [
@@ -74725,6 +74949,21 @@
   }
  },
  {
+  "ename": "nxml-uxml",
+  "commit": "fe5ce2d30569e0e957e175346579409567bdb0bd",
+  "sha256": "1xjzrnq75syi6a555j3395z0ynfxy7ywg61xzrcirm5i1h5z7afl",
+  "fetcher": "gitlab",
+  "repo": "dpk/nxml-uxml",
+  "unstable": {
+   "version": [
+    20220130,
+    1405
+   ],
+   "commit": "94440741f7e8b83504d53991f26f63b4855cce27",
+   "sha256": "17k0d6ik2zj99kdvxdj5jg2kjj83lpy983mgcr3vv36axlw58wyr"
+  }
+ },
+ {
   "ename": "nyan-mode",
   "commit": "4d8c3000df5f2ee2493a54dee6f9b65008add753",
   "sha256": "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv",
@@ -75604,14 +75843,14 @@
   "repo": "alf/ob-restclient.el",
   "unstable": {
    "version": [
-    20210718,
-    2008
+    20220202,
+    1609
    ],
    "deps": [
     "restclient"
    ],
-   "commit": "bfbc4d8e8a348c140f9328542daf5d979f0993e2",
-   "sha256": "0nq5w2gankvb7ix8rv33814j7qvhiawd9r15b9i6syn1i5k5pxhj"
+   "commit": "586f1fa07f76aaca13cb3f86945759f4b9fb8db7",
+   "sha256": "12cgjk3lpx8d0ms2j6b33s65jr4bg8g9cw9h2l82bm39nd6h5q9d"
   }
  },
  {
@@ -76055,8 +76294,8 @@
     20210923,
     1348
    ],
-   "commit": "7090b8dde4019fabef39cea329bc8e741f594aca",
-   "sha256": "07bn785bjl3s5d05mwyg5w1p940nbfvm1d2k9mgi7n76apj2q62a"
+   "commit": "fb005d5abc34bad8b7c39b9da04a16d997932a0d",
+   "sha256": "18ay9jrmc6ldywzrjac2gcjqczbsny7a4r2vf8kxaz8camgh7081"
   },
   "stable": {
    "version": [
@@ -77192,26 +77431,41 @@
   "repo": "awth13/org-appear",
   "unstable": {
    "version": [
-    20220117,
-    1642
+    20220122,
+    1913
    ],
    "deps": [
     "org"
    ],
-   "commit": "559a40dd036b6e8204b6a078ad4dc9439bc20e5c",
-   "sha256": "0y6fw53vasas7hcq9r711rvsjbc7p897pjrhqpzda8nyyvd673h4"
+   "commit": "303fcc8d5d85a4ebff2798dab50b2ccc0255ea5f",
+   "sha256": "1pdf16agcjfzpjvz8kv39abir35rip93nkawxcpjjh4ywsdsbnm6"
   },
   "stable": {
    "version": [
     0,
-    2,
-    4
+    3,
+    0
    ],
    "deps": [
     "org"
    ],
-   "commit": "a1aa8496f2fd61305e43e03e6eeee2ff92aa9e24",
-   "sha256": "0sfz8rpvc9hidjj81wlc48vi7ii90mssgvfnp2z215phv67npbzp"
+   "commit": "303fcc8d5d85a4ebff2798dab50b2ccc0255ea5f",
+   "sha256": "1pdf16agcjfzpjvz8kv39abir35rip93nkawxcpjjh4ywsdsbnm6"
+  }
+ },
+ {
+  "ename": "org-arbeitszeit",
+  "commit": "0d99045c0514613c6f3e3b0e167b5476fdaf6e43",
+  "sha256": "12w1yi3dzax0rywm83p7mkqj7fd05vg0lg2c9p20ckw7blxxk7xx",
+  "fetcher": "github",
+  "repo": "bkaestner/org-arbeitszeit",
+  "unstable": {
+   "version": [
+    20220127,
+    754
+   ],
+   "commit": "5b307ebc0db0d58ed6b94d4db30f2653b5782e41",
+   "sha256": "0dcawxni158af3jdhr22zkh39b39qvzsdk6kc5l8vjwjd37r1kks"
   }
  },
  {
@@ -78404,16 +78658,16 @@
   "repo": "marcIhm/org-index",
   "unstable": {
    "version": [
-    20211110,
-    1423
+    20220121,
+    1503
    ],
    "deps": [
     "dash",
     "org",
     "s"
    ],
-   "commit": "399020d435d296014f92fa5f632d7481ee002661",
-   "sha256": "01q8w49dh9fpr2sc70p92cxjm66fnrrgnk4ba321aq9dlfmly2zg"
+   "commit": "64930ad82c0220ad7d80ec0896b8647a3206d2d3",
+   "sha256": "0r4kn82jwv6w6ngz5azqq7jyxlfcspjj8lpscq8cnha5112qw7nh"
   },
   "stable": {
    "version": [
@@ -78516,16 +78770,16 @@
   "repo": "ahungry/org-jira",
   "unstable": {
    "version": [
-    20211114,
-    1616
+    20220129,
+    2049
    ],
    "deps": [
     "cl-lib",
     "dash",
     "request"
    ],
-   "commit": "01e6a7c17e210dac0608154dd69d637e9733498d",
-   "sha256": "19nljq73gnhjk7zz8y5wgap8j41jd7zifjcmfddrj27kmprw2h5z"
+   "commit": "f424364605b21e5f1686f8ce2645afe543538684",
+   "sha256": "1646hr3mmg0ppa4xx9gjc1zkdryfs2m0j39cjhrfxcn05gsykklh"
   },
   "stable": {
    "version": [
@@ -78798,20 +79052,20 @@
   "repo": "org-mime/org-mime",
   "unstable": {
    "version": [
-    20220117,
-    438
+    20220204,
+    42
    ],
-   "commit": "b3932a64ca0d3017255fc99b9cde253eb17b08f5",
-   "sha256": "0456i9784pvqkxwdyrrkgair2y4i46r9svx67fz5qljxd1z4yjkx"
+   "commit": "a7bf07316f93015e4f853ea0fc5b8d05b4a7695d",
+   "sha256": "01f04xpqkgja34a0z4smh2kxzn3lvx2391fnbfxmq92pxqp3gk0j"
   },
   "stable": {
    "version": [
     0,
     2,
-    4
+    6
    ],
-   "commit": "d52a7b52b652bb87a82be02f66ba14d54dee0cb5",
-   "sha256": "0in83jlrwjn81qgw1i7n228sbf314bj8hkrl14ahfn0zmfll60sw"
+   "commit": "a7bf07316f93015e4f853ea0fc5b8d05b4a7695d",
+   "sha256": "01f04xpqkgja34a0z4smh2kxzn3lvx2391fnbfxmq92pxqp3gk0j"
   }
  },
  {
@@ -79795,8 +80049,8 @@
   "repo": "jkitchin/org-ref",
   "unstable": {
    "version": [
-    20220110,
-    2258
+    20220202,
+    1733
    ],
    "deps": [
     "avy",
@@ -79809,8 +80063,8 @@
     "parsebib",
     "s"
    ],
-   "commit": "1ebe9997a82554466ca4d3a8c8b05e1bc77423ce",
-   "sha256": "03f2xhs7dfzdpf173c5cklmvlz82wkgjj677w3nh2cxkxdm820bq"
+   "commit": "9db9afb50407cdb1a8ec7c28bea69d0b6208fbdb",
+   "sha256": "1qs8c1sdz53pr2p53lqd1kx1747r4i2h9ynwi6dq6xab148zmdjg"
   },
   "stable": {
    "version": [
@@ -79893,8 +80147,8 @@
     "dash",
     "org"
    ],
-   "commit": "eac6aa8694b37623cef14d208ed88415499072a1",
-   "sha256": "01ri6h144s0bgf45azbqzkm2h4x0jlz9n2azxq27dk2n7k3lzv6l"
+   "commit": "341e829a730dd9eb1c14e2588fecb3ad7361f989",
+   "sha256": "0cj5ijf4bndx8n0ziwjp4q8wj779xhm12k0m0ld9hy21vn22z8l1"
   },
   "stable": {
    "version": [
@@ -79957,8 +80211,8 @@
   "repo": "org-roam/org-roam",
   "unstable": {
    "version": [
-    20220120,
-    257
+    20220131,
+    654
    ],
    "deps": [
     "dash",
@@ -79967,8 +80221,8 @@
     "magit-section",
     "org"
    ],
-   "commit": "817d8036fbf028d2c5c386720fbf9946d03fe891",
-   "sha256": "18rma7hm43zm7s8c0fjrdaphmbzsjryly7g46hgf3qwrn55n0y8m"
+   "commit": "eed1df90f571b19cae1581e7f5d938892b00c24d",
+   "sha256": "1pd887c4g9rykfz4sf7n6845b9md1sh64bychjbbwbj63375xvsm"
   },
   "stable": {
    "version": [
@@ -80046,16 +80300,16 @@
   "repo": "org-roam/org-roam-ui",
   "unstable": {
    "version": [
-    20220104,
-    1733
+    20220131,
+    1539
    ],
    "deps": [
     "org-roam",
     "simple-httpd",
     "websocket"
    ],
-   "commit": "5ecd418060bf606924ac86faa1aa4036d4c785fb",
-   "sha256": "1gj8bca7y8zjjnqjs0mg6vv2nvjrkqbqrj055zwkhz9sj36q5s5h"
+   "commit": "309fe3c58c7081de4e2c9c64f7b40ea291926048",
+   "sha256": "14qgr3jwn42a8wy07g03j55j5shnvv52ma2wq1zf34dag7d4fghw"
   }
  },
  {
@@ -80987,11 +81241,11 @@
   "repo": "flexibeast/org-vcard",
   "unstable": {
    "version": [
-    20220119,
-    248
+    20220206,
+    1209
    ],
-   "commit": "74fc34319ce26455f58c7ae476b482d323796276",
-   "sha256": "0s0bx2vgn2rzcda9sfcfds3x68d2gnz90qviphpf6bi27ab83a20"
+   "commit": "bdaebcb4ef44c155a92d9c89a21a1d29019ee026",
+   "sha256": "1djpjs0v0w6drqpi39y58hs563rqszcfwmldnwcmyp3f3cgqd8k3"
   },
   "stable": {
    "version": [
@@ -81014,17 +81268,17 @@
     20220109,
     2003
    ],
-   "commit": "6b5acc29867787660d46f13fe1555e49ef0ddc2a",
-   "sha256": "1la2gg39s5xjw3v75y19hvmw9cyhg6z3lmaggh9qpbd80cm1xyyw"
+   "commit": "1c6f4b0e1b83affd95130f2598f16ebc529aa250",
+   "sha256": "18ys6blh7zc8l015zcv9sl58pb85yf1k3dmsvvm0hcpf4p3frp95"
   },
   "stable": {
    "version": [
     1,
     1,
-    1
+    2
    ],
-   "commit": "6b5acc29867787660d46f13fe1555e49ef0ddc2a",
-   "sha256": "1la2gg39s5xjw3v75y19hvmw9cyhg6z3lmaggh9qpbd80cm1xyyw"
+   "commit": "1c6f4b0e1b83affd95130f2598f16ebc529aa250",
+   "sha256": "18ys6blh7zc8l015zcv9sl58pb85yf1k3dmsvvm0hcpf4p3frp95"
   }
  },
  {
@@ -81620,11 +81874,11 @@
   "repo": "tbanel/orgaggregate",
   "unstable": {
    "version": [
-    20220109,
-    1727
+    20220127,
+    1502
    ],
-   "commit": "b46158737eb6fb409ecef1a072184c5f7ae4b85d",
-   "sha256": "0wwlvc1nl5w3987wql3fp7j5qqxzjx0h5df84zbr77qjx637cs4d"
+   "commit": "36d7aec5549655174467db45d1dba6647b9e19b1",
+   "sha256": "0cg8rxl8wrcgm910jm0m61wbxk5i9f8cxcb289p7ip5bjbijmic9"
   }
  },
  {
@@ -81650,14 +81904,14 @@
   "repo": "tbanel/orgtbljoin",
   "unstable": {
    "version": [
-    20220109,
-    1733
+    20220127,
+    1516
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "3e99ebc8ad013d846d9d987a7dce54dd6f83e52a",
-   "sha256": "1aj4g7gh498xccq0hb6gxvxm20124754cnhp98pn7yaz5a56967b"
+   "commit": "f5254db6ae78e30c2786c53991e98e86ed344ac6",
+   "sha256": "1l63bcvlnqnj5z10cyanybc5jz9yimf53vffycf9wbsph5lpfs12"
   }
  },
  {
@@ -82566,14 +82820,14 @@
   "repo": "kaushalmodi/ox-hugo",
   "unstable": {
    "version": [
-    20220119,
-    1939
+    20220204,
+    1606
    ],
    "deps": [
     "org"
    ],
-   "commit": "5fd3bdcb0f3d49748302aeaf28b61fac9975eda9",
-   "sha256": "1sw7hr5h6lzamhw9zrqlahdn40dqpmnl8cg3sm8sw73g62pj85k2"
+   "commit": "e52b7e50db825027b5e770c433793b3284ce4367",
+   "sha256": "0gfzkzlfl5119nxlrc8dm1y6gqppvqc21ljy68nz2npp6fcswkb7"
   },
   "stable": {
    "version": [
@@ -82662,14 +82916,14 @@
   "repo": "stig/ox-jira.el",
   "unstable": {
    "version": [
-    20201202,
-    1658
+    20220121,
+    1015
    ],
    "deps": [
     "org"
    ],
-   "commit": "0bd966ba241a2458d5097e256543eceee50d462c",
-   "sha256": "1a1cwq8gaq3q6g7lfm2finz4srla5iyg8s81k2991fz2fh1iir9k"
+   "commit": "a8019237a8f5e016a7c952fc2f673a2498a0e779",
+   "sha256": "0pa7pwk0yjcgak3f9w9jggj3ghlig1azf15ng954r646810j9i4v"
   }
  },
  {
@@ -82687,8 +82941,8 @@
     "org",
     "s"
    ],
-   "commit": "4d2e0aa7f92d07e16cea2dd5e1d250a3f243c3cf",
-   "sha256": "1h5930953nnddg7ysr87m5r6gm517zbfi7jbc77hmrywgibqvpik"
+   "commit": "fc6b2594706c44d266d0863c323b1b58ab9d18ba",
+   "sha256": "01kydlzrc2qi4hrklzqc89fk9wpkc52slsslbv42ifsimlj2bnkq"
   },
   "stable": {
    "version": [
@@ -82925,14 +83179,14 @@
   "repo": "yjwen/org-reveal",
   "unstable": {
    "version": [
-    20211128,
-    1509
+    20220205,
+    1046
    ],
    "deps": [
     "org"
    ],
-   "commit": "ec6092d2d5ed0693413a86ad83a2c0936861d130",
-   "sha256": "0xbk5q9vcy4n814a077kgsvhsbbr51v5lyqdpyy9j4sakh1sxw3k"
+   "commit": "2f1509cc145c3604a0b17a306603f231d067ea16",
+   "sha256": "06p6r86way5cxvp6z65j5hdmv09frk69qly2c02zg64xxymc8n55"
   }
  },
  {
@@ -82943,14 +83197,14 @@
   "repo": "choppsv1/org-rfc-export",
   "unstable": {
    "version": [
-    20201218,
-    1356
+    20220206,
+    1046
    ],
    "deps": [
     "org"
    ],
-   "commit": "1a49535cf927cd52ffa05c815b890888c4addf86",
-   "sha256": "001dv3zxsvh5zgrwn5jmib82bns4phbbd5kcy5mvmk7nyayrmq9p"
+   "commit": "c9c1be3ff0ac2464f0d514939887f34f9b4198b2",
+   "sha256": "005qrg580328l4h67i0mm2r540dknmn0bnqyy2vdpk75qc2rirca"
   }
  },
  {
@@ -83362,14 +83616,14 @@
   "repo": "melpa/package-build",
   "unstable": {
    "version": [
-    20220114,
-    2049
+    20220115,
+    2346
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "61589823b393d0fe7d9bd6627571f6985f65537d",
-   "sha256": "16v7wjh45qg1hx5vw00irmf35g08kdqlx2g9pnic4ch403sd62y6"
+   "commit": "415552b9548fb4fd929a62ec09563e94dfbec5c9",
+   "sha256": "0y5b6y0a39x82qrg7bjk1gs5xn0qj68gywz2wkxkh5g4m90kylsg"
   },
   "stable": {
    "version": [
@@ -83466,11 +83720,11 @@
   "repo": "tttuuu888/package-loading-notifier",
   "unstable": {
    "version": [
-    20210724,
-    1700
+    20220130,
+    318
    ],
-   "commit": "895ab23f970f954349ccb6c89d397ad7d86087f8",
-   "sha256": "0maa3w06wx54f482z2k6d0vq8mr01j75nnbb7d0mjw15d6qi7pbk"
+   "commit": "bc06ba97a0537aa202f277e5597ac96ca39307ab",
+   "sha256": "0wp3jdbzcjpbx4720nd31fzs5app6phdrbcwisw89361wvmmnhkj"
   }
  },
  {
@@ -84070,11 +84324,11 @@
   "repo": "tarsius/paren-face",
   "unstable": {
    "version": [
-    20210127,
-    1749
+    20220129,
+    2216
    ],
-   "commit": "6790c7fdec490a69e7d460c0bea36ad343776f9b",
-   "sha256": "1zyrrrr8rmksr3rfsv96psk1z15wbbx1bvcfp3hf5ciyc2n79000"
+   "commit": "4f6ad761a7d508bb6b3e6539559929d2706caa10",
+   "sha256": "13d8psgd2j3vqmgwwf62gwyq7h6qlj8rrs31fxwjqmzzdblwqy1y"
   },
   "stable": {
    "version": [
@@ -84461,15 +84715,15 @@
   "repo": "volrath/password-store-otp.el",
   "unstable": {
    "version": [
-    20190713,
-    1748
+    20220128,
+    1320
    ],
    "deps": [
     "password-store",
     "s"
    ],
-   "commit": "04998c8578a060ab4a4e8f46f2ee0aafad4ab4d5",
-   "sha256": "1c9lvxi0yf0x3ywciv58zkn9ss6n41305g5rp4l32a33sq51s567"
+   "commit": "be3a00a981921ed1b2f78012944dc25eb5a0beca",
+   "sha256": "0hqfxdpis2if5fl5avar93mr2gfqqnd87s835hiibqq0800dv3v7"
   },
   "stable": {
    "version": [
@@ -84783,11 +85037,11 @@
   "repo": "JonWaltman/pcmpl-args.el",
   "unstable": {
    "version": [
-    20210805,
-    1537
+    20220131,
+    2316
    ],
-   "commit": "5f2943fd70d94065496c52d21f05eb89028637cc",
-   "sha256": "19xwwpfcf0l9jh7xixyjd5adivj27jw00zvxb7n1240k5p332pzi"
+   "commit": "94a19b693a226aa11b15627e01f9f4c9af752bab",
+   "sha256": "0y0mnm2fhshvvc9iz4mgzvxhvhj0xriinn155dilnm4skglzgxk1"
   },
   "stable": {
    "version": [
@@ -84969,16 +85223,16 @@
   "repo": "vedang/pdf-tools",
   "unstable": {
    "version": [
-    20220107,
-    1241
+    20220125,
+    1708
    ],
    "deps": [
     "let-alist",
     "nadvice",
     "tablist"
    ],
-   "commit": "4e6c778194bea39d81871a3caa0b72539fdb6868",
-   "sha256": "076597i0c3s8l010m6xirass0grcs3pjxs7l19xj8219x9lkf8l5"
+   "commit": "72ef774320d9eacd4d79b5016e9e989ab176afba",
+   "sha256": "15da6k648r0ir515bpyqf88wg7f8rxqz60zk88c4277ywa61z1zq"
   },
   "stable": {
    "version": [
@@ -85410,16 +85664,16 @@
   "repo": "SqrtMinusOne/perspective-exwm.el",
   "unstable": {
    "version": [
-    20220103,
-    909
+    20220125,
+    1939
    ],
    "deps": [
     "burly",
     "exwm",
     "perspective"
    ],
-   "commit": "3a4d382a744149b8bdbea5b62f66f6705fd5e2c7",
-   "sha256": "1kpciigv0lxdxswnqjdbqlk30jlzvzy9li21z1kbnr5plflj3ffb"
+   "commit": "541946caa0359c14c90da58196bec7baed122a46",
+   "sha256": "0mcrvv9mhg0cfkcp64hkdd9wh9j04hw0d9dz1ghafa4h6hf3azfl"
   },
   "stable": {
    "version": [
@@ -85876,11 +86130,11 @@
   "repo": "emacs-php/php-mode",
   "unstable": {
    "version": [
-    20220109,
-    247
+    20220120,
+    1959
    ],
-   "commit": "010d0f6987ab7336ac9475e8e2298caa56981085",
-   "sha256": "0z0cskqg9mjk7v2631pir3bmgyp2clmhq432blirfla269bry30c"
+   "commit": "5f26bec865ee159dc30d3922f17bc42adfcfed50",
+   "sha256": "0132az773sk6w1wdz4a1wxmxy5w69x4h2jrgd67h94k845nyl348"
   },
   "stable": {
    "version": [
@@ -85992,8 +86246,8 @@
   "repo": "emacs-php/phpactor.el",
   "unstable": {
    "version": [
-    20210619,
-    1706
+    20220120,
+    1919
    ],
    "deps": [
     "async",
@@ -86001,8 +86255,8 @@
     "f",
     "php-runtime"
    ],
-   "commit": "272217fbb6b7e7f70615fc518d77c6d75f33a44f",
-   "sha256": "0hm96i9vdbkcq6mypjpl94dn3gzyk23iql5zzy2d221vmjhqvn7d"
+   "commit": "585862496e8ac9f496c0c99c5b97af456cb1f73c",
+   "sha256": "1y5g5g2d5g9xiw3vwxqnmz58gyfn9hybpfzcjhyjhnjma74jkqfr"
   },
   "stable": {
    "version": [
@@ -87540,14 +87794,14 @@
   "repo": "polymode/poly-org",
   "unstable": {
    "version": [
-    20220119,
-    910
+    20220201,
+    1514
    ],
    "deps": [
     "polymode"
    ],
-   "commit": "e8e5375f82c1d1a6b4b0ba6ae7ea181ff6f49e3e",
-   "sha256": "1v1k0aah4c6b1zrswjgcfnsaypxxgiyai33j4slxvalbj4nsa5g5"
+   "commit": "01fd0f4b7eaeabf070af831f4825993210f64f2e",
+   "sha256": "1cp017g5a7mk61mw1dhykqlyc1nzk50diw8ykf4napbky643c803"
   },
   "stable": {
    "version": [
@@ -87700,11 +87954,11 @@
   "repo": "polymode/polymode",
   "unstable": {
    "version": [
-    20220119,
-    1503
+    20220125,
+    1433
    ],
-   "commit": "d0913ed53d27ee90b8a31b7a78a29502a5314087",
-   "sha256": "0h4xndlgyqv1ywqnvl6zb08brviiznmarnn56sikmjzkh9i64zdh"
+   "commit": "f2a2b9772722aaadf13bd4d35652637b495952d4",
+   "sha256": "1n6jj3lz72kh2kqp53fx7h2ggbh6c4s96v6cyhwjs4sls40xrbjl"
   },
   "stable": {
    "version": [
@@ -87813,8 +88067,8 @@
    "deps": [
     "yasnippet"
    ],
-   "commit": "115a0d5066f89554bee9cb1045bcda5a18ebd441",
-   "sha256": "1g11w52bf724zwwsvrcylk3ndjci2cnbzing77c91psz6d7zjkvw"
+   "commit": "81a1348f81b0d8a3097d1ca3f2fb2f57964d56d6",
+   "sha256": "0p2lnvcfjs8v012xrdphjbbdz1nkw9cqhiznadrgd3r0h49r13ys"
   },
   "stable": {
    "version": [
@@ -87850,8 +88104,8 @@
     "yafolding",
     "yasnippet"
    ],
-   "commit": "61f54d0620229afdd049dfe75681942bcf52e53d",
-   "sha256": "1z04y3kxbj2lisawl5yxwg7q8qry02fhmv0is6wwv3gmgnbk1kns"
+   "commit": "4bdffa94cd89da91b75e9edc56e9e2197ce072a3",
+   "sha256": "0vr4w7923g3a5sikw4px82plgjk9b3wki8ciqamp7i1p5i5lxbhz"
   },
   "stable": {
    "version": [
@@ -87928,11 +88182,11 @@
   "repo": "karthink/popper",
   "unstable": {
    "version": [
-    20211226,
-    2111
+    20220126,
+    844
    ],
-   "commit": "527a85c49174e6e79220f0ed0761c204a979eae6",
-   "sha256": "1l9n67jsj1y5q9hhkrmsxcjw1q3ychk7npl8fd1gbzxy2csc7vi2"
+   "commit": "a50edecacf2939fc50ad2bc48f1015486a09f885",
+   "sha256": "0p12zz2lhm10yikhnq52z66xwy64gcvig42bzajv5q7x09qvvna7"
   },
   "stable": {
    "version": [
@@ -88146,8 +88400,8 @@
     "json-rpc-server",
     "web-server"
    ],
-   "commit": "9e68b419acf9245208f8094e10041b7f04511473",
-   "sha256": "0kaf00924jg50l2zdhyf1lxsh44nfp4zbc23wxbir45xdx9rzl3z"
+   "commit": "21af54b2fc9fd8876664c8e6c2ff2e4ffbbad249",
+   "sha256": "1x117hnsn88gj7m0kwrl8gps5qrzzjmx9ki045ndgfpqayyfyplp"
   },
   "stable": {
    "version": [
@@ -88196,11 +88450,11 @@
   "repo": "tumashu/posframe",
   "unstable": {
    "version": [
-    20220110,
-    422
+    20220124,
+    859
    ],
-   "commit": "6c0e63d6b3b6638c11729c5db28019a38ff44f5b",
-   "sha256": "0l3c7d24lirks8i4s715cdv2x022h4l6p5kg81ramqzd843335qf"
+   "commit": "c91d4d53fa479ceb604071008ce0a901770eff57",
+   "sha256": "15h809mf8d8w8axbfzjs40j8yrh5ms88x4pmlx1qlcac8j6qrilf"
   },
   "stable": {
    "version": [
@@ -88291,14 +88545,14 @@
   "repo": "milkypostman/powerline",
   "unstable": {
    "version": [
-    20211022,
-    655
+    20220122,
+    1904
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "390a95fe5b71cfc20e18d034b4b35b5c159a83fc",
-   "sha256": "0n5fd38qqsj2m6m6dkm11ndk0blxnn5z5rdpb9blrni7p45d6z8b"
+   "commit": "566c77844f053cb39fa7acdfbc143a855450f0b5",
+   "sha256": "0nhh2bq35s8rgz6g38i97759d92d6z5yak66687lnk481wca3x4l"
   },
   "stable": {
    "version": [
@@ -88708,6 +88962,21 @@
   }
  },
  {
+  "ename": "pretty-speedbar",
+  "commit": "f91b1b66d4c9b7c47bc83e8c22b295b8804d3283",
+  "sha256": "14rd1h5pc31yv7rycpqdq5yhwif1b941fknr86qm055dlnrqqqa8",
+  "fetcher": "github",
+  "repo": "kcyarn/pretty-speedbar",
+  "unstable": {
+   "version": [
+    20220124,
+    16
+   ],
+   "commit": "ea3daaf6a526a1ad4ae385066c99fd9643da7f94",
+   "sha256": "0irnp6v1i930s8fh1iqmbs4amyia9qdnggq7n5hxfi4ni0p66yqq"
+  }
+ },
+ {
   "ename": "pretty-symbols",
   "commit": "ed01ef6333e4558877b0e357ff8bf601fb88b757",
   "sha256": "0d1ad2x4md0n3fad3s2355wm8hl311qdhih1gkdqwdaj4i1d6gvb",
@@ -89169,11 +89438,11 @@
   "repo": "bbatsov/projectile",
   "unstable": {
    "version": [
-    20211220,
-    1144
+    20220203,
+    1326
    ],
-   "commit": "4e6f66c329e57d66269b4bd3fc02518eb0c677bc",
-   "sha256": "10imlg3qmyskpzbw5i1ac1chn5yiyl3wi3wx9l3sn4kkjgggiicl"
+   "commit": "df3d73e1f0ff625a09196ff3ba6f4be82a53fb3b",
+   "sha256": "1iy5i8mdvzgfirsv5k59v8i45fcm6cimlfl546hgzb9ygl6l15vr"
   },
   "stable": {
    "version": [
@@ -89674,17 +89943,17 @@
     20211013,
     1726
    ],
-   "commit": "41e22cde8d8a44c35127a26c19e08b180e0b30a4",
-   "sha256": "12ixcl6983q1l3qgrxq9fs1v1v7ihc74k6xy52f63vm48z580lrr"
+   "commit": "3ea30d80847cd9561db570ae7f673afc15523545",
+   "sha256": "1yh2ayksfc3x6kavix8nk4y51gpajjrrf5cd9b18rkw2rn5xnb55"
   },
   "stable": {
    "version": [
     3,
     19,
-    3
+    4
    ],
-   "commit": "cc7b1b53234cd7a8f50d90ac3933b240dcf4cd97",
-   "sha256": "115mdsx8jck4202hhnnirq60y3ya6swhh31f9bwj7fqcmv9qn3lw"
+   "commit": "22d0e265de7d2b3d2e9a00d071313502e7d4cccf",
+   "sha256": "0vhzy6xy7r7622yid374b4fhnws0x9xpfcnhd1gwp0fmi5g3q54v"
   }
  },
  {
@@ -90086,11 +90355,11 @@
   "repo": "AmaiKinono/puni",
   "unstable": {
    "version": [
-    20211204,
-    1256
+    20220204,
+    1645
    ],
-   "commit": "e147a72f3c6b7bb40ef7fa37d12ea54afa09cd7e",
-   "sha256": "06lkpzz6ri092awgba575vq4qy3ym4qbk6hrwfpvmy81n26v7wsw"
+   "commit": "e6681214afc6b5ae06e4813492633bb4ad9b2b1b",
+   "sha256": "0jqii5ijbnppayawrl27b22accpxayf5i4h15zx1s0wpb77km0s8"
   }
  },
  {
@@ -90580,15 +90849,15 @@
   "repo": "tumashu/pyim",
   "unstable": {
    "version": [
-    20220112,
-    157
+    20220130,
+    722
    ],
    "deps": [
     "async",
     "xr"
    ],
-   "commit": "75ead11eeaaf801e342bb18d7c0ff93ed1c123ff",
-   "sha256": "1wlvgh214fn2d4h7wiq68hwshncq85qp9j5agkvh7avla56vi97j"
+   "commit": "028e443527166e8cd6ecc903e635fbe89aca9c91",
+   "sha256": "1qpskp8jqxwfbg274lkl95fmilygzxqpy2i7vv0vdl7pdknvbkgk"
   },
   "stable": {
    "version": [
@@ -90765,8 +91034,8 @@
     20210411,
     1931
    ],
-   "commit": "ccd9aee3c0a64c8a9de52be03daa0fcb7a6dd84b",
-   "sha256": "0024ppkkk9saj86ncld39qgxf365yfqx264hbad0k4xp0qrlig9k"
+   "commit": "d7013f6799d28a69dbbf3329da7867a8afacce82",
+   "sha256": "19w4i7yymj204v147z4ggqwb0ghiz6zsh1ykda3x3rc32d5aap3h"
   },
   "stable": {
    "version": [
@@ -91089,20 +91358,20 @@
   "repo": "jdtsmith/python-mls",
   "unstable": {
    "version": [
-    20220118,
-    300
+    20220128,
+    1953
    ],
-   "commit": "049bd0a118e0ea133b777b40af1728734c4bf481",
-   "sha256": "13x6vvzxwmcjs6gd3xmhszy139dxa4vylvn9bq4677cj62yf5xpl"
+   "commit": "97e58c6b785f7096c0e02f6c1d12b008cc0219c1",
+   "sha256": "0nhk2jwzlnc0c1fzzdbc7dwil9wwk2ghizgynvdp9b2kg3jyd76n"
   },
   "stable": {
    "version": [
     0,
     1,
-    0
+    1
    ],
-   "commit": "152c4355ca315b1e5861496d5abed9365d856e57",
-   "sha256": "1d2ymwfdsdqii0drpypbl4mla2mq4a8avch4j4zj7g9h8z7h6wq5"
+   "commit": "97e58c6b785f7096c0e02f6c1d12b008cc0219c1",
+   "sha256": "0nhk2jwzlnc0c1fzzdbc7dwil9wwk2ghizgynvdp9b2kg3jyd76n"
   }
  },
  {
@@ -91290,11 +91559,11 @@
   "repo": "psaris/q-mode",
   "unstable": {
    "version": [
-    20211126,
-    1944
+    20220123,
+    1721
    ],
-   "commit": "43e509ed323c105f9b312813a1ae953d1a2efe3e",
-   "sha256": "1b6prwdy3dnkdsxy1lwws1jmq5r80g729z18np8ylp9j3pzz0nrh"
+   "commit": "0bc3cdb32636278b1dc0bcc55741b147441347f6",
+   "sha256": "0dyf35fhm2wzq6p2wcgdhf81y4rs92j5np7jvrwp9ic9xzw51cx5"
   }
  },
  {
@@ -91331,8 +91600,8 @@
     20211010,
     1334
    ],
-   "commit": "a2c51cd1d54d507ec1902bc5c7bc888fe5a23c8d",
-   "sha256": "0zikg9gbcdzjlm6kdg71i28zxic4k22iijfvf7x4dvx5pc8pw8f6"
+   "commit": "fe3a99ff8cbddcf5391458f356cecf2e8c3a2b84",
+   "sha256": "07ssxr563lw748qwvdmp64dc0hlb1pf9kiv062xy2bp8hkxr0y9z"
   },
   "stable": {
    "version": [
@@ -91756,11 +92025,11 @@
   "repo": "greghendershott/racket-mode",
   "unstable": {
    "version": [
-    20220118,
-    1424
+    20220204,
+    2212
    ],
-   "commit": "e9b40d2902e2fe7a46757a4fc64c780a18c94169",
-   "sha256": "1b97q81qhn3v42ivfzckqv7rc1k3j060gzp90p7qg73nslxiz1vg"
+   "commit": "cef5a55d2b766973db92f9d9ab2210c03fa8ba02",
+   "sha256": "0zzk0s4akx6ffsbhylgfflcypkkg36a3accxhmmdd11yn5rckv7f"
   }
  },
  {
@@ -91771,15 +92040,15 @@
   "repo": "otavioschwanck/rails-i18n.el",
   "unstable": {
    "version": [
-    20220111,
-    1811
+    20220126,
+    1643
    ],
    "deps": [
     "dash",
     "yaml"
    ],
-   "commit": "b2048154beb384e9a732d3b4054dd18d974e9675",
-   "sha256": "1ci7an9jjnnl25gly1bg4njhcs20nvavpgbk34z9kvahpy12df48"
+   "commit": "8e87e4e48e31902b8259ded28a208c2e7efea6e9",
+   "sha256": "0mddr1gjhaxgc9rqmbkw2fymz3blvm0cvg15c9lrary1z1almj64"
   }
  },
  {
@@ -91805,15 +92074,14 @@
   "repo": "otavioschwanck/rails-routes.el",
   "unstable": {
    "version": [
-    20220111,
-    1811
+    20220126,
+    1631
    ],
    "deps": [
-    "inflections",
-    "projectile"
+    "inflections"
    ],
-   "commit": "9df7e0499e093463267d210f14e96cb7f2263387",
-   "sha256": "1njw56h8w2pq8za1cg1s2jj06ryfaxpk694ab4jgmf4dyny5qw91"
+   "commit": "eab995a9297ca5bd9bd4f4c2737f2fecfc36def0",
+   "sha256": "0109mfxz7h7423yri1g0l4fr911iw7n6wkivpjcv09f0nq82jxch"
   }
  },
  {
@@ -91953,16 +92221,16 @@
   "repo": "asok/rake",
   "unstable": {
    "version": [
-    20180212,
-    1008
+    20220131,
+    808
    ],
    "deps": [
     "cl-lib",
     "dash",
     "f"
    ],
-   "commit": "9c204334b03b4e899fadae6e59c20cf105404128",
-   "sha256": "09k2fqkmqr6g19rvqr5x2kpj1cn3wkncxg50hz02vmsrbgmzmnja"
+   "commit": "759fb373b90dc4cf762a58217e81d8a3fecb5563",
+   "sha256": "0w677abkmrghphi2gwbxypyb59znyv331shmg4j8y5fcqf1whm14"
   },
   "stable": {
    "version": [
@@ -92951,11 +93219,11 @@
   "repo": "ideasman42/emacs-recomplete",
   "unstable": {
    "version": [
-    20211108,
-    2240
+    20220206,
+    1140
    ],
-   "commit": "9d64b65855464bd92ccecf93c19db8b1fc12d7a3",
-   "sha256": "1fixdmrpa9jbjmpqf201420lpg6wcgngzddz7h5c4j68gw1a7jd0"
+   "commit": "2b38ca25e3392636fe936d3edad447970279a463",
+   "sha256": "0fqrhfk3jg4dyf4z8nx6sgpi9l5mxzld2w0icz81kr8vm9p92nmx"
   }
  },
  {
@@ -93119,8 +93387,8 @@
   "repo": "thanhvg/emacs-reddigg",
   "unstable": {
    "version": [
-    20210603,
-    2305
+    20220120,
+    2200
    ],
    "deps": [
     "ht",
@@ -93128,8 +93396,8 @@
     "promise",
     "request"
    ],
-   "commit": "1a6eaf3d1a5e44205399526c0f425281b8d9ccc3",
-   "sha256": "070zghnrh4ywndk6bz1vd750g2nxj4rd42gphymyz8x7kazqqh1j"
+   "commit": "edabb5df2aa0fee0c0f34b862505977dc13449cc",
+   "sha256": "0g6kj94904ymsk54y5f6ynh5w562hy6bx9lngnwrqxcga1xydk71"
   }
  },
  {
@@ -93319,11 +93587,11 @@
   "repo": "alk/elisp-regex-dsl",
   "unstable": {
    "version": [
-    20100124,
-    1028
+    20220125,
+    506
    ],
-   "commit": "ac89ab8b7691a165ef3007cb84417125cfc0632e",
-   "sha256": "1d34jd7is979vfgdy56zkd1m15ng3waiabfpak6dv6ak3cdh5fgx"
+   "commit": "8802555ecdab8b50bb64181798497c10cdb5034b",
+   "sha256": "0a3jyxrgr2sqigv86zr9irf0g8rvvc2bwjc3z2m8pbk75hm00k50"
   }
  },
  {
@@ -94262,6 +94530,30 @@
   }
  },
  {
+  "ename": "rhq",
+  "commit": "7538e3b243c20552f73d9a3c7524f0a106a62cb7",
+  "sha256": "1nv7hxw2yc8p5s95mf2lw50z69wpkcw63rq2k8x38r87bxfrifnh",
+  "fetcher": "github",
+  "repo": "ROCKTAKEY/rhq",
+  "unstable": {
+   "version": [
+    20220128,
+    1344
+   ],
+   "commit": "8d7e25de54f0b11df90a21d3fd2f7fd7608607f0",
+   "sha256": "17qiigk6ikfcyjgwxifmvwkyl8pa6iapyxz2qs0sbskw5d4mhdan"
+  },
+  "stable": {
+   "version": [
+    0,
+    5,
+    0
+   ],
+   "commit": "f554339b7a0be35ba43631a316a797edb888b206",
+   "sha256": "0pnh1mgv5xi11nrd0w2in5p412pqa29x3xvxj5q24lrwcjpl37lw"
+  }
+ },
+ {
   "ename": "rhtml-mode",
   "commit": "f9e14e9d8df9c2ce13e290a5f3d3bf9b247037f4",
   "sha256": "038j5jkcckmhlq3vz4h07s5y2scljh1fdn9r614hiyxwgk48lc35",
@@ -94426,8 +94718,8 @@
     "popup",
     "posframe"
    ],
-   "commit": "5c2ade217134f6f20cd405447af20825e5b44513",
-   "sha256": "1yp92sfirvcz3s2q8j8g6qlcmb7pn30m9ww4nc332m1axah7l05n"
+   "commit": "bb1b5282f08187a00fd59ece7aefa6f476c77c1e",
+   "sha256": "164q3j88r2hnqaaf6qahy2db7a7s4j31fwz9bzz00p1gn4chrm5w"
   },
   "stable": {
    "version": [
@@ -94857,15 +95149,15 @@
   "repo": "pezra/rspec-mode",
   "unstable": {
    "version": [
-    20201228,
-    1319
+    20220203,
+    211
    ],
    "deps": [
     "cl-lib",
     "ruby-mode"
    ],
-   "commit": "92ef785010f6a68cbf73861e75ac6cf4e1832291",
-   "sha256": "1di1b9psmaqzhp0ik3niwgy43i0vj16m5fx7xnsyi0bvwv45cab8"
+   "commit": "4215ff1f2d1cee24a144ff08297276dc7b971c25",
+   "sha256": "11bada87rji78pw0d3l9g70vz2i1cvdlwxl4ixxcyc6whlfbff3f"
   },
   "stable": {
    "version": [
@@ -95356,6 +95648,26 @@
   }
  },
  {
+  "ename": "run-command-recipes",
+  "commit": "797acbc65d7043abd094604ac7840dfaab0ef2c7",
+  "sha256": "1ifj1rk2yx379fkbagn90idhzglc0wgq749ab1w65yj00fmybz05",
+  "fetcher": "github",
+  "repo": "semenInRussia/emacs-run-command-recipes",
+  "unstable": {
+   "version": [
+    20220205,
+    1840
+   ],
+   "deps": [
+    "dash",
+    "f",
+    "run-command"
+   ],
+   "commit": "93de193267da8be1d1f6a23faf3988797f597846",
+   "sha256": "1pz5d7dh6k7qbv5qq21g279il43zy5aipncbfh1kgnkq5ackk779"
+  }
+ },
+ {
   "ename": "run-stuff",
   "commit": "68b7cb0ffe90cd56e2ca6e91e33668be586a1da7",
   "sha256": "038brammgivaq2423sx0iy6n7d7lyx3r939a0b85ix8zvkcbinia",
@@ -95454,11 +95766,11 @@
   "repo": "rust-lang/rust-mode",
   "unstable": {
    "version": [
-    20220108,
-    1844
+    20220203,
+    1832
    ],
-   "commit": "49ff6cceba7a546595c5b0cc18c7501b22e0c9e9",
-   "sha256": "1cj59mwrp4igfcrsya3nlrgp465r0gmnyzglmgsg24pyna3rycwz"
+   "commit": "832980d96a3b7e985bc8bfb1dc2bd7e9599c6312",
+   "sha256": "1dlg6526zfpflmvsq12fql0ri6l8mchs0bi8malx9v8rxn84k3bp"
   },
   "stable": {
    "version": [
@@ -95501,8 +95813,8 @@
   "repo": "brotzeit/rustic",
   "unstable": {
    "version": [
-    20220116,
-    2233
+    20220204,
+    1613
    ],
    "deps": [
     "dash",
@@ -95516,13 +95828,13 @@
     "spinner",
     "xterm-color"
    ],
-   "commit": "f92e9cdfa44c7948417093d6f275a2a8241cae8f",
-   "sha256": "00i500k8cjc4vskvqlcn095vidyklc61np2i8nh8bazqh1k9d15g"
+   "commit": "7261c78004317628d2fdaf425a4c1a1bdb687605",
+   "sha256": "0fzkpli0l8ir4wa4hibkhgia2gxc5pb56zr7mpfyd736j3016acl"
   },
   "stable": {
    "version": [
     2,
-    5
+    6
    ],
    "deps": [
     "dash",
@@ -95536,8 +95848,8 @@
     "spinner",
     "xterm-color"
    ],
-   "commit": "513845b99a61e1137049a2157a122bcfd8a13c2c",
-   "sha256": "1jx8gzcm9ka2chpq51jx4mfa12wqrj2dsrpxwylfcb9qkqjncbn5"
+   "commit": "4aca1c28676fa53d5784b7aee3565f26d43751e9",
+   "sha256": "0lnymi6nxn5dafm8q0av07dcjwrqxd3gm4hj1pi26kw62aw0ws24"
   }
  },
  {
@@ -96026,8 +96338,8 @@
     20200830,
     301
    ],
-   "commit": "51e17a6fecad2dd35e02518934597b3b43273a3f",
-   "sha256": "1aclnsa72pazi1xagymgpfc998sring4xaflg3ha6f9lbdn2qkqq"
+   "commit": "a83597a7e67a2aa05a0a8c0c9af0c70c61a263e2",
+   "sha256": "18nxc94gii1hq5m9p9am00mfc2yprhwdrd9d3hs84868lwv7rack"
   }
  },
  {
@@ -96156,8 +96468,8 @@
     20211020,
     420
    ],
-   "commit": "d96c462e7f340f142ce3c5ffd31fa267223fd854",
-   "sha256": "0w8xlnpawkq580gc6cvxzln29x9v5g05ab7i8wwg1r5jhw9bjvgs"
+   "commit": "aac29628d4eea2d6ec0bfda39503c1f71a379bc9",
+   "sha256": "0pa054hanclapkj73wwwwwjmk2b3p36w2p44d1fz3w3lfjkf852v"
   }
  },
  {
@@ -96413,11 +96725,11 @@
   "repo": "ideasman42/emacs-scroll-on-jump",
   "unstable": {
    "version": [
-    20220117,
-    606
+    20220126,
+    2331
    ],
-   "commit": "556e9a7a8119e24503f54b25f5c2a8084752d64d",
-   "sha256": "086p847snpz62b6g7k8sz7izfrbkza1g178q3lj4vysdg8w1fhf7"
+   "commit": "1e9e09f0ccadf805e9bb4dbd1050944f82c5ed0f",
+   "sha256": "0n472jp8j1al7c4cf1k8l5my1hzln68ix5gl8vz8kpaxhlh0s8p0"
   }
  },
  {
@@ -96842,11 +97154,11 @@
   "repo": "raxod502/selectrum",
   "unstable": {
    "version": [
-    20220119,
-    50
+    20220123,
+    27
    ],
-   "commit": "823eec0246388e8dcf5581533dac96c2626d51f3",
-   "sha256": "1h6a5mvfcyz3x0s15g4mi503fg3mqbwajns9y20148gydvfjbxjl"
+   "commit": "26908ea0e88727f5eb6c5ebae7f9fbbe117ef25f",
+   "sha256": "0fd7nq7nxl9gjb37r14z5rdrk97p9z80z91i9744c1p6x714w702"
   },
   "stable": {
    "version": [
@@ -97050,15 +97362,15 @@
   "repo": "twlz0ne/separedit.el",
   "unstable": {
    "version": [
-    20211116,
-    326
+    20220202,
+    1359
    ],
    "deps": [
     "dash",
     "edit-indirect"
    ],
-   "commit": "59c4e3718943dbe8d14bdbba5de24fe2c80f0b56",
-   "sha256": "06wx9nz688x15rz1mcl3jcbaa3pn6xls7my2srn5id1rdbwyl52x"
+   "commit": "a2cea75f7b66a02e28334291fc6fb371cd5741b1",
+   "sha256": "133r9s2zbc1k2jd9ajxbxss0iy9xsjphxzwfhfvvay8jqy0r71gi"
   },
   "stable": {
    "version": [
@@ -98589,14 +98901,14 @@
   "repo": "jorenvo/simple-mpc",
   "unstable": {
    "version": [
-    20200523,
-    1804
+    20220204,
+    2207
    ],
    "deps": [
     "s"
    ],
-   "commit": "ce731fa390b7e4edfc461a9cfb4443c1aab4b011",
-   "sha256": "14fb52r5fzdcqqbh5kkajaz43iqq8g64g0rsswwwv6g1j23y93k3"
+   "commit": "265ee01f6c7c6c44f103b740c37df14f4c1fdb16",
+   "sha256": "14z8sqs094xq1n3hynglh1bj38kmzwfd9h66nxp95wdxanzlzghz"
   }
  },
  {
@@ -99048,28 +99360,27 @@
   "repo": "slime/slime",
   "unstable": {
    "version": [
-    20220115,
-    2013
+    20220204,
+    1357
    ],
    "deps": [
     "cl-lib",
     "macrostep"
    ],
-   "commit": "fad4f25ff0eb7e2df2ab587976f569d8694f641d",
-   "sha256": "0p5c54c1l5a4k41ji92ykcl9mlggcv0f7rlf5830v4967qfgww2r"
+   "commit": "2080537746ba808b9c1683a280e803e65f196a9c",
+   "sha256": "0shi2zazr44bnc1j985wvx2248gl2gp20v1kyb2mzsydw3w462vw"
   },
   "stable": {
    "version": [
     2,
-    26,
-    1
+    27
    ],
    "deps": [
     "cl-lib",
     "macrostep"
    ],
-   "commit": "15cf0609d30255405957bf0612fd6291fea438bc",
-   "sha256": "11zb8aaay1yirql638ssbap4rnxdf6a4lwmqm761grgssk44rqpd"
+   "commit": "cf30941e5858e93eb91574ad91499075222a447b",
+   "sha256": "0wrq7s39lwca9wi01fj0wa2z6n0yyrv17c471kdkxxqppl4whi8m"
   }
  },
  {
@@ -99288,11 +99599,11 @@
   "repo": "joaotavora/sly",
   "unstable": {
    "version": [
-    20211222,
-    1234
+    20220131,
+    1646
    ],
-   "commit": "2e00c3bd4bdf6658f258cc78b3254f0ec24591e5",
-   "sha256": "0qlc5ny85dd03i0fj10ypjxkziih23k031m1wlvhjsdjg2ibs0f7"
+   "commit": "8074da031ed9d677abc77fb3dab4bb42c6be76c3",
+   "sha256": "0yp1fzm7kiqd7316v6ndgildf81mslylnmqhx1xn8g8hsp2fl2l6"
   }
  },
  {
@@ -99787,15 +100098,15 @@
   "repo": "Fuco1/smartparens",
   "unstable": {
    "version": [
-    20211101,
-    1101
+    20220204,
+    1134
    ],
    "deps": [
     "cl-lib",
     "dash"
    ],
-   "commit": "f59a40d54f35299007c396bd667ce3e9ec4714e3",
-   "sha256": "0n0c2knva2c6ajdhqglr2yzhr53sgqr4bscsd1lwmwajgb0iyrw3"
+   "commit": "37f77bf2e2199be9fe27e981317b02cfd0e8c70e",
+   "sha256": "095aqr4mz6yx8xa2gr7k5nf6a82qxdrjh8qv47hfhbc3832gy8jk"
   },
   "stable": {
    "version": [
@@ -100299,15 +100610,15 @@
   "repo": "SpringHan/sniem",
   "unstable": {
    "version": [
-    20210826,
-    832
+    20220206,
+    815
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "4d921b6e9c98fa208578b2b409e627580d1ab8c2",
-   "sha256": "0bh9brzqsvm6dj961smp4592bgjrhhq600qbqbgps8rnbbcjnl3r"
+   "commit": "f629aa45bbfbbde99390e7d4791f14b649d79f35",
+   "sha256": "070nbk9a68ww1mrb4xpda59s3wlcxvz0x2krc0f1g546vj3drakx"
   }
  },
  {
@@ -100726,11 +101037,11 @@
   "repo": "mssola/soria",
   "unstable": {
    "version": [
-    20211025,
-    1535
+    20220127,
+    1004
    ],
-   "commit": "a111e7169405778d95f7a1e61a7d197ca1217edf",
-   "sha256": "130sz27mq3w0svv114qnwqjdbvrnljprab7v0acp5zwj9gqgwkk5"
+   "commit": "2db1859743fe9fc58eab4e6f6c1e37825ad7b69c",
+   "sha256": "0vikil31dwpmnd5iv3iwb8wrnny2xibydvc2mlgsvxjqjw7d40ng"
   },
   "stable": {
    "version": [
@@ -101089,11 +101400,11 @@
   "repo": "nashamri/spacemacs-theme",
   "unstable": {
    "version": [
-    20220114,
-    1455
+    20220128,
+    1519
    ],
-   "commit": "45ba182eabeaf80b7c6c4bec192d8380023ab0d5",
-   "sha256": "0crwjad4ccnb76pwlg03yj5rmf1rhijk1sllij9n054in6ichk02"
+   "commit": "a09347a354a14f5407e99fa730e01345d03e03fd",
+   "sha256": "0nnc6pk5jjx4yhadcph9q9aqb0ks8gs9ybhd32wm32653518hmv4"
   },
   "stable": {
    "version": [
@@ -101217,11 +101528,11 @@
   "repo": "condy0919/spdx.el",
   "unstable": {
    "version": [
-    20211202,
-    1925
+    20220204,
+    53
    ],
-   "commit": "4d1ce0ca8a4c84667301b3e347fe594989c25e60",
-   "sha256": "0fmaxsx6yn3j9i4k6kzap0s2fc5899j623sz9v71g5pjg4pfwmyy"
+   "commit": "38cfd66c3044f26cd1c7d6e599bc73f9b9fc0760",
+   "sha256": "1s5hi5kgq6m2ms9k2f0an3h0mf1lm9s5yriprkp7kmr4d4rk3c6s"
   }
  },
  {
@@ -101831,11 +102142,11 @@
   "repo": "pekingduck/emacs-sqlite3-api",
   "unstable": {
    "version": [
-    20200916,
-    132
+    20220202,
+    728
    ],
-   "commit": "95abc25cc67d652ce2ba79907224e581aef62e93",
-   "sha256": "1kx2ik7k0ads71r2xq4c8jkk460m44prggiiskj1g88yxx0rnqkj"
+   "commit": "88dfeae8f9612cb3564a7393aa8a5c867aacbaf8",
+   "sha256": "0sj1fsgcgfzz6dfpmp8r5gmdwpbdzpk5g5lm8j7c3nqj6wqgg7g6"
   }
  },
  {
@@ -101931,11 +102242,11 @@
   "repo": "srfi-explorations/emacs-srfi",
   "unstable": {
    "version": [
-    20220108,
-    212
+    20220202,
+    2241
    ],
-   "commit": "a47c0df8b5df36f5a8ca41f3f5dc60e1fbd09924",
-   "sha256": "1if3xyma26vzsivpvyf9vxsy0yv64vbl1kkd5rvnx48ly4axqk3a"
+   "commit": "48318da86b2b214106c3e6248c7865407aeebcd4",
+   "sha256": "111h20gp0ns2c4cj9rh2bqlp4mksv1w4ybli64fnm300jci1p2lg"
   },
   "stable": {
    "version": [
@@ -102063,11 +102374,11 @@
   "repo": "cjohansson/emacs-ssh-deploy",
   "unstable": {
    "version": [
-    20210626,
-    2228
+    20220126,
+    658
    ],
-   "commit": "7c5fe8af2d62d8f6d32ebe2d3bfc53051a9432d1",
-   "sha256": "1ca1ai742g2901pni08clk37h1ls4n65pzxpsfzsxnr7i46yh989"
+   "commit": "9311f9b4f8d25ce54fb7da9bf59d955fed366a4d",
+   "sha256": "1wgm4q46nja71grwbdnacnlazj3cgfr6r1glpkyx8y3dn9amdhip"
   },
   "stable": {
    "version": [
@@ -102359,16 +102670,16 @@
     20200606,
     1308
    ],
-   "commit": "8254ffb2eee53f97e9c6210078db55c15340ead3",
-   "sha256": "1saj40x6gj3w261g7792h92m2wy9fa7klf4s8xya778j3yvy62n1"
+   "commit": "03fc757c4255bfd445cdbc2a62ca3b02a65beba5",
+   "sha256": "1p6lcc2xnslkcm2d3pg5zd6nvbdy1y9m3ymrcv1kz0xj33cnphjf"
   },
   "stable": {
    "version": [
     1,
-    4
+    5
    ],
-   "commit": "262b2fc5b533f6f609c43a6f543c9d0d185b8f55",
-   "sha256": "0g0jnry8y858dl3z5w4zd02s0lq9qvha848xb8i1xpsx8xh8plf9"
+   "commit": "03fc757c4255bfd445cdbc2a62ca3b02a65beba5",
+   "sha256": "1p6lcc2xnslkcm2d3pg5zd6nvbdy1y9m3ymrcv1kz0xj33cnphjf"
   }
  },
  {
@@ -102771,11 +103082,11 @@
   "repo": "cryon/subatomic-theme",
   "unstable": {
    "version": [
-    20190607,
-    1022
+    20220128,
+    1615
    ],
-   "commit": "a13cdac97a6d0488b13bc36d4c2f4d4102ff6a31",
-   "sha256": "1l7yvplvjfcv1d1ij0inijm47nx42d3r00w43xjqnyhk9rrvazh1"
+   "commit": "9d0ac6aa5272d0285965a48505eb35658c5472b0",
+   "sha256": "0fs1y53b025fwd690dl5iipsh3nz5g0jvj8ny1az614697yx90xw"
   },
   "stable": {
    "version": [
@@ -103854,8 +104165,8 @@
   "repo": "countvajhula/symex.el",
   "unstable": {
    "version": [
-    20220112,
-    1901
+    20220127,
+    144
    ],
    "deps": [
     "evil",
@@ -103867,8 +104178,8 @@
     "seq",
     "undo-tree"
    ],
-   "commit": "d0fb945e5978b1ee2fe164b6bb30900969762193",
-   "sha256": "0c2iw3p1jw7hk8dxni7c4b3l23x8x406k94xgaj7h7mk6y36p0x0"
+   "commit": "f04d372646d13c3c4ee1aae1230815e8e4d18280",
+   "sha256": "0avpjfpnmx3az3ahxgzd4ki4hm2n5xsdsjcki51b41vlrkwmijlk"
   },
   "stable": {
    "version": [
@@ -104079,6 +104390,24 @@
   }
  },
  {
+  "ename": "syntree",
+  "commit": "765e71a13aab2829d02e9567654aaf9a3de64098",
+  "sha256": "0ck61zjqqv1yqlvmq165avhn9ck3x1a7myldmqpy3q7gg4qcz71z",
+  "fetcher": "github",
+  "repo": "enricoflor/syntree",
+  "unstable": {
+   "version": [
+    20220122,
+    2341
+   ],
+   "deps": [
+    "transient"
+   ],
+   "commit": "45d010b071c32cab4a3a5d336d6c01cde49657f8",
+   "sha256": "0dlq1z4d1sfhzv14y8b3xk9ixjsjd9wl66nbd18aqkm86rx0320f"
+  }
+ },
+ {
   "ename": "sysctl",
   "commit": "72ab5a8c1bc5901477b888a1abf8835a5af7cb41",
   "sha256": "09h3z6mnsck82m8jhbgllx71wg1kmr5v57354xa2db6nfppp09rj",
@@ -104653,11 +104982,11 @@
   "repo": "kanchoku/tc",
   "unstable": {
    "version": [
-    20201022,
-    1646
+    20220122,
+    1443
    ],
-   "commit": "5c6bbb0ff08e5d81e905198156ae5600df7ff7ab",
-   "sha256": "0n78aiwdkb7k8hj1cxg2gawlgq228vi2v0fyjicry6l4i1p4d1ds"
+   "commit": "d0adf22f5aed4d9608778108b60a06c9ea58b289",
+   "sha256": "19wbpa06bfydsgik28c8j9irvsax4drv9hy5ci3ph7sgwnq692nv"
   }
  },
  {
@@ -104731,28 +105060,28 @@
   "repo": "zevlg/telega.el",
   "unstable": {
    "version": [
-    20220119,
-    6
+    20220206,
+    849
    ],
    "deps": [
     "rainbow-identifiers",
     "visual-fill-column"
    ],
-   "commit": "5739794d2d0c8a4e7b77c2e37a097e19f80ac9f0",
-   "sha256": "1am0b2bjjkw7zd0yq39v015a08dcbk43j4d4h8y2q8hj53ryfk5a"
+   "commit": "13077c5e5eaa5621fbb68838ca3c15238faf73e0",
+   "sha256": "0z5h4g2c5ldfdsxzsiyj1dfwrk684vwhb7vx25mjvv01591mgq5c"
   },
   "stable": {
    "version": [
     0,
     8,
-    1
+    2
    ],
    "deps": [
     "rainbow-identifiers",
     "visual-fill-column"
    ],
-   "commit": "7b1107bc11285ef3ed182f638980fba6d7ab2508",
-   "sha256": "1f9asfgjxq73h203cii86irlz4zg29xkr9f5sl59l70bhzchfyx9"
+   "commit": "4c981d6d65d612948227bde6ae8b7d601e0a190f",
+   "sha256": "0f600wd1wz2mfk6cbaxpd6f1sdpbkq5n4d1km5nzgynbjpr2is91"
   }
  },
  {
@@ -104852,11 +105181,11 @@
   "repo": "minad/tempel",
   "unstable": {
    "version": [
-    20220116,
-    2206
+    20220203,
+    2002
    ],
-   "commit": "17f3020b8ecd7fdd16b34aeb11c91a620ac42c3a",
-   "sha256": "0ddjkxxg6f998p87b7dpdmxyj14x542p455321y4kra420n0lmzi"
+   "commit": "6ca08f66585dee09d1e48ee600cbaab579720488",
+   "sha256": "09l7scif2sc0m9ral5nzv4rf02pwsk7z5822y77klj36zsrxigdc"
   },
   "stable": {
    "version": [
@@ -105693,11 +106022,11 @@
   "repo": "GongYiLiao/theme-anchor",
   "unstable": {
    "version": [
-    20211224,
-    2042
+    20220204,
+    321
    ],
-   "commit": "aad9c0c0c888325cf6f9bb2310677d667b364f21",
-   "sha256": "1cpr11kasmskwx3b5v5x5j6mndlz0dm854p4d793m3m9fwdk3303"
+   "commit": "c6f715d4ccd30e83922e39cab856578ce19224bb",
+   "sha256": "1k6vb1r1lzksnki4rxjjcbvcpc59q76vhc3dq7kmi5d20fdgrm9v"
   }
  },
  {
@@ -105875,18 +106204,18 @@
     20200212,
     1903
    ],
-   "commit": "68c1c9216dfed14d37cb84f62e526ad817349cd3",
-   "sha256": "0xvk3m3asiy648zxsr1zdvar7dzxa3xmiw8sprix32djvfrwcllk"
+   "commit": "2f2a408f31d3f3e87415865676479091fea1749c",
+   "sha256": "0mw3lhw0g7b5abaq57q97376bpn4n6q7pb9yazmr8csv6apjk0xd"
   },
   "stable": {
    "version": [
     2022,
     1,
-    17,
+    31,
     0
    ],
-   "commit": "ef52e26081223b80bdc2d8bfadc628c4dead17b6",
-   "sha256": "1rpimfpgxhbxri6zh1n5m218ln20xkn9y3qmjqahr78rxy9hsbni"
+   "commit": "a0a3b22d57d9ec2ee61e37c882467f5580749b1f",
+   "sha256": "18gp39nfw9lzg7d399sr2llaf87yg8rwwf4palncz7spvl0ikyfr"
   }
  },
  {
@@ -106191,19 +106520,19 @@
   "repo": "aimebertrand/timu-spacegrey-theme",
   "unstable": {
    "version": [
-    20220119,
-    2057
+    20220126,
+    2034
    ],
-   "commit": "8e28f7ba737a53cb304a4d4c5317f36d2273cc60",
-   "sha256": "135igyyhl1f4kmlcr05x6srwrx98v6m6750migi7dsmga00ragpg"
+   "commit": "f0e8cee8caef2f3a411cbf276940dfacfc4d4158",
+   "sha256": "1rhr7j0gfcxvcgl5dfr4fidyx9m9lxwqyi8vcnvwcz0vnfxbr8x1"
   },
   "stable": {
    "version": [
     1,
-    8
+    9
    ],
-   "commit": "3da96d529c09dc1000de425f937380895ab9efa6",
-   "sha256": "0k2l15lkk3b5y7qfzhjid8l1clam5j9nhm635a1qmhjgcdln18x3"
+   "commit": "d623d3fba1a3a50bd677b4b4a22b1e13bdf86e68",
+   "sha256": "1rhr7j0gfcxvcgl5dfr4fidyx9m9lxwqyi8vcnvwcz0vnfxbr8x1"
   }
  },
  {
@@ -106422,16 +106751,16 @@
   "repo": "abrochard/emacs-todoist",
   "unstable": {
    "version": [
-    20210922,
-    2254
+    20220126,
+    1813
    ],
    "deps": [
     "dash",
     "org",
     "transient"
    ],
-   "commit": "3662c323f02e89d48c206103b43a185b930220e7",
-   "sha256": "02wwsaj7vc5vs8xij6kzgqqdwigy0qcvridbp8zsjmhy2rgq4w3w"
+   "commit": "585cd45b2c1442888a465e4e9d538eeb1a7b3c0a",
+   "sha256": "1m7pxf54l7qazh7fj2b6b0z9h2zfaxspxlx7lyxrfncdmp1bcswz"
   }
  },
  {
@@ -106442,11 +106771,11 @@
   "repo": "rpdillon/todotxt.el",
   "unstable": {
    "version": [
-    20200530,
-    2337
+    20220204,
+    1903
    ],
-   "commit": "b51f7fa1357d2cbc1b72b10d15f8c6f009ce5a46",
-   "sha256": "1asf33na834mc4ppvfyjxa70v4r80dnq641si5kd86gjfzjjjfmi"
+   "commit": "ddb25fb931b4bbc1af14c4c712d412af454794c4",
+   "sha256": "1mb7cp0czhfzq0wb69lcihblr77f4fvq7ffcl64kkddnlp1ychr3"
   }
  },
  {
@@ -106553,11 +106882,11 @@
   "repo": "topikettunen/tok-theme",
   "unstable": {
    "version": [
-    20220118,
-    2058
+    20220202,
+    1805
    ],
-   "commit": "763c141ee79d67d8f57bfe8960f4691a357067c6",
-   "sha256": "1dknbml53m2n7ajm36dj118lxbky9lhlv4yj50dhrbxffgwrjmdd"
+   "commit": "5df42d3f5569d9005f9180337aa88befaf77c491",
+   "sha256": "120lh5c01wbv92zljw8jhx16cdjp154bjas8k0bi461x1xa5mzl5"
   }
  },
  {
@@ -107014,11 +107343,11 @@
   "repo": "magit/transient",
   "unstable": {
    "version": [
-    20220117,
-    1122
+    20220130,
+    1941
    ],
-   "commit": "a19faa1c71428e1f5b2bb548b966e9f9b1a9eca2",
-   "sha256": "07vn0j3vk62w8rai8lwr7i16qqnx4zvzh0li20bfzgyi81za6md8"
+   "commit": "440a341831398b825dc2288a10821cf7be1999ca",
+   "sha256": "0vaaxjkk6rllypfspvi2gb0kcfkgh3sipg6nmfwaz62y1kviwc1s"
   },
   "stable": {
    "version": [
@@ -107258,8 +107587,8 @@
   "repo": "ethan-leba/tree-edit",
   "unstable": {
    "version": [
-    20220120,
-    122
+    20220129,
+    448
    ],
    "deps": [
     "dash",
@@ -107269,8 +107598,8 @@
     "tree-sitter-langs",
     "tsc"
    ],
-   "commit": "ad5d3c5060d8cf43d2053c2bc74b0beda1e664a1",
-   "sha256": "0az5p42vhpbrqhgavfk3jyp1izillvqsik9rpwh5g48c3qm42bjh"
+   "commit": "a94e4a645988a2c0e2369e27a2635f6555d321d8",
+   "sha256": "1pszg8vlhdbpl3q6wr60jv1pn52dpxl8lzmvrvsy5jwvlmiwy91y"
   }
  },
  {
@@ -107296,26 +107625,26 @@
   "repo": "emacs-tree-sitter/elisp-tree-sitter",
   "unstable": {
    "version": [
-    20211211,
-    1220
+    20220129,
+    1630
    ],
    "deps": [
     "tsc"
    ],
-   "commit": "48b06796a3b2e76ce004972d929de38146eafaa0",
-   "sha256": "04dlwpi5w1g9v62l51zwa6idsajk6km39ljk2k9z3jrcs0fj22ml"
+   "commit": "771239bacecf6c3ba9ee8b9eecec2b9fdd8e2256",
+   "sha256": "0bl7709r4mhb5nmfcsiqj09ja8wn53x9nf5jrr5lq3n1lwz7qq66"
   },
   "stable": {
    "version": [
     0,
-    16,
-    1
+    17,
+    0
    ],
    "deps": [
     "tsc"
    ],
-   "commit": "48b06796a3b2e76ce004972d929de38146eafaa0",
-   "sha256": "04dlwpi5w1g9v62l51zwa6idsajk6km39ljk2k9z3jrcs0fj22ml"
+   "commit": "771239bacecf6c3ba9ee8b9eecec2b9fdd8e2256",
+   "sha256": "0bl7709r4mhb5nmfcsiqj09ja8wn53x9nf5jrr5lq3n1lwz7qq66"
   }
  },
  {
@@ -107357,26 +107686,26 @@
   "repo": "emacs-tree-sitter/tree-sitter-langs",
   "unstable": {
    "version": [
-    20211228,
-    1446
+    20220129,
+    1702
    ],
    "deps": [
     "tree-sitter"
    ],
-   "commit": "3c0c82f9fb0a796f5ebd7e1e4c89f13d5ab6ef58",
-   "sha256": "0jijx5l4wx03wnq5v3qlfw3kwzssiv5glqxz9clr827qdzgpxnlb"
+   "commit": "a9b0390a751be0a631cf8a356d61933795d9fcbc",
+   "sha256": "10dscwcn6g0hm39jag2cd7avvwqav9xs43ygcgcx1lxcxfk6ib18"
   },
   "stable": {
    "version": [
     0,
-    10,
-    14
+    11,
+    0
    ],
    "deps": [
     "tree-sitter"
    ],
-   "commit": "53fb0fb0c00f622a4661721ce04b8b5f73eb80f0",
-   "sha256": "1xv3pfbddyky68bc3ckxz5gji54ysl1frazlw6pn74xmr62y99xq"
+   "commit": "a9b0390a751be0a631cf8a356d61933795d9fcbc",
+   "sha256": "10dscwcn6g0hm39jag2cd7avvwqav9xs43ygcgcx1lxcxfk6ib18"
   }
  },
  {
@@ -107423,8 +107752,8 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20220119,
-    1620
+    20220129,
+    1122
    ],
    "deps": [
     "ace-window",
@@ -107436,8 +107765,8 @@
     "pfuture",
     "s"
    ],
-   "commit": "410277b60282fc4b400e34cd87008a1183b1151d",
-   "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w"
+   "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314",
+   "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar"
   },
   "stable": {
    "version": [
@@ -107467,15 +107796,15 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20211107,
-    1818
+    20220124,
+    1914
    ],
    "deps": [
     "all-the-icons",
     "treemacs"
    ],
-   "commit": "410277b60282fc4b400e34cd87008a1183b1151d",
-   "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w"
+   "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314",
+   "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar"
   },
   "stable": {
    "version": [
@@ -107506,8 +107835,8 @@
     "evil",
     "treemacs"
    ],
-   "commit": "410277b60282fc4b400e34cd87008a1183b1151d",
-   "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w"
+   "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314",
+   "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar"
   },
   "stable": {
    "version": [
@@ -107537,8 +107866,8 @@
    "deps": [
     "treemacs"
    ],
-   "commit": "410277b60282fc4b400e34cd87008a1183b1151d",
-   "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w"
+   "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314",
+   "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar"
   },
   "stable": {
    "version": [
@@ -107569,8 +107898,8 @@
     "pfuture",
     "treemacs"
    ],
-   "commit": "410277b60282fc4b400e34cd87008a1183b1151d",
-   "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w"
+   "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314",
+   "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar"
   },
   "stable": {
    "version": [
@@ -107603,8 +107932,8 @@
     "persp-mode",
     "treemacs"
    ],
-   "commit": "410277b60282fc4b400e34cd87008a1183b1151d",
-   "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w"
+   "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314",
+   "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar"
   },
   "stable": {
    "version": [
@@ -107637,8 +107966,8 @@
     "perspective",
     "treemacs"
    ],
-   "commit": "410277b60282fc4b400e34cd87008a1183b1151d",
-   "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w"
+   "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314",
+   "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar"
   },
   "stable": {
    "version": [
@@ -107670,8 +107999,8 @@
     "projectile",
     "treemacs"
    ],
-   "commit": "410277b60282fc4b400e34cd87008a1183b1151d",
-   "sha256": "1pd8kp6bym4y8hrr9b6ws12g3acvhrzrq06fjcdwpwp8aihgpw0w"
+   "commit": "ca4b4dd373ed4ff879dcc07b18832f3e27559314",
+   "sha256": "18yaswgyaxji27b0shccdp99g4amay6x6vsl80dlzjf070y483ar"
   },
   "stable": {
    "version": [
@@ -107927,20 +108256,20 @@
   "repo": "emacs-tree-sitter/elisp-tree-sitter",
   "unstable": {
    "version": [
-    20211211,
-    1220
+    20220129,
+    1630
    ],
-   "commit": "48b06796a3b2e76ce004972d929de38146eafaa0",
-   "sha256": "04dlwpi5w1g9v62l51zwa6idsajk6km39ljk2k9z3jrcs0fj22ml"
+   "commit": "771239bacecf6c3ba9ee8b9eecec2b9fdd8e2256",
+   "sha256": "0bl7709r4mhb5nmfcsiqj09ja8wn53x9nf5jrr5lq3n1lwz7qq66"
   },
   "stable": {
    "version": [
     0,
-    16,
-    1
+    17,
+    0
    ],
-   "commit": "48b06796a3b2e76ce004972d929de38146eafaa0",
-   "sha256": "04dlwpi5w1g9v62l51zwa6idsajk6km39ljk2k9z3jrcs0fj22ml"
+   "commit": "771239bacecf6c3ba9ee8b9eecec2b9fdd8e2256",
+   "sha256": "0bl7709r4mhb5nmfcsiqj09ja8wn53x9nf5jrr5lq3n1lwz7qq66"
   }
  },
  {
@@ -108418,11 +108747,11 @@
   "repo": "md-arif-shaikh/tzc",
   "unstable": {
    "version": [
-    20220118,
-    557
+    20220126,
+    604
    ],
-   "commit": "d1f08fff5d4f9c2584a3b405464c6a92000f62b3",
-   "sha256": "108920snw6i0lbdy7ky336n5lkf44bv1cfn0an12amfa3jb5w1wg"
+   "commit": "3af821d2125a67786f93d50d532a71f681f381cc",
+   "sha256": "0zd0g5qdm4w0jj37n0ijcknz74xgb3f9s0w72qz8zapf5n8q9mbp"
   }
  },
  {
@@ -109244,6 +109573,30 @@
   }
  },
  {
+  "ename": "unmodified-buffer",
+  "commit": "0a8d1d4a74ceed49d0506c19715e1dcf33ba90bd",
+  "sha256": "105vgslgjfwhdvmmwxrz32mz8rpz74gvxkylvvb2jrfddfx575hq",
+  "fetcher": "github",
+  "repo": "arthurcgusmao/unmodified-buffer",
+  "unstable": {
+   "version": [
+    20220129,
+    2013
+   ],
+   "commit": "9095a3f870aa570804a11d75aba0952294199715",
+   "sha256": "1b78m66i00fg4f84kvwd82w3pb2rr3skf6cgckb0g1fsdzzhrjb8"
+  },
+  "stable": {
+   "version": [
+    1,
+    1,
+    0
+   ],
+   "commit": "9095a3f870aa570804a11d75aba0952294199715",
+   "sha256": "1b78m66i00fg4f84kvwd82w3pb2rr3skf6cgckb0g1fsdzzhrjb8"
+  }
+ },
+ {
   "ename": "unobtrusive-magit-theme",
   "commit": "6dd57561738c2dc3ed6dc03f57d2487ce949f035",
   "sha256": "05djixlq49dn1m64xs8b6w4kg650wrr8rs2pb72p1kfvp2a53g7w",
@@ -111066,11 +111419,11 @@
   "repo": "emacs-vs/vs-dark-theme",
   "unstable": {
    "version": [
-    20220119,
-    1100
+    20220201,
+    1229
    ],
-   "commit": "be9e32f04ea7f190c57d18e59eb4fdd53e89e542",
-   "sha256": "0bc5n14xzdlwyxx2h4pw4ffzb16jzsmm4a3pr99i5di8gr57d5rh"
+   "commit": "e292c57d53823038733105d22f576a83b5dfdaae",
+   "sha256": "0687q8m5a3rqwdjgr898gz4nckyi5awksz5z6m6qhga3zmhcmqkw"
   },
   "stable": {
    "version": [
@@ -111089,11 +111442,11 @@
   "repo": "emacs-vs/vs-light-theme",
   "unstable": {
    "version": [
-    20220119,
-    1101
+    20220201,
+    1228
    ],
-   "commit": "0198d598657ce02c95a977eb27b681a5cc7604a7",
-   "sha256": "1zvhiz45nnzh5k1pki4j6mx5vr3nyqp7q5vb5816f646j8kf7lby"
+   "commit": "b99fdcfdb5259b2d831302f38288bdbb3a21ed19",
+   "sha256": "09nbdyw4kjbfpyswjwn0rdffpcmcnl5y32vrncaxwx44rsg3y1cr"
   },
   "stable": {
    "version": [
@@ -111181,14 +111534,14 @@
   "repo": "jixiuf/vterm-toggle",
   "unstable": {
    "version": [
-    20210902,
-    828
+    20220202,
+    1722
    ],
    "deps": [
     "vterm"
    ],
-   "commit": "ea0bfeaa200d9ed02b51bbbd83222657b02637e7",
-   "sha256": "0bwgzpf2wyzdj9smwys06zx4yha72pw50wzdh4zld45ph40pb6qw"
+   "commit": "2a6861ef6af91dad4be082139214a30116b50acf",
+   "sha256": "19rr03fqicykw73wbpw2nzz0b0dc62qpqh7gddmgz8lv39d6xmfb"
   }
  },
  {
@@ -111309,16 +111662,16 @@
   "repo": "d12frosted/vulpea",
   "unstable": {
    "version": [
-    20211118,
-    734
+    20220204,
+    936
    ],
    "deps": [
     "org",
     "org-roam",
     "s"
    ],
-   "commit": "398ca17f83ea59f54f61898fefdb55332cd3ba46",
-   "sha256": "0qa49s0nhqbh9bmxi1zglnx3yajqcdx8j7yiy23lxbya2fpl557i"
+   "commit": "38efd2e08345d02f64b768629e26fa4e4e7beb85",
+   "sha256": "1n1fhy9456d10isddfp29dqnjccs6hs4ymdxcs05c55sw2vgjc1l"
   },
   "stable": {
    "version": [
@@ -111343,14 +111696,14 @@
   "repo": "embed-me/vunit-mode",
   "unstable": {
    "version": [
-    20220118,
-    1929
+    20220121,
+    1644
    ],
    "deps": [
     "hydra"
    ],
-   "commit": "7f36752161b1a172ff74b3fd9f1289f89471e002",
-   "sha256": "1na722d9mgcmsqf0pdwnr7wy4zl8d4f3yj1ckpi4rmh5mj0g1blp"
+   "commit": "13311cc9fba6e73cf859dd5defefd330cc41b489",
+   "sha256": "0k7xj2a0xdc4g0bi1fxmwy1bl1ha9z68f7l1qc296r8q3hq8ghi9"
   }
  },
  {
@@ -112727,11 +113080,11 @@
   "repo": "progfolio/wikinfo",
   "unstable": {
    "version": [
-    20210711,
-    249
+    20220121,
+    2017
    ],
-   "commit": "c75c588a3ebf4cf155c33ca018c56ac914092860",
-   "sha256": "0vrbqaby2q34350mkpykxqw5kfagrdsz12l3fbmdpqvwh1vhjwdm"
+   "commit": "b149228023d4abb29555ce69877df521887cafe9",
+   "sha256": "153jmq14x4bim9v5xhd4zd100bqy2amj62sqjlmxf60pmd6xqc69"
   }
  },
  {
@@ -113117,11 +113470,11 @@
   "url": "https://hg.sr.ht/~arnebab/wisp",
   "unstable": {
    "version": [
-    20210405,
-    1410
+    20220204,
+    436
    ],
-   "commit": "c15e50edbfadf6cc46b8ed22a13438ecdb6757ee",
-   "sha256": "0jg9r9ykad05ng1y12mcva52bi8apid9vxaxxww262hgl647cl2v"
+   "commit": "08b3d086d1f1ac77a7d14f763063e75c29e600c8",
+   "sha256": "08zh4fdmdpi3wd2ysfv3awbq9lfvscanz3478k4fliw6igidk3qa"
   }
  },
  {
@@ -113162,11 +113515,11 @@
   "repo": "magit/with-editor",
   "unstable": {
    "version": [
-    20220107,
-    1056
+    20220130,
+    1942
    ],
-   "commit": "a4e720b12a0946a271a274bbe0b45ae07f83520b",
-   "sha256": "06a66119rp5vfqdzqk10df3qyh9jvjl6j3pqm03jy0b110v2bfa8"
+   "commit": "edf4445edb613c8355c45209264f691268116f0f",
+   "sha256": "1rrzn34cqi2vf5vp4ip15qcprbm9y7jw9kh2yxkw82mxm8gh7m3h"
   },
   "stable": {
    "version": [
@@ -113406,6 +113759,21 @@
   }
  },
  {
+  "ename": "wordel",
+  "commit": "a0186cd951d0d4a6eb5b1f872d7114e24ce479a2",
+  "sha256": "0xdj3fqkq1cixmr7nnzl0ch4zl9mpd0x1y8svdcqz0a1ncg6pg9g",
+  "fetcher": "github",
+  "repo": "progfolio/wordel",
+  "unstable": {
+   "version": [
+    20220124,
+    251
+   ],
+   "commit": "c2f0d61646d2744167661e5ce60fae679d50c850",
+   "sha256": "12b42qcmc8k15n2zdvl264sz9w697f6dm9vynyw7gk3g16rydbhj"
+  }
+ },
+ {
   "ename": "wordgen",
   "commit": "5cfdc64a9aa79575dad8057c4cd747d2cdd460aa",
   "sha256": "0vlrplm3pmpwwa8p8j6lck97b875gzzm7vxxc8l9l18vs237cz1m",
@@ -114750,11 +115118,11 @@
   "repo": "Kungsgeten/yankpad",
   "unstable": {
    "version": [
-    20210811,
-    1934
+    20220201,
+    2104
    ],
-   "commit": "6562d021cfc76b88a7b39b49adc44fcad835bd3f",
-   "sha256": "1xh36s2vy521hni9993ajnqv3apinqsiq09yfhfkz4skw22p891g"
+   "commit": "927e6d26956ac7219b8a69d641acf486854fba16",
+   "sha256": "17zz614fy7r2azgqfwiyl9gr9y3fxls65b0nahdb5dlsr9gsjiw5"
   },
   "stable": {
    "version": [
@@ -115460,11 +115828,11 @@
   "repo": "bbatsov/zenburn-emacs",
   "unstable": {
    "version": [
-    20220115,
-    1539
+    20220130,
+    1555
    ],
-   "commit": "e519713330fd2eebf9ee9d3ec695a32b567c587d",
-   "sha256": "1z26w72g4ckfa7gid6rb89fv08k76aqk5n8474zqs3sagrjjgqbr"
+   "commit": "50e9bb9bcd62edf29d29a29b2b9b6b845db68174",
+   "sha256": "0yp0szhncygbb5cl7ai0296fiiz401r1wf7xm9kix3h2211zm5id"
   },
   "stable": {
    "version": [
@@ -115784,6 +116152,21 @@
   }
  },
  {
+  "ename": "zk",
+  "commit": "4ae4dee35fd931915f6162a8c2f46df21dd07c09",
+  "sha256": "0b8kcz415c5vl6cyw2ygi8znd6sq449rsba12znvlgc9gg3rhx05",
+  "fetcher": "github",
+  "repo": "localauthor/zk",
+  "unstable": {
+   "version": [
+    20220205,
+    2000
+   ],
+   "commit": "44b59d15e4ec491129104b6d1a1a0ed8bdff645f",
+   "sha256": "1fgcdip4jn8j5668ws0pxma8hibsnsamk1gq0fb4mcb24mczxvc3"
+  }
+ },
+ {
   "ename": "zlc",
   "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487",
   "sha256": "0qw0qf14l09mcnw7h0ccbw17psfpra76qfawkc10zpdb5a2167d0",
diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix
deleted file mode 100644
index 7d1830c842b..00000000000
--- a/pkgs/applications/editors/heme/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, lib, fetchurl, ncurses }:
-
-stdenv.mkDerivation rec {
-  pname = "heme";
-  version = "0.4.2";
-  src = fetchurl {
-    url = "mirror://sourceforge/project/heme/heme/heme-${version}/heme-${version}.tar.gz";
-    sha256 = "0wsrnj5mrlazgqs4252k30aw8m86qw0z9dmrsli9zdxl7j4cg99v";
-  };
-  postPatch = ''
-    substituteInPlace Makefile \
-      --replace "/usr/local" "$out" \
-      --replace "CFLAGS = " "CFLAGS = -I${ncurses.dev}/include " \
-      --replace "LDFLAGS = " "LDFLAGS = -L${ncurses.out}/lib " \
-      --replace "-lcurses" "-lncurses"
-  '';
-  buildInputs = [ ncurses ];
-  preBuild = ''
-    mkdir -p $out/bin
-    mkdir -p $out/man/man1
-  '';
-  meta = with lib; {
-    description = "Portable and fast console hex editor for unix operating systems";
-    homepage = "http://heme.sourceforge.net/";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ cstrahan ];
-  };
-}
diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix
index a468e34393c..b19c3f531b7 100644
--- a/pkgs/applications/editors/lite-xl/default.nix
+++ b/pkgs/applications/editors/lite-xl/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lite-xl";
-  version = "2.0.4";
+  version = "2.0.5";
 
   src = fetchFromGitHub {
     owner = "lite-xl";
     repo = "lite-xl";
     rev = "v${version}";
-    sha256 = "sha256-yMdfJ8qE2Tv+CtvbPN6todzY/pDrYo+vaBeppuUt5F4=";
+    sha256 = "sha256-7ppO5ITijhJ37OL6xlQgu1SaQ/snXDH5xJOwuXZNUVA=";
   };
 
   patches = [
diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix
index 45a86a73d02..133c5fe9cbe 100644
--- a/pkgs/applications/editors/vscode/generic.nix
+++ b/pkgs/applications/editors/vscode/generic.nix
@@ -125,7 +125,7 @@ let
       rm -rf "$packed"
 
       # this fixes bundled ripgrep
-      chmod +x resources/app/node_modules/vscode-ripgrep/bin/rg
+      chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg
     '';
 
     inherit meta;
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 8990ef75a85..d307db0b1b5 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -14,17 +14,17 @@ let
   archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "1bglf1a8b5whv9pk811fdnx0mvfcfasjxbik73p67msp4yy68lm4";
-    x86_64-darwin = "0cv6i2i69xf6hn0vrfl3gk3ky7r5yvp4k7zx2k695gzck5s9bx8y";
-    aarch64-linux = "1jggspj5q4vfgs4xdvx5p8qsfm98wf17jmxqzs68lmlhmhadyh22";
-    aarch64-darwin = "0c1nz7a54xq20a2a4fqcmlhry6gqwz5f1ys7dx0x5whaxbybh8my";
-    armv7l-linux = "0p2rdxbqpzk79ra7br7wfs8kr0hnh3l022mqb7y16gc426xjlfn4";
+    x86_64-linux = "0nszdd3bmixspv9wc837l9ibs996kr92awpnhx0c00mh823id9g8";
+    x86_64-darwin = "0fvxlkgsr19rwbjlqqsql7rb1ah15svr4bd9zwxg0xv23q51xadc";
+    aarch64-linux = "0037k2iv8cg45rx8sprm3zdj0ai76xn2l4ynij0hp7s2sh947d4s";
+    aarch64-darwin = "0z3zrd90cxh892g5n5ga8xxwczfqd03lcnhz8b8k0lh2l9321inc";
+    armv7l-linux = "193b560pvznkwk58bhqbr3jgbwx26vg26s5sqaibcw3z41v58a3c";
   }.${system};
 in
   callPackage ./generic.nix rec {
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.63.2";
+    version = "1.64.0";
     pname = "vscode";
 
     executableName = "code" + lib.optionalString isInsiders "-insiders";
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 0ca39a72842..d5d52010e05 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -13,10 +13,10 @@ let
   archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "0pczrbifjgm905371i8c6bk90ka291cmny6hr1nzfix7bn5psjx0";
-    x86_64-darwin = "12g2jlrhng3i56a4v9jf7nrj045jivnfdx4dhka1fiv60nn4gc46";
-    aarch64-linux = "1bhhz4yvmk3zqljy3b77hlsxbwm2l675pslhwr44p6fb4hmn8fai";
-    armv7l-linux = "15nbskq92b85zdyg7pgagi9mqhnbyisfkipqb3brc2rvmyxpzclb";
+    x86_64-linux = "0s45ydca4lmcyki58n4zmvdpn32x7z1q249i3qxcn2a5ay2mhhxc";
+    x86_64-darwin = "1wab60dx5hfgmsw313qk8cbwvyq291d1q82hwll129dgcfhkrzrj";
+    aarch64-linux = "1mkvca3hjcqf3k0v04lynmlm5j3lj86l5j15a505a3f8xp97yvdy";
+    armv7l-linux = "1lcaq5k17km9p6xx26dpxgq5zrnjvh3yf8svz5nb5fa01v8fz4ds";
   }.${system};
 
   sourceRoot = {
@@ -31,7 +31,7 @@ in
 
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.63.2";
+    version = "1.64.0";
     pname = "vscodium";
 
     executableName = "codium";
diff --git a/pkgs/applications/graphics/evilpixie/default.nix b/pkgs/applications/graphics/evilpixie/default.nix
index 4c47283c42a..2518eb0942a 100644
--- a/pkgs/applications/graphics/evilpixie/default.nix
+++ b/pkgs/applications/graphics/evilpixie/default.nix
@@ -49,9 +49,9 @@ in mkDerivation rec {
 
   meta = with lib; {
     description = "Pixel-oriented paint program, modelled on Deluxe Paint";
-    homepage = "http://evilpixie.scumways.com/";
+    homepage = "https://github.com/bcampbell/evilpixie"; # http://evilpixie.scumways.com/ is gone
     downloadPage = "https://github.com/bcampbell/evilpixie/releases";
-    license = licenses.gpl3;
+    license = licenses.gpl3Only;
     maintainers = with maintainers; [ fgaz ];
     platforms = platforms.all;
   };
diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix
index c2ce2840379..fdf6831b974 100644
--- a/pkgs/applications/graphics/glabels/default.nix
+++ b/pkgs/applications/graphics/glabels/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Create labels and business cards";
-    homepage = "https://glabels.org/";
+    homepage = "https://github.com/jimevins/glabels";
     license = with licenses; [ gpl3Plus lgpl3Plus ];
     platforms = platforms.unix;
     maintainers = [ maintainers.nico202 ];
diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix
index 9f09e3d978e..f7c5714f126 100644
--- a/pkgs/applications/misc/gxmessage/default.nix
+++ b/pkgs/applications/misc/gxmessage/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.4.3";
 
   src = fetchurl {
-    url = "http://homepages.ihug.co.nz/~trmusson/stuff/${pname}-${version}.tar.gz";
+    url = "https://trmusson.dreamhosters.com/stuff/${pname}-${version}.tar.gz";
     sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05";
   };
 
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A GTK enabled dropin replacement for xmessage";
-    homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage";
-    license = lib.licenses.gpl3;
+    homepage = "https://trmusson.dreamhosters.com/programs.html#gxmessage";
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [jfb];
     platforms = with lib.platforms; linux;
   };
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index a38421b3178..84565a5dff2 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -223,13 +223,13 @@ let
           self: super: {
             octoprint = self.buildPythonPackage rec {
               pname = "OctoPrint";
-              version = "1.7.2";
+              version = "1.7.3";
 
               src = fetchFromGitHub {
                 owner = "OctoPrint";
                 repo = "OctoPrint";
                 rev = version;
-                sha256 = "sha256-jCfzUx3LQ7TlXKQU8qbhyS1P4Wew/SSgJHVSc1VLdx4=";
+                sha256 = "sha256-U6g7WysHHOlZ4p5BM4tw3GGAxQmxv6ltYgAp1rO/eCg=";
               };
 
               propagatedBuildInputs = with super; [
diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix
index ae25ce358de..c65f9b5b84b 100644
--- a/pkgs/applications/misc/taskwarrior-tui/default.nix
+++ b/pkgs/applications/misc/taskwarrior-tui/default.nix
@@ -5,19 +5,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "taskwarrior-tui";
-  version = "0.13.35";
+  version = "0.18.5";
 
   src = fetchFromGitHub {
     owner = "kdheepak";
     repo = "taskwarrior-tui";
     rev = "v${version}";
-    sha256 = "sha256-sXJto2YygPz2B5y7m8uUfOhuRCbKkZGoCmzHOhvH2MU=";
+    sha256 = "sha256-Rztz/qye+VsZ0czPt6xk4PwK0e6Aq1GC404+843W55Y=";
   };
 
   # Because there's a test that requires terminal access
   doCheck = false;
 
-  cargoSha256 = "sha256-mUlwpH2XhVDtjV7ChEqlEUXffOIbips4FzQyGejFvWk=";
+  cargoSha256 = "sha256-H2A78ACz4TxHxCCtcOuzrfAk4awU6/HC/TlHLNtb/bk=";
 
   meta = with lib; {
     description = "A terminal user interface for taskwarrior ";
diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index 1548b0581b6..67fe3032d05 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -30,4 +30,4 @@ let
     };
   };
 
-in self.zathuraWrapper
+in self
diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix
index ccbde19d2aa..60ff0bd6885 100644
--- a/pkgs/applications/misc/zathura/wrapper.nix
+++ b/pkgs/applications/misc/zathura/wrapper.nix
@@ -11,7 +11,7 @@ symlinkJoin {
   in ''
     makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \
       --prefix PATH ":" "${lib.makeBinPath [ file ]}" \
-      --add-flags --plugins-dir="$out/lib/zathura"
+      --prefix ZATHURA_PLUGINS_PATH : "$out/lib/zathura"
 
     # zathura fish completion references the zathura_core derivation to
     # check for supported plugins which live in the wrapper derivation,
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index f1da103157b..d1fd9f05ccb 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -118,6 +118,9 @@ in stdenv.mkDerivation {
     cp -a opt/* $out/share
     cp -a usr/share/* $out/share
 
+
+    substituteInPlace $out/share/google/$appname/google-$appname \
+      --replace 'CHROME_WRAPPER' 'WRAPPER'
     substituteInPlace $out/share/applications/google-$appname.desktop \
       --replace /usr/bin/google-chrome-$dist $exe
     substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \
@@ -143,6 +146,7 @@ in stdenv.mkDerivation {
       --prefix LD_LIBRARY_PATH : "$rpath" \
       --prefix PATH            : "$binpath" \
       --prefix XDG_DATA_DIRS   : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \
+      --set CHROME_WRAPPER  "google-chrome-$dist" \
       --add-flags ${escapeShellArg commandLineArgs} \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
 
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index bf220c02b4e..7584cd3aa2e 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -19,11 +19,11 @@ let
   vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "5.0.2497.32-1";
+  version = "5.0.2497.51-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
-    sha256 = "1l333q002z9rr08np0r0j89j26shmsl8y2clyqwh54h22h7hmypz";
+    sha256 = "OOLTY6Q0BI65PVN/B6+Q9t4Fa5Z0p9U2KyAeCGwCCPw=";
   };
 
   unpackPhase = ''
diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers
index 46f0ce1be56..57e1ab32f08 100755
--- a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers
+++ b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers
@@ -18,5 +18,5 @@ echo "${providers}"
 
 for provider in ${providers}; do
   echo "Updating ${provider}"
-  ./update-provider "${provider}"
+  ./update-provider "$@" "${provider}"
 done
diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider
index 0cbb855da20..255e82aee1d 100755
--- a/pkgs/applications/networking/cluster/terraform-providers/update-provider
+++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider
@@ -11,7 +11,7 @@ shopt -s inherit_errexit
 
 show_usage() {
   cat <<DOC
-Usage: ./update-provider [--force] [--vendor] [<owner>/]<provider>
+Usage: ./update-provider [--force] [--no-build] [<owner>/]<provider>
 
 Update a single provider in the providers.json inventory file.
 
@@ -27,14 +27,14 @@ to add the provider to the list:
 Options:
 
   * --force: Force the update even if the version matches.
-  * --vendor: Switch from go package to go modules with vendor.
+  * --no-build: Don't build provider
   * --vendor-sha256 <sha256>: Override the SHA256 or "null".
 DOC
 }
 
 force=
 provider=
-vendor=
+build=1
 vendorSha256=
 
 while [[ $# -gt 0 ]]; do
@@ -47,9 +47,8 @@ while [[ $# -gt 0 ]]; do
     force=1
     shift
     ;;
-  --vendor)
-    force=1
-    vendor=1
+  --no-build)
+    build=0
     shift
     ;;
   --vendor-sha256)
@@ -142,12 +141,10 @@ update_attr rev "${rev}"
 sha256=$(prefetch_github "${org}" "${repo}" "${rev}")
 update_attr sha256 "${sha256}"
 
-repo_root=$(git rev-parse --show-toplevel)
-
 if [[ -z ${vendorSha256} ]]; then
   if [[ ${old_vendor_sha256} == null ]]; then
     vendorSha256=null
-  elif [[ -n ${old_vendor_sha256} || ${vendor} == 1 ]]; then
+  elif [[ -n ${old_vendor_sha256} ]]; then
     echo "=== Calculating vendorSha256 ==="
     vendorSha256=$(nix-prefetch -I nixpkgs=../../../../.. "{ sha256 }: (import ../../../../.. {}).terraform-providers.${provider_name}.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })")
     # Deal with nix unstable
@@ -162,5 +159,7 @@ if [[ -n ${vendorSha256} ]]; then
 fi
 
 # Check that the provider builds
-echo "=== Building terraform-providers.${provider_name} ==="
-nix-build --no-out-link "${repo_root}" -A "terraform-providers.${provider_name}"
+if [[ ${build} == 1 ]]; then
+  echo "=== Building terraform-providers.${provider_name} ==="
+  nix-build --no-out-link ../../../../.. -A "terraform-providers.${provider_name}"
+fi
diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix
index 92421b33a21..8b6a5e2cc25 100644
--- a/pkgs/applications/networking/dnscontrol/default.nix
+++ b/pkgs/applications/networking/dnscontrol/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "dnscontrol";
-  version = "3.13.1";
+  version = "3.14.0";
 
   src = fetchFromGitHub {
     owner = "StackExchange";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-S3/uxtrCFU9HbNhYKqOYy1ytSVi2DU/lXIlhBgNnaPg=";
+    sha256 = "sha256-4az63Ff4aUAFMZoQeHshS9TxA/BIyHFZ/svFgAsU6WU=";
   };
 
-  vendorSha256 = "sha256-OwiZL+MBmAFtV8Vg2Wl9yAeTG3AzMSmCjefxObU7lfQ=";
+  vendorSha256 = "sha256-KbM2bKYnllxTw4B9W5E8iLZKvN/DJqBmWkXXLhEtsSQ=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 6c222444ce1..d3321a9ea72 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -56,28 +56,27 @@ let
 
   version = {
     x86_64-darwin = x86_64-darwin-version;
-    aarch64-darwin = aarch64-darwin-version;
     x86_64-linux = x86_64-linux-version;
+    aarch64-darwin =  aarch64-darwin-version;
   }.${system} or throwSystem;
 
-  src =
-    let
-      base = "https://downloads.slack-edge.com";
-    in
-      {
-        x86_64-darwin = fetchurl {
-          url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg";
-          sha256 = x86_64-darwin-sha256;
-        };
-        aarch64-darwin = fetchurl {
-          url = "${base}/releases/macos/${version}/prod/arm64/Slack-${version}-macOS.dmg";
-          sha256 = aarch64-darwin-sha256;
-        };
-        x86_64-linux = fetchurl {
-          url = "${base}/releases/linux/${version}/prod/x64/slack-desktop-${version}-amd64.deb";
-          sha256 = x86_64-linux-sha256;
-        };
-      }.${system} or throwSystem;
+
+  src = let
+    base = "https://downloads.slack-edge.com";
+  in {
+    x86_64-darwin = fetchurl {
+      url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg";
+      sha256 = x86_64-darwin-sha256;
+    };
+    x86_64-linux = fetchurl {
+      url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb";
+      sha256 = x86_64-linux-sha256;
+    };
+    aarch64-darwin = fetchurl {
+      url = "${base}/releases/macos/${version}/prod/arm64/Slack-${version}-macOS.dmg";
+      sha256 = aarch64-darwin-sha256;
+    };
+  }.${system} or throwSystem;
 
   meta = with lib; {
     description = "Desktop client for Slack";
@@ -195,7 +194,10 @@ let
       runHook preInstall
       mkdir -p $out/Applications/Slack.app
       cp -R . $out/Applications/Slack.app
-      /usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES
+    '' + lib.optionalString (!stdenv.isAarch64) ''
+      # on aarch64-darwin we get: Could not write domain com.tinyspeck.slackmacgap; exiting
+      /usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -Bool YES
+    '' + ''
       runHook postInstall
     '';
   };
diff --git a/pkgs/applications/networking/instant-messengers/slack/update.sh b/pkgs/applications/networking/instant-messengers/slack/update.sh
index 46306488714..28591d132d3 100755
--- a/pkgs/applications/networking/instant-messengers/slack/update.sh
+++ b/pkgs/applications/networking/instant-messengers/slack/update.sh
@@ -16,6 +16,7 @@ nixpkgs="$(git rev-parse --show-toplevel)"
 slack_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix"
 nixpkgs_linux_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-linux-version = \"\([0-9\.]\+\)\";.*/\1/p')
 nixpkgs_mac_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p')
+nixpkgs_mac_arm_version=$(cat "$slack_nix" | sed -n 's/.*aarch64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p')
 
 if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && "$nixpkgs_mac_version" == "$latest_mac_version" ]]; then
   echo "nixpkgs versions are all up to date!"
@@ -24,13 +25,17 @@ fi
 
 linux_url="https://downloads.slack-edge.com/releases/linux/${latest_linux_version}/prod/x64/slack-desktop-${latest_linux_version}-amd64.deb"
 mac_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/x64/Slack-${latest_mac_version}-macOS.dmg"
+mac_arm_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/arm64/Slack-${latest_mac_version}-macOS.dmg"
 linux_sha256=$(nix-prefetch-url ${linux_url})
 mac_sha256=$(nix-prefetch-url ${mac_url})
+mac_arm_sha256=$(nix-prefetch-url ${mac_arm_url})
 
 sed -i "s/x86_64-linux-version = \".*\"/x86_64-linux-version = \"${latest_linux_version}\"/" "$slack_nix"
 sed -i "s/x86_64-darwin-version = \".*\"/x86_64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix"
+sed -i "s/aarch64-darwin-version = \".*\"/aarch64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix"
 sed -i "s/x86_64-linux-sha256 = \".*\"/x86_64-linux-sha256 = \"${linux_sha256}\"/" "$slack_nix"
-sed -i "s/x86_64-darwin-sha256 = \".*\"/x86_64-darwin-sha256 = \"${mac_sha256}\"/" "$slack_nix"
+sed -i "s/x86_64-darwin-sha256 = \".*\"/x86_64-darwin-sha256 = \"${mac_arm_sha256}\"/" "$slack_nix"
+sed -i "s/aarch64-darwin-sha256 = \".*\"/aarch64-darwin-sha256 = \"${mac_arm_sha256}\"/" "$slack_nix"
 
 if ! nix-build -A slack "$nixpkgs"; then
   echo "The updated slack failed to build."
diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 7a4fc703dd7..8dbd2cd73ee 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,17 +1,27 @@
-{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr, git }:
 
 stdenv.mkDerivation rec {
   pname = "irssi";
   version = "1.2.3";
 
-  src = fetchurl {
-    url = "https://github.com/irssi/irssi/releases/download/${version}/${pname}-${version}.tar.gz";
-    sha256 = "09cwz5ff1i5lp35qhhmw6kbw5dwcn9pl16gpzkc92xg5sx3bgjr9";
+
+  src = fetchFromGitHub {
+    "owner" = "irssi";
+    "repo" = "irssi";
+    "rev" = "91dc3e4dfa1a9558c5a7fe0ea982cb9df0e2de65";
+    "sha256" = "efnE4vuDd7TnOBxMPduiV0/nez1jVhTjbJ0vzN4ZMcg=";
+    "leaveDotGit" = true;
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ pkg-config autoconf automake libtool git ];
   buildInputs = [ ncurses glib openssl perl libintl libgcrypt libotr ];
 
+  enableParallelBuilding = true;
+
+  preConfigure = ''
+    NOCONFIGURE=1 ./autogen.sh
+  '';
+
   configureFlags = [
     "--with-proxy"
     "--with-bot"
diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix
index df59ddec6a9..a3ee4e4ab9c 100644
--- a/pkgs/applications/networking/irc/irssi/fish/default.nix
+++ b/pkgs/applications/networking/irc/irssi/fish/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-    tar xf ${irssi.src}
+    cp -a "${irssi.src}" "./${irssi.name}"
     configureFlags="$configureFlags --with-irssi-source=`pwd`/${irssi.name}"
 
     ./regen.sh
diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix
index d557f32bb6d..fb5cce02bdb 100644
--- a/pkgs/applications/science/astronomy/gravit/default.nix
+++ b/pkgs/applications/science/astronomy/gravit/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }:
+{ lib, stdenv, fetchFromGitHub, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }:
 
 stdenv.mkDerivation rec {
   pname = "gravit";
   version = "0.5.1";
 
-  src = fetchurl {
-    url = "https://gravit.slowchop.com/media/downloads/gravit-${version}.tgz";
-    sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7";
+  src = fetchFromGitHub {
+    owner = "gak";
+    repo = pname;
+    rev = version;
+    hash = "sha256-JuqnLLD5+Ec8kQI0SK98V1O6TTbGM6+yKn5KCHe85eM=";
   };
 
   buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image lua5 libpng libSM libICE ];
@@ -23,9 +25,9 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    homepage = "https://gravit.slowchop.com";
+    homepage = "https://github.com/gak/gravit";
     description = "Beautiful OpenGL-based gravity simulator";
-    license = lib.licenses.gpl2;
+    license = lib.licenses.gpl2Plus;
 
     longDescription = ''
       Gravit is a gravity simulator which runs under Linux, Windows and
diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/pkgs/applications/science/biology/hisat2/default.nix
index ab8e26f92a0..67c39031b77 100644
--- a/pkgs/applications/science/biology/hisat2/default.nix
+++ b/pkgs/applications/science/biology/hisat2/default.nix
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Graph based aligner";
-    license = licenses.gpl3;
-    homepage = "https://ccb.jhu.edu/software/hisat2/index.shtml";
+    license = licenses.gpl3Plus;
+    homepage = "https://daehwankimlab.github.io/hisat2/";
     maintainers = with maintainers; [ jbedo ];
     platforms = [ "x86_64-linux" "i686-linux" ];
   };
diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix
index 8ea75a3ec48..94457c81ce9 100644
--- a/pkgs/applications/science/electronics/eagle/eagle7.nix
+++ b/pkgs/applications/science/electronics/eagle/eagle7.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Schematic editor and PCB layout tool from CadSoft";
-    homepage = "http://www.cadsoftusa.com/";
+    homepage = "https://www.autodesk.com/products/eagle/overview";
     license = licenses.unfree;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 6d38d2a650e..fe99b045512 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -204,5 +204,6 @@ self = stdenv.mkDerivation {
     branch = coq-version;
     maintainers = with maintainers; [ roconnor thoughtpolice vbgl Zimmi48 ];
     platforms = platforms.unix;
+    mainProgram = "coqide";
   };
 }; in self
diff --git a/pkgs/applications/terminal-emulators/eterm/default.nix b/pkgs/applications/terminal-emulators/eterm/default.nix
index b5ca8b88959..328e61f1fe5 100644
--- a/pkgs/applications/terminal-emulators/eterm/default.nix
+++ b/pkgs/applications/terminal-emulators/eterm/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    homepage = "http://www.eterm.org";
+    homepage = "https://github.com/mej/Eterm"; # http://www.eterm.org is gone
     description = "Terminal emulator";
     license = licenses.bsd2;
     maintainers = [ maintainers.AndersonTorres ];
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
index 70ff4a4555d..0e9402cf495 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, makeDesktopItem
+{ lib, stdenv, fetchurl, fetchpatch, makeDesktopItem
 , libX11, libXt, libXft, libXrender
 , ncurses, fontconfig, freetype
 , pkg-config, gdk-pixbuf, perl
@@ -6,6 +6,7 @@
 , perlSupport      ? true
 , gdkPixbufSupport ? true
 , unicode3Support  ? true
+, emojiSupport     ? false
 }:
 
 let
@@ -22,6 +23,13 @@ let
     genericName = pname;
     categories = "System;TerminalEmulator;";
   };
+
+  fetchPatchFromAUR = { package, name, rev, sha256 }:
+    fetchpatch rec {
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=${package}&id=${rev}";
+      extraPrefix = "";
+      inherit name sha256;
+    };
 in
 
 with lib;
@@ -44,18 +52,33 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "terminfo" ];
 
-  patches = [
+  patches = (if emojiSupport then [
+    # the required patches to libXft are in nixpkgs by default, see
+    # ../../../servers/x11/xorg/overrides.nix
+    (fetchPatchFromAUR {
+      name = "enable-wide-glyphs.patch";
+      package = "rxvt-unicode-truecolor-wide-glyphs";
+      rev = "69701a09c2c206233952b84bc966407f6774f1dc";
+      sha256 = "0jfcj0ahky4dxdfrhqvh1v83mblhf5nak56dk1vq3bhyifdg7ffq";
+    })
+    (fetchPatchFromAUR {
+      name = "improve-font-rendering.patch";
+      package = "rxvt-unicode-truecolor-wide-glyphs";
+      rev = "69701a09c2c206233952b84bc966407f6774f1dc";
+      sha256 = "1jj5ai2182nq912279adihi4zph1w4dvbdqa1pwacy4na6y0fz9y";
+    })
+  ] else [
     ./patches/9.06-font-width.patch
+  ]) ++ [
     ./patches/256-color-resources.patch
-  ] ++ optional stdenv.isDarwin ./patches/makefile-phony.patch;
-
+  ]++ optional stdenv.isDarwin ./patches/makefile-phony.patch;
 
   configureFlags = [
     "--with-terminfo=${placeholder "terminfo"}/share/terminfo"
     "--enable-256-color"
     (enableFeature perlSupport "perl")
     (enableFeature unicode3Support "unicode3")
-  ];
+  ] ++ optional emojiSupport "--enable-wide-glyphs";
 
   LDFLAGS = [ "-lfontconfig" "-lXrender" "-lpthread" ];
   CFLAGS = [ "-I${freetype.dev}/include/freetype2" ];
diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix
index f8d84f4e93c..9f1df695a17 100644
--- a/pkgs/applications/version-management/cvs2svn/default.nix
+++ b/pkgs/applications/version-management/cvs2svn/default.nix
@@ -8,7 +8,7 @@ pypy2Packages.buildPythonApplication  rec {
   version = "2.5.0";
 
   src = fetchurl {
-    url = "http://cvs2svn.tigris.org/files/documents/1462/49543/${pname}-${version}.tar.gz";
+    url = "https://github.com/mhagger/cvs2svn/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "1ska0z15sjhyfi860rjazz9ya1gxbf5c0h8dfqwz88h7fccd22b4";
   };
 
@@ -29,7 +29,7 @@ pypy2Packages.buildPythonApplication  rec {
 
   meta = with lib; {
     description = "A tool to convert CVS repositories to Subversion repositories";
-    homepage = "http://cvs2svn.tigris.org/";
+    homepage = "https://github.com/mhagger/cvs2svn";
     maintainers = [ maintainers.makefu ];
     platforms = platforms.unix;
     license = licenses.asl20;
diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix
index 18e105aea4b..a2da28404ac 100644
--- a/pkgs/applications/version-management/sourcehut/dispatch.nix
+++ b/pkgs/applications/version-management/sourcehut/dispatch.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "dispatchsrht" ];
 
   meta = with lib; {
-    homepage = "https://dispatch.sr.ht/~sircmpwn/dispatch.sr.ht";
+    homepage = "https://git.sr.ht/~sircmpwn/dispatch.sr.ht";
     description = "Task dispatcher and service integration tool for the sr.ht network";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ eadwu ];
diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index 25966fb9366..deac4bed607 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "https://www.ice-wm.org/";
+    homepage = "https://ice-wm.org/";
     description = "A simple, lightweight X window manager";
     longDescription = ''
       IceWM is a window manager for the X Window System. The goal of IceWM is
diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix
index 32eee9df0d8..20e29938d0c 100644
--- a/pkgs/applications/window-managers/picom/default.nix
+++ b/pkgs/applications/window-managers/picom/default.nix
@@ -32,13 +32,13 @@
 
 stdenv.mkDerivation rec {
   pname = "picom";
-  version = "8.2";
+  version = "9";
 
   src = fetchFromGitHub {
     owner = "yshui";
     repo = "picom";
     rev = "v${version}";
-    sha256 = "0gjksayz2xpmgglvw17ppsan2imrd1fijs579kbf27xwp503xgfl";
+    sha256 = "sha256-ym4fWOcZFlHkLUQEanC+thQLbPial7ZNzxfCWSlweWg=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/window-managers/picom/picom-next.nix b/pkgs/applications/window-managers/picom/picom-next.nix
index 88b00c2731d..d20d7a5ecce 100644
--- a/pkgs/applications/window-managers/picom/picom-next.nix
+++ b/pkgs/applications/window-managers/picom/picom-next.nix
@@ -2,12 +2,12 @@
 
 picom.overrideAttrs (oldAttrs: rec {
   pname = "picom-next";
-  version = "unstable-2021-11-19";
+  version = "unstable-2022-02-05";
   src = fetchFromGitHub {
     owner = "yshui";
     repo = "picom";
-    rev = "1c7a4ff5a3cd5f3e25abcac0196896eea5939dce";
-    sha256 = "sha256-2uy2ofXhEWKuM+nEUqU16c85UGt6fJGtPZj+az907aw=";
+    rev = "928963721c8789fc5f27949e8b0730771aab940d";
+    sha256 = "sha256-qu9HnUG5VQbiSgduW1oR/tVvzEckaD2TWzds4R5zI+Y=";
   };
   meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ];
 })
diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix
index 1e3effeba55..b1f80d102d2 100644
--- a/pkgs/applications/window-managers/river/default.nix
+++ b/pkgs/applications/window-managers/river/default.nix
@@ -14,18 +14,19 @@
 , libevdev
 , libinput
 , libGL
-, xwaylandSupport ? true, libX11
+, libX11
+, xwaylandSupport ? true
 }:
 
 stdenv.mkDerivation rec {
   pname = "river";
-  version = "0.1.2";
+  version = "0.1.3";
 
   src = fetchFromGitHub {
     owner = "riverwm";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0mysj6fmgiwzrfzm1rk09k4xa9qiqsdwvwr59b4rs010c1gsllwk";
+    sha256 = "sha256-bHfHhyDx/Wzhvhr7mAeVzJf0TBJgMTGb/ClGjWMLlQ8=";
     fetchSubmodules = true;
   };
 
@@ -55,8 +56,8 @@ stdenv.mkDerivation rec {
   '';
 
   /* Builder patch install dir into river to get default config
-     When installFlags is removed, river becomes half broken.
-     See https://github.com/riverwm/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56
+    When installFlags is removed, river becomes half broken.
+    See https://github.com/riverwm/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56
   */
   installFlags = [ "DESTDIR=$(out)" ];
 
diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/data/fonts/cm-unicode/default.nix
index d7437c3231d..3248813c3cb 100644
--- a/pkgs/data/fonts/cm-unicode/default.nix
+++ b/pkgs/data/fonts/cm-unicode/default.nix
@@ -16,7 +16,7 @@ in fetchzip rec {
   sha256 = "1rzz7yhqq3lljyqxbg46jfzfd09qgpgx865lijr4sgc94riy1ypn";
 
   meta = with lib; {
-    homepage = "http://canopus.iacp.dvo.ru/~panov/cm-unicode/";
+    homepage = "https://cm-unicode.sourceforge.io/";
     description = "Computer Modern Unicode fonts";
     maintainers = with maintainers; [ raskin rycee ];
     license = licenses.ofl;
diff --git a/pkgs/data/fonts/crimson/default.nix b/pkgs/data/fonts/crimson/default.nix
index b8ff43a1128..9400ef06cf9 100644
--- a/pkgs/data/fonts/crimson/default.nix
+++ b/pkgs/data/fonts/crimson/default.nix
@@ -16,7 +16,7 @@ in fetchzip rec {
   sha256 = "0mg65f0ydyfmb43jqr1f34njpd10w8npw15cbb7z0nxmy4nkl842";
 
   meta = with lib; {
-    homepage = "https://aldusleaf.org/crimson.html";
+    homepage = "https://github.com/skosch/Crimson";
     description = "A font family inspired by beautiful oldstyle typefaces";
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix
index aed90b103b4..ba9fed1be28 100644
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/pkgs/data/fonts/dejavu-fonts/default.nix
@@ -12,7 +12,7 @@ let
       This package includes DejaVu Sans, DejaVu Serif, DejaVu Sans Mono, and
       the TeX Gyre DejaVu Math font.
     '';
-    homepage = "http://dejavu-fonts.org/wiki/Main_Page";
+    homepage = "https://dejavu-fonts.github.io/";
 
     # Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved.
     # Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/data/fonts/encode-sans/default.nix
index c6bb23b4326..3fd0115ddb4 100644
--- a/pkgs/data/fonts/encode-sans/default.nix
+++ b/pkgs/data/fonts/encode-sans/default.nix
@@ -23,7 +23,7 @@ fetchzip rec {
 
       Designed by Pablo Impallari and Andres Torresi.
     '';
-    homepage = "http://www.impallari.com/projects/overview/encode";
+    homepage = "https://github.com/impallari/Encode-Sans";
     license = licenses.ofl;
     maintainers = with maintainers; [ cmfwyp ];
     platforms = platforms.all;
diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/data/fonts/ipafont/default.nix
index eec28db883a..9bc9b82db0e 100644
--- a/pkgs/data/fonts/ipafont/default.nix
+++ b/pkgs/data/fonts/ipafont/default.nix
@@ -3,7 +3,7 @@
 fetchzip {
   name = "ipafont-003.03";
 
-  url = "http://ipafont.ipa.go.jp/old/ipafont/IPAfont00303.php";
+  url = "https://moji.or.jp/wp-content/ipafont/IPAfont/IPAfont00303.zip";
 
   postFetch = ''
     mkdir -p $out/share/fonts
@@ -19,7 +19,7 @@ fetchzip {
       Promotion Agency of Japan. It provides both Mincho and Gothic fonts,
       suitable for both display and printing.
     '';
-    homepage = "http://ipafont.ipa.go.jp/ipafont/";
+    homepage = "https://moji.or.jp/ipafont/";
     license = lib.licenses.ipa;
     maintainers = [ lib.maintainers.auntie ];
   };
diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
index 8b940fc851f..48a9bc9a0dc 100644
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
 {
-  "commit": "b233c8c0ee187788a69d929293a953cf89ffc012",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/b233c8c0ee187788a69d929293a953cf89ffc012.tar.gz",
-  "sha256": "00mi9jxjbd9mk2pghj1ks9mjy9i0x50kcgi28iajq0kvxc97c9sp",
-  "msg": "Update from Hackage at 2022-01-27T16:52:24Z"
+  "commit": "72a59574747346b3f9aa2cd91cb7469d4e168b53",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/72a59574747346b3f9aa2cd91cb7469d4e168b53.tar.gz",
+  "sha256": "0nspncjgh8lgr15zx8ss3fp289jl7gg21wchj0k821y3cz057ry3",
+  "msg": "Update from Hackage at 2022-01-31T19:23:21Z"
 }
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
index 28737253af5..735dfdb4f81 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
@@ -63,8 +63,9 @@ let
         '';
 
       meta = {
-        homepage = "http://wiki.docbook.org/topic/DocBookXslStylesheets";
+        homepage = "https://github.com/docbook/wiki/wiki/DocBookXslStylesheets";
         description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats";
+        license = lib.licenses.mit;
         maintainers = [ lib.maintainers.eelco ];
         platforms = lib.platforms.all;
       };
diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix
index 3e9920cf629..ecd28b496da 100644
--- a/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/addons/bismuth/default.nix
@@ -12,13 +12,13 @@
 
 mkDerivation rec {
   pname = "bismuth";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "Bismuth-Forge";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-ntfLijYPaOHvQToiAxuBZ5ayHPyQyevP9l6++SL0vUw=";
+    sha256 = "sha256-b+dlBv1M4//oeCGM2qrQ3s6z2yLql6eQWNqId3JB3Z4=";
   };
 
   cmakeFlags = [
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index a91105adc33..6f6130c3678 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -4,20 +4,20 @@ let
   getPatches = dir:
     let files = builtins.attrNames (builtins.readDir dir);
     in map (f: dir + ("/" + f)) files;
-  version = "2.8.0";
+  version = "2.10.0";
   channel = "stable";
   filename = "flutter_linux_${version}-${channel}.tar.xz";
 
   # Decouples flutter derivation from dart derivation,
   # use specific dart version to not need to bump dart derivation when bumping flutter.
-  dartVersion = "2.15.0";
+  dartVersion = "2.16.0";
   dartSourceBase = "https://storage.googleapis.com/dart-archive/channels";
   dartForFlutter = dart.override {
     version = dartVersion;
     sources = {
       "${dartVersion}-x86_64-linux" = fetchurl {
         url = "${dartSourceBase}/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
-        sha256 = "sha256-U1V1OPmFeNZCdBxFy7yqAbAE0cxh9f2UqKQmreJu9YA=";
+        sha256 = "sha256-n+hr3iMt5S0iEeR/X9zBQ86TbjCajaG0RyE+Ij1/aNM=";
       };
     };
   };
@@ -29,7 +29,7 @@ in {
     pname = "flutter";
     src = fetchurl {
       url = "https://storage.googleapis.com/flutter_infra_release/releases/${channel}/linux/${filename}";
-      sha256 = "sha256-sSz/owGdCMB5b9+cAWvLkrfFcIIq5665Xopd4JKv1G4=";
+      sha256 = "sha256-4ZEpZPGVnisnK9QT1o4G2G6CiflYElh+e3+X8odnx1U=";
     };
     patches = getPatches ./patches;
   };
diff --git a/pkgs/development/compilers/flutter/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/disable-auto-update.patch
index d0fd363d3c6..e799f6e1550 100644
--- a/pkgs/development/compilers/flutter/patches/disable-auto-update.patch
+++ b/pkgs/development/compilers/flutter/patches/disable-auto-update.patch
@@ -1,8 +1,8 @@
 diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh
-index be9320210e..6eb50aae95 100644
+index 05cba4393b..2a775bf24f 100644
 --- a/bin/internal/shared.sh
 +++ b/bin/internal/shared.sh
-@@ -218,8 +218,6 @@ function shared::execute() {
+@@ -217,8 +217,6 @@ function shared::execute() {
    # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS"
    # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432"
  
@@ -12,19 +12,19 @@ index be9320210e..6eb50aae95 100644
    case "$BIN_NAME" in
      flutter*)
 diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-index 550a75bc65..c98a4591cc 100644
+index 396756808e..d324a6df59 100644
 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
 +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-@@ -244,7 +244,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
+@@ -241,7 +241,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
            globals.flutterUsage.suppressAnalytics = true;
          }
  
 -        globals.flutterVersion.ensureVersionFile();
-         final bool machineFlag = topLevelResults['machine'] as bool;
+         final bool machineFlag = topLevelResults['machine'] as bool? ?? false;
          final bool ci = await globals.botDetector.isRunningOnBot;
          final bool redirectedCompletion = !globals.stdio.hasTerminal &&
-@@ -253,10 +252,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
-         final bool versionCheckFlag = topLevelResults['version-check'] as bool;
+@@ -250,10 +249,6 @@ class FlutterCommandRunner extends CommandRunner<void> {
+         final bool versionCheckFlag = topLevelResults['version-check'] as bool? ?? false;
          final bool explicitVersionCheckPassed = topLevelResults.wasParsed('version-check') && versionCheckFlag;
  
 -        if (topLevelResults.command?.name != 'upgrade' &&
@@ -33,4 +33,4 @@ index 550a75bc65..c98a4591cc 100644
 -        }
  
          // See if the user specified a specific device.
-         globals.deviceManager.specifiedDeviceId = topLevelResults['device-id'] as String;
+         globals.deviceManager?.specifiedDeviceId = topLevelResults['device-id'] as String?;
diff --git a/pkgs/development/compilers/flutter/patches/move-cache.patch b/pkgs/development/compilers/flutter/patches/move-cache.patch
index 701cab54d80..a81d2def242 100644
--- a/pkgs/development/compilers/flutter/patches/move-cache.patch
+++ b/pkgs/development/compilers/flutter/patches/move-cache.patch
@@ -1,5 +1,5 @@
 diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
-index ed42baea29..fee2fb1d62 100644
+index ed42baea29..12941f733a 100644
 --- a/packages/flutter_tools/lib/src/asset.dart
 +++ b/packages/flutter_tools/lib/src/asset.dart
 @@ -11,11 +11,11 @@ import 'base/file_system.dart';
@@ -25,7 +25,7 @@ index ed42baea29..fee2fb1d62 100644
            entryUri: entryUri,
            package: null,
 diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
-index 7870c7807f..3fcf92f20d 100644
+index defc86cc20..7fdf14d112 100644
 --- a/packages/flutter_tools/lib/src/cache.dart
 +++ b/packages/flutter_tools/lib/src/cache.dart
 @@ -22,6 +22,7 @@ import 'base/user_messages.dart';
@@ -36,7 +36,7 @@ index 7870c7807f..3fcf92f20d 100644
  
  const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo)
  const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo)
-@@ -302,8 +303,13 @@ class Cache {
+@@ -322,8 +323,13 @@ class Cache {
        return;
      }
      assert(_lock == null);
@@ -51,7 +51,17 @@ index 7870c7807f..3fcf92f20d 100644
      try {
        _lock = lockFile.openSync(mode: FileMode.write);
      } on FileSystemException catch (e) {
-@@ -453,7 +459,7 @@ class Cache {
+@@ -382,8 +388,7 @@ class Cache {
+ 
+   String get devToolsVersion {
+     if (_devToolsVersion == null) {
+-      const String devToolsDirPath = 'dart-sdk/bin/resources/devtools';
+-      final Directory devToolsDir = getCacheDir(devToolsDirPath, shouldCreate: false);
++      final Directory devToolsDir = _fileSystem.directory(_fileSystem.path.join(flutterRoot!, 'bin/cache/dart-sdk/bin/resources/devtools'));
+       if (!devToolsDir.existsSync()) {
+         throw Exception('Could not find directory at ${devToolsDir.path}');
+       }
+@@ -536,7 +541,7 @@ class Cache {
      if (_rootOverride != null) {
        return _fileSystem.directory(_fileSystem.path.join(_rootOverride!.path, 'bin', 'cache'));
      } else {
diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix
index 025fc8c3fa7..d027898cf9d 100644
--- a/pkgs/development/compilers/unison/default.nix
+++ b/pkgs/development/compilers/unison/default.nix
@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
     homepage = "https://unisonweb.org/";
     license = with licenses; [ mit bsd3 ];
     maintainers = [ maintainers.virusdave ];
-    platforms = [ "x86_64-darwin" "x86_64-linux" ];
+    platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ];
   };
 }
diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix
index d8d189ed5c1..82fb6c536d3 100644
--- a/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/pkgs/development/coq-modules/dpdgraph/default.nix
@@ -9,6 +9,7 @@ mkCoqDerivation {
   repo = "coq-dpdgraph";
   inherit version;
   defaultVersion = switch coq.coq-version [
+    { case = "8.15"; out = "1.0+8.15"; }
     { case = "8.14"; out = "1.0+8.14"; }
     { case = "8.13"; out = "1.0+8.13"; }
     { case = "8.12"; out = "0.6.8"; }
@@ -21,6 +22,7 @@ mkCoqDerivation {
     { case = "8.5";  out = "0.6"; }
   ] null;
 
+  release."1.0+8.15".sha256 = "sha256:1pxr0gakcz297y8hhrnssv5j07ccd58pv7rh7qv5g7855pfqrkg7";
   release."1.0+8.14".sha256 = "sha256:01pmi7jcc77431jii6x6nd4m8jg4vycachiyi1h6dx9rp3a2508s";
   release."1.0+8.13".sha256 = "sha256:0f8lj8b99n8nsq2jf5m0snblfs8yz50hmlqqq9nlw4qklq7j4z5z";
   release."0.6.9".sha256 = "11mbydpcgk7y8pqzickbzx0ig7g9k9al71i9yfrcscd2xj8fwj8z";
diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix
index 72066313eca..ba66635be50 100644
--- a/pkgs/development/guile-modules/guile-xcb/default.nix
+++ b/pkgs/development/guile-modules/guile-xcb/default.nix
@@ -1,6 +1,6 @@
 { lib
 , stdenv
-, fetchurl
+, fetchFromGitHub
 , guile
 , pkg-config
 , texinfo
@@ -10,9 +10,11 @@ stdenv.mkDerivation rec {
   pname = "guile-xcb";
   version = "1.3";
 
-  src = fetchurl {
-    url = "http://www.markwitmer.com/dist/${pname}-${version}.tar.gz";
-    hash = "sha256-iYR6AYSTgUsURAEJTWcdHlc0f8LzEftAIsfonBteuxE=";
+  src = fetchFromGitHub {
+    owner = "mwitmer";
+    repo = pname;
+    rev = version;
+    hash = "sha256-8iaYil2wiqnu9p7Gj93GE5akta1A0zqyApRwHct5RSs=";
   };
 
   nativeBuildInputs = [
@@ -29,7 +31,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    homepage = "http://www.markwitmer.com/guile-xcb/guile-xcb.html";
+    homepage = "https://github.com/mwitmer/guile-xcb";
     description = "XCB bindings for Guile";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ vyp ];
diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix
index 9e95e0bdad2..2ea0f56634b 100644
--- a/pkgs/development/haskell-modules/configuration-arm.nix
+++ b/pkgs/development/haskell-modules/configuration-arm.nix
@@ -96,6 +96,9 @@ self: super: {
   hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin;
   hls-module-name-plugin = dontCheck super.hls-module-name-plugin;
   hls-brittany-plugin = dontCheck super.hls-brittany-plugin;
+  hls-qualify-imported-names-plugin = dontCheck super.hls-qualify-imported-names-plugin;
+  hls-class-plugin = dontCheck super.hls-class-plugin;
+  hls-selection-range-plugin = dontCheck super.hls-selection-range-plugin;
 
   # Similar RTS issue in test suite:
   # rts/linker/elf_reloc_aarch64.c:98: encodeAddendAarch64: Assertion `isInt64(21+12, addend)' failed.
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4fc26f4403b..e99d653d832 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -77,7 +77,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "14zzs4j9dpc6rdnna80m0vi7s1awlz0mrmwfh8l4zvglx75avpw5";
+      sha256 = "11idvicisp4wnw15lk7f9fs0kqpssngs1j8f98050f3jrqsccj0j";
       # delete android and Android directories which cause issues on
       # darwin (case insensitive directory). Since we don't need them
       # during the build process, we can delete it to prevent a hash
@@ -2038,13 +2038,13 @@ self: super: {
   # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.
   streamly-posix = doJailbreak super.streamly-posix;
 
-  # 2021-09-13: hls 1.3 needs a newer lsp than stackage-lts. (lsp >= 1.2.0.1)
+  # 2021-09-13: hls 1.6 needs a newer lsp than stackage-lts. (lsp >= 1.2.0.1)
   # (hls is nearly the only consumer, but consists of 18 packages, so we bump lsp globally.)
-  lsp = doDistribute self.lsp_1_2_0_1;
-  lsp-types = doDistribute self.lsp-types_1_3_0_1;
+  lsp = doDistribute self.lsp_1_4_0_0;
+  lsp-types = doDistribute self.lsp-types_1_4_0_1;
   # Not running the "example" test because it requires a binary from lsps test
   # suite which is not part of the output of lsp.
-  lsp-test = doDistribute (overrideCabal (old: { testTarget = "tests func-test"; }) self.lsp-test_0_14_0_1);
+  lsp-test = doDistribute (overrideCabal (old: { testTarget = "tests func-test"; }) self.lsp-test_0_14_0_2);
 
   # 2021-09-14: Tests are flaky.
   hls-splice-plugin = dontCheck super.hls-splice-plugin;
@@ -2101,7 +2101,7 @@ self: super: {
 
   # Needs brick > 0.64
   nix-tree = super.nix-tree.override {
-    brick = self.brick_0_66_1;
+    brick = self.brick_0_67;
   };
 
   # build newer version for `pkgs.shellcheck`
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
index 558e43469dc..c628fe95f7c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@@ -60,6 +60,7 @@ self: super: {
   lukko = doJailbreak super.lukko;
   parallel = doJailbreak super.parallel;
   primitive = doJailbreak (dontCheck super.primitive);
+  primitive-extras = doDistribute (self.primitive-extras_0_10_1_4);
   regex-posix = doJailbreak super.regex-posix;
   resolv = doJailbreak super.resolv;
   singleton-bool = doJailbreak super.singleton-bool;
@@ -71,8 +72,8 @@ self: super: {
   vector-th-unbox = doJailbreak super.vector-th-unbox;
   zlib = doJailbreak super.zlib;
   weeder = self.weeder_2_3_0;
-  generic-lens-core = self.generic-lens-core_2_2_0_0;
-  generic-lens = self.generic-lens_2_2_0_0;
+  generic-lens-core = self.generic-lens-core_2_2_1_0;
+  generic-lens = self.generic-lens_2_2_1_0;
   th-desugar = self.th-desugar_1_13;
   # 2021-11-08: Fixed in autoapply-0.4.2
   autoapply = doJailbreak self.autoapply_0_4_1_1;
@@ -83,7 +84,7 @@ self: super: {
   });
 
   # Upstream also disables test for GHC 9: https://github.com/kcsongor/generic-lens/pull/130
-  generic-lens_2_2_0_0 = dontCheck super.generic-lens_2_2_0_0;
+  generic-lens_2_2_1_0 = dontCheck super.generic-lens_2_2_1_0;
 
   # Apply patches from head.hackage.
   alex = appendPatch (pkgs.fetchpatch {
@@ -149,23 +150,14 @@ self: super: {
   # Fixes a bug triggered on GHC 9.0.1
   text-short = self.text-short_0_1_5;
 
-  # 2021-09-18: The following plugins don‘t work yet on ghc9.
-  haskell-language-server = appendConfigureFlags [
-    "-f-tactic"
-    "-f-splice"
-    "-f-refineimports"
-    "-f-class"
+  fourmolu = doJailbreak self.fourmolu_0_4_0_0;
 
-    "-f-fourmolu"
+  # 2022-02-05: The following plugins don‘t work yet on ghc9.
+  # Compare: https://haskell-language-server.readthedocs.io/en/latest/supported-versions.html
+  haskell-language-server = appendConfigureFlags [
     "-f-brittany"
     "-f-stylishhaskell"
   ] (super.haskell-language-server.override {
-    hls-tactics-plugin = null; # No upstream support, generic-lens-core fail
-    hls-splice-plugin = null; # No upstream support in hls 1.4.0, should be fixed in 1.5
-    hls-refine-imports-plugin = null; # same issue es splice-plugin
-    hls-class-plugin = null; # No upstream support
-
-    hls-fourmolu-plugin = null; # No upstream support, needs new fourmolu release
     hls-stylish-haskell-plugin = null; # No upstream support
     hls-brittany-plugin = null; # Dependencies don't build with 9.0.1
   });
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
index bb2527b2e13..49bfd64324a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
@@ -112,6 +112,7 @@ self: super: {
     libraryHaskellDepends = [
       self.fail
       self.ordered-containers
+      self.data-default
     ] ++ drv.libraryHaskellDepends or [];
   }) super.ghc-exactprint;
   ghc-lib = self.ghc-lib_9_2_1_20220109;
@@ -137,7 +138,7 @@ self: super: {
   quickcheck-instances = super.quickcheck-instances_0_3_27;
   regex-posix = doJailbreak super.regex-posix;
   resolv = doJailbreak super.resolv;
-  retrie = doDistribute self.retrie_1_2_0_1;
+  retrie = doDistribute (dontCheck self.retrie_1_2_0_1);
   semialign = super.semialign_1_2_0_1;
   singleton-bool = doJailbreak super.singleton-bool;
   scientific = doJailbreak super.scientific;
@@ -188,11 +189,6 @@ self: super: {
     sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv";
   }) (doJailbreak super.language-haskell-extract);
 
-  haskell-src-meta = appendPatch (pkgs.fetchpatch {
-    url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/haskell-src-meta-0.8.7.patch";
-    sha256 = "013k8hpxac226j47cdzgdf9a1j91kmm0cvv7n8zwlajbj3y9bzjp";
-  }) (doJailbreak super.haskell-src-meta);
-
   # Tests depend on `parseTime` which is no longer available
   hourglass = dontCheck super.hourglass;
 
@@ -245,4 +241,37 @@ self: super: {
   # need bytestring >= 0.11 which is only bundled with GHC >= 9.2
   regex-rure = doDistribute (markUnbroken super.regex-rure);
   jacinda = doDistribute super.jacinda;
+  some = doJailbreak super.some;
+  fourmolu = super.fourmolu_0_5_0_1;
+  implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
+  lucid = doJailbreak super.lucid;
+  hashtables = doJailbreak super.hashtables;
+  primitive-extras = super.primitive-extras_0_10_1_4;
+  hiedb = doJailbreak super.hiedb;
+
+  # 2022-02-05: The following plugins don‘t work yet on ghc9.2.
+  # Compare: https://haskell-language-server.readthedocs.io/en/latest/supported-versions.html
+  haskell-language-server = appendConfigureFlags [
+    "-f-alternateNumberFormat"
+    "-f-class"
+    "-f-eval"
+    "-f-haddockComments"
+    "-f-hlint"
+    "-f-retrie"
+    "-f-splice"
+    "-f-tactics"
+    "-f-brittany"
+    "-f-stylish-haskell"
+  ] (super.haskell-language-server.override {
+    hls-alternate-number-format-plugin = null;
+    hls-class-plugin = null;
+    hls-eval-plugin = null;
+    hls-haddock-comments-plugin = null;
+    hls-hlint-plugin = null;
+    hls-retrie-plugin = null;
+    hls-splice-plugin = null;
+    hls-tactics-plugin = null;
+    hls-brittany-plugin = null;
+    hls-stylish-haskell-plugin = null;
+  });
 }
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index e7dcdcc9222..c1c584e05eb 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -830,8 +830,8 @@ broken-packages:
   - ContextAlgebra
   - context-free-grammar
   - context-stack
-  - contiguous
   - contiguous-checked
+  - contiguous-fft
   - continue
   - Contract
   - control-iso
@@ -1133,6 +1133,7 @@ broken-packages:
   - doctest-discover-configurator
   - doctest-parallel
   - doctest-prop
+  - docusign-base
   - docusign-example
   - docvim
   - doi
@@ -2378,6 +2379,7 @@ broken-packages:
   - hsns
   - hsnsq
   - hsntp
+  - hs-opentelemetry-instrumentation-persistent
   - hsoptions
   - hsoz
   - hsparql
@@ -2727,6 +2729,7 @@ broken-packages:
   - katydid
   - kawaii
   - kawhi
+  - kazura-queue
   - kdesrc-build-extra
   - kd-tree
   - keccak
@@ -2999,6 +3002,7 @@ broken-packages:
   - lye
   - lz4-frame-conduit
   - lzip
+  - lzlib
   - lzma-streams
   - lzo
   - maam
@@ -3894,6 +3898,7 @@ broken-packages:
   - PrimitiveArray-Pretty
   - primitive-atomic
   - primitive-checked
+  - primitive-containers
   - primitive-convenience
   - primitive-foreign
   - primitive-indexed
@@ -4199,6 +4204,7 @@ broken-packages:
   - riemann
   - riff
   - ring-buffer
+  - ring-buffers
   - riscv-isa
   - Ritt-Wu
   - rivers
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 72c6cebb7bb..56a6cb41cba 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -82,8 +82,6 @@ default-package-overrides:
   - reflex-dom-pandoc < 1.0.0.0
   # 2021-09-07: pin to our current GHC version
   - ghc-api-compat == 8.10.7
-  # 2021-09-14: Pin hiedb to version needed by ghcide
-  - hiedb == 0.4.0.*
   # 2021-10-13: weeder 2.3.0 require GHC == 9.0.*; remove pin when GHC version changes
   - weeder < 2.3.0
   # 2021-10-10: taskwarrior 0.4 requires aeson > 2.0.1.0
@@ -169,10 +167,7 @@ extra-packages:
   - brick == 0.64.*                     # 2021-12-03: matterhorn depends on brick < 0.65
   - path == 0.9.0                       # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2
   - ormolu == 0.3.*                     # 2021-12-03: for HLS with GHC 9.0.2
-  # 2022-01-08 hls-plugin-api 1.2.0.2 needs lsp < 1.3, but newer than stackage
-  - lsp < 1.3
-  - lsp-types < 1.4
-  - lsp-test < 0.14.0.2
+  - fourmolu == 0.4.*                   # 2022-02-05: for HLS with GHC 9.0.2
 
 package-maintainers:
   abbradar:
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index db22584d9e5..7be9c09e485 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -474,10 +474,8 @@ dont-distribute-packages:
  - atomic-primops-foreign
  - atp
  - attoparsec-enumerator
- - attoparsec-ip
  - attoparsec-iteratee
  - attoparsec-text-enumerator
- - attoparsec-uri
  - atuin
  - audiovisual
  - aura
@@ -637,7 +635,6 @@ dont-distribute-packages:
  - bv-sized-lens
  - bytehash
  - bytelog
- - bytesmith
  - bytestring-read
  - c0check
  - cabal-bounds
@@ -716,7 +713,6 @@ dont-distribute-packages:
  - chr-core
  - chr-lang
  - chromatin
- - chronos_1_1_3
  - chu2
  - chuchu
  - chunks
@@ -729,7 +725,9 @@ dont-distribute-packages:
  - claferwiki
  - clash
  - clash-ghc
+ - clash-ghc_1_4_7
  - clash-lib
+ - clash-lib_1_4_7
  - clash-multisignal
  - clash-prelude-quickcheck
  - clash-shake
@@ -815,7 +813,6 @@ dont-distribute-packages:
  - consumers
  - container
  - containers-accelerate
- - contiguous-fft
  - continuum
  - continuum-client
  - control
@@ -838,6 +835,7 @@ dont-distribute-packages:
  - coroutine-iteratee
  - couch-simple
  - couchdb-enumerator
+ - cpkg
  - cprng-aes-effect
  - cql-io-tinylog
  - cqrs-example
@@ -1196,7 +1194,7 @@ dont-distribute-packages:
  - funnyprint
  - funsat
  - fused-effects-squeal
- - futhark_0_21_4
+ - futhark_0_21_5
  - fwgl-glfw
  - fwgl-javascript
  - fxpak
@@ -1627,6 +1625,7 @@ dont-distribute-packages:
  - hreader-lens
  - hreq-client
  - hreq-conduit
+ - hriemann
  - hs-blake2
  - hs-brotli
  - hs-duktape
@@ -1789,7 +1788,6 @@ dont-distribute-packages:
  - invertible-hlist
  - invertible-hxt
  - ion
- - ip
  - ipatch
  - ipc
  - ipld-cid
@@ -2094,7 +2092,6 @@ dont-distribute-packages:
  - markdown-pap
  - markdown2svg
  - markov-processes
- - markup
  - marmalade-upload
  - marquise
  - marvin
@@ -2178,7 +2175,6 @@ dont-distribute-packages:
  - mpretty
  - mprover
  - mps
- - mptcp
  - mptcpanalyzer
  - msgpack-aeson
  - msgpack-idl
@@ -2314,7 +2310,7 @@ dont-distribute-packages:
  - pairing
  - panda
  - pandoc-japanese-filters
- - pandoc_2_17_0_1
+ - pandoc_2_17_1_1
  - papa
  - papa-base
  - papa-base-implement
@@ -2437,8 +2433,6 @@ dont-distribute-packages:
  - prednote-test
  - presto-hdbc
  - preview
- - primitive-containers
- - primitive-sort
  - primula-board
  - primula-bot
  - proc
@@ -2631,7 +2625,6 @@ dont-distribute-packages:
  - ribosome-root
  - ribosome-test
  - ridley-extras
- - ring-buffers
  - rio-process-pool
  - riot
  - ripple
@@ -2705,7 +2698,6 @@ dont-distribute-packages:
  - scholdoc
  - scholdoc-citeproc
  - scholdoc-texmath
- - scientific-notation
  - scion
  - scion-browser
  - scope
@@ -2808,7 +2800,6 @@ dont-distribute-packages:
  - smallstring
  - smartword
  - smcdel
- - smith
  - smith-cli
  - smith-client
  - smtlib2-debug
@@ -3148,8 +3139,6 @@ dont-distribute-packages:
  - urembed
  - uri-enumerator
  - uri-enumerator-file
- - url-bytes
- - urlpath
  - usb
  - usb-enumerator
  - usb-hid
@@ -3161,7 +3150,6 @@ dont-distribute-packages:
  - uu-cco-examples
  - uu-cco-hut-parsing
  - uu-cco-uu-parsinglib
- - uuid-bytes
  - uuid-crypto
  - uvector-algorithms
  - v4l2
@@ -3209,7 +3197,6 @@ dont-distribute-packages:
  - wai-middleware-cache
  - wai-middleware-cache-redis
  - wai-middleware-consul
- - wai-middleware-content-type
  - wai-middleware-rollbar
  - wai-middleware-route
  - wai-session-tokyocabinet
@@ -3251,7 +3238,6 @@ dont-distribute-packages:
  - wrecker-ui
  - wright
  - writer-cps-full
- - ws
  - wss-client
  - wtk-gtk
  - wu-wei
@@ -3279,7 +3265,6 @@ dont-distribute-packages:
  - xml-push
  - xml-query-xml-conduit
  - xml-query-xml-types
- - xml-syntax
  - xml-tydom-conduit
  - xml2x
  - xmltv
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index f76c91c64d9..7e51968fa45 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -209,16 +209,6 @@ self: super: builtins.intersectAttrs super {
   # Help the test suite find system timezone data.
   tz = overrideCabal (drv: {
     preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
-    patches = [
-      # Fix tests failing with libSystem, musl etc. due to a lack of
-      # support for glibc's non-POSIX TZDIR environment variable.
-      # https://github.com/nilcons/haskell-tz/pull/29
-      (pkgs.fetchpatch {
-        name = "support-non-glibc-tzset.patch";
-        url = "https://github.com/sternenseemann/haskell-tz/commit/64928f1a50a1a276a718491ae3eeef63abcdb393.patch";
-        sha256 = "1f53w8k1vpy39hzalyykpvm946ykkarj2714w988jdp4c2c4l4cf";
-      })
-    ] ++ (drv.patches or []);
   }) super.tz;
 
   # Nix-specific workaround
@@ -814,90 +804,11 @@ self: super: builtins.intersectAttrs super {
     '' + drv.postInstall or "";
   }) super.hlint;
 
-  hls-brittany-plugin = overrideCabal (drv: {
-    testToolDepends = [ pkgs.git ];
-    preCheck = ''
-      export HOME=$TMPDIR/home
-    '';
-  }) super.hls-brittany-plugin;
-  hls-class-plugin = overrideCabal (drv: {
-    testToolDepends = [ pkgs.git ];
-    preCheck = ''
-      export HOME=$TMPDIR/home
-    '';
-  }) super.hls-class-plugin;
-  hls-ormolu-plugin = overrideCabal (drv: {
-    testToolDepends = [ pkgs.git ];
-    preCheck = ''
-      export HOME=$TMPDIR/home
-    '';
-  }) super.hls-ormolu-plugin;
-  hls-fourmolu-plugin = overrideCabal (drv: {
-    testToolDepends = [ pkgs.git ];
-    preCheck = ''
-      export HOME=$TMPDIR/home
-    '';
-  }) super.hls-fourmolu-plugin;
-  hls-module-name-plugin = overrideCabal (drv: {
-    testToolDepends = [ pkgs.git ];
-    preCheck = ''
-      export HOME=$TMPDIR/home
-    '';
-  }) super.hls-module-name-plugin;
-  hls-rename-plugin = overrideCabal (drv: {
-    testToolDepends = [ pkgs.git ];
-    preCheck = ''
-      export HOME=$TMPDIR/home
-    '' + (drv.preCheck or "");
-  }) super.hls-rename-plugin;
-  hls-splice-plugin = overrideCabal (drv: {
-    testToolDepends = [ pkgs.git ];
-    preCheck = ''
-      export HOME=$TMPDIR/home
-    '';
-  }) super.hls-splice-plugin;
-  hls-floskell-plugin = overrideCabal (drv: {
-    testToolDepends = [ pkgs.git ];
-    preCheck = ''
-      export HOME=$TMPDIR/home
-    '';
-  }) super.hls-floskell-plugin;
-  hls-pragmas-plugin = overrideCabal (drv: {
-    testToolDepends = [ pkgs.git ];
-    preCheck = ''
-      export HOME=$TMPDIR/home
-    '';
-  }) super.hls-pragmas-plugin;
-  hls-hlint-plugin = overrideCabal (drv: {
-    testToolDepends = [ pkgs.git ];
-    preCheck = ''
-      export HOME=$TMPDIR/home
-    '';
-  }) super.hls-hlint-plugin;
   hiedb = overrideCabal (drv: {
     preCheck = ''
       export PATH=$PWD/dist/build/hiedb:$PATH
     '';
   }) super.hiedb;
-  hls-call-hierarchy-plugin = overrideCabal (drv: {
-    preCheck = ''
-      export HOME=$TMPDIR/home
-    '';
-  }) super.hls-call-hierarchy-plugin;
-  # Tests have file permissions expections that don‘t work with the nix store.
-  hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin;
-  hls-haddock-comments-plugin = overrideCabal (drv: {
-    testToolDepends = [ pkgs.git ];
-    preCheck = ''
-      export HOME=$TMPDIR/home
-    '';
-  }) super.hls-haddock-comments-plugin;
-  hls-eval-plugin = overrideCabal (drv: {
-    testToolDepends = [ pkgs.git ];
-    preCheck = ''
-      export HOME=$TMPDIR/home
-    '';
-  }) super.hls-eval-plugin;
 
   taglib = overrideCabal (drv: {
     librarySystemDepends = [
@@ -1062,4 +973,35 @@ self: super: builtins.intersectAttrs super {
       install -Dm644 test/examples/*.jac -t "$docDir/examples"
     '';
   }) super.jacinda;
+
+# haskell-language-server plugins all use the same test harness so we give them what we want in this loop.
+} // pkgs.lib.mapAttrs
+  (_: overrideCabal (drv: {
+    testToolDepends = (drv.testToolDepends or [ ]) ++ [ pkgs.git ];
+    preCheck = ''
+      export HOME=$TMPDIR/home
+    '' + (drv.preCheck or "");
+  }))
+{
+  inherit (super)
+    hls-brittany-plugin
+    hls-call-hierarchy-plugin
+    hls-class-plugin
+    hls-eval-plugin
+    hls-floskell-plugin
+    hls-fourmolu-plugin
+    hls-module-name-plugin
+    hls-ormolu-plugin
+    hls-pragmas-plugin
+    hls-rename-plugin
+    hls-selection-range-plugin
+    hls-splice-plugin;
+  # Tests have file permissions expections that don‘t work with the nix store.
+  hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin;
+
+  # Flaky tests
+  hls-hlint-plugin = dontCheck super.hls-hlint-plugin;
+  hls-alternate-number-format-plugin = dontCheck super.hls-alternate-number-format-plugin;
+  hls-qualify-imported-names-plugin = dontCheck super.hls-qualify-imported-names-plugin;
+  hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;
 }
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 392b7a3b647..811e94c7729 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -35801,7 +35801,6 @@ self: {
        ];
        description = "Parse IP data types with attoparsec";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "attoparsec-iso8601" = callPackage
@@ -35954,7 +35953,6 @@ self: {
        ];
        description = "URI parser / printer using attoparsec";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "attoparsec-varword" = callPackage
@@ -40227,10 +40225,8 @@ self: {
      }:
      mkDerivation {
        pname = "beam-core";
-       version = "0.9.2.0";
-       sha256 = "1b1xk4pi9j49fmh9lywgqcg61gbd6i7905gv5prnf0799iqz68g9";
-       revision = "1";
-       editedCabalFile = "1wfvfgram4sy9lw6l5xizhdmfaxq7gyv4ygph6r46c47abzv3ha0";
+       version = "0.9.2.1";
+       sha256 = "0js10ai2dqdv6fm99ni6ckiq1rbq1wm82s73h81hln0qf1xnk3ra";
        libraryHaskellDepends = [
          aeson base bytestring containers dlist free ghc-prim hashable
          microlens mtl network-uri scientific tagged text time vector
@@ -40251,8 +40247,8 @@ self: {
      }:
      mkDerivation {
        pname = "beam-migrate";
-       version = "0.5.1.1";
-       sha256 = "1amfm0lzy220blpkpvdh3b9kiypxz9gbvz2f20abfrvh6vdcd3hv";
+       version = "0.5.1.2";
+       sha256 = "1h1nb5y6lzc5zclkz925kr446kc05sdj94hbvpf41lypx0b133xv";
        libraryHaskellDepends = [
          aeson base beam-core bytestring containers deepseq dependent-map
          dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl
@@ -40309,8 +40305,8 @@ self: {
      }:
      mkDerivation {
        pname = "beam-postgres";
-       version = "0.5.2.0";
-       sha256 = "1n3hpya8g7lx0y0nmz5fhcdjzq5qaxnn3hbnnzaf9kk5v6xw7qd5";
+       version = "0.5.2.1";
+       sha256 = "028aqd7r49avmwlf97612f98a5maw01l0d5vlbg0nj7kqi03ghj4";
        libraryHaskellDepends = [
          aeson attoparsec base beam-core beam-migrate bytestring
          case-insensitive conduit free hashable haskell-src-exts lifted-base
@@ -40335,8 +40331,8 @@ self: {
      }:
      mkDerivation {
        pname = "beam-sqlite";
-       version = "0.5.1.1";
-       sha256 = "1kzn8d7xjp8grkjqdzj1hqckfibrw6apa8ki078zhpszl787ffql";
+       version = "0.5.1.2";
+       sha256 = "0d5s6r54aamkr91ji3z05cn7vjmbl0xaysnx3dmalx75r5jhmhzq";
        libraryHaskellDepends = [
          aeson attoparsec base beam-core beam-migrate bytestring dlist free
          hashable monad-control mtl network-uri scientific sqlite-simple
@@ -46916,7 +46912,7 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
-  "brick_0_66_1" = callPackage
+  "brick_0_67" = callPackage
     ({ mkDerivation, base, bytestring, config-ini, containers
      , contravariant, data-clist, deepseq, directory, dlist, exceptions
      , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm
@@ -46925,8 +46921,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.66.1";
-       sha256 = "04acisnnrhhq0xh470wfqjyyym8wjv5zv93pmwklz84ypzfdw60a";
+       version = "0.67";
+       sha256 = "02f8qmc3y2pyqysc9qan2l05vk3ryvlc7mgs8hdh18fp96x88669";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -48845,7 +48841,6 @@ self: {
        ];
        description = "Nonresumable byte parser";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "bytestring_0_11_2_0" = callPackage
@@ -48999,10 +48994,8 @@ self: {
      }:
      mkDerivation {
        pname = "bytestring-encoding";
-       version = "0.1.1.0";
-       sha256 = "0m2w1nvj5izmb4j08c57lk89i3rnhhb0n0rz511pb6s75ijqrb71";
-       revision = "1";
-       editedCabalFile = "0vfigz5181rpk6lcajdbljvsrip3nlwxly1pflc6isn24wcd2jn1";
+       version = "0.1.2.0";
+       sha256 = "1j1gli2aa7kflirvnaqdwg212s85v4j2fak5qy79y8zsb3l62p44";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [
          base bytestring deepseq QuickCheck tasty tasty-hunit
@@ -57052,6 +57045,37 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "clash-ghc_1_4_7" = callPackage
+    ({ mkDerivation, array, base, bifunctors, bytestring, Cabal
+     , clash-lib, clash-prelude, concurrent-supply, containers, deepseq
+     , directory, exceptions, extra, filepath, ghc, ghc-boot, ghc-prim
+     , ghc-typelits-extra, ghc-typelits-knownnat
+     , ghc-typelits-natnormalise, ghci, hashable, haskeline, integer-gmp
+     , lens, mtl, primitive, process, reflection, split
+     , template-haskell, text, time, transformers, uniplate, unix
+     , unordered-containers, utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "clash-ghc";
+       version = "1.4.7";
+       sha256 = "06r97diqy6px1pf06dbnvf6ns0kmqy5gc5mr6k9xam1d2pk37xwd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base bifunctors bytestring Cabal clash-lib clash-prelude
+         concurrent-supply containers deepseq directory exceptions extra
+         filepath ghc ghc-boot ghc-prim ghc-typelits-extra
+         ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable
+         haskeline integer-gmp lens mtl primitive process reflection split
+         template-haskell text time transformers uniplate unix
+         unordered-containers utf8-string vector
+       ];
+       executableHaskellDepends = [ base ];
+       description = "Clash: a functional hardware description language - GHC frontend";
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "clash-lib" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array
      , attoparsec, base, base16-bytestring, binary, bytestring
@@ -57095,6 +57119,49 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "clash-lib_1_4_7" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array
+     , attoparsec, base, base16-bytestring, binary, bytestring
+     , clash-prelude, concurrent-supply, containers, cryptohash-sha256
+     , data-binary-ieee754, data-default, deepseq, directory, dlist
+     , errors, exceptions, extra, filepath, ghc, ghc-boot-th
+     , ghc-typelits-knownnat, hashable, haskell-src-exts
+     , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl
+     , ordered-containers, parsers, pretty-show, prettyprinter
+     , primitive, process, quickcheck-text, reducers, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, temporary, terminal-size
+     , text, text-show, time, transformers, trifecta
+     , unordered-containers, utf8-string, vector
+     , vector-binary-instances
+     }:
+     mkDerivation {
+       pname = "clash-lib";
+       version = "1.4.7";
+       sha256 = "03wj0i926x8lc09nwgwh48plqxc49i5zzwil88bgnxdcwv9ncv18";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty ansi-terminal array attoparsec base
+         base16-bytestring binary bytestring clash-prelude concurrent-supply
+         containers cryptohash-sha256 data-binary-ieee754 data-default
+         deepseq directory dlist errors exceptions extra filepath ghc
+         ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate
+         lens mtl ordered-containers parsers pretty-show prettyprinter
+         primitive process reducers template-haskell temporary terminal-size
+         text text-show time transformers trifecta unordered-containers
+         utf8-string vector vector-binary-instances
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty base base16-bytestring bytestring clash-prelude
+         concurrent-supply containers data-default deepseq ghc
+         ghc-typelits-knownnat haskell-src-exts lens pretty-show
+         quickcheck-text tasty tasty-hunit tasty-quickcheck template-haskell
+         text transformers unordered-containers
+       ];
+       description = "Clash: a functional hardware description language - As a library";
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "clash-multisignal" = callPackage
     ({ mkDerivation, base, clash-prelude, deepseq
      , ghc-typelits-knownnat, QuickCheck
@@ -57152,6 +57219,48 @@ self: {
        broken = true;
      }) {};
 
+  "clash-prelude_1_4_7" = callPackage
+    ({ mkDerivation, array, arrows, base, bifunctors, binary
+     , bytestring, Cabal, cabal-doctest, constraints, containers
+     , criterion, data-binary-ieee754, data-default-class, deepseq
+     , doctest, extra, ghc-prim, ghc-typelits-extra
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise, half, hashable
+     , hedgehog, hint, integer-gmp, interpolate, lens, QuickCheck
+     , quickcheck-classes-base, recursion-schemes, reflection
+     , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck
+     , tasty-th, template-haskell, text, text-show, th-abstraction
+     , th-lift, th-orphans, time, transformers, type-errors, uniplate
+     , vector
+     }:
+     mkDerivation {
+       pname = "clash-prelude";
+       version = "1.4.7";
+       sha256 = "1ba7w8d9532gd6ahvmdbxsby2rx9wpxblkgmkrn6df1xdp3aqi9w";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         array arrows base bifunctors binary bytestring constraints
+         containers data-binary-ieee754 data-default-class deepseq extra
+         ghc-prim ghc-typelits-extra ghc-typelits-knownnat
+         ghc-typelits-natnormalise half hashable integer-gmp interpolate
+         lens QuickCheck recursion-schemes reflection singletons
+         template-haskell text text-show th-abstraction th-lift th-orphans
+         time transformers type-errors uniplate vector
+       ];
+       testHaskellDepends = [
+         base deepseq doctest ghc-typelits-extra ghc-typelits-knownnat
+         ghc-typelits-natnormalise hedgehog hint quickcheck-classes-base
+         tasty tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th
+         template-haskell
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq template-haskell
+       ];
+       description = "Clash: a functional hardware description language - Prelude library";
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "clash-prelude-quickcheck" = callPackage
     ({ mkDerivation, base, clash-prelude, QuickCheck }:
      mkDerivation {
@@ -57775,6 +57884,30 @@ self: {
        broken = true;
      }) {};
 
+  "cleff" = callPackage
+    ({ mkDerivation, atomic-primops, base, containers, exceptions
+     , extra, hspec, lifted-base, microlens, monad-control, primitive
+     , QuickCheck, template-haskell, th-abstraction, transformers
+     , transformers-base, unliftio
+     }:
+     mkDerivation {
+       pname = "cleff";
+       version = "0.1.0.0";
+       sha256 = "16fd1ly5299an0wlmnc3f6asikbr8n8b8vzkmvd2jq86sk0x5z1n";
+       libraryHaskellDepends = [
+         atomic-primops base containers exceptions microlens monad-control
+         primitive template-haskell th-abstraction transformers
+         transformers-base unliftio
+       ];
+       testHaskellDepends = [
+         atomic-primops base containers exceptions extra hspec lifted-base
+         microlens monad-control primitive QuickCheck template-haskell
+         th-abstraction transformers transformers-base unliftio
+       ];
+       description = "Fast and concise extensible effects";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "cless" = callPackage
     ({ mkDerivation, base, highlighting-kate, optparse-applicative
      , process, terminfo, wl-pprint-extras, wl-pprint-terminfo
@@ -61176,6 +61309,17 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "commutative-semigroups" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "commutative-semigroups";
+       version = "0.0.1.0";
+       sha256 = "0vpg3vl84pwv7rnrmh0g6dzg0x61w919c84bry6gpmdkil55zlll";
+       libraryHaskellDepends = [ base ];
+       description = "Commutative semigroups";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "comonad" = callPackage
     ({ mkDerivation, base, containers, distributive
      , indexed-traversable, tagged, transformers, transformers-compat
@@ -64624,6 +64768,26 @@ self: {
        license = lib.licenses.bsd2;
      }) {};
 
+  "constraints_0_13_3" = callPackage
+    ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec
+     , hspec-discover, mtl, transformers, transformers-compat
+     , type-equality
+     }:
+     mkDerivation {
+       pname = "constraints";
+       version = "0.13.3";
+       sha256 = "0jhdix263zxsiki0pmdpyrg7vcfxx2x9w7pjiypva3wsr9agdjzr";
+       libraryHaskellDepends = [
+         base binary deepseq ghc-prim hashable mtl transformers
+         transformers-compat type-equality
+       ];
+       testHaskellDepends = [ base hspec ];
+       testToolDepends = [ hspec-discover ];
+       description = "Constraint manipulation";
+       license = lib.licenses.bsd2;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "constraints-deriving" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, filepath, ghc, ghc-paths
      , path, path-io
@@ -65104,8 +65268,6 @@ self: {
        ];
        description = "Unified interface for primitive arrays";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "contiguous-checked" = callPackage
@@ -65131,6 +65293,7 @@ self: {
        description = "dft of contiguous memory structures";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "continue" = callPackage
@@ -66679,6 +66842,7 @@ self: {
        testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ];
        description = "Build tool for C";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "cplex-hs" = callPackage
@@ -75138,6 +75302,8 @@ self: {
        pname = "dependent-monoidal-map";
        version = "0.1.1.2";
        sha256 = "11qcrxji3lvq4blzh1qk9wkhhzjkvz3maxfv63zgby98dpmkxa2x";
+       revision = "1";
+       editedCabalFile = "0149hmhqlj69pjg325p3da1z96czbjc18vp4i4acrvzbjh060nd4";
        libraryHaskellDepends = [
          aeson base constraints constraints-extras dependent-map
          dependent-sum dependent-sum-aeson-orphans
@@ -75634,8 +75800,8 @@ self: {
      }:
      mkDerivation {
        pname = "deriving-trans";
-       version = "0.2.1.0";
-       sha256 = "114npy6rb24gsblncsgzdr1mfhnh8r2pblazvjz5l444h5im0ln2";
+       version = "0.2.2.0";
+       sha256 = "1v2iamc375i6gqavb2s644mbb99wlnv0nk07dmbyaw522svp20y4";
        libraryHaskellDepends = [
          base monad-control mtl transformers transformers-base
        ];
@@ -76714,8 +76880,8 @@ self: {
        pname = "dhall-recursive-adt";
        version = "0.1.0.1";
        sha256 = "09s3m86vflj5im2walab8d0wpvihsvxc5mzy55m10pfzr3gxsd11";
-       revision = "1";
-       editedCabalFile = "0phfa1y6fic6wyvm3bp56z4sj43wbf75rzggzgf763vivlnvc7xw";
+       revision = "2";
+       editedCabalFile = "14a524zh3vi06cnf5glhd1kdl4wsmzsaqgvsvxg5096kzn6cijqx";
        libraryHaskellDepends = [ base data-fix dhall recursion-schemes ];
        testHaskellDepends = [
          base dhall either hedgehog recursion-schemes tasty tasty-hedgehog
@@ -81309,6 +81475,8 @@ self: {
        ];
        description = "Low-level bindings to the DocuSign API";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "docusign-base-minimal" = callPackage
@@ -81881,6 +82049,24 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "double-conversion_2_0_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, ghc-prim, HUnit, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "double-conversion";
+       version = "2.0.4.1";
+       sha256 = "1hrpqh8lbw0kkryqsya95mfnnnj0pj7zswxrn6kvfy4rf7z8v2d4";
+       libraryHaskellDepends = [ base bytestring ghc-prim text ];
+       testHaskellDepends = [
+         base bytestring HUnit test-framework test-framework-hunit
+         test-framework-quickcheck2 text
+       ];
+       description = "Fast conversion between single and double precision floating point and text";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "double-extra" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava, deepseq
      , double-conversion, rawstring-qm, text
@@ -95075,6 +95261,24 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "fingertree_0_1_5_0" = callPackage
+    ({ mkDerivation, base, HUnit, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "fingertree";
+       version = "0.1.5.0";
+       sha256 = "0wdzpli8bpgk8lrsp105zb0y5gn1r2029laclvhz264bza93q9pk";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2
+       ];
+       description = "Generic finger-tree structure, with example instances";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "fingertree-psqueue" = callPackage
     ({ mkDerivation, base, fingertree }:
      mkDerivation {
@@ -98139,6 +98343,8 @@ self: {
        pname = "formatting";
        version = "7.1.3";
        sha256 = "1vrc2i1b6lxx2aq5hysfl3gl6miq2wbhxc384axvgrkqjbibnqc0";
+       revision = "1";
+       editedCabalFile = "046cm1jvxmsmpclrwmwc1pj90f2qdhd5ysya0ckzqrc3ls6fgcxz";
        libraryHaskellDepends = [
          base clock double-conversion ghc-prim old-locale scientific text
          time transformers
@@ -98534,6 +98740,40 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "fourmolu_0_4_0_0" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal
+     , containers, Diff, directory, dlist, exceptions, filepath
+     , ghc-lib-parser, gitrev, hspec, hspec-discover, HsYAML
+     , HsYAML-aeson, mtl, optparse-applicative, path, path-io, syb
+     , temporary, text
+     }:
+     mkDerivation {
+       pname = "fourmolu";
+       version = "0.4.0.0";
+       sha256 = "1mq0h6nsl7ssfwh6zqhyja7w212vn8msmlm5iwwimca279hzwywb";
+       revision = "1";
+       editedCabalFile = "03bwhqj547brmgk191gy3k9xayi6fqqk2f5sbz3ail1bk7b73xnq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base bytestring Cabal containers Diff directory
+         dlist exceptions filepath ghc-lib-parser HsYAML HsYAML-aeson mtl
+         syb text
+       ];
+       executableHaskellDepends = [
+         base directory filepath ghc-lib-parser gitrev optparse-applicative
+         text
+       ];
+       testHaskellDepends = [
+         base containers directory filepath hspec path path-io temporary
+         text
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "A formatter for Haskell source code";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "fourmolu_0_5_0_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring
      , Cabal, containers, Diff, directory, dlist, exceptions, filepath
@@ -101241,7 +101481,7 @@ self: {
        license = lib.licenses.isc;
      }) {};
 
-  "futhark_0_21_4" = callPackage
+  "futhark_0_21_5" = callPackage
     ({ mkDerivation, aeson, alex, ansi-terminal, array, base
      , base16-bytestring, binary, blaze-html, bmp, bytestring
      , bytestring-to-vector, cmark-gfm, containers, cryptohash-md5
@@ -101256,8 +101496,8 @@ self: {
      }:
      mkDerivation {
        pname = "futhark";
-       version = "0.21.4";
-       sha256 = "0ij7sc9zq3l8i100kf7acwvrmqnq3f6x78wv5a7r8mfmb8bs51b3";
+       version = "0.21.5";
+       sha256 = "1an0xk4hqma5hd5jq3m00l0f2kkh8mpg01ww488xsbh1976jm1dy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106683,6 +106923,23 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "ghc-source-gen_0_4_3_0" = callPackage
+    ({ mkDerivation, base, ghc, ghc-paths, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "ghc-source-gen";
+       version = "0.4.3.0";
+       sha256 = "1lhqsklibgiv51hs8mnrkn784rc5sxf5z8cfv8hf9jqlny50720f";
+       libraryHaskellDepends = [ base ghc ];
+       testHaskellDepends = [
+         base ghc ghc-paths QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "Constructs Haskell syntax trees for the GHC API";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "ghc-srcspan-plugin" = callPackage
     ({ mkDerivation, array, base, containers, ghc, hpc }:
      mkDerivation {
@@ -107229,46 +107486,46 @@ self: {
 
   "ghcide" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, async, base
-     , base16-bytestring, binary, bytestring, bytestring-encoding
-     , case-insensitive, containers, cryptohash-sha1, data-default
-     , deepseq, dependent-map, dependent-sum, Diff, directory, dlist
-     , exceptions, extra, filepath, fingertree, fuzzy, ghc, ghc-boot
-     , ghc-boot-th, ghc-check, ghc-exactprint, ghc-paths
-     , ghc-trace-events, ghc-typelits-knownnat, gitrev, Glob
-     , haddock-library, hashable, heapsize, hie-bios, hie-compat, hiedb
-     , hls-graph, hls-plugin-api, hp2pretty, hslogger, implicit-hie
-     , implicit-hie-cradle, lens, lsp, lsp-test, lsp-types
-     , monoid-subclasses, mtl, network-uri, opentelemetry
-     , optparse-applicative, parallel, prettyprinter
-     , prettyprinter-ansi-terminal, process, QuickCheck
-     , quickcheck-instances, record-dot-preprocessor, record-hasfield
-     , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions
-     , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty
-     , tasty-expected-failure, tasty-hunit, tasty-quickcheck
-     , tasty-rerun, text, time, transformers, unix, unliftio
-     , unliftio-core, unordered-containers, utf8-string, vector
-     , vector-algorithms, yaml
+     , base16-bytestring, binary, bytestring, case-insensitive
+     , containers, cryptohash-sha1, data-default, deepseq, dependent-map
+     , dependent-sum, Diff, directory, dlist, exceptions, extra
+     , filepath, fingertree, focus, fuzzy, ghc, ghc-boot, ghc-boot-th
+     , ghc-check, ghc-exactprint, ghc-paths, ghc-trace-events
+     , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable
+     , heapsize, hie-bios, hie-compat, hiedb, hls-graph, hls-plugin-api
+     , hp2pretty, hslogger, implicit-hie, implicit-hie-cradle, lens
+     , list-t, lsp, lsp-test, lsp-types, monoid-subclasses, mtl
+     , network-uri, opentelemetry, optparse-applicative, parallel
+     , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck
+     , quickcheck-instances, random, record-dot-preprocessor
+     , record-hasfield, regex-tdfa, retrie, rope-utf16-splay, safe
+     , safe-exceptions, shake, shake-bench, sorted-list, sqlite-simple
+     , stm, stm-containers, syb, tasty, tasty-expected-failure
+     , tasty-hunit, tasty-quickcheck, tasty-rerun, text, time
+     , transformers, unix, unliftio, unliftio-core, unordered-containers
+     , utf8-string, vector, vector-algorithms, yaml
      }:
      mkDerivation {
        pname = "ghcide";
-       version = "1.5.0.1";
-       sha256 = "0z6fq9p6wikcgacnqg8brq0bkphd14h7g5absw53ya047vgp02gc";
+       version = "1.6.0.0";
+       sha256 = "0clmpgkywzrgsnmawi5l1n2hgymrkyijpqkqc38xsgxf8nsvmh8c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty array async base base16-bytestring binary
-         bytestring bytestring-encoding case-insensitive containers
-         cryptohash-sha1 data-default deepseq dependent-map dependent-sum
-         Diff directory dlist exceptions extra filepath fingertree fuzzy ghc
-         ghc-boot ghc-boot-th ghc-check ghc-exactprint ghc-paths
-         ghc-trace-events Glob haddock-library hashable heapsize hie-bios
-         hie-compat hiedb hls-graph hls-plugin-api hslogger
-         implicit-hie-cradle lens lsp lsp-types monoid-subclasses mtl
-         network-uri opentelemetry optparse-applicative parallel
-         prettyprinter prettyprinter-ansi-terminal regex-tdfa retrie
+         bytestring case-insensitive containers cryptohash-sha1 data-default
+         deepseq dependent-map dependent-sum Diff directory dlist exceptions
+         extra filepath fingertree focus fuzzy ghc ghc-boot ghc-boot-th
+         ghc-check ghc-exactprint ghc-paths ghc-trace-events Glob
+         haddock-library hashable heapsize hie-bios hie-compat hiedb
+         hls-graph hls-plugin-api hslogger implicit-hie-cradle lens list-t
+         lsp lsp-types monoid-subclasses mtl network-uri opentelemetry
+         optparse-applicative parallel prettyprinter
+         prettyprinter-ansi-terminal random regex-tdfa retrie
          rope-utf16-splay safe safe-exceptions sorted-list sqlite-simple stm
-         syb text time transformers unix unliftio unliftio-core
-         unordered-containers utf8-string vector vector-algorithms
+         stm-containers syb text time transformers unix unliftio
+         unliftio-core unordered-containers utf8-string vector
+         vector-algorithms
        ];
        executableHaskellDepends = [
          aeson base bytestring containers data-default directory extra
@@ -107279,11 +107536,12 @@ self: {
        testHaskellDepends = [
          aeson async base binary bytestring containers data-default
          directory extra filepath ghc ghc-typelits-knownnat haddock-library
-         hls-graph hls-plugin-api lens lsp lsp-test lsp-types network-uri
-         optparse-applicative process QuickCheck quickcheck-instances
-         record-dot-preprocessor record-hasfield regex-tdfa rope-utf16-splay
-         safe safe-exceptions shake tasty tasty-expected-failure tasty-hunit
-         tasty-quickcheck tasty-rerun text unordered-containers
+         hls-graph hls-plugin-api lens list-t lsp lsp-test lsp-types
+         network-uri optparse-applicative process QuickCheck
+         quickcheck-instances random record-dot-preprocessor record-hasfield
+         regex-tdfa rope-utf16-splay safe safe-exceptions shake
+         sqlite-simple stm stm-containers tasty tasty-expected-failure
+         tasty-hunit tasty-quickcheck tasty-rerun text unordered-containers
        ];
        testToolDepends = [ implicit-hie ];
        benchmarkHaskellDepends = [
@@ -110069,8 +110327,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "8.20211231";
-       sha256 = "0cpa3rl8vcm0arima8x9m5q0a9r05z0851ibr1vcria2z0mmwmi7";
+       version = "10.20220127";
+       sha256 = "06s80fa91cnn2r5n6d52lqqp3hpc4ksag82razs7sj19iwixan2w";
        configureFlags = [
          "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime"
          "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser"
@@ -124932,29 +125190,31 @@ self: {
     ({ mkDerivation, aeson, aeson-pretty, async, base
      , base16-bytestring, binary, bytestring, containers
      , cryptohash-sha1, data-default, deepseq, directory, extra
-     , filepath, ghc, ghc-boot-th, ghc-paths, ghcide, gitrev, hashable
-     , hie-bios, hiedb, hls-brittany-plugin, hls-call-hierarchy-plugin
-     , hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin
-     , hls-floskell-plugin, hls-fourmolu-plugin, hls-graph
-     , hls-haddock-comments-plugin, hls-hlint-plugin
-     , hls-module-name-plugin, hls-ormolu-plugin, hls-plugin-api
-     , hls-pragmas-plugin, hls-refine-imports-plugin, hls-retrie-plugin
-     , hls-splice-plugin, hls-stylish-haskell-plugin, hls-tactics-plugin
-     , hls-test-utils, hslogger, hspec-expectations, lens, lsp, lsp-test
+     , filepath, ghc, ghc-boot-th, ghc-paths, ghcide, githash, gitrev
+     , hashable, hie-bios, hiedb, hls-alternate-number-format-plugin
+     , hls-brittany-plugin, hls-call-hierarchy-plugin, hls-class-plugin
+     , hls-eval-plugin, hls-explicit-imports-plugin, hls-floskell-plugin
+     , hls-fourmolu-plugin, hls-graph, hls-haddock-comments-plugin
+     , hls-hlint-plugin, hls-module-name-plugin, hls-ormolu-plugin
+     , hls-plugin-api, hls-pragmas-plugin
+     , hls-qualify-imported-names-plugin, hls-refine-imports-plugin
+     , hls-retrie-plugin, hls-selection-range-plugin, hls-splice-plugin
+     , hls-stylish-haskell-plugin, hls-tactics-plugin, hls-test-utils
+     , hslogger, hspec-expectations, lens, lens-aeson, lsp, lsp-test
      , lsp-types, mtl, optparse-applicative, optparse-simple, process
-     , regex-tdfa, safe-exceptions, sqlite-simple, temporary, text
+     , regex-tdfa, safe-exceptions, sqlite-simple, stm, temporary, text
      , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "haskell-language-server";
-       version = "1.5.1.0";
-       sha256 = "0aixq570sbrg9nnhaxlj8lv3k1dskbz53iwp5c1ljgrlmsz786ky";
+       version = "1.6.1.0";
+       sha256 = "1dc711b46kilb7dqr19m63hc20q2nzy5c6p5dzg3a4g5ixkaimwl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson-pretty async base base16-bytestring bytestring containers
          cryptohash-sha1 data-default directory extra filepath ghc ghcide
-         gitrev hie-bios hiedb hls-graph hls-plugin-api hslogger lsp
+         githash hie-bios hiedb hls-graph hls-plugin-api hslogger lsp
          optparse-applicative optparse-simple process safe-exceptions
          sqlite-simple text unordered-containers
        ];
@@ -124962,20 +125222,24 @@ self: {
          aeson async base base16-bytestring binary bytestring containers
          cryptohash-sha1 data-default deepseq directory extra filepath ghc
          ghc-boot-th ghc-paths ghcide gitrev hashable hie-bios hiedb
-         hls-brittany-plugin hls-call-hierarchy-plugin hls-class-plugin
-         hls-eval-plugin hls-explicit-imports-plugin hls-floskell-plugin
-         hls-fourmolu-plugin hls-graph hls-haddock-comments-plugin
-         hls-hlint-plugin hls-module-name-plugin hls-ormolu-plugin
-         hls-plugin-api hls-pragmas-plugin hls-refine-imports-plugin
-         hls-retrie-plugin hls-splice-plugin hls-stylish-haskell-plugin
-         hls-tactics-plugin hslogger lens lsp mtl optparse-applicative
-         optparse-simple process regex-tdfa safe-exceptions sqlite-simple
-         temporary text transformers unordered-containers
+         hls-alternate-number-format-plugin hls-brittany-plugin
+         hls-call-hierarchy-plugin hls-class-plugin hls-eval-plugin
+         hls-explicit-imports-plugin hls-floskell-plugin hls-fourmolu-plugin
+         hls-graph hls-haddock-comments-plugin hls-hlint-plugin
+         hls-module-name-plugin hls-ormolu-plugin hls-plugin-api
+         hls-pragmas-plugin hls-qualify-imported-names-plugin
+         hls-refine-imports-plugin hls-retrie-plugin
+         hls-selection-range-plugin hls-splice-plugin
+         hls-stylish-haskell-plugin hls-tactics-plugin hslogger lens lsp mtl
+         optparse-applicative optparse-simple process regex-tdfa
+         safe-exceptions sqlite-simple stm temporary text transformers
+         unordered-containers
        ];
        testHaskellDepends = [
          aeson base bytestring containers data-default directory extra
          filepath ghcide hls-plugin-api hls-test-utils hspec-expectations
-         lens lsp-test lsp-types process text unordered-containers
+         lens lens-aeson lsp-test lsp-types process text
+         unordered-containers
        ];
        testToolDepends = [ ghcide ];
        description = "LSP server for GHC";
@@ -130776,7 +131040,7 @@ self: {
        maintainers = with lib.maintainers; [ maralorn ];
      }) {};
 
-  "hedgehog_1_1" = callPackage
+  "hedgehog_1_1_1" = callPackage
     ({ mkDerivation, ansi-terminal, async, barbies, base, bytestring
      , concurrent-output, containers, deepseq, directory, erf
      , exceptions, lifted-async, mmorph, monad-control, mtl, pretty-show
@@ -130785,10 +131049,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedgehog";
-       version = "1.1";
-       sha256 = "1g05jw568lv02ikqhp2wyx52218b6rm7rxyh93cwrmbmgd2sxhsc";
-       revision = "1";
-       editedCabalFile = "19r528rsfzyfaz3xcwbi2zmf6sgzls2x61z24j3wfiicch30qk69";
+       version = "1.1.1";
+       sha256 = "1qx7bjcdgczvz5xhrqz25lray9rk3wrhzqfc5vpjnvgkzvnj3mny";
        libraryHaskellDepends = [
          ansi-terminal async barbies base bytestring concurrent-output
          containers deepseq directory erf exceptions lifted-async mmorph
@@ -130843,6 +131105,8 @@ self: {
        pname = "hedgehog-classes";
        version = "0.2.5.3";
        sha256 = "1qanfnvciykm5hmiqyf0icn4xn16v6zvlfal98lphhcmym26m9x1";
+       revision = "1";
+       editedCabalFile = "0nq1qj1hmyihyvbj0l6hdbrpk8fjf2kn97abiap5v8hdvcnznhjy";
        libraryHaskellDepends = [
          aeson base binary comonad containers hedgehog pretty-show primitive
          semirings silently transformers vector wl-pprint-annotated
@@ -130877,6 +131141,19 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "hedgehog-fakedata_0_0_1_5" = callPackage
+    ({ mkDerivation, base, containers, fakedata, hedgehog, random }:
+     mkDerivation {
+       pname = "hedgehog-fakedata";
+       version = "0.0.1.5";
+       sha256 = "00k26d83v0646klrg0k3cf94r4fnnx3ykxv7i8shjjgbkbzlzz78";
+       libraryHaskellDepends = [ base fakedata hedgehog random ];
+       testHaskellDepends = [ base containers fakedata hedgehog ];
+       description = "Use 'fakedata' with 'hedgehog'";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "hedgehog-fn" = callPackage
     ({ mkDerivation, base, contravariant, hedgehog, transformers }:
      mkDerivation {
@@ -131040,23 +131317,21 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "hedis_0_15_0" = callPackage
+  "hedis_0_15_1" = callPackage
     ({ mkDerivation, async, base, bytestring, bytestring-lexing
      , containers, deepseq, doctest, errors, exceptions, HTTP, HUnit
      , mtl, network, network-uri, resource-pool, scanner, stm
      , test-framework, test-framework-hunit, text, time, tls
-     , unordered-containers, vector
+     , unliftio-core, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hedis";
-       version = "0.15.0";
-       sha256 = "1wcsjvya9hnvgjl9vnimi3928fx2gy0glgdc30slfwnjpijs97n0";
-       revision = "1";
-       editedCabalFile = "0njy7nh5r935xb0za9r0hligqy0nzwlfnzlfqcvb1frkzxissydp";
+       version = "0.15.1";
+       sha256 = "1a09i21qmzjcx171452bm69cj188f1jha2gwj0yi7shimcqz3l8m";
        libraryHaskellDepends = [
          async base bytestring bytestring-lexing containers deepseq errors
          exceptions HTTP mtl network network-uri resource-pool scanner stm
-         text time tls unordered-containers vector
+         text time tls unliftio-core unordered-containers vector
        ];
        testHaskellDepends = [
          async base bytestring doctest HUnit mtl stm test-framework
@@ -134003,8 +134278,8 @@ self: {
      }:
      mkDerivation {
        pname = "hie-compat";
-       version = "0.2.1.0";
-       sha256 = "0dl48y5ijr73dc1lrarvfz6bivxg42ll4y339saw1y5xmgw1c5w7";
+       version = "0.2.1.1";
+       sha256 = "054ll31b2j31a2yjcz7q7zxqyyszrkbaz4kzxhih4k84v9h0nhk6";
        libraryHaskellDepends = [
          array base bytestring containers directory filepath ghc ghc-boot
          transformers
@@ -134059,31 +134334,6 @@ self: {
      }:
      mkDerivation {
        pname = "hiedb";
-       version = "0.4.0.0";
-       sha256 = "1frcl9mxmn97qc97l3kw21ksapyndn6jq7yfxxrr0fvzn7jji7wv";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         algebraic-graphs ansi-terminal array base bytestring containers
-         directory extra filepath ghc hie-compat lucid mtl
-         optparse-applicative sqlite-simple terminal-size text
-       ];
-       executableHaskellDepends = [ base ghc-paths ];
-       testHaskellDepends = [
-         base directory filepath ghc ghc-paths hspec process temporary
-       ];
-       description = "Generates a references DB from .hie files";
-       license = lib.licenses.bsd3;
-     }) {};
-
-  "hiedb_0_4_1_0" = callPackage
-    ({ mkDerivation, algebraic-graphs, ansi-terminal, array, base
-     , bytestring, containers, directory, extra, filepath, ghc
-     , ghc-paths, hie-compat, hspec, lucid, mtl, optparse-applicative
-     , process, sqlite-simple, temporary, terminal-size, text
-     }:
-     mkDerivation {
-       pname = "hiedb";
        version = "0.4.1.0";
        sha256 = "1389qmlga5rq8has02rn35pzag5wnfpx3w77r60mzl3b4pkpzi7i";
        isLibrary = true;
@@ -134099,7 +134349,6 @@ self: {
        ];
        description = "Generates a references DB from .hie files";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hieraclus" = callPackage
@@ -136733,19 +136982,41 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "hls-alternate-number-format-plugin" = callPackage
+    ({ mkDerivation, aeson, base, containers, filepath, ghc-boot-th
+     , ghcide, hie-compat, hls-graph, hls-plugin-api, hls-test-utils
+     , lens, lsp, mtl, QuickCheck, regex-tdfa, syb, tasty-quickcheck
+     , text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "hls-alternate-number-format-plugin";
+       version = "1.0.1.0";
+       sha256 = "1xr4rizv1k6dx32mnny55s33cngmvy0a52sswpk17fl4zx3bd0pp";
+       libraryHaskellDepends = [
+         aeson base containers ghc-boot-th ghcide hie-compat hls-graph
+         hls-plugin-api lens lsp mtl regex-tdfa syb text
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         base filepath hls-test-utils lsp QuickCheck regex-tdfa
+         tasty-quickcheck text
+       ];
+       description = "Provide Alternate Number Formats plugin for Haskell Language Server";
+       license = lib.licenses.asl20;
+     }) {};
+
   "hls-brittany-plugin" = callPackage
-    ({ mkDerivation, base, brittany, czipwith, extra, filepath, ghc
+    ({ mkDerivation, base, brittany, czipwith, extra, filepath
      , ghc-boot-th, ghc-exactprint, ghcide, hls-plugin-api
      , hls-test-utils, lens, lsp-types, text, transformers
      }:
      mkDerivation {
        pname = "hls-brittany-plugin";
-       version = "1.0.1.1";
-       sha256 = "09j40rh3nn5i8h8k5hpqy1vwjjmfma8n8lf59180ravia4pfddli";
+       version = "1.0.2.0";
+       sha256 = "0vxlhggmbrfmf81qgpxmrpsflmi32hafhy21dxain1as5hrnxw8g";
        libraryHaskellDepends = [
-         base brittany czipwith extra filepath ghc ghc-boot-th
-         ghc-exactprint ghcide hls-plugin-api lens lsp-types text
-         transformers
+         base brittany czipwith extra filepath ghc-boot-th ghc-exactprint
+         ghcide hls-plugin-api lens lsp-types text transformers
        ];
        testHaskellDepends = [ base filepath hls-test-utils ];
        description = "Integration with the Brittany code formatter";
@@ -136759,8 +137030,8 @@ self: {
      }:
      mkDerivation {
        pname = "hls-call-hierarchy-plugin";
-       version = "1.0.1.1";
-       sha256 = "10faqaj4zhpl2aqlmqr8l96dij31x47vj2sfbpxhpcm5j3zxqwni";
+       version = "1.0.2.0";
+       sha256 = "0772kxdp6ww91a1b0c8lfxjlpvwr8smcf8ayvaxazw76hisxrrj5";
        libraryHaskellDepends = [
          aeson base bytestring containers extra ghc ghcide hiedb
          hls-plugin-api lens lsp sqlite-simple text unordered-containers
@@ -136780,8 +137051,8 @@ self: {
      }:
      mkDerivation {
        pname = "hls-class-plugin";
-       version = "1.0.1.2";
-       sha256 = "1ybg6dd3m8ynhkn80189nqc8ng2lfplk3xrq7cq4mdx4bgdnjbgq";
+       version = "1.0.2.0";
+       sha256 = "0drpxrazhwd228skgky7xdzcf22gi1pi2lby0dj0nzpzhrdl0pw0";
        libraryHaskellDepends = [
          aeson base containers ghc ghc-exactprint ghcide hls-plugin-api lens
          lsp text transformers
@@ -136804,8 +137075,8 @@ self: {
      }:
      mkDerivation {
        pname = "hls-eval-plugin";
-       version = "1.2.0.2";
-       sha256 = "0nrlfs40hmbjjw6r01b3fcxwh01b4ap9v2ij6jyqrgkbs19qfp49";
+       version = "1.2.1.0";
+       sha256 = "18xjq664b8aj199gd1sswa7gndwikch77v3p1c36yshfa0rviwi8";
        libraryHaskellDepends = [
          aeson base containers data-default deepseq Diff directory dlist
          extra filepath ghc ghc-boot-th ghc-paths ghcide hashable hls-graph
@@ -136847,8 +137118,8 @@ self: {
      }:
      mkDerivation {
        pname = "hls-explicit-imports-plugin";
-       version = "1.0.1.2";
-       sha256 = "12m0idqxx47ixyn6i03jzwp4z9xwnb5q0p0655ik03xhibwjja7d";
+       version = "1.0.2.0";
+       sha256 = "04v6sgzsjqk4qj586qzvfvq405z0zpc08xljxb12glmqghvi5xjg";
        libraryHaskellDepends = [
          aeson base containers deepseq ghc ghcide hls-graph hls-plugin-api
          lsp text unordered-containers
@@ -136864,8 +137135,8 @@ self: {
      }:
      mkDerivation {
        pname = "hls-floskell-plugin";
-       version = "1.0.0.2";
-       sha256 = "0b9dil7sc334iv4kn1gbkvjg78pamlhrw12r6k2vsz57xkz1b7ls";
+       version = "1.0.1.0";
+       sha256 = "1slzv2c5lzxprh8yhfk8iabmmlhh3sx97m393nrnwrjcbpzq0vai";
        libraryHaskellDepends = [
          base floskell ghcide hls-plugin-api lsp-types text transformers
        ];
@@ -136880,8 +137151,8 @@ self: {
      }:
      mkDerivation {
        pname = "hls-fourmolu-plugin";
-       version = "1.0.1.2";
-       sha256 = "1w7rnb18fn71aqzspq7wic0nd1qwh5r2vr9j2yiwvp95p42zxf0n";
+       version = "1.0.2.0";
+       sha256 = "0n9yk539wc046i6sx68gsbrc4jfmp1nsm2nir00q4sdcf7flcvff";
        libraryHaskellDepends = [
          base filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api lens
          lsp text
@@ -136893,19 +137164,19 @@ self: {
 
   "hls-graph" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
-     , deepseq, directory, exceptions, extra, filepath, hashable
-     , js-dgtable, js-flot, js-jquery, primitive, time, transformers
-     , unordered-containers
+     , deepseq, directory, exceptions, extra, filepath, focus, hashable
+     , js-dgtable, js-flot, js-jquery, list-t, primitive, stm
+     , stm-containers, time, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "hls-graph";
-       version = "1.5.1.1";
-       sha256 = "1ak6i03ch5xm6r4ym09k9vxfq7y5xwr9c6d84cgl8288g2i0fnpz";
+       version = "1.6.0.0";
+       sha256 = "0raz4gkfhxzbmg5rf65yp5p0i3mpd0rlraz90gwbvf5l1z9jlqml";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson async base bytestring containers deepseq directory exceptions
-         extra filepath hashable js-dgtable js-flot js-jquery primitive time
-         transformers unordered-containers
+         extra filepath focus hashable js-dgtable js-flot js-jquery list-t
+         primitive stm stm-containers time transformers unordered-containers
        ];
        description = "Haskell Language Server internal graph API";
        license = lib.licenses.asl20;
@@ -136918,8 +137189,8 @@ self: {
      }:
      mkDerivation {
        pname = "hls-haddock-comments-plugin";
-       version = "1.0.0.4";
-       sha256 = "0c4s10jmp5whi7k48llqs51vp22fav5ldzyxq1cv38ai1wqma3g8";
+       version = "1.0.1.0";
+       sha256 = "1jlz6vg5ff2j2vba4yg8nymxfs7vmg5h3kzjhsj6bs2jn8kh722r";
        libraryHaskellDepends = [
          base containers ghc ghc-exactprint ghcide hls-plugin-api lsp-types
          text unordered-containers
@@ -136934,18 +137205,18 @@ self: {
      , containers, data-default, deepseq, Diff, directory, extra
      , filepath, ghc, ghc-exactprint, ghc-lib, ghc-lib-parser-ex, ghcide
      , hashable, hlint, hls-plugin-api, hls-test-utils, hslogger, lens
-     , lsp, lsp-types, regex-tdfa, temporary, text, transformers
+     , lsp, lsp-types, regex-tdfa, stm, temporary, text, transformers
      , unordered-containers
      }:
      mkDerivation {
        pname = "hls-hlint-plugin";
-       version = "1.0.2.1";
-       sha256 = "11a6gkz4af137zdg0m4bipjy2vn8bmarjd127sdrwli3vy7jzs3s";
+       version = "1.0.3.0";
+       sha256 = "0vzgsh6x8bjgi3l6nc9kfgbczxnd7fws5bmglac5khr0z042babb";
        libraryHaskellDepends = [
          aeson apply-refact base binary bytestring containers data-default
          deepseq Diff directory extra filepath ghc ghc-exactprint ghc-lib
          ghc-lib-parser-ex ghcide hashable hlint hls-plugin-api hslogger
-         lens lsp regex-tdfa temporary text transformers
+         lens lsp regex-tdfa stm temporary text transformers
          unordered-containers
        ];
        testHaskellDepends = [
@@ -136963,8 +137234,8 @@ self: {
      }:
      mkDerivation {
        pname = "hls-module-name-plugin";
-       version = "1.0.0.3";
-       sha256 = "0nymxfwvqalmwgv3a0a5a10vk8yi6k7r3gb1yyd0iz6vkz6k10p3";
+       version = "1.0.1.0";
+       sha256 = "108p9j01d2s14akbwgwmpwb2a5r5d14vqzy6lw8n5cymgfdlza4a";
        libraryHaskellDepends = [
          aeson base directory filepath ghcide hls-plugin-api lsp text
          transformers unordered-containers
@@ -136981,8 +137252,8 @@ self: {
      }:
      mkDerivation {
        pname = "hls-ormolu-plugin";
-       version = "1.0.1.2";
-       sha256 = "1kp63ydmczvjbwzkmxzd8m4fnm8yljzxraisa85sd7pagv2djh7q";
+       version = "1.0.2.0";
+       sha256 = "1jbh16z4yzl3lx9q7pcrkfrmip6rifif3rirfn7dvyj1q7cf1fk4";
        libraryHaskellDepends = [
          base filepath ghc ghc-boot-th ghcide hls-plugin-api lens lsp ormolu
          text
@@ -136994,37 +137265,41 @@ self: {
 
   "hls-plugin-api" = callPackage
     ({ mkDerivation, aeson, base, containers, data-default
-     , dependent-map, dependent-sum, Diff, dlist, ghc, hashable
-     , hls-graph, hslogger, lens, lsp, opentelemetry
-     , optparse-applicative, process, regex-tdfa, text, unix
+     , dependent-map, dependent-sum, Diff, dlist, extra, ghc, hashable
+     , hls-graph, hslogger, lens, lens-aeson, lsp, lsp-types
+     , opentelemetry, optparse-applicative, process, regex-tdfa, tasty
+     , tasty-hunit, tasty-rerun, text, transformers, unix
      , unordered-containers
      }:
      mkDerivation {
        pname = "hls-plugin-api";
-       version = "1.2.0.2";
-       sha256 = "0mrfkqrkgvg53za026rfk6yqyyr1irk9k6k375dylaas7qlh0f0p";
+       version = "1.3.0.0";
+       sha256 = "0dkpamqgw2icx6zns79cpzsnsr33qg0i3ix66hvcl5fhhp363g9m";
        libraryHaskellDepends = [
          aeson base containers data-default dependent-map dependent-sum Diff
-         dlist ghc hashable hls-graph hslogger lens lsp opentelemetry
-         optparse-applicative process regex-tdfa text unix
-         unordered-containers
+         dlist extra ghc hashable hls-graph hslogger lens lens-aeson lsp
+         opentelemetry optparse-applicative process regex-tdfa text
+         transformers unix unordered-containers
+       ];
+       testHaskellDepends = [
+         base lsp-types tasty tasty-hunit tasty-rerun
        ];
        description = "Haskell Language Server API for plugin communication";
        license = lib.licenses.asl20;
      }) {};
 
   "hls-pragmas-plugin" = callPackage
-    ({ mkDerivation, base, extra, filepath, fuzzy, ghcide
-     , hls-plugin-api, hls-test-utils, lens, lsp, lsp-types, text
-     , transformers, unordered-containers
+    ({ mkDerivation, base, containers, extra, filepath, fuzzy, ghc
+     , ghcide, hls-plugin-api, hls-test-utils, lens, lsp, lsp-types
+     , text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "hls-pragmas-plugin";
-       version = "1.0.1.1";
-       sha256 = "1yy6avwff8swxrkhfcslckx6ql26w2chcv19z217s00y30z70xmq";
+       version = "1.0.2.0";
+       sha256 = "0bmifvjhcvwhivnx6s971nidjdb2ichphp70pahx72ai24ffqqx9";
        libraryHaskellDepends = [
-         base extra fuzzy ghcide hls-plugin-api lens lsp text transformers
-         unordered-containers
+         base containers extra fuzzy ghc ghcide hls-plugin-api lens lsp text
+         transformers unordered-containers
        ];
        testHaskellDepends = [
          base filepath hls-test-utils lens lsp-types text
@@ -137033,6 +137308,24 @@ self: {
        license = lib.licenses.asl20;
      }) {};
 
+  "hls-qualify-imported-names-plugin" = callPackage
+    ({ mkDerivation, aeson, base, containers, deepseq, dlist, filepath
+     , ghc, ghcide, hls-graph, hls-plugin-api, hls-test-utils, lsp, text
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "hls-qualify-imported-names-plugin";
+       version = "1.0.1.0";
+       sha256 = "0h456cq3qvksrkzfzpq2qsabsl3vpg4gh2mwyxc39xh4qm7ifban";
+       libraryHaskellDepends = [
+         aeson base containers deepseq dlist ghc ghcide hls-graph
+         hls-plugin-api lsp text transformers unordered-containers
+       ];
+       testHaskellDepends = [ base filepath hls-test-utils text ];
+       description = "A Haskell Language Server plugin that qualifies imported names";
+       license = lib.licenses.asl20;
+     }) {};
+
   "hls-refine-imports-plugin" = callPackage
     ({ mkDerivation, aeson, base, containers, deepseq, filepath, ghc
      , ghcide, hls-explicit-imports-plugin, hls-graph, hls-plugin-api
@@ -137040,8 +137333,8 @@ self: {
      }:
      mkDerivation {
        pname = "hls-refine-imports-plugin";
-       version = "1.0.0.2";
-       sha256 = "0spxczjf85z8zvkqyqrmwjacw9f44zminm8k8ygyn6b2wh9bzyqr";
+       version = "1.0.1.0";
+       sha256 = "10q5yjpny5aah245ivazqn2h05ak428qc9arpzlg5ks2n4n293lf";
        libraryHaskellDepends = [
          aeson base containers deepseq ghc ghcide
          hls-explicit-imports-plugin hls-graph hls-plugin-api lsp text
@@ -137076,23 +137369,45 @@ self: {
      }) {};
 
   "hls-retrie-plugin" = callPackage
-    ({ mkDerivation, aeson, base, containers, deepseq, directory, extra
-     , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie
-     , safe-exceptions, text, transformers, unordered-containers
+    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+     , directory, extra, ghc, ghcide, hashable, hls-plugin-api, lsp
+     , lsp-types, retrie, safe-exceptions, stm, text, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "hls-retrie-plugin";
-       version = "1.0.1.4";
-       sha256 = "18ldvywi8zl08xfd1z4dhj84xhxa9kq0hdminv6d3xf470ghkrdv";
+       version = "1.0.2.0";
+       sha256 = "0w41di7rqy8xrcaavzlfhai73yw0whmnyqxhyfjwx93y1sy1l6zg";
        libraryHaskellDepends = [
-         aeson base containers deepseq directory extra ghc ghcide hashable
-         hls-plugin-api lsp lsp-types retrie safe-exceptions text
-         transformers unordered-containers
+         aeson base bytestring containers deepseq directory extra ghc ghcide
+         hashable hls-plugin-api lsp lsp-types retrie safe-exceptions stm
+         text transformers unordered-containers
        ];
        description = "Retrie integration plugin for Haskell Language Server";
        license = lib.licenses.asl20;
      }) {};
 
+  "hls-selection-range-plugin" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, extra
+     , filepath, ghcide, hls-plugin-api, hls-test-utils, lens, lsp
+     , lsp-test, mtl, semigroupoids, text, transformers
+     }:
+     mkDerivation {
+       pname = "hls-selection-range-plugin";
+       version = "1.0.0.0";
+       sha256 = "1pfgxz7nyqr8gaxxv7nc0d4rpfc4rbgdkafy1fpgcsbkqx9llkn0";
+       libraryHaskellDepends = [
+         aeson base containers extra ghcide hls-plugin-api lsp mtl
+         semigroupoids text transformers
+       ];
+       testHaskellDepends = [
+         base bytestring containers filepath hls-test-utils lens lsp
+         lsp-test text
+       ];
+       description = "HLS Plugin to support smart selection range";
+       license = lib.licenses.asl20;
+     }) {};
+
   "hls-splice-plugin" = callPackage
     ({ mkDerivation, aeson, base, containers, dlist, extra, filepath
      , foldl, ghc, ghc-exactprint, ghcide, hls-plugin-api
@@ -137101,8 +137416,8 @@ self: {
      }:
      mkDerivation {
        pname = "hls-splice-plugin";
-       version = "1.0.0.6";
-       sha256 = "0cnm0kaimbcyrjgphz61fhs9wg4wscv8bj9c09pxxwz6npf2r3wz";
+       version = "1.0.1.0";
+       sha256 = "07v4rgss140vfc4xqibccimm48ys4awz7yficr0wf440p6i83qdc";
        libraryHaskellDepends = [
          aeson base containers dlist extra foldl ghc ghc-exactprint ghcide
          hls-plugin-api lens lsp retrie syb text transformers unliftio-core
@@ -137120,8 +137435,8 @@ self: {
      }:
      mkDerivation {
        pname = "hls-stylish-haskell-plugin";
-       version = "1.0.0.4";
-       sha256 = "0p6cqjslf9qnb2df6dvznyzily55mcs13f0kd0x64p8kf2chc6ic";
+       version = "1.0.1.0";
+       sha256 = "1f9g113xrb167cpdjifd2zp8ps1w2apvkghdiagc9rzw1fl0l7l4";
        libraryHaskellDepends = [
          base directory filepath ghc ghc-boot-th ghcide hls-plugin-api
          lsp-types stylish-haskell text
@@ -137143,8 +137458,8 @@ self: {
      }:
      mkDerivation {
        pname = "hls-tactics-plugin";
-       version = "1.5.0.1";
-       sha256 = "1fji3m1dczswzsrvvsg00jflsq9h4jpgclyma91rcncdrl7j4ylz";
+       version = "1.6.1.0";
+       sha256 = "15ynxlafrs0hss5qcn4aj8iip8iy631hfgqql0irqskvf3x5yxlx";
        libraryHaskellDepends = [
          aeson base containers deepseq directory extra filepath fingertree
          generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide
@@ -137171,8 +137486,8 @@ self: {
      }:
      mkDerivation {
        pname = "hls-test-utils";
-       version = "1.1.0.2";
-       sha256 = "1506438g4bzc05f8km5kcjq8hv1sk56bllbcnjkx3fdqdamr3piv";
+       version = "1.2.0.0";
+       sha256 = "1y3g101n7z78f5shfqfklg5zgl8gpkic0dwvpr5072dq1vvpfdvf";
        libraryHaskellDepends = [
          aeson async base blaze-markup bytestring containers data-default
          directory extra filepath ghcide hls-graph hls-plugin-api hspec
@@ -138244,6 +138559,27 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "hoauth2_2_0_0" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, exceptions
+     , hashable, http-conduit, http-types, microlens, text
+     , unordered-containers, uri-bytestring, uri-bytestring-aeson
+     }:
+     mkDerivation {
+       pname = "hoauth2";
+       version = "2.0.0";
+       sha256 = "1052ibfliwjg6p0r9y32i5j25dankp2zcy9hjm6sxag0wjgqz3wb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base binary bytestring exceptions hashable http-conduit
+         http-types microlens text unordered-containers uri-bytestring
+         uri-bytestring-aeson
+       ];
+       description = "Haskell OAuth2 authentication client";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "hob" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango
@@ -141099,6 +141435,7 @@ self: {
        ];
        description = "A Riemann Client for Haskell";
        license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hruby" = callPackage
@@ -141764,6 +142101,27 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "hs-opentelemetry-instrumentation-persistent" = callPackage
+    ({ mkDerivation, base, hs-opentelemetry-api, mtl, persistent
+     , resourcet, text, unliftio, vault
+     }:
+     mkDerivation {
+       pname = "hs-opentelemetry-instrumentation-persistent";
+       version = "0.0.1.0";
+       sha256 = "0windpdg269g376mhza26swsvl32pfsfzqjrd9psybp9mdsw1lwq";
+       libraryHaskellDepends = [
+         base hs-opentelemetry-api mtl persistent resourcet text unliftio
+         vault
+       ];
+       testHaskellDepends = [
+         base hs-opentelemetry-api mtl persistent resourcet text unliftio
+         vault
+       ];
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
+     }) {};
+
   "hs-opentelemetry-instrumentation-postgresql-simple" = callPackage
     ({ mkDerivation, base, bytestring, hs-opentelemetry-api, iproute
      , network, postgresql-libpq, postgresql-simple, text, unliftio
@@ -144173,7 +144531,7 @@ self: {
        license = lib.licenses.mit;
      }) {inherit (pkgs) lua5_3;};
 
-  "hslua_2_0_1" = callPackage
+  "hslua_2_1_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions
      , hslua-classes, hslua-core, hslua-marshalling
      , hslua-objectorientation, hslua-packaging, mtl, tasty, tasty-hslua
@@ -144181,8 +144539,8 @@ self: {
      }:
      mkDerivation {
        pname = "hslua";
-       version = "2.0.1";
-       sha256 = "1qbxd2bsi7yybawjvisbkbqb6kl0jvlir53p37jq0ya1pqr5y9z0";
+       version = "2.1.0";
+       sha256 = "0adii64aaq20dmsxkrac8smgwa9vm1ld1rpzz3m33vyyp1yfsjka";
        libraryHaskellDepends = [
          base bytestring containers exceptions hslua-classes hslua-core
          hslua-marshalling hslua-objectorientation hslua-packaging mtl text
@@ -144218,27 +144576,26 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "hslua-aeson_2_0_1" = callPackage
+  "hslua-aeson_2_1_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hashable
-     , hslua-core, hslua-marshalling, ieee754, mtl, QuickCheck
-     , quickcheck-instances, scientific, tasty, tasty-hunit
-     , tasty-quickcheck, text, unordered-containers, vector
+     , hslua-core, hslua-marshalling, mtl, QuickCheck
+     , quickcheck-instances, scientific, tasty, tasty-quickcheck, text
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "hslua-aeson";
-       version = "2.0.1";
-       sha256 = "17j5gz8pjysq1dgvfqdzbcg3x7nrianzv707rrhj578661hg8h5h";
+       version = "2.1.0";
+       sha256 = "0x966djzb9blrs586407qx6lz8bh23s048jv9nbgzy99qwxm20db";
        libraryHaskellDepends = [
          aeson base bytestring containers hashable hslua-core
          hslua-marshalling mtl scientific text unordered-containers vector
        ];
        testHaskellDepends = [
          aeson base bytestring containers hashable hslua-core
-         hslua-marshalling ieee754 mtl QuickCheck quickcheck-instances
-         scientific tasty tasty-hunit tasty-quickcheck text
-         unordered-containers vector
+         hslua-marshalling mtl QuickCheck quickcheck-instances scientific
+         tasty tasty-quickcheck text unordered-containers vector
        ];
-       description = "Allow aeson data types to be used with lua";
+       description = "Allow aeson data types to be used with Lua";
        license = lib.licenses.mit;
        hydraPlatforms = lib.platforms.none;
      }) {};
@@ -144251,8 +144608,8 @@ self: {
      }:
      mkDerivation {
        pname = "hslua-classes";
-       version = "2.0.0";
-       sha256 = "1vnck29395dc4rcyr082vxyf8pz5llz73rpvkl3sq8029pj9jwsl";
+       version = "2.1.0";
+       sha256 = "0gz30ppa7fjm555mxmwfjq767wn6z60jkw36sdmryrby1raspz4s";
        libraryHaskellDepends = [
          base bytestring containers exceptions hslua-core hslua-marshalling
          text
@@ -144273,8 +144630,8 @@ self: {
      }:
      mkDerivation {
        pname = "hslua-core";
-       version = "2.0.0.2";
-       sha256 = "0hbabk6q3lfkj82v11aicnq52bibn8xnapmws8g639fnbslp66id";
+       version = "2.1.0";
+       sha256 = "1iaii879b13j8a8lgv78wja85ik2y5xlkv1mzckjl4nqn91968wq";
        libraryHaskellDepends = [
          base bytestring exceptions lua mtl text
        ];
@@ -144292,8 +144649,8 @@ self: {
      }:
      mkDerivation {
        pname = "hslua-examples";
-       version = "2.0.0";
-       sha256 = "12wkhs83yrragwfrgl7xdgzs4bgm3zawrkxkh16dxn619brh7n8z";
+       version = "2.0.1";
+       sha256 = "0llh0cq1qzy4yl03vmvyipjq83apfx5f01qnbs84a2dad9nd8bm7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -144312,8 +144669,8 @@ self: {
      }:
      mkDerivation {
        pname = "hslua-marshalling";
-       version = "2.0.1";
-       sha256 = "1s64cpy220wnjb2s2y8v96jn3dqids7wny3hwmb35pjyffaykrwl";
+       version = "2.1.0";
+       sha256 = "0rp2bbk3smmx223c8x781311s29c0dhk0c5z3p8z1vxr3m3lhz1c";
        libraryHaskellDepends = [
          base bytestring containers hslua-core mtl text
        ];
@@ -144342,14 +144699,14 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "hslua-module-doclayout_1_0_0" = callPackage
+  "hslua-module-doclayout_1_0_1" = callPackage
     ({ mkDerivation, base, doclayout, hslua, tasty, tasty-hunit
      , tasty-lua, text
      }:
      mkDerivation {
        pname = "hslua-module-doclayout";
-       version = "1.0.0";
-       sha256 = "1lzyb23bg0rjxlhz7q08r30yaqbx0h74869l212bimzq2df3fvmq";
+       version = "1.0.1";
+       sha256 = "05k4cpi3mpm9gialy0m8by808xl8nc6ccjwfqhh1sp4xm46zp0px";
        libraryHaskellDepends = [ base doclayout hslua text ];
        testHaskellDepends = [
          base doclayout hslua tasty tasty-hunit tasty-lua
@@ -144375,19 +144732,21 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "hslua-module-path_1_0_0" = callPackage
-    ({ mkDerivation, base, filepath, hslua, hslua-marshalling
+  "hslua-module-path_1_0_1" = callPackage
+    ({ mkDerivation, base, filepath, hslua-core, hslua-marshalling
      , hslua-packaging, tasty, tasty-hunit, tasty-lua, text
      }:
      mkDerivation {
        pname = "hslua-module-path";
-       version = "1.0.0";
-       sha256 = "1yhalkvz2pyhv6fw1a5sd1a4zcd3qarrcbhfk6z80wh1j23cabzg";
+       version = "1.0.1";
+       sha256 = "1ffqfkyk4nqvk03mrdp5bz6miq0d06d1nwdklpchs55n6s95wl6x";
+       revision = "1";
+       editedCabalFile = "110bdz2pwnvcsnq1vlm17x91mdqfif839qgji2gjzddcj9q5pbqa";
        libraryHaskellDepends = [
-         base filepath hslua hslua-marshalling hslua-packaging text
+         base filepath hslua-core hslua-marshalling hslua-packaging text
        ];
        testHaskellDepends = [
-         base filepath hslua hslua-marshalling hslua-packaging tasty
+         base filepath hslua-core hslua-marshalling hslua-packaging tasty
          tasty-hunit tasty-lua text
        ];
        description = "Lua module to work with file paths";
@@ -144413,15 +144772,17 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "hslua-module-system_1_0_0" = callPackage
+  "hslua-module-system_1_0_1" = callPackage
     ({ mkDerivation, base, directory, exceptions, hslua-core
      , hslua-marshalling, hslua-packaging, tasty, tasty-hunit, tasty-lua
      , temporary, text
      }:
      mkDerivation {
        pname = "hslua-module-system";
-       version = "1.0.0";
-       sha256 = "1qvc2200mi1pqckjhav3d488nc4bfh1qv4mgaqx35njda8an6l9q";
+       version = "1.0.1";
+       sha256 = "0mbp7yh1m167fpsvscpa1mhpdi9h2xpwghr2bxl6swg8ab4s2lzw";
+       revision = "1";
+       editedCabalFile = "14ixzwii8y1mab6z9c20w4p3q4in3zknffmarr02gmgl1ksrl2cw";
        libraryHaskellDepends = [
          base directory exceptions hslua-core hslua-marshalling
          hslua-packaging temporary text
@@ -144452,14 +144813,16 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "hslua-module-text_1_0_0" = callPackage
+  "hslua-module-text_1_0_1" = callPackage
     ({ mkDerivation, base, hslua-core, hslua-marshalling
      , hslua-packaging, tasty, tasty-hunit, tasty-lua, text
      }:
      mkDerivation {
        pname = "hslua-module-text";
-       version = "1.0.0";
-       sha256 = "0ymmca9nmxhwghyrbs08g0d0k49zby5rrvqjzxz332yh2nvi2fg1";
+       version = "1.0.1";
+       sha256 = "0p6fw5vx77999yfbc2i77x5mnlxgi7bgwhx23017q5zbvs09c739";
+       revision = "1";
+       editedCabalFile = "18zvaqzdphqisisvpffpkwkms7mh556zxxbwp2n2h1bv2s8f0x5s";
        libraryHaskellDepends = [
          base hslua-core hslua-marshalling hslua-packaging text
        ];
@@ -144472,18 +144835,20 @@ self: {
      }) {};
 
   "hslua-module-version" = callPackage
-    ({ mkDerivation, base, filepath, hslua, hslua-marshalling
+    ({ mkDerivation, base, filepath, hslua-core, hslua-marshalling
      , hslua-packaging, tasty, tasty-hunit, tasty-lua, text
      }:
      mkDerivation {
        pname = "hslua-module-version";
-       version = "1.0.0";
-       sha256 = "1kbk0iva5g4garpx0d5l1gr6zlcfi565mscqr602dr88as87nfyn";
+       version = "1.0.1";
+       sha256 = "125kpfypq5hync80f1g1w618xrfqvi5bsqks9pg2rq1d57qxk5yc";
+       revision = "1";
+       editedCabalFile = "0gl9gn1pkpa3cg0sx971q45hj23kq9czcswli9yaz0mij5wqyh57";
        libraryHaskellDepends = [
-         base filepath hslua hslua-marshalling hslua-packaging text
+         base filepath hslua-core hslua-marshalling hslua-packaging text
        ];
        testHaskellDepends = [
-         base filepath hslua hslua-marshalling hslua-packaging tasty
+         base filepath hslua-core hslua-marshalling hslua-packaging tasty
          tasty-hunit tasty-lua text
        ];
        description = "Lua module to work with version specifiers";
@@ -144500,8 +144865,8 @@ self: {
      }:
      mkDerivation {
        pname = "hslua-objectorientation";
-       version = "2.0.1";
-       sha256 = "15bz27fkfqbmqrqd0vv8z4a0yjby0s8mrkijp9d54ji9f5cbjbwd";
+       version = "2.1.0";
+       sha256 = "01ghqsaknl4b8l3f6src8q7b54r5crmja62mhfwhz8a35px3rzrx";
        libraryHaskellDepends = [
          base bytestring containers exceptions hslua-core hslua-marshalling
          mtl text
@@ -144522,8 +144887,8 @@ self: {
      }:
      mkDerivation {
        pname = "hslua-packaging";
-       version = "2.0.0";
-       sha256 = "0zb9cdbrsqs882r56vbxi9v6r34kqhacb4dwm85j5yhdmpdy0p7d";
+       version = "2.1.0";
+       sha256 = "0n8vhfi59q6dzcvi4fgsjp8w0slbl8l2s5l6rxgypb6vqgm759l9";
        libraryHaskellDepends = [
          base containers hslua-core hslua-marshalling
          hslua-objectorientation mtl text
@@ -151917,6 +152282,17 @@ self: {
        broken = true;
      }) {};
 
+  "hypergeometric" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "hypergeometric";
+       version = "0.1.0.0";
+       sha256 = "0fpwn13bmx750k6ch79aa2alh2dhc2sjdj95272knhc3khp9zxi9";
+       libraryHaskellDepends = [ base ];
+       description = "Hypergeometric functions";
+       license = lib.licenses.agpl3Only;
+     }) {};
+
   "hyperion" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, clock
      , containers, deepseq, directory, exceptions, filepath
@@ -151998,6 +152374,21 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "hyperscript" = callPackage
+    ({ mkDerivation, base, megaparsec, text }:
+     mkDerivation {
+       pname = "hyperscript";
+       version = "0.1.0.1";
+       sha256 = "01rhw8i34j600x6i31z53ab4gzbdqry9src37vq51w2wk64ll7lb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base megaparsec text ];
+       executableHaskellDepends = [ base megaparsec text ];
+       testHaskellDepends = [ base megaparsec text ];
+       description = "A parser for the _hyperscript programming language";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "hypertypes" = callPackage
     ({ mkDerivation, array, base, base-compat, binary, constraints
      , containers, criterion, deepseq, generic-constraints, generic-data
@@ -157078,7 +157469,6 @@ self: {
        ];
        description = "Library for IP and MAC addresses";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ip-quoter" = callPackage
@@ -162985,6 +163375,8 @@ self: {
        ];
        description = "Fast concurrent queues much inspired by unagi-chan";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "kbq-gu" = callPackage
@@ -176224,8 +176616,8 @@ self: {
     ({ mkDerivation, base, lua, tasty, tasty-hunit }:
      mkDerivation {
        pname = "lpeg";
-       version = "1.0.1";
-       sha256 = "0zhg7d85s6rx1dh3mndpjjy3k8b5ixyz28wl6i8zvn2mxyx40y98";
+       version = "1.0.2";
+       sha256 = "0b1khwgmvlnvan6vp46mlvhzdrhawl5s1v971bm660aq0q8jjv1k";
        libraryHaskellDepends = [ base lua ];
        testHaskellDepends = [ base lua tasty tasty-hunit ];
        description = "LPeg – Parsing Expression Grammars For Lua";
@@ -176362,39 +176754,6 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "lsp_1_2_0_1" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, bytestring
-     , containers, data-default, dependent-map, exceptions, filepath
-     , hashable, hslogger, hspec, hspec-discover, lens, lsp-types, mtl
-     , network-uri, QuickCheck, quickcheck-instances, random
-     , rope-utf16-splay, scientific, sorted-list, stm, text, time
-     , transformers, unliftio-core, unordered-containers, uuid
-     }:
-     mkDerivation {
-       pname = "lsp";
-       version = "1.2.0.1";
-       sha256 = "1bdgbxakdyhkrddj58f0al2wrx1mckp6hia7hk2wqjix20my8v49";
-       revision = "1";
-       editedCabalFile = "193y4b3l6agm83ng2c0ngvd0j9a71q237g9i5v57p502lhzfaag2";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson async attoparsec base bytestring containers data-default
-         dependent-map exceptions hashable hslogger lens lsp-types mtl
-         network-uri random scientific sorted-list stm text time
-         transformers unliftio-core unordered-containers uuid
-       ];
-       testHaskellDepends = [
-         aeson base containers filepath hspec lens network-uri QuickCheck
-         quickcheck-instances rope-utf16-splay sorted-list text
-         unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Haskell library for the Microsoft Language Server Protocol";
-       license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "lsp_1_4_0_0" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, bytestring
      , containers, data-default, exceptions, filepath, hashable
@@ -176453,34 +176812,6 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "lsp-test_0_14_0_1" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
-     , bytestring, conduit, conduit-parse, containers, data-default
-     , Diff, directory, extra, filepath, Glob, hspec, lens, lsp
-     , lsp-types, mtl, parser-combinators, process, some, text, time
-     , transformers, unix, unliftio, unordered-containers
-     }:
-     mkDerivation {
-       pname = "lsp-test";
-       version = "0.14.0.1";
-       sha256 = "0fr1812dnzv9hljb77khspaz666wqr6m1gj963v0z2j6xgvw2ipy";
-       libraryHaskellDepends = [
-         aeson aeson-pretty ansi-terminal async base bytestring conduit
-         conduit-parse containers data-default Diff directory filepath Glob
-         lens lsp-types mtl parser-combinators process some text time
-         transformers unix unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson async base data-default directory filepath hspec lens lsp mtl
-         parser-combinators process text unliftio unordered-containers
-       ];
-       testToolDepends = [ lsp ];
-       benchmarkHaskellDepends = [ base extra lsp process ];
-       description = "Functional test framework for LSP servers";
-       license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "lsp-test_0_14_0_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
      , bytestring, conduit, conduit-parse, containers, data-default
@@ -176532,30 +176863,6 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "lsp-types_1_3_0_1" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, containers
-     , data-default, deepseq, dependent-sum, dependent-sum-template
-     , Diff, directory, dlist, filepath, hashable, hslogger, lens, mtl
-     , network-uri, rope-utf16-splay, scientific, some, template-haskell
-     , temporary, text, unordered-containers
-     }:
-     mkDerivation {
-       pname = "lsp-types";
-       version = "1.3.0.1";
-       sha256 = "05zgd99y7xnxnydisq5x24n1af2isar172p247hb5q0mp12hdd3z";
-       revision = "1";
-       editedCabalFile = "031b69fxi8m4fcwwgqb7cf4k806ikkmjqnn3wv6bn3sny1hn5gg7";
-       libraryHaskellDepends = [
-         aeson base binary bytestring containers data-default deepseq
-         dependent-sum dependent-sum-template Diff directory dlist filepath
-         hashable hslogger lens mtl network-uri rope-utf16-splay scientific
-         some template-haskell temporary text unordered-containers
-       ];
-       description = "Haskell library for the Microsoft Language Server Protocol, data types";
-       license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
-     }) {};
-
   "lsp-types_1_4_0_1" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , data-default, deepseq, Diff, directory, dlist, filepath, hashable
@@ -176727,8 +177034,8 @@ self: {
     ({ mkDerivation, base, lua5_3, tasty, tasty-hunit }:
      mkDerivation {
        pname = "lua";
-       version = "2.0.2";
-       sha256 = "0hsbwws16p9xrpmx4j8f9hmz8lhjjz9b8ngb3y7pxi6lx08mypgw";
+       version = "2.1.0";
+       sha256 = "00fcx1by3b2bjb3sc86azr3gmy9jd1b0gilbz48pkbb7cw4p5z1c";
        configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ];
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ lua5_3 ];
@@ -176743,6 +177050,8 @@ self: {
        pname = "lua-arbitrary";
        version = "1.0.0";
        sha256 = "13kfpiyln1i3d1a47fpf00lrcj4m9dyg80zrqclx7wzy9p8ixh7l";
+       revision = "1";
+       editedCabalFile = "19cc5vn27izx5cnpq1xj915ax16czvxaarvigggwi73cgk11hbf1";
        libraryHaskellDepends = [ base lua QuickCheck ];
        description = "Arbitrary instances for Lua types";
        license = lib.licenses.mit;
@@ -176899,12 +177208,12 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "lucid-alpine_0_1_0_5" = callPackage
+  "lucid-alpine_0_1_0_7" = callPackage
     ({ mkDerivation, base, lucid, text }:
      mkDerivation {
        pname = "lucid-alpine";
-       version = "0.1.0.5";
-       sha256 = "1prcr3rfpg3saybfjmfik9xznj0knvfxy5dwllkq6s5szi2bqyaz";
+       version = "0.1.0.7";
+       sha256 = "1p6cmjxbin7wj3b3cbg15gv43mcfqzm791swmhcwx0x41x41jygx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base lucid text ];
@@ -176982,12 +177291,12 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "lucid-htmx_0_1_0_4" = callPackage
+  "lucid-htmx_0_1_0_5" = callPackage
     ({ mkDerivation, base, lucid, servant, text }:
      mkDerivation {
        pname = "lucid-htmx";
-       version = "0.1.0.4";
-       sha256 = "0rq25ixsyvnp3zh3wsfmijlyv4dg94d1k1bhhwq8y624v819yg8r";
+       version = "0.1.0.5";
+       sha256 = "1zbk1fdril0cm4cs5scrvk1fvfkds8pgkwnb5c9vxawv5v3kgpl5";
        libraryHaskellDepends = [ base lucid servant text ];
        testHaskellDepends = [ base lucid servant text ];
        description = "Use htmx in your lucid templates";
@@ -176995,6 +177304,21 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
+  "lucid-hyperscript" = callPackage
+    ({ mkDerivation, base, lucid, template-haskell, text }:
+     mkDerivation {
+       pname = "lucid-hyperscript";
+       version = "0.1.0.2";
+       sha256 = "1gf6q1ckxpswd550dgr8nr6ghd5hv0iz73scab2rgiv7fsjchcnl";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base lucid template-haskell text ];
+       executableHaskellDepends = [ base lucid template-haskell text ];
+       testHaskellDepends = [ base lucid template-haskell text ];
+       description = "Use _hyperscript with lucid";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "lucid-svg" = callPackage
     ({ mkDerivation, base, blaze-builder, lucid, text, transformers }:
      mkDerivation {
@@ -177477,8 +177801,8 @@ self: {
      }:
      mkDerivation {
        pname = "lzlib";
-       version = "1.0.7.1";
-       sha256 = "18y6diahfvqvv3qp6ch1jbi9jwz6li4xm1y1c5pi2895h4c51ljf";
+       version = "1.0.7.2";
+       sha256 = "00hjq15jc94bf3lgzh33w7ksf3daw2l7x1qljn11lbr48a8a2zmi";
        libraryHaskellDepends = [ base bytestring ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [
@@ -177489,6 +177813,8 @@ self: {
        ];
        description = "lzlib bindings";
        license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "lzma" = callPackage
@@ -179568,7 +179894,6 @@ self: {
        ];
        description = "Abstraction for HTML-embedded content";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "markup-preview" = callPackage
@@ -189601,7 +189926,6 @@ self: {
        testHaskellDepends = [ base hspec ip text ];
        description = "Datastructures to describe TCP and MPTCP connections";
        license = lib.licenses.gpl3Only;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "mptcp-pm" = callPackage
@@ -191950,6 +192274,35 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "mustache_2_4_0" = callPackage
+    ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring
+     , cmdargs, containers, directory, filepath, hspec, lens, mtl
+     , parsec, process, scientific, tar, template-haskell, temporary
+     , text, th-lift, unordered-containers, vector, wreq, yaml, zlib
+     }:
+     mkDerivation {
+       pname = "mustache";
+       version = "2.4.0";
+       sha256 = "0g7bwfc1yx59lk2l12wbh67ydk4rnwam2kv6ypc85qxd0pjbcd4n";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath mtl parsec
+         scientific template-haskell text th-lift unordered-containers
+         vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring cmdargs filepath text yaml
+       ];
+       testHaskellDepends = [
+         aeson base base-unicode-symbols bytestring directory filepath hspec
+         lens process tar temporary text unordered-containers wreq yaml zlib
+       ];
+       description = "A mustache template parser library";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "mustache-haskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory
      , optparse-applicative, parsec, pretty-show, scientific, text
@@ -195313,6 +195666,18 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "network-info_0_2_1" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "network-info";
+       version = "0.2.1";
+       sha256 = "015lm3b8n8sb16qsffjxz1jvijyy0z600ch0sm8h6a685wqqhbcv";
+       libraryHaskellDepends = [ base ];
+       description = "Access the local computer's basic network configuration";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "network-interfacerequest" = callPackage
     ({ mkDerivation, base, bytestring, ioctl, network }:
      mkDerivation {
@@ -199415,7 +199780,7 @@ self: {
        license = lib.licenses.asl20;
      }) {};
 
-  "nvim-hs_2_1_0_7" = callPackage
+  "nvim-hs_2_2_0_0" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit
      , containers, data-default, deepseq, foreign-store, hslogger, hspec
      , hspec-discover, HUnit, megaparsec, messagepack, mtl, network
@@ -199428,8 +199793,8 @@ self: {
      }:
      mkDerivation {
        pname = "nvim-hs";
-       version = "2.1.0.7";
-       sha256 = "0vbqlrjwfg5pl4f9xymdlx0k01jziqrmqf8m0vm7iiy0vnjzx19j";
+       version = "2.2.0.0";
+       sha256 = "196szwcd156029hsg0ql3m4zphz3hnz09yic3037hj12yp87fdzf";
        libraryHaskellDepends = [
          base bytestring cereal cereal-conduit conduit containers
          data-default deepseq foreign-store hslogger megaparsec messagepack
@@ -200955,7 +201320,7 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
-  "opaleye_0_8_0_1" = callPackage
+  "opaleye_0_9_0_0" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , case-insensitive, containers, contravariant, dotenv, hspec
      , hspec-discover, multiset, postgresql-simple, pretty
@@ -200965,8 +201330,8 @@ self: {
      }:
      mkDerivation {
        pname = "opaleye";
-       version = "0.8.0.1";
-       sha256 = "1py950js9k80manm3xj1sfls0xnw1kd609hw268wr9izd0syfva4";
+       version = "0.9.0.0";
+       sha256 = "0i2ncvgx7pdq4q7i1fxnpxya3jb9jnzz7d6hcd5s0lrc2flv6rxd";
        libraryHaskellDepends = [
          aeson base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
@@ -201063,8 +201428,8 @@ self: {
      }:
      mkDerivation {
        pname = "opc-xml-da-client";
-       version = "0.1";
-       sha256 = "0wi2qv4594fz3z6jqdmqnxv17w1yp5ds8xwflnxawb6lpadprskp";
+       version = "0.1.1";
+       sha256 = "15mc3i7j2pjxd7gw7ba8nlvkbp8j161vphbsg3iqbjqaqivfzivl";
        libraryHaskellDepends = [
          acc attoparsec attoparsec-data base base64 bytestring containers
          data-default domain domain-optics hashable hashable-time
@@ -204895,7 +205260,7 @@ self: {
        maintainers = with lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_2_17_0_1" = callPackage
+  "pandoc_2_17_1_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , case-insensitive, citeproc, commonmark, commonmark-extensions
@@ -204915,8 +205280,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.17.0.1";
-       sha256 = "1xh5vwwnwwrxdkqm72qcd67hc0a1ffhkki1f1ls9bm1mhgq6fr17";
+       version = "2.17.1.1";
+       sha256 = "1l8spmsyg2c5j16q7a7fd5i6kcvkyipq4jrhrv2k0ca1s4lcb7k4";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -205263,8 +205628,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-lua-marshal";
-       version = "0.1.3.1";
-       sha256 = "04q433gpqkydyy2gx6jhyvv7lahx186b1d90clkggach1x0rg8ii";
+       version = "0.1.4";
+       sha256 = "09l601d50h4ymnfcspwf1sl6hks8skvd1wpb9j3y2znyciq2pdkq";
        libraryHaskellDepends = [
          base bytestring containers exceptions hslua hslua-marshalling lua
          pandoc-types safe text
@@ -208781,15 +209146,15 @@ self: {
        license = lib.licenses.asl20;
      }) {};
 
-  "pcre2_2_0_4" = callPackage
+  "pcre2_2_0_5" = callPackage
     ({ mkDerivation, base, containers, criterion, hspec, microlens
      , microlens-platform, mtl, pcre-light, regex-pcre-builtin
      , template-haskell, text
      }:
      mkDerivation {
        pname = "pcre2";
-       version = "2.0.4";
-       sha256 = "15zbwsv4kic58znngw1ff8vxqjqqglsds9xnn1s4f9hnzd87vwx2";
+       version = "2.0.5";
+       sha256 = "11rggirpd02rx9xyfd1yigglzyqzn8vx0knszgrbbvj0cmzb20fn";
        libraryHaskellDepends = [
          base containers microlens mtl template-haskell text
        ];
@@ -210064,6 +210429,43 @@ self: {
        maintainers = with lib.maintainers; [ psibi ];
      }) {};
 
+  "persistent_2_13_3_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , blaze-html, bytestring, conduit, containers, criterion, deepseq
+     , fast-logger, file-embed, hspec, http-api-data, lift-type
+     , monad-logger, mtl, path-pieces, QuickCheck, quickcheck-instances
+     , resource-pool, resourcet, scientific, shakespeare, silently
+     , template-haskell, text, th-lift-instances, time, transformers
+     , unliftio, unliftio-core, unordered-containers, vault, vector
+     }:
+     mkDerivation {
+       pname = "persistent";
+       version = "2.13.3.0";
+       sha256 = "059y0wyd74rb0aa32b54vj9n0g5pz9nfcbx2h3iil2qbgjvzvw9w";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring blaze-html bytestring
+         conduit containers fast-logger http-api-data lift-type monad-logger
+         mtl path-pieces resource-pool resourcet scientific silently
+         template-haskell text th-lift-instances time transformers unliftio
+         unliftio-core unordered-containers vault vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base64-bytestring blaze-html bytestring
+         conduit containers fast-logger hspec http-api-data monad-logger mtl
+         path-pieces QuickCheck quickcheck-instances resource-pool resourcet
+         scientific shakespeare silently template-haskell text
+         th-lift-instances time transformers unliftio unliftio-core
+         unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq file-embed template-haskell text
+       ];
+       description = "Type-safe, multi-backend data serialization";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       maintainers = with lib.maintainers; [ psibi ];
+     }) {};
+
   "persistent-audit" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring
      , getopt-generics, hashable, hspec, mongoDB, persistent
@@ -210407,7 +210809,7 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "persistent-mysql_2_13_0_3" = callPackage
+  "persistent-mysql_2_13_1_0" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , containers, fast-logger, hspec, http-api-data, HUnit
      , monad-logger, mysql, mysql-simple, path-pieces, persistent
@@ -210416,18 +210818,18 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-mysql";
-       version = "2.13.0.3";
-       sha256 = "0z4dpysridkssq3gmnh65mxa2acs1r7mhcbnsfgqk5gzqyzhfxr3";
+       version = "2.13.1.0";
+       sha256 = "16balbklf4800pqivmvnamjhy3xvnr9939fz3qkicfs4ba68m62k";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring conduit containers monad-logger
          mysql mysql-simple persistent resource-pool resourcet text
          transformers unliftio-core
        ];
        testHaskellDepends = [
-         aeson base bytestring containers fast-logger hspec http-api-data
-         HUnit monad-logger mysql path-pieces persistent persistent-qq
-         persistent-test QuickCheck quickcheck-instances resourcet text time
-         transformers unliftio-core
+         aeson base bytestring conduit containers fast-logger hspec
+         http-api-data HUnit monad-logger mysql path-pieces persistent
+         persistent-qq persistent-test QuickCheck quickcheck-instances
+         resourcet text time transformers unliftio-core
        ];
        description = "Backend for the persistent library using MySQL database server";
        license = lib.licenses.mit;
@@ -210556,7 +210958,7 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "persistent-postgresql_2_13_3_0" = callPackage
+  "persistent-postgresql_2_13_4_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , conduit, containers, fast-logger, hspec, hspec-expectations
      , hspec-expectations-lifted, http-api-data, HUnit, monad-logger
@@ -210564,19 +210966,19 @@ self: {
      , postgresql-libpq, postgresql-simple, QuickCheck
      , quickcheck-instances, resource-pool, resourcet
      , string-conversions, text, time, transformers, unliftio
-     , unliftio-core, unordered-containers, vector
+     , unliftio-core, unordered-containers, vault, vector
      }:
      mkDerivation {
        pname = "persistent-postgresql";
-       version = "2.13.3.0";
-       sha256 = "08br76dk1ilci5428z351n4ykvgazhbf9r8ny6kx95x5p7nifx0i";
+       version = "2.13.4.0";
+       sha256 = "1hvk7fvknq27nfpyv32b7062cs4c3h2s62ssr133abq78ymcfcll";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring conduit containers
          monad-logger mtl persistent postgresql-libpq postgresql-simple
          resource-pool resourcet string-conversions text time transformers
-         unliftio-core
+         unliftio-core vault
        ];
        testHaskellDepends = [
          aeson base bytestring containers fast-logger hspec
@@ -210775,6 +211177,39 @@ self: {
        maintainers = with lib.maintainers; [ psibi ];
      }) {inherit (pkgs) sqlite;};
 
+  "persistent-sqlite_2_13_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, containers
+     , exceptions, fast-logger, hspec, HUnit, microlens, microlens-th
+     , monad-logger, mtl, persistent, persistent-test, QuickCheck
+     , resource-pool, resourcet, sqlite, system-fileio, system-filepath
+     , temporary, text, time, transformers, unliftio-core
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "persistent-sqlite";
+       version = "2.13.1.0";
+       sha256 = "1z8650nv10f6yldn9sihk54c7mlcnkxwaj956igvs6q3x3s8aa1b";
+       configureFlags = [ "-fsystemlib" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring conduit containers microlens-th monad-logger
+         mtl persistent resource-pool resourcet text time transformers
+         unliftio-core unordered-containers
+       ];
+       librarySystemDepends = [ sqlite ];
+       testHaskellDepends = [
+         base bytestring conduit containers exceptions fast-logger hspec
+         HUnit microlens monad-logger mtl persistent persistent-test
+         QuickCheck resourcet system-fileio system-filepath temporary text
+         time transformers unliftio-core
+       ];
+       description = "Backend for the persistent library using sqlite3";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       maintainers = with lib.maintainers; [ psibi ];
+     }) {inherit (pkgs) sqlite;};
+
   "persistent-template" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -210833,6 +211268,30 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
+  "persistent-test_2_13_1_0" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit
+     , containers, exceptions, hspec, hspec-expectations, http-api-data
+     , HUnit, monad-control, monad-logger, mtl, path-pieces, persistent
+     , QuickCheck, quickcheck-instances, random, resourcet, text, time
+     , transformers, transformers-base, unliftio, unliftio-core
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "persistent-test";
+       version = "2.13.1.0";
+       sha256 = "1ccv9rrnjngwf8av3zyq28myd1iyb6831nnqjpllwlyrpgnmafvr";
+       libraryHaskellDepends = [
+         aeson base blaze-html bytestring conduit containers exceptions
+         hspec hspec-expectations http-api-data HUnit monad-control
+         monad-logger mtl path-pieces persistent QuickCheck
+         quickcheck-instances random resourcet text time transformers
+         transformers-base unliftio unliftio-core unordered-containers
+       ];
+       description = "Tests for Persistent";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "persistent-typed-db" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec
      , hspec-discover, http-api-data, monad-logger, path-pieces
@@ -211745,8 +212204,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-examples-array";
-       version = "0.16.2.2";
-       sha256 = "0s8n0nds142nlp2p9h9i78i31822akyyd0zm38hfc4ygkhpgzpkm";
+       version = "0.16.3.0";
+       sha256 = "12hqxk3fga9k6xw8wns834n12wcpmxki2cbyq03jgz22n00css0f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -211782,8 +212241,8 @@ self: {
      }:
      mkDerivation {
        pname = "phonetic-languages-simplified-examples-common";
-       version = "0.4.1.0";
-       sha256 = "158v8x7i4h4z60xckpav14p9b0hhhz5jqp48glq1wscrp94qqpjv";
+       version = "0.4.2.0";
+       sha256 = "05ghrqxjlpgdxdcfzj5l0shwmria2c9xkkbps1j1vdsn2qlwihxy";
        libraryHaskellDepends = [
          base heaps phonetic-languages-constraints-array
          phonetic-languages-ukrainian-array
@@ -211962,8 +212421,8 @@ self: {
     ({ mkDerivation, base, mmsyn2-array, mmsyn5 }:
      mkDerivation {
        pname = "phonetic-languages-ukrainian-array";
-       version = "0.9.1.0";
-       sha256 = "0m20ifxzdycmcymkrhm5c7x4ccq63znfwa4jvbxyvgxnp6bd92aa";
+       version = "0.9.2.0";
+       sha256 = "0x0llv91r0837qiajnxhln6ddf8qyc7m13rc87x8rg7f5rqpzqip";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ];
@@ -218910,8 +219369,8 @@ self: {
      }:
      mkDerivation {
        pname = "powerdns";
-       version = "0.2.1";
-       sha256 = "09amgmzyypjilz6armsvyjjxj8frx48aq3nq8vjkp30j2xs7a7a4";
+       version = "0.2.2";
+       sha256 = "05znwk4s6b60rz4qf63b75y84a0yljyiynmkxj4sjafd810cbnwc";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
          deepseq servant servant-client servant-client-core text time
@@ -220551,6 +221010,7 @@ self: {
        description = "containers backed by arrays";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "primitive-convenience" = callPackage
@@ -220701,7 +221161,6 @@ self: {
        benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ];
        description = "Sort primitive arrays";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "primitive-stablename" = callPackage
@@ -223352,8 +223811,8 @@ self: {
      }:
      mkDerivation {
        pname = "ptera";
-       version = "0.1.0.0";
-       sha256 = "1bcbv740rvhibmkvyp097nm1f07ira8i9anq4m3vd6gp96mbin48";
+       version = "0.2.0.0";
+       sha256 = "0lf9d2mcigrmn4asr6cjh5hbp1yl048v57a7az8aszhpsz4k8vkp";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base containers enummapset-th membership ptera-core
@@ -223399,8 +223858,8 @@ self: {
      }:
      mkDerivation {
        pname = "ptera-th";
-       version = "0.1.0.0";
-       sha256 = "1sbgyq5gf9fyam0gazjr1gc49fv8s9rsd8rkb9pbpfi258yzj7pr";
+       version = "0.2.0.0";
+       sha256 = "15djvwgivi2gxqhq65j3qkfh2w9z07yjh4nrg42ydv6n3ps4s9i8";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          array base containers enummapset-th ghc-prim membership ptera
@@ -226110,8 +226569,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-string-random";
-       version = "0.1.4.0";
-       sha256 = "08ikiqgzhizg4acv9kba6glwa47xzpdzrpzcz95kcw7b90q9qqp9";
+       version = "0.1.4.2";
+       sha256 = "1r03w9ypvc063fhcd7sqs654gg0sz66jfll84bwg5709ws3y9bh6";
        libraryHaskellDepends = [ base QuickCheck string-random text ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck text
@@ -232178,8 +232637,8 @@ self: {
        pname = "regex-tdfa";
        version = "1.3.1.1";
        sha256 = "1msrq31k4jmn2lmrdzn87jqarqhw265ca69rfg5jpa5adrzm3gmi";
-       revision = "2";
-       editedCabalFile = "06zs654j7lrap69fqvmsas7f9x50kbxba7qzq4yihd94f03ba911";
+       revision = "3";
+       editedCabalFile = "11c7kqjf86jmm6pcxypbvlqb3iim5rcv9gxy1046iappasapampd";
        libraryHaskellDepends = [
          array base bytestring containers mtl parsec regex-base text
        ];
@@ -232817,7 +233276,7 @@ self: {
        maintainers = with lib.maintainers; [ sternenseemann ];
      }) {};
 
-  "rel8_1_2_2_0" = callPackage
+  "rel8_1_3_0_0" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring
      , case-insensitive, comonad, containers, contravariant, hasql
      , hasql-transaction, hedgehog, mmorph, opaleye, pretty
@@ -232827,8 +233286,8 @@ self: {
      }:
      mkDerivation {
        pname = "rel8";
-       version = "1.2.2.0";
-       sha256 = "1jbss5liyz8r747yzva1ciadacd63lida1gzrw9g7075hsawfwjf";
+       version = "1.3.0.0";
+       sha256 = "00iw5fzfx81j7phzjqzmk2bfxvg9q21sn3gw42a3xbnqk1ivrhjy";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring case-insensitive comonad
          contravariant hasql opaleye pretty product-profunctors profunctors
@@ -235372,6 +235831,17 @@ self: {
        broken = true;
      }) {};
 
+  "reverse-list" = callPackage
+    ({ mkDerivation, base, containers, contiguous, deepseq }:
+     mkDerivation {
+       pname = "reverse-list";
+       version = "0.2.0";
+       sha256 = "0r4bjrc1vksx3j61qb0g1a7nngkzvsybr0v0admls3ffqf3y4zgh";
+       libraryHaskellDepends = [ base containers contiguous deepseq ];
+       description = "reversed lists/snoc lists";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "reversi" = callPackage
     ({ mkDerivation, array, base, process }:
      mkDerivation {
@@ -236175,6 +236645,7 @@ self: {
        description = "mutable ring buffers with atomic updates in GHC Haskell";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
+       broken = true;
      }) {};
 
   "rings" = callPackage
@@ -236389,8 +236860,8 @@ self: {
      }:
      mkDerivation {
        pname = "risc386";
-       version = "0.0.20210812";
-       sha256 = "0fxwmah8f4jhs480hrvbvchkmxgfmnsswg0d5zlbdgsiqfln42qv";
+       version = "0.0.20220128";
+       sha256 = "01bmmz6l5fq825ni1dk5d38x0p8k5fw2ingc3gzj8yzjmhfwp318";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers mtl pretty ];
@@ -241491,7 +241962,6 @@ self: {
        ];
        description = "Scientific notation intended for tokenization";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "scion" = callPackage
@@ -245758,6 +246228,21 @@ self: {
        broken = true;
      }) {};
 
+  "servant-htmx" = callPackage
+    ({ mkDerivation, base, servant-server, text }:
+     mkDerivation {
+       pname = "servant-htmx";
+       version = "0.1.0.1";
+       sha256 = "1plqqaa3vhmwg37bai6xpi415fd772fx6rf0dr919mc79ms0zcfx";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base servant-server text ];
+       executableHaskellDepends = [ base servant-server text ];
+       testHaskellDepends = [ base servant-server text ];
+       description = "A library for using htmx with servant";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "servant-http-streams" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring
      , case-insensitive, containers, deepseq, entropy, exceptions, hspec
@@ -247800,6 +248285,8 @@ self: {
        pname = "set-monad";
        version = "0.3.0.0";
        sha256 = "0iv1mphhhqla4bbr2lhy6zj8bp963jlcxqkib2nnl7vyw1ya1cd1";
+       revision = "1";
+       editedCabalFile = "1wlg93dx439kvwd5ndsgcyb6v4yqp3w3ql3md62far7cvajrfylc";
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Set monad";
        license = lib.licenses.bsd3;
@@ -248482,15 +248969,16 @@ self: {
   "shake-bench" = callPackage
     ({ mkDerivation, aeson, base, Chart, Chart-diagrams
      , diagrams-contrib, diagrams-core, diagrams-lib, diagrams-svg
-     , directory, extra, filepath, shake, text
+     , directory, extra, filepath, lens, lens-aeson, shake, text
      }:
      mkDerivation {
        pname = "shake-bench";
-       version = "0.1.0.2";
-       sha256 = "14p9887qa2i34pbwfg2v2zzvdsbcpzf1d0mr0y2rzjy703356xsm";
+       version = "0.1.0.3";
+       sha256 = "04pngr9a1g7dr7kb0xp9k2yrbg6vqk3lfpksz6bbyydbmypix3ay";
        libraryHaskellDepends = [
          aeson base Chart Chart-diagrams diagrams-contrib diagrams-core
-         diagrams-lib diagrams-svg directory extra filepath shake text
+         diagrams-lib diagrams-svg directory extra filepath lens lens-aeson
+         shake text
        ];
        description = "Build rules for historical benchmarking";
        license = lib.licenses.asl20;
@@ -249438,8 +249926,8 @@ self: {
        pname = "shelly";
        version = "1.9.0";
        sha256 = "1kma77gixhyciimh19p64h1ndbcrs9qhk8fgyv71iqh5q57zvday";
-       revision = "2";
-       editedCabalFile = "0d08dlfgwi2m3wvcmcrcsn2g8lpqzkmxwxw74sysh94qb1gasr0y";
+       revision = "3";
+       editedCabalFile = "0jgd4jx16sm055riacqfvccnm3r5mz33ynxf41ckvkx42wxd98hp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -249457,6 +249945,32 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "shelly_1_10_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, directory
+     , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib
+     , HUnit, lifted-async, lifted-base, monad-control, mtl, process
+     , text, time, transformers, transformers-base, unix-compat
+     }:
+     mkDerivation {
+       pname = "shelly";
+       version = "1.10.0";
+       sha256 = "0hgzh0rrhipir8378civ5mwvkvcsd063jm2pyx8dqngdynph0h65";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions filepath lifted-async lifted-base monad-control mtl
+         process text time transformers transformers-base unix-compat
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath hspec hspec-contrib HUnit
+         lifted-async mtl text transformers unix-compat
+       ];
+       description = "shell-like (systems) programming in Haskell";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "shelly-extra" = callPackage
     ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore
      , shelly, text
@@ -253703,7 +254217,6 @@ self: {
        libraryHaskellDepends = [ base bytesmith primitive ];
        description = "Parse arrays of tokens";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "smith-cli" = callPackage
@@ -263575,6 +264088,30 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "string-random_0_1_4_2" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , optparse-applicative, pcre-heavy, QuickCheck, random, tasty
+     , tasty-hunit, tasty-quickcheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "string-random";
+       version = "0.1.4.2";
+       sha256 = "0rqh0cwywlzg4xyb1s80mghl3kq3sngg8xjbh4g9x4p8fc6maiw9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base containers random text transformers
+       ];
+       executableHaskellDepends = [ base optparse-applicative text ];
+       testHaskellDepends = [
+         base bytestring pcre-heavy QuickCheck tasty tasty-hunit
+         tasty-quickcheck text
+       ];
+       description = "A library for generating random string from a regular experession";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "string-similarity" = callPackage
     ({ mkDerivation, base, bytestring, criterion, hspec, QuickCheck
      , suffixtree
@@ -264556,6 +265093,36 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "subcategories_0_2_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default, foldl
+     , hashable, inspection-testing, mono-traversable, pointed
+     , primitive, QuickCheck, reflection, semialign, tasty
+     , tasty-discover, tasty-expected-failure, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, these
+     , unordered-containers, vector, vector-algorithms, vector-builder
+     }:
+     mkDerivation {
+       pname = "subcategories";
+       version = "0.2.0.0";
+       sha256 = "0qxiccv9xpl6ms8j9lfvl8jps9gr979ya441fghy1jvfza0fxd1x";
+       libraryHaskellDepends = [
+         base containers data-default foldl hashable mono-traversable
+         pointed primitive reflection semialign template-haskell text these
+         unordered-containers vector vector-algorithms vector-builder
+       ];
+       testHaskellDepends = [
+         base bytestring containers data-default foldl hashable
+         inspection-testing mono-traversable pointed primitive QuickCheck
+         reflection semialign tasty tasty-expected-failure tasty-hunit
+         tasty-quickcheck template-haskell text these unordered-containers
+         vector vector-algorithms vector-builder
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Subcategories induced by class constraints";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "subhask" = callPackage
     ({ mkDerivation, approximate, array, base, bloomfilter, bytes
      , bytestring, cassava, containers, criterion, deepseq, erf, gamma
@@ -269738,8 +270305,8 @@ self: {
        pname = "tasty-hedgehog";
        version = "1.1.0.0";
        sha256 = "0cy49z8n124xh2ra2482vfy5if1n6d9lbdjma2zg1mxfj0k0zyfb";
-       revision = "2";
-       editedCabalFile = "08in0mli87szyx9lz2lcz3m1q0d3sxzzk5srzkkx4d10fgr6g6xv";
+       revision = "3";
+       editedCabalFile = "1i7i2yws3bdmsg2hl7dh65zvh9sna3gnlv0l4m1sqqdx5dji1a3w";
        libraryHaskellDepends = [ base hedgehog tagged tasty ];
        testHaskellDepends = [
          base hedgehog tasty tasty-expected-failure
@@ -269777,8 +270344,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-hslua";
-       version = "1.0.0";
-       sha256 = "07il3h282lj7m9y7cgc2w0gbffzndibwgxqfdv5m2n4kf1c3finl";
+       version = "1.0.1";
+       sha256 = "1zmxvhmmj6f0jw19v25pkhschrvzhwfr20jqg1sxdg15aaa3gjf7";
        libraryHaskellDepends = [
          base bytestring hslua-core tasty tasty-hunit
        ];
@@ -270040,20 +270607,22 @@ self: {
        license = lib.licenses.mit;
      }) {};
 
-  "tasty-lua_1_0_0" = callPackage
+  "tasty-lua_1_0_1" = callPackage
     ({ mkDerivation, base, bytestring, directory, file-embed, filepath
-     , hslua-core, hslua-marshalling, tasty, tasty-hunit, text
+     , hslua-core, hslua-marshalling, lua-arbitrary, QuickCheck, tasty
+     , tasty-hunit, text
      }:
      mkDerivation {
        pname = "tasty-lua";
-       version = "1.0.0";
-       sha256 = "1ykl3by81ivz59zy3cqd6xsa4g8g7axwr9hajdbvmwn1b5y4h880";
+       version = "1.0.1";
+       sha256 = "0izkj9miws0w8320mfaxhj2bnwri3x338qvdz73wbzmbjwibmg23";
        libraryHaskellDepends = [
-         base bytestring file-embed hslua-core hslua-marshalling tasty text
+         base bytestring file-embed hslua-core hslua-marshalling
+         lua-arbitrary QuickCheck tasty text
        ];
        testHaskellDepends = [
-         base directory filepath hslua-core hslua-marshalling tasty
-         tasty-hunit
+         base bytestring directory filepath hslua-core hslua-marshalling
+         lua-arbitrary QuickCheck tasty tasty-hunit
        ];
        description = "Write tests in Lua, integrate into tasty";
        license = lib.licenses.mit;
@@ -283987,22 +284556,21 @@ self: {
 
   "tz" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , test-framework-th, thyme, time, timezone-olson, timezone-series
-     , tzdata, vector
+     , data-default, deepseq, HUnit, lens, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell, thyme
+     , time, timezone-olson, timezone-series, tzdata, vector
      }:
      mkDerivation {
        pname = "tz";
-       version = "0.1.3.5";
-       sha256 = "1svqcpcpy5mydkmf42a78khxa053jxbvrbdh5jzprh2b7g0dpvlb";
+       version = "0.1.3.6";
+       sha256 = "1vqnfk656i6j3j1bf9lc36adziv52x1b2ccq6afp8cka1nay2mcd";
        libraryHaskellDepends = [
          base binary bytestring containers data-default deepseq
          template-haskell time tzdata vector
        ];
        testHaskellDepends = [
-         base HUnit QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2 test-framework-th time tzdata
+         base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck tasty-th
+         time tzdata
        ];
        benchmarkHaskellDepends = [
          base criterion lens thyme time timezone-olson timezone-series
@@ -284034,6 +284602,26 @@ self: {
        license = lib.licenses.asl20;
      }) {};
 
+  "tzdata_0_2_20211021_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, HUnit
+     , tasty, tasty-hunit, tasty-th, unix, vector
+     }:
+     mkDerivation {
+       pname = "tzdata";
+       version = "0.2.20211021.0";
+       sha256 = "0x1pqdlbhh8qhbbfpc01jlcamk2ihwxbs9m8kgm8abd9fk0bwa0a";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers deepseq vector
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit tasty tasty-hunit tasty-th unix
+       ];
+       description = "Time zone database (as files and as a module)";
+       license = lib.licenses.asl20;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "u2f" = callPackage
     ({ mkDerivation, aeson, asn1-encoding, asn1-types, base
      , base64-bytestring, binary, bytestring, cryptohash, cryptonite
@@ -287554,7 +288142,6 @@ self: {
        ];
        description = "Memory efficient url type and parser";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "url-decoders" = callPackage
@@ -287673,7 +288260,6 @@ self: {
        ];
        description = "Painfully simple URL deployment";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "urn" = callPackage
@@ -288453,7 +289039,6 @@ self: {
        ];
        description = "UUID parsing using byteverse packages";
        license = lib.licenses.mit;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "uuid-crypto" = callPackage
@@ -290067,8 +290652,8 @@ self: {
      }:
      mkDerivation {
        pname = "vector-extras";
-       version = "0.2.4";
-       sha256 = "0aiycxljvwakvfigbm9wbg7b4jahd3ijckzgrfwdjpnxcqhjr0p9";
+       version = "0.2.6";
+       sha256 = "08zf1h6inqziy52q2nmgkvnaccpbg389pz41yyg6h0drsg5x8r4h";
        libraryHaskellDepends = [
          base containers deferred-folds foldl hashable unordered-containers
          vector
@@ -290674,8 +291259,8 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, hspec, semigroupoids }:
      mkDerivation {
        pname = "versioning";
-       version = "0.3.1.0";
-       sha256 = "0m5hgl6n8znxn63pkvv7yb2nx7is4wivbzvbyh698cv5d92jb7cp";
+       version = "0.3.2.0";
+       sha256 = "0lwhcyb4g2j7wz16b7qp6vzmawlxx8k0xfvr9sdw5maljir0hykx";
        libraryHaskellDepends = [ aeson base bytestring semigroupoids ];
        testHaskellDepends = [ aeson base bytestring hspec ];
        description = "Type-safe data versioning";
@@ -290726,23 +291311,23 @@ self: {
      }) {};
 
   "vessel" = callPackage
-    ({ mkDerivation, aeson, aeson-gadt-th, base, bifunctors
-     , constraints, constraints-extras, containers, dependent-map
-     , dependent-monoidal-map, dependent-sum
+    ({ mkDerivation, aeson, aeson-gadt-th, base, base-orphans
+     , bifunctors, constraints, constraints-extras, containers
+     , dependent-map, dependent-monoidal-map, dependent-sum
      , dependent-sum-aeson-orphans, dependent-sum-template, lens
      , markdown-unlit, monoidal-containers, mtl, patch, reflex
      , semialign, text, these, witherable
      }:
      mkDerivation {
        pname = "vessel";
-       version = "0.2.0.0";
-       sha256 = "04zdcl4pbqf4b9nvgp7dnv91i1mbm60lnldxijgpnmlhrrff2dd4";
+       version = "0.2.1.0";
+       sha256 = "04pvn5rs3pgi917m0rsfmjxc035ns8sd79vza72qh0skvsg81pq6";
        libraryHaskellDepends = [
-         aeson aeson-gadt-th base bifunctors constraints constraints-extras
-         containers dependent-map dependent-monoidal-map dependent-sum
-         dependent-sum-aeson-orphans dependent-sum-template lens
-         markdown-unlit monoidal-containers mtl patch reflex semialign text
-         these witherable
+         aeson aeson-gadt-th base base-orphans bifunctors constraints
+         constraints-extras containers dependent-map dependent-monoidal-map
+         dependent-sum dependent-sum-aeson-orphans dependent-sum-template
+         lens markdown-unlit monoidal-containers mtl patch reflex semialign
+         text these witherable
        ];
        libraryToolDepends = [ markdown-unlit ];
        doHaddock = false;
@@ -292714,6 +293299,24 @@ self: {
        license = lib.licenses.bsd3;
      }) {};
 
+  "wai-logger_2_4_0" = callPackage
+    ({ mkDerivation, base, byteorder, bytestring, Cabal, cabal-doctest
+     , doctest, fast-logger, http-types, network, wai
+     }:
+     mkDerivation {
+       pname = "wai-logger";
+       version = "2.4.0";
+       sha256 = "02i9jsy5gdglqwwk5gcvax8y498lz9flrfp4v9nrv8rmrmd66zh5";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base byteorder bytestring fast-logger http-types network wai
+       ];
+       testHaskellDepends = [ base doctest ];
+       description = "A logging system for WAI";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
   "wai-logger-buffered" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default
      , http-types, time, wai, warp
@@ -293029,7 +293632,6 @@ self: {
        ];
        description = "Route to different middlewares based on the incoming Accept header";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "wai-middleware-crowd" = callPackage
@@ -295159,29 +295761,28 @@ self: {
   "webauthn" = callPackage
     ({ mkDerivation, aeson, asn1-encoding, asn1-parse, asn1-types, base
      , base16-bytestring, base64-bytestring, binary, bytestring, cborg
-     , containers, cryptonite, deriving-aeson, directory, file-embed
-     , filepath, hashable, hourglass, hspec, hspec-expectations-json
-     , jose, lens, memory, monad-time, mtl, pem, QuickCheck
-     , quickcheck-instances, serialise, singletons, text, time
-     , unordered-containers, uuid, validation, x509, x509-store
-     , x509-validation
+     , containers, cryptonite, directory, file-embed, filepath, hashable
+     , hourglass, hspec, hspec-expectations-json, jose, lens, memory
+     , monad-time, mtl, pem, QuickCheck, quickcheck-instances, serialise
+     , singletons, text, time, unordered-containers, uuid, validation
+     , x509, x509-store, x509-validation
      }:
      mkDerivation {
        pname = "webauthn";
-       version = "0.1.1.0";
-       sha256 = "1zjkx57k2j998gxi7gylq0d8djiwdi4b4b486msn4q998jn2h8qy";
+       version = "0.2.0.0";
+       sha256 = "0vdx1rlc2mb9nnxyzw94vw1kpjxd5qg9nqg1bh4wkdrxqqb3n7aj";
        libraryHaskellDepends = [
          aeson asn1-encoding asn1-parse asn1-types base base16-bytestring
          base64-bytestring binary bytestring cborg containers cryptonite
-         deriving-aeson file-embed hashable hourglass jose lens memory
-         monad-time mtl serialise singletons text time unordered-containers
-         uuid validation x509 x509-store x509-validation
+         file-embed hashable hourglass jose lens memory monad-time mtl
+         serialise singletons text time unordered-containers uuid validation
+         x509 x509-store x509-validation
        ];
        testHaskellDepends = [
          aeson asn1-encoding base bytestring containers cryptonite directory
          filepath hourglass hspec hspec-expectations-json memory mtl pem
-         QuickCheck quickcheck-instances serialise singletons text uuid
-         validation x509 x509-store
+         QuickCheck quickcheck-instances serialise singletons text
+         unordered-containers uuid validation x509 x509-store
        ];
        description = "Relying party (server) implementation of the WebAuthn 2 specification";
        license = lib.licenses.asl20;
@@ -298383,7 +298984,6 @@ self: {
        ];
        description = "A simple CLI utility for interacting with a websocket";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "ws-chans" = callPackage
@@ -298510,27 +299110,29 @@ self: {
 
   "wstunnel" = callPackage
     ({ mkDerivation, async, base, base64-bytestring, binary, bytestring
-     , classy-prelude, cmdargs, connection, hslogger, hspec, iproute
-     , mtl, network, network-conduit-tls, streaming-commons, text
-     , unordered-containers, websockets
+     , case-insensitive, classy-prelude, cmdargs, connection, hslogger
+     , hspec, iproute, mtl, network, network-conduit-tls
+     , streaming-commons, text, unordered-containers, websockets
      }:
      mkDerivation {
        pname = "wstunnel";
-       version = "0.3.1.0";
-       sha256 = "14f790bya156ffdp2rrxzibz54yd714p59h56amfnsakrn8ygghy";
+       version = "0.4.1.0";
+       sha256 = "022x4g1ya5676v7q0q3rzwn6rzlnz74f8xwwp3mnvyih025cx770";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         async base base64-bytestring binary bytestring classy-prelude
-         connection hslogger iproute mtl network network-conduit-tls
-         streaming-commons text unordered-containers websockets
+         async base base64-bytestring binary bytestring case-insensitive
+         classy-prelude connection hslogger iproute mtl network
+         network-conduit-tls streaming-commons text unordered-containers
+         websockets
        ];
        executableHaskellDepends = [
-         async base bytestring classy-prelude cmdargs hslogger text
+         async base bytestring case-insensitive classy-prelude cmdargs
+         hslogger text
        ];
        testHaskellDepends = [
-         async base binary bytestring classy-prelude hspec network
-         network-conduit-tls streaming-commons text
+         async base binary bytestring case-insensitive classy-prelude hspec
+         network network-conduit-tls streaming-commons text
        ];
        description = "Tunneling program over websocket protocol";
        license = lib.licenses.bsd3;
@@ -299365,6 +299967,8 @@ self: {
        pname = "xhb";
        version = "0.6.2015.8.1";
        sha256 = "1rq6g96v1fs66kdmnkvlkcxrv614ha77czclm3sfw274f7q2r2kb";
+       revision = "1";
+       editedCabalFile = "0f2vhak11kijd74il1r27h1zbcsj36yyv5x02h3kq6vdx0h0zyd9";
        libraryHaskellDepends = [
          base binary byteorder bytestring containers network parsec stm
          Xauth
@@ -300157,8 +300761,8 @@ self: {
      }:
      mkDerivation {
        pname = "xml-prettify-text";
-       version = "1.0.0.2";
-       sha256 = "02rnglx1fm4xirpl1y0g3q34k593cbijg33hh77nzsp78qcnvfr9";
+       version = "1.0.0.3";
+       sha256 = "1bxp9dvy3js7az1c1kbrgjhhp4ssg7mb1gxgfj2qcaggv2b97v7i";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -300267,7 +300871,6 @@ self: {
        ];
        description = "Parse XML from bytes";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "xml-to-json" = callPackage
@@ -302486,8 +303089,8 @@ self: {
        pname = "yasi";
        version = "0.1.2.1";
        sha256 = "0647z79wva7apkp0swj7gax780vqmhr5czxrvg88gl3bi03wcapl";
-       revision = "3";
-       editedCabalFile = "0laibkj367wqnq95jiw1rca9b2jb5hanhvlclsdflyzg8kfknmhc";
+       revision = "4";
+       editedCabalFile = "0vljbnfrcscb468mcqx62r0xcdnz73glam67v73jqq6g4vhyaimr";
        libraryHaskellDepends = [ base bytestring template-haskell text ];
        testHaskellDepends = [
          base hedgehog tasty tasty-hedgehog tasty-hunit text
@@ -306617,6 +307220,18 @@ self: {
        broken = true;
      }) {};
 
+  "zigzag" = callPackage
+    ({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck }:
+     mkDerivation {
+       pname = "zigzag";
+       version = "0.0.1.0";
+       sha256 = "1gy2hv4ggxfwrxg9v3qyxpfrm1j5sixckc2j3h37ckzsh5v06mga";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+       description = "Zigzag encoding of integers into unsigned integers";
+       license = lib.licenses.bsd3;
+     }) {};
+
   "zim-parser" = callPackage
     ({ mkDerivation, array, base, base-compat, binary, binary-conduit
      , bytestring, conduit, conduit-extra, hspec, lzma
diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix
index d6fb1ac78bd..781533694f2 100644
--- a/pkgs/development/idris-modules/default.nix
+++ b/pkgs/development/idris-modules/default.nix
@@ -145,7 +145,7 @@
 
     posix = callPackage ./posix.nix {};
 
-    protobuf = callPackage ./protobuf.nix {};
+    protobuf = throw "idrisPackages.protobuf has been removed: abandoned by upstream"; # added 2022-02-06
 
     quantities = callPackage ./quantities.nix {};
 
diff --git a/pkgs/development/idris-modules/protobuf.nix b/pkgs/development/idris-modules/protobuf.nix
deleted file mode 100644
index ebfc3c27508..00000000000
--- a/pkgs/development/idris-modules/protobuf.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ build-idris-package
-, fetchFromGitHub
-, lightyear
-, lib
-}:
-build-idris-package  {
-  name = "protobuf";
-  version = "2017-08-12";
-
-  idrisDeps = [ lightyear ];
-
-  src = fetchFromGitHub {
-    owner = "artagnon";
-    repo = "idris-protobuf";
-    rev = "c21212534639518453d16ae1b0f07d94464ff8eb";
-    sha256 = "0n5w7bdbxqca3b7hzg95md01mx4sfvl9fi82xjm0hzds33akmn05";
-  };
-
-  meta = {
-    description = "A partial implementation of Protocol Buffers in Idris";
-    homepage = "https://github.com/artagnon/idris-protobuf";
-    license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.brainrape ];
-  };
-}
diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
index 64b7aefe8b9..527db0e2c1e 100644
--- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix
+++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
@@ -61,8 +61,8 @@ in stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "OS abstraction functions used by aqbanking and related tools";
-    homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1";
-    license = licenses.lgpl21;
+    homepage = "https://www.aquamaniac.de/rdm/projects/gwenhywfar";
+    license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ goibhniu ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch b/pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch
new file mode 100644
index 00000000000..e13dda54970
--- /dev/null
+++ b/pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch
@@ -0,0 +1,24 @@
+From abdfbb94df98fe88be4dd92ca587500126558411 Mon Sep 17 00:00:00 2001
+From: Victor Gaydov <victor@enise.org>
+Date: Sun, 26 Jul 2020 11:54:52 +0300
+Subject: [PATCH] Remove deprecated scons call
+
+---
+ SConstruct | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/SConstruct b/SConstruct
+index 407025d8..04afa91f 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -49,7 +49,6 @@ env = Environment(ENV=os.environ, tools=[
+ # performance tuning
+ env.Decider('MD5-timestamp')
+ env.SetOption('implicit_cache', 1)
+-env.SourceCode('.', None)
+ 
+ # provide absolute path to force single sconsign file
+ # per-directory sconsign files seems to be buggy with generated sources
+-- 
+2.34.1
+
diff --git a/pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch b/pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch
new file mode 100644
index 00000000000..097f1b3ff47
--- /dev/null
+++ b/pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch
@@ -0,0 +1,31 @@
+From 15b37bb12a362c7889ac431eca4a47d6b2bdb97c Mon Sep 17 00:00:00 2001
+From: Victor Gaydov <victor@enise.org>
+Date: Sat, 5 Dec 2020 18:38:36 +0300
+Subject: [PATCH] Fix compatibility with new SCons
+
+---
+ site_scons/site_tools/roc/config.py | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/site_scons/site_tools/roc/config.py b/site_scons/site_tools/roc/config.py
+index b42b3adb..03b76be7 100644
+--- a/site_scons/site_tools/roc/config.py
++++ b/site_scons/site_tools/roc/config.py
+@@ -13,7 +13,13 @@ def _run_prog(context, src, suffix):
+     # RunProg may incorrectly use cached results from a previous run saved for
+     # different file contents but the same invocation number. To prevent this, we
+     # monkey patch its global counter with a hashsum of the file contents.
+-    SCons.SConf._ac_build_counter = int(hashlib.md5(src.encode()).hexdigest(), 16)
++    # The workaround is needed only for older versions of SCons, where
++    # _ac_build_counter was an integer.
++    try:
++        if type(SCons.SConf._ac_build_counter) is int:
++            SCons.SConf._ac_build_counter = int(hashlib.md5(src.encode()).hexdigest(), 16)
++    except:
++        pass
+     return context.RunProg(src, suffix)
+ 
+ def CheckLibWithHeaderExt(context, libs, headers, language, expr='1', run=True):
+-- 
+2.34.1
+
diff --git a/pkgs/development/libraries/audio/roc-toolkit/default.nix b/pkgs/development/libraries/audio/roc-toolkit/default.nix
index 728e52b2670..98c088ed549 100644
--- a/pkgs/development/libraries/audio/roc-toolkit/default.nix
+++ b/pkgs/development/libraries/audio/roc-toolkit/default.nix
@@ -1,7 +1,7 @@
 { stdenv,
   lib,
   fetchFromGitHub,
-  sconsPackages,
+  scons,
   ragel,
   gengetopt,
   pkg-config,
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    sconsPackages.scons_3_0_1
+    scons
     ragel
     gengetopt
     pkg-config
@@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
       "--host=${stdenv.hostPlatform.config}"
       "--prefix=${placeholder "out"}"
       "--disable-sox"
+      "--disable-doc"
       "--disable-tests" ] ++
     lib.optional (!libunwindSupport) "--disable-libunwind" ++
     lib.optional (!pulseaudioSupport) "--disable-pulseaudio" ++
@@ -55,6 +56,12 @@ stdenv.mkDerivation rec {
   prePatch = lib.optionalString stdenv.isAarch64
     "sed -i 's/c++98/c++11/g' SConstruct";
 
+  # TODO: Remove these patches in the next version.
+  patches = [
+    ./0001-Remove-deprecated-scons-call.patch
+    ./0002-Fix-compatibility-with-new-SCons.patch
+  ];
+
   meta = with lib; {
     description = "Roc is a toolkit for real-time audio streaming over the network";
     homepage = "https://github.com/roc-streaming/roc-toolkit";
diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix
index d4fe5e83658..3b47b1d5e72 100644
--- a/pkgs/development/libraries/celt/generic.nix
+++ b/pkgs/development/libraries/celt/generic.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     description = "Ultra-low delay audio codec";
-    homepage    = "http://www.celt-codec.org/";
+    homepage    = "https://gitlab.xiph.org/xiph/celt"; # http://www.celt-codec.org/ is gone
     license     = licenses.bsd2;
     maintainers = with maintainers; [ codyopel raskin ];
     platforms   = platforms.unix;
diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix
index ad582d93305..03c4ea0ee8f 100644
--- a/pkgs/development/libraries/easyloggingpp/default.nix
+++ b/pkgs/development/libraries/easyloggingpp/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   pname = "easyloggingpp";
   version = "9.97.0";
   src = fetchFromGitHub {
-    owner = "muflihun";
+    owner = "amrayn";
     repo = "easyloggingpp";
     rev = "v${version}";
     sha256 = "sha256-sFWmZMnucMuvpwDzuowni21KiD3bx0lH1Ts+yhusOYs=";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
   meta = {
     description = "C++ logging library";
-    homepage = "https://muflihun.github.io/easyloggingpp/";
+    homepage = "https://github.com/amrayn/easyloggingpp";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [acowley];
     platforms = lib.platforms.all;
diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix
index 1ec666a920c..434d445ceb4 100644
--- a/pkgs/development/libraries/fcgi/default.nix
+++ b/pkgs/development/libraries/fcgi/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A language independent, scalable, open extension to CG";
-    homepage = "http://www.fastcgi.com/";
+    homepage = "https://fastcgi-archives.github.io/"; # Formerly http://www.fastcgi.com/
     license = "FastCGI see LICENSE.TERMS";
     platforms = platforms.all;
   };
diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix
index 283c815b199..c294aec893a 100644
--- a/pkgs/development/libraries/flann/default.nix
+++ b/pkgs/development/libraries/flann/default.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
   buildInputs = lib.optionals enablePython [ python3 ];
 
   meta = {
-    homepage = "http://people.cs.ubc.ca/~mariusm/flann/";
+    homepage = "https://github.com/flann-lib/flann";
     license = lib.licenses.bsd3;
     description = "Fast approximate nearest neighbor searches in high dimensional spaces";
     maintainers = with lib.maintainers; [viric];
diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix
index 472a23a2b74..37354f8be48 100644
--- a/pkgs/development/libraries/idnkit/default.nix
+++ b/pkgs/development/libraries/idnkit/default.nix
@@ -12,9 +12,12 @@ stdenv.mkDerivation rec {
   buildInputs = [ libiconv ];
 
   meta = with lib; {
-    homepage = "https://www.nic.ad.jp/ja/idn/idnkit";
+    homepage = "https://jprs.co.jp/idn/index-e.html";
     description = "Provides functionalities about i18n domain name processing";
-    license = "idnkit-2 license";
+    license = {
+      fullName = "Open Source Code License version 1.1";
+      url = "https://jprs.co.jp/idn/idnkit2-OSCL.txt";
+    };
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/java/gwt-dragdrop/default.nix b/pkgs/development/libraries/java/gwt-dragdrop/default.nix
deleted file mode 100644
index a7270bbfa2b..00000000000
--- a/pkgs/development/libraries/java/gwt-dragdrop/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  pname = "gwt-dnd";
-  version = "2.6.5";
-
-  src = fetchurl {
-    url = "http://gwt-dnd.googlecode.com/files/gwt-dnd-${version}.jar";
-    sha256 = "07zdlr8afs499asnw0dcjmw1cnjc646v91lflx5dv4qj374c97fw";
-  };
-
-  dontUnpack = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share/java
-    cp $src $out/share/java/$name.jar
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    platforms = platforms.unix;
-    license = licenses.asl20;
-  };
-}
diff --git a/pkgs/development/libraries/java/gwt-widgets/default.nix b/pkgs/development/libraries/java/gwt-widgets/default.nix
deleted file mode 100644
index ebba8548016..00000000000
--- a/pkgs/development/libraries/java/gwt-widgets/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  pname = "gwt-widgets";
-  version = "0.2.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/gwt-widget/gwt-widgets-${version}-bin.tar.gz";
-    sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb";
-  };
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share/java
-    cp gwt-widgets-*.jar $out/share/java
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    platforms = platforms.unix;
-    license = with licenses; [ afl21 lgpl2 ];
-  };
-}
diff --git a/pkgs/development/libraries/nghttp3/default.nix b/pkgs/development/libraries/nghttp3/default.nix
index 21b9fdf419c..fc2416c2cfb 100644
--- a/pkgs/development/libraries/nghttp3/default.nix
+++ b/pkgs/development/libraries/nghttp3/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub
 , autoreconfHook, pkg-config
-, cunit, file
+, cunit, file, ncurses
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-pV1xdQa5RBz17jDINC2uN1Q+jpa2edDwqTqf8D5VU3E=";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkg-config cunit file ];
+  nativeBuildInputs = [ autoreconfHook pkg-config file ];
+  checkInputs = [ cunit ncurses ];
 
   preConfigure = ''
     substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
@@ -23,12 +24,13 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   doCheck = true;
+  enableParallelBuilding = true;
 
   meta = with lib; {
     homepage = "https://github.com/ngtcp2/nghttp3";
     description = "nghttp3 is an implementation of HTTP/3 mapping over QUIC and QPACK in C.";
     license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ izorkin ];
   };
 }
diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix
index dfe07c39e32..650516d360c 100644
--- a/pkgs/development/libraries/ngtcp2/default.nix
+++ b/pkgs/development/libraries/ngtcp2/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchFromGitHub
 , autoreconfHook, pkg-config
-, cunit, file
-, jemalloc, libev, nghttp3, quictls
+, cunit, file, ncurses
+, libev, nghttp3, quictls
+, withJemalloc ? false, jemalloc
 }:
 
 stdenv.mkDerivation rec {
@@ -15,8 +16,9 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-uBmD26EYT8zxmHD5FuHCbEuTdWxer/3uhRp8PhUT87M=";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkg-config cunit file ];
-  buildInputs = [ jemalloc libev nghttp3 quictls ];
+  nativeBuildInputs = [ autoreconfHook pkg-config file ];
+  buildInputs = [ libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc;
+  checkInputs = [ cunit ncurses ];
 
   preConfigure = ''
     substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
@@ -25,12 +27,13 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" ];
 
   doCheck = true;
+  enableParallelBuilding = true;
 
   meta = with lib; {
     homepage = "https://github.com/ngtcp2/ngtcp2";
     description = "ngtcp2 project is an effort to implement QUIC protocol which is now being discussed in IETF QUICWG for its standardization.";
     license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ izorkin ];
   };
 }
diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/development/libraries/sope/default.nix
index bf2145c68c4..39b2d7fd8fd 100644
--- a/pkgs/development/libraries/sope/default.nix
+++ b/pkgs/development/libraries/sope/default.nix
@@ -4,13 +4,13 @@ with lib;
 
 gnustep.stdenv.mkDerivation rec {
   pname = "sope";
-  version = "5.5.0";
+  version = "5.5.1";
 
   src = fetchFromGitHub {
     owner = "inverse-inc";
     repo = pname;
     rev = "SOPE-${version}";
-    sha256 = "sha256-M5PF15Ok+rJLWlfHsC8F8JXJonAR0wwTUbWxegBZ/qQ=";
+    sha256 = "sha256-w78YO5EQWtEiySOm9NpPbaMChbJppNBoZNOBs9fibbM=";
   };
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix
index 0a9922f6788..1801a0679b5 100644
--- a/pkgs/development/ocaml-modules/cairo2/default.nix
+++ b/pkgs/development/ocaml-modules/cairo2/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, lib, fetchurl, buildDunePackage, ocaml, dune-configurator, pkg-config, cairo }:
+{ stdenv, lib, fetchurl, buildDunePackage, ocaml, dune-configurator, pkg-config, cairo
+, ApplicationServices }:
 
 buildDunePackage rec {
   pname = "cairo2";
@@ -13,7 +14,7 @@ buildDunePackage rec {
   useDune2 = true;
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ cairo dune-configurator ];
+  buildInputs = [ cairo dune-configurator ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ];
 
   doCheck = !(stdenv.isDarwin
   # https://github.com/Chris00/ocaml-cairo/issues/19
diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix
index d86c0d09324..2da2b12b5b3 100644
--- a/pkgs/development/ocaml-modules/cpdf/default.nix
+++ b/pkgs/development/ocaml-modules/cpdf/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     owner = "johnwhitington";
     repo = "cpdf-source";
     rev = "v${version}";
-    sha256 = "sha256:0ps6d78i5mp1gcigxfp9rxmjr1k00nkr37vllhr0rdyph97w41s1";
+    sha256 = "sha256:1qmx229nij7g6qmiacmyy4mcgx3k9509p4slahivshqm79d6wiwl";
   };
 
   buildInputs = [ ocaml findlib ncurses ];
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index 96a66874c75..67ec458a122 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -37,7 +37,7 @@ buildDunePackage rec {
     ocaml_pcre xml-light
   ];
 
-  configureFlags = [ "--root $(out)" "--prefix /" ];
+  configureFlags = [ "--root $(out)" "--prefix /" "--temproot ''" ];
 
   dontAddPrefix = true;
   dontAddStaticConfigureFlags = true;
@@ -47,6 +47,10 @@ buildDunePackage rec {
     make -C src confs
   '';
 
+  postInstall = ''
+    make install.files
+  '';
+
   postFixup =
   ''
   rm -rf $out/var/run
diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix
index e49f4ba53fe..c9eb73c7f04 100644
--- a/pkgs/development/python-modules/androidtv/default.nix
+++ b/pkgs/development/python-modules/androidtv/default.nix
@@ -3,37 +3,48 @@
 , aiofiles
 , buildPythonPackage
 , fetchFromGitHub
-, isPy3k
 , mock
 , pure-python-adb
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "androidtv";
-  version = "0.0.60";
+  version = "0.0.63";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
-  # pypi does not contain tests, using github sources instead
   src = fetchFromGitHub {
     owner = "JeffLIrion";
     repo = "python-androidtv";
     rev = "v${version}";
-    sha256 = "sha256-GWCiRxZ6pHrcVkOKNGxSK8lUD0RohtED8czXIWUoVaM=";
+    hash = "sha256-Peg/agAb1lUBUBK1OkYVovE4pzM8iaQHVaSk/hr1plw=";
   };
 
-  propagatedBuildInputs = [ adb-shell pure-python-adb ]
-    ++ lib.optionals (isPy3k) [ aiofiles ];
+  propagatedBuildInputs = [
+    adb-shell
+    aiofiles
+    pure-python-adb
+  ];
 
   checkInputs = [
     mock
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "androidtv" ];
+  disabledTests = [
+    # Requires git but fails anyway
+    "test_no_underscores"
+  ];
+
+  pythonImportsCheck = [
+    "androidtv"
+  ];
 
   meta = with lib; {
-    description =
-      "Communicate with an Android TV or Fire TV device via ADB over a network";
+    description = "Communicate with an Android TV or Fire TV device via ADB over a network";
     homepage = "https://github.com/JeffLIrion/python-androidtv/";
     license = licenses.mit;
     maintainers = with maintainers; [ jamiemagee ];
diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix
index 324e4ec823a..a01e9389f43 100644
--- a/pkgs/development/python-modules/asyncio-dgram/default.nix
+++ b/pkgs/development/python-modules/asyncio-dgram/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "asyncio-dgram";
-  version = "2.1.1";
+  version = "2.1.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.5";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "jsbronder";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-3K9VpX6JWCgz+Lx+5ZKqXG53B/uJCtI0x4pHy2pJdZg=";
+    sha256 = "sha256-Eb/9JtgPT2yOlfnn5Ox8M0kcQhSlRCuX8+Rq6amki8Q=";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix
index 7ae4cb1b789..7d28810380f 100644
--- a/pkgs/development/python-modules/asyncpg/default.nix
+++ b/pkgs/development/python-modules/asyncpg/default.nix
@@ -1,14 +1,21 @@
-{ lib, isPy3k, fetchPypi, buildPythonPackage
-, uvloop, postgresql }:
+{ lib
+, fetchPypi
+, buildPythonPackage
+, uvloop
+, postgresql
+, pythonOlder
+}:
 
 buildPythonPackage rec {
   pname = "asyncpg";
   version = "0.25.0";
-  disabled = !isPy3k;
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "63f8e6a69733b285497c2855464a34de657f2cccd25aeaeeb5071872e9382540";
+    hash = "sha256-Y/jmppczsoVJfChVRko03mV/LMzSWurutQcYcuk4JUA=";
   };
 
   checkInputs = [
@@ -16,15 +23,17 @@ buildPythonPackage rec {
     postgresql
   ];
 
-  pythonImportsCheck = [ "asyncpg" ];
+  pythonImportsCheck = [
+    "asyncpg"
+  ];
 
   meta = with lib; {
+    description = "Asyncio PosgtreSQL driver";
     homepage = "https://github.com/MagicStack/asyncpg";
-    description = "An asyncio PosgtreSQL driver";
     longDescription = ''
       Asyncpg is a database interface library designed specifically for
       PostgreSQL and Python/asyncio. asyncpg is an efficient, clean
-      implementation of PostgreSQL server binary protocol for use with Python’s
+      implementation of PostgreSQL server binary protocol for use with Python's
       asyncio framework.
     '';
     license = licenses.asl20;
diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix
index 7cdfbb66b26..2db70c162d2 100644
--- a/pkgs/development/python-modules/asyncssh/default.nix
+++ b/pkgs/development/python-modules/asyncssh/default.nix
@@ -1,31 +1,32 @@
 { lib
+, bcrypt
 , buildPythonPackage
-, fetchPypi
-, pythonOlder
 , cryptography
-, bcrypt
-, gssapi
+, fetchPypi
 , fido2
+, gssapi
 , libnacl
 , libsodium
 , nettle
-, python-pkcs11
-, pyopenssl
-, openssl
 , openssh
+, openssl
+, pyopenssl
 , pytestCheckHook
+, python-pkcs11
+, pythonOlder
+, typing-extensions
 }:
 
 buildPythonPackage rec {
   pname = "asyncssh";
-  version = "2.8.1";
+  version = "2.9.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0648eba58d72653755f28e26c9bd83147d9652c1f2f5e87fbf5a87d7f8fbf83a";
+    sha256 = "sha256-PMM32AZhlGVFW/GH6KkeP1dUI3GBhOI4+a6MQcTzOvE=";
   };
 
   propagatedBuildInputs = [
@@ -36,8 +37,9 @@ buildPythonPackage rec {
     libnacl
     libsodium
     nettle
-    python-pkcs11
     pyopenssl
+    python-pkcs11
+    typing-extensions
   ];
 
   checkInputs = [
@@ -66,6 +68,8 @@ buildPythonPackage rec {
     "TestSKAuthCTAP2"
     # Requires network access
     "test_connect_timeout_exceeded"
+    # Fails in the sandbox
+    "test_forward_remote"
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix
index 98c087ae74f..4ad71306789 100644
--- a/pkgs/development/python-modules/asysocks/default.nix
+++ b/pkgs/development/python-modules/asysocks/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "asysocks";
-  version = "0.1.6";
+  version = "0.1.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-uXrJBc1Moeeo58KV+csiztXf0/F+iI5xy/BaHWek05M=";
+    sha256 = "sha256-I9X8+ucadYJsPteHvZsbw7GJ7DdliWG86DyemUVeNUw=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/discogs-client/default.nix b/pkgs/development/python-modules/discogs-client/default.nix
index e47922f9577..f4940cf7c61 100644
--- a/pkgs/development/python-modules/discogs-client/default.nix
+++ b/pkgs/development/python-modules/discogs-client/default.nix
@@ -5,18 +5,21 @@
 , oauthlib
 , python-dateutil
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "discogs-client";
-  version = "2.3.12";
+  version = "2.3.13";
+  format = "setuptools";
 
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "joalla";
     repo = "discogs_client";
     rev = "v${version}";
-    sha256 = "0y553x8rkgmqqg980n62pwdxbp75xalkhlb6k5g0cms42ggy5fsc";
+    sha256 = "sha256-TOja0pCJv8TAI0ns8M/tamZ5Pp8k5sSKDnvN4SeKtW8=";
   };
 
   propagatedBuildInputs = [
@@ -29,7 +32,9 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "discogs_client" ];
+  pythonImportsCheck = [
+    "discogs_client"
+  ];
 
   meta = with lib; {
     description = "Unofficial Python API client for Discogs";
diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix
index c8d427900c6..b10b8ec9313 100644
--- a/pkgs/development/python-modules/dj-email-url/default.nix
+++ b/pkgs/development/python-modules/dj-email-url/default.nix
@@ -5,12 +5,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.0.4";
+  version = "1.0.5";
   pname = "dj-email-url";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7ee35df51065d17ac7b55e98ad8eda3a1f6c5d65fc89cdc5de7a96e534942553";
+    sha256 = "sha256-7zb4oyTsV8875cen70TtaQDKAghiSpGKszrcHPZCezk=";
   };
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix
index b5a22858b57..3ac8166bbbd 100644
--- a/pkgs/development/python-modules/flax/default.nix
+++ b/pkgs/development/python-modules/flax/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "flax";
-  version = "0.3.6";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0zvq0vl88hiwmss49bnm7gdmndr1dfza2bcs1fj88a9r7w9dmlsr";
+    sha256 = "0rvdaxyf68qmm5d77gbizpcibyz2ic2pb2x7rgf7p8qwijyc39ws";
   };
 
   buildInputs = [ jaxlib ];
diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix
index 29a0ca3ff72..a35f95d9e8f 100644
--- a/pkgs/development/python-modules/flux-led/default.nix
+++ b/pkgs/development/python-modules/flux-led/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "flux-led";
-  version = "0.28.20";
+  version = "0.28.21";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "flux_led";
     rev = version;
-    sha256 = "sha256-+2oY+dfRoY9Ypa2DJfIoz7jrTKMoSYz2zhjgl+BNmds=";
+    sha256 = "sha256-Vt+vlJlOznGShPUUQUt4zL9ht52TvNWbRRO9v9C0cqg=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/garminconnect-aio/default.nix b/pkgs/development/python-modules/garminconnect-aio/default.nix
index bb754118e07..abdd1f9f2f2 100644
--- a/pkgs/development/python-modules/garminconnect-aio/default.nix
+++ b/pkgs/development/python-modules/garminconnect-aio/default.nix
@@ -3,18 +3,22 @@
 , brotlipy
 , buildPythonPackage
 , fetchFromGitHub
+, pythonOlder
 , yarl
 }:
 
 buildPythonPackage rec {
   pname = "garminconnect-aio";
   version = "0.1.4";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "cyberjunky";
     repo = "python-garminconnect-aio";
     rev = version;
-    sha256 = "0s2gpy5hciv9akqqhxy0d2ywp6jp9mmdngx34q7fq3xn668kcrhr";
+    hash = "sha256-GWY2kTG2D+wOJqM/22pNV5rLvWjAd4jxVGlHBou/T2g=";
   };
 
   propagatedBuildInputs = [
@@ -26,7 +30,9 @@ buildPythonPackage rec {
   # Project has no tests
   doCheck = false;
 
-  pythonImportsCheck = [ "garminconnect_aio" ];
+  pythonImportsCheck = [
+    "garminconnect_aio"
+  ];
 
   meta = with lib; {
     description = "Python module to interact with Garmin Connect";
diff --git a/pkgs/development/python-modules/garminconnect-ha/default.nix b/pkgs/development/python-modules/garminconnect/default.nix
index c88af9b230e..62a85ea8bc3 100644
--- a/pkgs/development/python-modules/garminconnect-ha/default.nix
+++ b/pkgs/development/python-modules/garminconnect/default.nix
@@ -2,18 +2,22 @@
 , buildPythonPackage
 , cloudscraper
 , fetchFromGitHub
+, pythonOlder
 , requests
 }:
 
 buildPythonPackage rec {
-  pname = "garminconnect-ha";
-  version = "0.1.13";
+  pname = "garminconnect";
+  version = "0.1.44";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "cyberjunky";
-    repo = "python-garminconnect-ha";
+    repo = "python-garminconnect";
     rev = version;
-    sha256 = "sha256-1O1EcG5FvpwUvI8rwcdlQLzEEStyFAwvmkaL97u6hZ4=";
+    hash = "sha256-CUjMbh3eGPwoHW+oOjaVyr0g/txWmzGuP1usq2WCwZg=";
   };
 
   propagatedBuildInputs = [
@@ -21,14 +25,16 @@ buildPythonPackage rec {
     requests
   ];
 
-  # Project has no tests
+  # Module has no tests
   doCheck = false;
 
-  pythonImportsCheck = [ "garminconnect_ha" ];
+  pythonImportsCheck = [
+    "garminconnect"
+  ];
 
   meta = with lib; {
-    description = "Minimal Garmin Connect Python 3 API wrapper for Home Assistant";
-    homepage = "https://github.com/cyberjunky/python-garminconnect-ha";
+    description = "Garmin Connect Python API wrapper";
+    homepage = "https://github.com/cyberjunky/python-garminconnect";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix
index 855b671d2b6..b74ef29e543 100644
--- a/pkgs/development/python-modules/gehomesdk/default.nix
+++ b/pkgs/development/python-modules/gehomesdk/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "gehomesdk";
-  version = "0.4.22";
+  version = "0.4.23";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-3HErbW9/YD8Jd6zr5O2hjoLZ9x5P/vzZLjqPmSm09EM=";
+    sha256 = "sha256-y8L0krMSAOFP97j5QQGiJJMhzRidhMgoHGsMYMyUdd8=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix
index 82122d13ffd..cd8dfe3fb6f 100644
--- a/pkgs/development/python-modules/intellifire4py/default.nix
+++ b/pkgs/development/python-modules/intellifire4py/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "intellifire4py";
-  version = "0.5";
+  version = "0.7.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "jeeftor";
     repo = pname;
     rev = version;
-    hash = "sha256-ESNFTlzwxv0SZA/vVU3aIjkt5nCX3D4VbwIRNSzMIK4=";
+    hash = "sha256-vOARk7TZrpsJLt8Ofur1NxknejmmxmH4Z+30mev4++o=";
   };
 
   propagatedBuildInputs = [
@@ -32,6 +32,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # Test file is missing
+    "test_json_files"
+  ];
+
   pythonImportsCheck = [
     "intellifire4py"
   ];
diff --git a/pkgs/development/python-modules/minikerberos/default.nix b/pkgs/development/python-modules/minikerberos/default.nix
index 0279261e0ed..f242ac69c25 100644
--- a/pkgs/development/python-modules/minikerberos/default.nix
+++ b/pkgs/development/python-modules/minikerberos/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "minikerberos";
-  version = "0.2.16";
+  version = "0.2.17";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-66idXGSSQaM2eDnr0cAzO5qeT+UUdG4kamofLLe94m4=";
+    sha256 = "sha256-yoPUTwpsk8wimN9DXFFz6ZJi1tI0uAVcfAi5BiwsfJM=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/pkgs/development/python-modules/oscrypto/default.nix
index cc89f312480..b4d1c8fb88a 100644
--- a/pkgs/development/python-modules/oscrypto/default.nix
+++ b/pkgs/development/python-modules/oscrypto/default.nix
@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , buildPythonPackage
 , asn1crypto
 , fetchPypi
@@ -35,6 +36,8 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "oscrypto" ];
 
+  doCheck = !stdenv.isDarwin;
+
   meta = with lib; {
     description = "Encryption library for Python";
     homepage = "https://github.com/wbond/oscrypto";
diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix
index f61a0c59327..57c9f77f1fe 100644
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/pkgs/development/python-modules/pg8000/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pg8000";
-  version = "1.23.0";
+  version = "1.24.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-pBPgAUE0KBOiykfot7BUn/M4zKAryBkHa21w8S11XHk=";
+    sha256 = "sha256-BsawsGjQfONm97ztrfdqC12mph+GMCyMr/aQt/xd/ts=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index b65f8b5f84c..3297dbc091b 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "plugwise";
-  version = "0.16.1";
+  version = "0.16.2";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = "python-plugwise";
     rev = "v${version}";
-    sha256 = "sha256-95b2PliBlCNHzl9oTu0Mv6e30WE8lXwlAjzwqX2dNZI=";
+    sha256 = "sha256-//0M5eNWJoviHWuZnHO6hCEP3g2dA8utJeoS5Lp0Hy8=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix
index f42b901a594..1f1d97f19fa 100644
--- a/pkgs/development/python-modules/pysdl2/default.nix
+++ b/pkgs/development/python-modules/pysdl2/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "PySDL2";
-  version = "0.9.10";
+  version = "0.9.11";
   # The tests use OpenGL using find_library, which would have to be
   # patched; also they seem to actually open X windows and test stuff
   # like "screensaver disabling", which would have to be cleverly
@@ -11,7 +11,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "20f6aa5dbb4e2a17fce883fc4c7a044f675a044d91291c3ba2647ef438aad359";
+    sha256 = "93e51057d39fd583b80001d42b21d5a3f71e30d489d85924d944b2c7350e2da6";
   };
 
   # Deliberately not in propagated build inputs; users can decide
diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix
index b000379dd1b..31352435165 100644
--- a/pkgs/development/python-modules/python-lsp-server/default.nix
+++ b/pkgs/development/python-modules/python-lsp-server/default.nix
@@ -20,6 +20,7 @@
 , pythonOlder
 , rope
 , setuptools
+, stdenv
 , ujson
 , yapf
 , withAutopep8 ? true
@@ -73,14 +74,17 @@ buildPythonPackage rec {
     matplotlib
     numpy
     pandas
-    pyqt5
     pytestCheckHook
-  ];
+  ]
+  # pyqt5 is broken on aarch64-darwin
+  ++ lib.optionals (!stdenv.isDarwin || !stdenv.isAarch64) [ pyqt5 ];
 
   disabledTests = [
     # pytlint output changed
     "test_lint_free_pylint"
-  ] ++ lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config";
+  ] ++ lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config"
+  # pyqt5 is broken on aarch64-darwin
+  ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "test_pyqt_completion";
 
   disabledTestPaths = lib.optional (!withAutopep8) "test/plugins/test_autopep8_format.py"
     ++ lib.optional (!withRope) "test/plugins/test_completion.py"
diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix
index aea8b6dab30..21f29efb28f 100644
--- a/pkgs/development/python-modules/python-manilaclient/default.nix
+++ b/pkgs/development/python-modules/python-manilaclient/default.nix
@@ -18,11 +18,11 @@
 
 buildPythonApplication rec {
   pname = "python-manilaclient";
-  version = "3.1.0";
+  version = "3.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d53f69238cdc454c0297f513e0b481a039d0bac723990ebd5ab9d3d29633956e";
+    sha256 = "sha256-6iAed0mtEYHguYq4Rlh4YWT8E5hNqBYPcnG9/8RMspo=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix
index 1a2e6cc43ec..e1c74b08461 100644
--- a/pkgs/development/python-modules/pytradfri/default.nix
+++ b/pkgs/development/python-modules/pytradfri/default.nix
@@ -9,15 +9,16 @@
 
 buildPythonPackage rec {
   pname = "pytradfri";
-  version = "8.0.1";
+  version = "9.0.0";
+  format = "setuptools";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "pytradfri";
     rev = version;
-    hash = "sha256-Wxz2P55lc7yJ1OXNXYWb25a+xtMs1sANNc7hE7nawHI=";
+    hash = "sha256-12ol+2CnoPfkxmDGJJAkoafHGpQuWC4lh0N7lSvx2DE=";
   };
 
   propagatedBuildInputs = [
@@ -29,7 +30,9 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "pytradfri" ];
+  pythonImportsCheck = [
+    "pytradfri"
+  ];
 
   meta = with lib; {
     description = "Python package to communicate with the IKEA Trådfri ZigBee Gateway";
diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix
index 16a72550ffd..620463c9863 100644
--- a/pkgs/development/python-modules/pywizlight/default.nix
+++ b/pkgs/development/python-modules/pywizlight/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pywizlight";
-  version = "0.4.16";
+  version = "0.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "sbidy";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Da5hkmzGJtfqiDPV9X02opv54Ry6sGiSbDnej9a2QDA=";
+    sha256 = "sha256-hw8fNguIqQslea44hiLgh6FntfKHFG1UeVYIvmu5nTw=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix
index 9f102c5c924..c350f1df7d3 100644
--- a/pkgs/development/python-modules/rokuecp/default.nix
+++ b/pkgs/development/python-modules/rokuecp/default.nix
@@ -1,9 +1,12 @@
 { lib
 , aiohttp
 , aresponses
+, awesomeversion
+, backoff
 , buildPythonPackage
 , cachetools
 , fetchFromGitHub
+, poetry
 , pytest-asyncio
 , pytestCheckHook
 , pythonOlder
@@ -13,22 +16,29 @@
 
 buildPythonPackage rec {
   pname = "rokuecp";
-  version = "0.12.0";
-  format = "setuptools";
+  version = "0.13.1";
+  format = "pyproject";
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "ctalkington";
     repo = "python-rokuecp";
     rev = version;
-    sha256 = "1pqiba4zgx7knm1k53p6w6b9a81dalqfq2agdyrz3734nhl6gx1h";
+    hash = "sha256-6bHEg7bpqldLDr3UX42GUg7kIDHVxtnVnrFr8CvTJU4=";
   };
 
+  nativeBuildInputs = [
+    # Requires poetry not poetry-core
+    poetry
+  ];
+
   propagatedBuildInputs = [
     aiohttp
+    backoff
     cachetools
     xmltodict
+    awesomeversion
     yarl
   ];
 
@@ -38,6 +48,11 @@ buildPythonPackage rec {
     pytest-asyncio
   ];
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace " --cov" ""
+  '';
+
   disabledTests = [
     # https://github.com/ctalkington/python-rokuecp/issues/249
     "test_resolve_hostname"
diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index 20da548c0e6..aad12172940 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker";
-  version = "2.74.0";
+  version = "2.75.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14215f5077151a7f32ca048ff7fad63c977d7cdeadc93d93c8957efbe3c89ba6";
+    sha256 = "sha256-zTaySMjvhh+cx/0ZO5R1uf0O8lIszwtoq1ua4jZ7WFE=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix
index c18f2934c23..4f823a54580 100644
--- a/pkgs/development/python-modules/scikit-fmm/default.nix
+++ b/pkgs/development/python-modules/scikit-fmm/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "scikit-fmm";
-  version = "2021.10.29";
+  version = "2022.2.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "799f36e918a2b64ed8434d6c4fef3a1a47757055955c240fba0d4aadccca26b2";
+    sha256 = "sha256-0Pvm6Sn0OWOwEX7E4OhBwo2hxzQmGzV2Yvytkm14+ls=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix
index 811f3a907b4..ac95384fb6c 100644
--- a/pkgs/development/python-modules/soco/default.nix
+++ b/pkgs/development/python-modules/soco/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "soco";
-  version = "0.26.1";
+  version = "0.26.2";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "SoCo";
     repo = "SoCo";
     rev = "v${version}";
-    sha256 = "sha256-h9mgL98+MPY9K5sKuRQthQoP8nVL1tIHGslh5ojgLfc=";
+    sha256 = "sha256-VOGdv3g11OzNeTlBwm8hRy6fThDKVKIlgQxR4b07y/8=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix
index 0b5ad0c8983..7ed83adc64d 100644
--- a/pkgs/development/python-modules/treex/default.nix
+++ b/pkgs/development/python-modules/treex/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "treex";
-  version = "0.6.8";
+  version = "0.6.9";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "cgarciae";
     repo = pname;
     rev = version;
-    sha256 = "0pi4c78vqhy7mh9ranssdxdjbqnvyagsfkx95k93bnvzgmnr2kxb";
+    sha256 = "1yvlldmhji12h249j14ba44hnb9x1fhrj7rh1cx2vn0vxj5wpg7x";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix
index 5967b9b9abb..47a96633254 100644
--- a/pkgs/development/python-modules/vispy/default.nix
+++ b/pkgs/development/python-modules/vispy/default.nix
@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "vispy";
-  version = "0.9.4";
+  version = "0.9.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8561e41bbcca5fadce4a8d974ca2f96cbe7710d835bfed6a55ed6d10900ef5d5";
+    sha256 = "sha256-ISzVtQgkSZu84+LXQaray3nAt3GsVm+THGE1WXYCi8s=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix
index 3b2f567c7da..b2bfeea8f7a 100644
--- a/pkgs/development/python-modules/xknx/default.nix
+++ b/pkgs/development/python-modules/xknx/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "xknx";
-  version = "0.19.1";
+  version = "0.19.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "XKNX";
     repo = pname;
     rev = version;
-    sha256 = "sha256-CmiibJc8cy0NuGVS9CEsML2DgVRIsNmWsqp9nmzInAA=";
+    sha256 = "sha256-LJ7MmKCWx+n7caud0pN4+7f9H4XzwuAAn9u86X/FACo=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/pkgs/development/tools/analysis/eresi/default.nix
index b8abad44f24..158f6545b71 100644
--- a/pkgs/development/tools/analysis/eresi/default.nix
+++ b/pkgs/development/tools/analysis/eresi/default.nix
@@ -59,8 +59,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "The ERESI Reverse Engineering Software Interface";
-    license = lib.licenses.gpl2;
-    homepage = "http://www.eresi-project.org/";
+    license = lib.licenses.gpl2Only;
+    homepage = "https://github.com/thorkill/eresi"; # Formerly http://www.eresi-project.org/
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix
deleted file mode 100644
index 8286435d9a3..00000000000
--- a/pkgs/development/tools/deis/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  pname = "deis";
-  version = "1.13.4";
-  rev = "v${version}";
-
-  goPackagePath = "github.com/deis/deis";
-  subPackages = [ "client" ];
-
-  postInstall = ''
-    if [ -f "$out/bin/client" ]; then
-      mv "$out/bin/client" "$out/bin/deis"
-    fi
-  '';
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "deis";
-    repo = "deis";
-    sha256 = "0hndzvlgpfm83c4i1c88byv8j9clagswa79nny8wrw33dx90dym1";
-  };
-
-  preBuild = ''
-    export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace
-  '';
-
-  meta = with lib; {
-    homepage = "https://deis.io";
-    description = "A command line utility used to interact with the Deis open source PaaS";
-    license = licenses.asl20;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
-    ];
-  };
-}
diff --git a/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix
deleted file mode 100644
index 67245a5ebbe..00000000000
--- a/pkgs/development/tools/deisctl/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  pname = "deis";
-  version = "1.13.3";
-  rev = "v${version}";
-
-  goPackagePath = "github.com/deis/deis";
-  subPackages = [ "deisctl" ];
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "deis";
-    repo = "deis";
-    sha256 = "15q44jyjms8fdmly0z4sn4ymf1dx6cmdavgixjixdj2wbjw0yi2p";
-  };
-
-  preBuild = ''
-    export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace
-  '';
-
-  meta = with lib; {
-    homepage = "https://deis.io";
-    description = "A command-line utility used to provision and operate a Deis cluster";
-    license = licenses.asl20;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [
-    ];
-  };
-}
diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
index 2b5f6c4da80..f8f1f85b270 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
@@ -1,5 +1,10 @@
-{ lib, supportedGhcVersions ? [ "884" "8107" "902" ], stdenv, haskellPackages
-, haskell }:
+{ lib
+, stdenv
+, supportedGhcVersions ? [ "884" "8107" "902" ]
+    ++ lib.optionals (!stdenv.hostPlatform.isAarch64) [ "921" ]
+, haskellPackages
+, haskell
+}:
 #
 # The recommended way to override this package is
 #
diff --git a/pkgs/development/tools/haskell/hyper-haskell/server.nix b/pkgs/development/tools/haskell/hyper-haskell/server.nix
index 47a9c550fa8..b8e5aa281ea 100644
--- a/pkgs/development/tools/haskell/hyper-haskell/server.nix
+++ b/pkgs/development/tools/haskell/hyper-haskell/server.nix
@@ -3,7 +3,8 @@
 let
 hyperHaskellEnv = ghcWithPackages (self: [ self.hyper-haskell-server ] ++ packages self);
 in stdenv.mkDerivation {
-  name = "hyper-haskell-server-with-packages-${hyperHaskellEnv.version}";
+  pname = "hyper-haskell-server-with-packages";
+  version = hyperHaskellEnv.version;
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/development/tools/misc/direvent/default.nix b/pkgs/development/tools/misc/direvent/default.nix
index cf2a5227603..2763a1eaa21 100644
--- a/pkgs/development/tools/misc/direvent/default.nix
+++ b/pkgs/development/tools/misc/direvent/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "direvent-${version}";
+  pname = "direvent";
   version = "5.2";
 
   src = fetchurl {
-    url = "mirror://gnu/direvent/${name}.tar.gz";
+    url = "mirror://gnu/direvent/direvent-${version}.tar.gz";
     sha256 = "0m9vi01b1km0cpknflyzsjnknbava0s1n6393b2bpjwyvb6j5613";
   };
 
diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix
index 6de12a84522..f5fb8e8eeb1 100644
--- a/pkgs/development/tools/misc/distcc/default.nix
+++ b/pkgs/development/tools/misc/distcc/default.nix
@@ -6,10 +6,10 @@
 }:
 
 let
-  name    = "distcc";
+  pname = "distcc";
   version = "2021-03-11";
   distcc = stdenv.mkDerivation {
-    name = "${name}-${version}";
+    inherit pname version;
     src = fetchFromGitHub {
       owner = "distcc";
       repo = "distcc";
diff --git a/pkgs/development/tools/misc/k2tf/default.nix b/pkgs/development/tools/misc/k2tf/default.nix
index f4225a901e4..fef4d7d405c 100644
--- a/pkgs/development/tools/misc/k2tf/default.nix
+++ b/pkgs/development/tools/misc/k2tf/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
     sha256 = "sha256-75L8fcmZbG7PbZrF4cScRQjqbuu5eTnLIaDGzgF57/0=";
   };
 
-  vendorSha256 = "sha256-hxB+TZfwn16JXGRXZNB6HdDa62JQIQMaYpDzjOcLjFg=";
+  vendorSha256 = "sha256-YsSOw3G5ufxBn8Wu5J8md2Aaqhl0VJa7uB6ZzSPWo/A=";
 
   ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ];
 
diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix
index ae757f0d80d..03044fe5c44 100644
--- a/pkgs/development/tools/misc/kconfig-frontends/default.nix
+++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix
@@ -1,13 +1,12 @@
 { lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, python3, bash }:
 
 stdenv.mkDerivation rec {
-  basename = "kconfig-frontends";
+  pname = "kconfig-frontends";
   version = "4.11.0.1";
-  name = "${basename}-${version}";
 
   src = fetchurl {
     sha256 = "1xircdw3k7aaz29snf96q2fby1cs48bidz5l1kkj0a5gbivw31i3";
-    url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz";
+    url = "http://ymorin.is-a-geek.org/download/kconfig-frontends/kconfig-frontends-${version}.tar.xz";
   };
 
   nativeBuildInputs = [ bison flex gperf pkg-config ];
diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix
index 740015dbe98..e6280586750 100644
--- a/pkgs/development/tools/misc/patchelf/unstable.nix
+++ b/pkgs/development/tools/misc/patchelf/unstable.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, autoreconfHook, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "patchelf-${version}";
+  pname = "patchelf";
   version = "2021-11-16";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/misc/premake/3.nix b/pkgs/development/tools/misc/premake/3.nix
index 28894743dd6..c05581f5591 100644
--- a/pkgs/development/tools/misc/premake/3.nix
+++ b/pkgs/development/tools/misc/premake/3.nix
@@ -1,14 +1,11 @@
 {lib, stdenv, fetchurl, unzip}:
 
-let baseName = "premake";
+stdenv.mkDerivation rec {
+  pname = "premake";
   version  = "3.7";
-in
-
-stdenv.mkDerivation {
-  name = "${baseName}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/sourceforge/premake/${baseName}-src-${version}.zip";
+    url = "mirror://sourceforge/sourceforge/premake/premake-src-${version}.zip";
     sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5";
   };
 
diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix
index 192a7746203..35c651f4a18 100644
--- a/pkgs/development/tools/misc/premake/default.nix
+++ b/pkgs/development/tools/misc/premake/default.nix
@@ -1,14 +1,11 @@
 { lib, stdenv, fetchurl, unzip }:
 
-let baseName = "premake";
+stdenv.mkDerivation rec {
+  pname = "premake";
   version  = "4.3";
-in
-
-stdenv.mkDerivation {
-  name = "${baseName}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${baseName}/${baseName}-${version}-src.zip";
+    url = "mirror://sourceforge/premake/premake-${version}-src.zip";
     sha256 = "1017rd0wsjfyq2jvpjjhpszaa7kmig6q1nimw76qx3cjz2868lrn";
   };
 
diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix
index 6c1a9009993..e443ca7751e 100644
--- a/pkgs/development/tools/misc/universal-ctags/default.nix
+++ b/pkgs/development/tools/misc/universal-ctags/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, coreutils, pkg-config, perl, python3Packages, libiconv, jansson }:
+{ lib, stdenv, buildPackages, fetchFromGitHub, autoreconfHook, coreutils, pkg-config, perl, python3Packages, libiconv, jansson }:
 
 stdenv.mkDerivation rec {
   pname = "universal-ctags";
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0c031y0dl2b70pd0mqfbylplf8f27x11b0ch7ljka3rqav0zb1zr";
   };
 
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ autoreconfHook coreutils pkg-config python3Packages.docutils ];
   buildInputs = [ jansson ] ++ lib.optional stdenv.isDarwin libiconv;
 
diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/development/tools/rust/cargo-spellcheck/default.nix
index 8e6e9459aab..3b579d3ef9f 100644
--- a/pkgs/development/tools/rust/cargo-spellcheck/default.nix
+++ b/pkgs/development/tools/rust/cargo-spellcheck/default.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-spellcheck";
-  version = "0.9.6";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "drahnr";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0brrpcnsphvl1qn8myrzan0k87ph629gcj6zd54ym9f67qg2nri1";
+    sha256 = "sha256-AKk25/j9Ao7ss8+2x+A5ohZ4P1wQ8uW5DVIBCHqFSPU=";
   };
 
-  cargoSha256 = "0d0adpgf0j8xvw0dm3gcd6lnksn6p5rz3limc038fg8k84zf7cdb";
+  cargoSha256 = "sha256-6zTZXSW8poePNZy48F6u5tF1LEDQt4f9qv7W/pdIBbI=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
@@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "Checks rust documentation for spelling and grammar mistakes";
     homepage = "https://github.com/drahnr/cargo-spellcheck";
+    changelog = "https://github.com/drahnr/cargo-spellcheck/blob/v${version}/CHANGELOG.md";
     license = with licenses; [ asl20 /* or */ mit ];
     maintainers = with maintainers; [ newam ];
   };
diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix
index 164e57e7749..53e74bf1639 100644
--- a/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -11,14 +11,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-analyzer-unwrapped";
-  version = "2021-12-27";
-  cargoSha256 = "sha256-yok7kLcvKvDwrdgJR0540QLJi5/zXi0NyZxhtoQ8Xno=";
+  version = "2022-01-31";
+  cargoSha256 = "sha256-BWCLzyCcLWwmh7Os7NjN2o89KD+VB0EHyZfTyYoYM08=";
 
   src = fetchFromGitHub {
     owner = "rust-analyzer";
     repo = "rust-analyzer";
     rev = version;
-    sha256 = "sha256-/195+NsV6Mku2roi8zVy4dw8QGL6rQcnPcQ29Os8oqs=";
+    sha256 = "sha256-6+d/x7ZIyvkPLdn7ziXuPyKfxt/7z5PCWs7B960DFqk=";
   };
 
   patches = [
diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix
index b8508860112..33565ecf8a2 100644
--- 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.18.1";
+  version = "4.19.1";
 
   src = fetchFromGitHub {
     owner = "mikefarah";
     repo = "yq";
     rev = "v${version}";
-    sha256 = "sha256-1jPYrZgA1Sg8Cvhfd7BULcpePHH/Buczvgu92KrkSg8=";
+    sha256 = "sha256-kIXMBXKcM9EHECJiegnjeFnccF68hmL/7I/QnePJdIw=";
   };
 
   vendorSha256 = "sha256-samz70Dybu/Xf9+ftgIKgd2pyQcXw6Ybs/0oJN47IFE=";
diff --git a/pkgs/games/cl-wordle/default.nix b/pkgs/games/cl-wordle/default.nix
new file mode 100644
index 00000000000..e80dacc6470
--- /dev/null
+++ b/pkgs/games/cl-wordle/default.nix
@@ -0,0 +1,24 @@
+{ lib, rustPlatform, fetchCrate }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "cl-wordle";
+  version = "0.1.2";
+
+  src = fetchCrate {
+    inherit pname version;
+    sha256 = "sha256-mcPC2Lj+Vsytfl3+ghYn74QRfM6U4dQLUybtCqkjKlk=";
+  };
+
+  cargoSha256 = "sha256-3Ef8gLFWIAYpKdPixvILvDee5Gezh68hc9TR5+zRX0I=";
+
+  patches = [ ./rust-1-57.diff ];
+
+  meta = with lib; {
+    description = "Wordle TUI in Rust";
+    homepage = "https://github.com/conradludgate/wordle";
+    # repo has no license, but crates.io says it's MIT
+    license = licenses.mit;
+    maintainers = with maintainers; [ lom ];
+    mainProgram = "wordle";
+  };
+}
diff --git a/pkgs/games/cl-wordle/rust-1-57.diff b/pkgs/games/cl-wordle/rust-1-57.diff
new file mode 100644
index 00000000000..32b95bdaae9
--- /dev/null
+++ b/pkgs/games/cl-wordle/rust-1-57.diff
@@ -0,0 +1,13 @@
+diff --git a/src/bin/wordle/game.rs b/src/bin/wordle/game.rs
+index 8500732..6f26e2a 100644
+--- a/src/bin/wordle/game.rs
++++ b/src/bin/wordle/game.rs
+@@ -235,7 +235,7 @@ impl Display for GameShare {
+             score = self.score
+         )?;
+         for m in &self.matches {
+-            write!(f, "\n{m}")?;
++            write!(f, "\n{}", m)?;
+         }
+         Ok(())
+     }
diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix
index 158e81d9128..506868efe31 100644
--- a/pkgs/games/egoboo/default.nix
+++ b/pkgs/games/egoboo/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "3D dungeon crawling adventure";
 
-    homepage = "http://www.freedink.org/";
+    homepage = "http://egoboo.sourceforge.net/";
     license = lib.licenses.gpl2Plus;
 
     # I take it out of hydra as it does not work as well as I'd like
diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix
index c80dc2b0703..75c50669421 100644
--- a/pkgs/games/freedink/default.nix
+++ b/pkgs/games/freedink/default.nix
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
       with close compatibility, under multiple platforms.
     '';
 
-    homepage = "http://www.freedink.org/";
+    homepage = "https://www.gnu.org/software/freedink/"; # Formerly http://www.freedink.org
     license = lib.licenses.gpl3Plus;
 
     maintainers = [ lib.maintainers.bjg ];
diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index 7ffa361da55..facdcae8e26 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -66,6 +66,10 @@ let
       license = licenses.lgpl21Plus;
       platforms = platforms.linux ++ platforms.darwin;
       maintainers = with maintainers; [ pyrolagus fpletz ];
+      # never built on Hydra
+      # https://hydra.nixos.org/job/nixpkgs/trunk/minetestclient_4.x86_64-darwin
+      # https://hydra.nixos.org/job/nixpkgs/trunk/minetestserver_4.x86_64-darwin
+      broken = (lib.versionOlder version "5.0.0") && stdenv.isDarwin;
     };
   };
 
diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix
index 9daed151ce4..db0b1e1dcba 100644
--- a/pkgs/os-specific/darwin/duti/default.nix
+++ b/pkgs/os-specific/darwin/duti/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [matthewbauer];
     platforms = platforms.darwin;
     license = licenses.publicDomain;
-    homepage = "http://duti.org/";
+    homepage = "https://github.com/moretension/duti/";
   };
 }
diff --git a/pkgs/os-specific/linux/greetd/default.nix b/pkgs/os-specific/linux/greetd/default.nix
index cfde703cd67..744b43f6f8a 100644
--- a/pkgs/os-specific/linux/greetd/default.nix
+++ b/pkgs/os-specific/linux/greetd/default.nix
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec {
       that makes no assumptions about what you want to launch.
       Comes with agreety, a simple, text-based greeter.
     '';
-    homepage = "https://kl.wtf/projects/greetd/";
+    homepage = "https://sr.ht/~kennylevinsen/greetd/";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ luc65r ];
     platforms = platforms.linux;
diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix
index eee65c3a5d1..0efadc6524a 100644
--- a/pkgs/servers/fcgiwrap/default.nix
+++ b/pkgs/servers/fcgiwrap/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "https://nginx.localdomain.pl/wiki/FcgiWrap";
+    homepage = "https://github.com/gnosek/fcgiwrap";
     description = "Simple server for running CGI applications over FastCGI";
     maintainers = with maintainers; [ ];
     platforms = with platforms; linux;
diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix
index b33e4535ca9..8d73542bec6 100644
--- a/pkgs/servers/mail/dspam/default.nix
+++ b/pkgs/servers/mail/dspam/default.nix
@@ -100,9 +100,9 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "http://nuclearelephant.com/";
+    homepage = "http://dspam.sourceforge.net/";
     description = "Community Driven Antispam Filter";
-    license = licenses.agpl3;
+    license = licenses.agpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
   };
diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix
index 59ccf2c8059..1fd9cda2dab 100644
--- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "redis_exporter";
-  version = "1.34.1";
+  version = "1.35.0";
 
   src = fetchFromGitHub {
     owner = "oliver006";
     repo = "redis_exporter";
     rev = "v${version}";
-    sha256 = "sha256-poD7cuOxrNhhyW/GRxBjlJlRle38aYrQJ/g1d8TZ5o0=";
+    sha256 = "sha256-Bdgj72AuRkstmqKq8tJemK46bJKk0pJtemoDNg28ww8=";
   };
 
-  vendorSha256 = "sha256-1ogMI8Aw1xBd2PQ2QRiDLifQL3Z3kU4PbbCgHLHtp6A=";
+  vendorSha256 = "sha256-u9FfKOD6kiCFTjwQ7LHE9WC4j2vPm0ZCluL8pC4aQIc=";
 
   ldflags = [
     "-X main.BuildVersion=${version}"
diff --git a/pkgs/servers/web-apps/rss-bridge/default.nix b/pkgs/servers/web-apps/rss-bridge/default.nix
index 649b76f871c..89398a9edbe 100644
--- a/pkgs/servers/web-apps/rss-bridge/default.nix
+++ b/pkgs/servers/web-apps/rss-bridge/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rss-bridge";
-  version = "2021-04-25";
+  version = "2022-01-20";
 
   src = fetchFromGitHub {
     owner = "RSS-Bridge";
     repo = "rss-bridge";
     rev = version;
-    sha256 = "0dkw8xq710q0wclyr003357gk0vgb5pmpcx75k13pv56c3mrg9vm";
+    sha256 = "sha256-wQW6U24TMnRxQ9zxdq8cMzO0OGX/re065YDhl1AbwO8=";
   };
 
   postPatch = ''
diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix
index b3888b7b32a..343a1c345c6 100644
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "wordpress";
-  version = "5.8.3";
+  version = "5.9";
 
   src = fetchurl {
     url = "https://wordpress.org/${pname}-${version}.tar.gz";
-    sha256 = "sha256-1OuhoP+QRZrbdThI/npWbOchLR3MnrH7+lFRf5oVPaU=";
+    sha256 = "sha256-RVg45GvS0wqEka6b0lv3Acgu1p28fImAbioTCGjG/7c=";
   };
 
   installPhase = ''
diff --git a/pkgs/tools/admin/afterburn/default.nix b/pkgs/tools/admin/afterburn/default.nix
index 0126d68ed2d..ea97aa5e525 100644
--- a/pkgs/tools/admin/afterburn/default.nix
+++ b/pkgs/tools/admin/afterburn/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "afterburn";
-  version = "5.1.0";
+  version = "5.2.0";
 
   src = fetchFromGitHub {
     owner = "coreos";
     repo = "afterburn";
     rev = "v${version}";
-    sha256 = "sha256-5dzgvoR6qGlVz0RJ1j9B4yna1aCbOczVLcU++GWNEL8=";
+    sha256 = "sha256-Uzkp4G72oarpBnhbgLoh//JW9kg/t2XpNbiZTNxMl/w=";
   };
 
-  cargoSha256 = "sha256-cqipYIH/XHMe7ppsXPVnDfsUqXoIep7CHiOGEPbZK4M=";
+  cargoSha256 = "sha256-92E76QwxeOLp9sfO066L97r2FO/9nQ4DaVyWJrL9L2M=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];
diff --git a/pkgs/tools/admin/amazon-ec2-utils/default.nix b/pkgs/tools/admin/amazon-ec2-utils/default.nix
index 2dc91f037a9..f6e92bd5287 100644
--- a/pkgs/tools/admin/amazon-ec2-utils/default.nix
+++ b/pkgs/tools/admin/amazon-ec2-utils/default.nix
@@ -2,36 +2,55 @@
 , lib
 , fetchFromGitHub
 , curl
+, gawk
 , python3
+, installShellFiles
 }:
 stdenv.mkDerivation rec {
   pname = "amazon-ec2-utils";
-  version = "1.3";
+  version = "2.0";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-ec2-utils";
-    rev = version;
-    hash = "sha256:04dpxaaca144a74r6d93q4lp0d5l32v07rldj7v2v1c6s9nsf4mv";
+    rev = "v${version}";
+    hash = "sha256-u1rHBV8uVcCywvQNYagtDleYB12tmhyqDbXTBzt45dk=";
   };
 
+  outputs = [ "out" "man" ];
+
+  strictDeps = true;
   buildInputs = [
     python3
   ];
-
-  propagatedBuildInputs = [
-    curl
+  nativeBuildInputs = [
+    installShellFiles
   ];
 
   installPhase = ''
-    mkdir -p $out/bin/
+    install -Dm755 -t $out/bin/ ebsnvme-id
+    install -Dm755 -t $out/bin/ ec2-metadata
+    install -Dm755 -t $out/bin/ ec2nvme-nsid
+    install -Dm755 -t $out/bin/ ec2udev-vbd
+
+    install -Dm644 -t $out/lib/udev/rules.d/ 51-ec2-hvm-devices.rules
+    install -Dm644 -t $out/lib/udev/rules.d/ 51-ec2-xen-vbd-devices.rules
+    install -Dm644 -t $out/lib/udev/rules.d/ 53-ec2-read-ahead-kb.rules
+    install -Dm644 -t $out/lib/udev/rules.d/ 70-ec2-nvme-devices.rules
+    install -Dm644 -t $out/lib/udev/rules.d/ 60-cdrom_id.rules
+
+    installManPage doc/*.8
+  '';
 
-    cp ebsnvme-id $out/bin/
-    cp ec2-metadata $out/bin/
-    cp ec2udev-vbd $out/bin/
-    cp ec2udev-vcpu $out/bin/
+  postFixup = ''
+    for i in $out/etc/udev/rules.d/*.rules $out/lib/udev/rules.d/*.rules ; do
+      substituteInPlace "$i" \
+        --replace '/usr/sbin' "$out/bin" \
+        --replace '/bin/awk' '${gawk}/bin/awk'
+    done
 
-    chmod +x $out/bin/*
+    substituteInPlace "$out/bin/ec2-metadata" \
+      --replace 'curl' '${curl}/bin/curl'
   '';
 
   doInstallCheck = true;
@@ -48,6 +67,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/aws/amazon-ec2-utils";
     description = "Contains a set of utilities and settings for Linux deployments in EC2";
     license = licenses.mit;
-    maintainers = with maintainers; [ ketzacoatl ];
+    maintainers = with maintainers; [ ketzacoatl thefloweringash ];
   };
 }
diff --git a/pkgs/tools/audio/mpris-scrobbler/default.nix b/pkgs/tools/audio/mpris-scrobbler/default.nix
index 07248213213..93960a5278f 100644
--- a/pkgs/tools/audio/mpris-scrobbler/default.nix
+++ b/pkgs/tools/audio/mpris-scrobbler/default.nix
@@ -52,9 +52,10 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Minimalistic scrobbler for libre.fm & last.fm";
-    homepage    = "https://github.com/mariusor/mpris-scrobbler";
-    license     = licenses.mit;
+    homepage = "https://github.com/mariusor/mpris-scrobbler";
+    license = licenses.mit;
     maintainers = with maintainers; [ emantor ];
-    platforms   = platforms.unix;
+    platforms = platforms.unix;
+    broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/mpris-scrobbler.x86_64-darwin
   };
 }
diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
index e6f98bdee31..e7869965c70 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix
@@ -1,15 +1,21 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, which
-, glib, gtk2
+{ lib
+, stdenv
+, fetchurl
+, gettext
+, pkg-config
+, which
+, glib
+, gtk2
 , enableSoftening ? true
 }:
 
 stdenv.mkDerivation rec {
   pname = "dvdisaster";
-  version = "0.79.5";
+  version = "0.79.9";
 
   src = fetchurl {
-    url = "http://dvdisaster.net/downloads/${pname}-${version}.tar.bz2";
-    sha256 = "0f8gjnia2fxcbmhl8b3qkr5b7idl8m855dw7xw2fnmbqwvcm6k4w";
+    url = "https://dvdisaster.jcea.es/downloads/${pname}-${version}.tar.bz2";
+    hash = "sha256-eclOJ33pS2aP4F7RUHc84ynpH7sTv2dsO4vn5vB248M=";
   };
 
   nativeBuildInputs = [ gettext pkg-config which ];
@@ -40,6 +46,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
   checkPhase = ''
+    runHook preCheck
     pushd regtest
 
     mkdir -p "$TMP"/{log,regtest}
@@ -59,9 +66,11 @@ stdenv.mkDerivation rec {
     done
 
     popd
+    runHook postCheck
   '';
 
   postInstall = ''
+    rm -f $out/bin/dvdisaster-uninstall.sh
     mkdir -pv $out/share/applications
     cp contrib/dvdisaster.desktop $out/share/applications/
 
@@ -73,7 +82,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "http://dvdisaster.net/";
+    homepage = "https://dvdisaster.jcea.es/";
     description = "Data loss/scratch/aging protection for CD/DVD media";
     longDescription = ''
       Dvdisaster provides a margin of safety against data loss on CD and
diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix
index de2f2cc8a86..6904d466772 100644
--- a/pkgs/tools/misc/ent/default.nix
+++ b/pkgs/tools/misc/ent/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
 
   meta = with lib; {
     description = "Pseudorandom Number Sequence Test Program";
-    homepage = "http://www.fourmilab.ch/random/";
+    homepage = "https://www.fourmilab.ch/random/";
     platforms = platforms.all;
     license = licenses.publicDomain;
   };
diff --git a/pkgs/tools/misc/fdtools/default.nix b/pkgs/tools/misc/fdtools/default.nix
index f55c7f6d3b3..0815ae04d62 100644
--- a/pkgs/tools/misc/fdtools/default.nix
+++ b/pkgs/tools/misc/fdtools/default.nix
@@ -78,9 +78,9 @@ in stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "https://code.dogmap.org./fdtools/";
+    homepage = "https://code.dogmap.org/fdtools/";
     description = "A set of utilities for working with file descriptors";
-    license = lib.licenses.gpl2;
+    license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.Profpatsch ];
   };
diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/tools/misc/hyperledger-fabric/default.nix
index 9f7fa31d3f2..c2c48bfa7d8 100644
--- a/pkgs/tools/misc/hyperledger-fabric/default.nix
+++ b/pkgs/tools/misc/hyperledger-fabric/default.nix
@@ -28,7 +28,7 @@ buildGoPackage rec {
 
   meta = with lib; {
     description = "An implementation of blockchain technology, leveraging familiar and proven technologies";
-    homepage = "https://wiki.hyperledger.org/projects/Fabric";
+    homepage = "https://wiki.hyperledger.org/display/fabric";
     license = licenses.asl20;
     maintainers = [ maintainers.marsam ];
   };
diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix
index c67dddf536f..3a7baa62bae 100644
--- a/pkgs/tools/misc/rpi-imager/default.nix
+++ b/pkgs/tools/misc/rpi-imager/default.nix
@@ -16,13 +16,13 @@
 
 mkDerivation rec {
   pname = "rpi-imager";
-  version = "1.6.2";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-ITn31ENEf2bysgJgV3u+NNPXk1pfIkUyJWIvS2DOrzY=";
+    sha256 = "sha256-Yt+RWox+0VOw8SH7Ry/o4NHOg3IGcebVeE9OWGP17do=";
   };
 
   nativeBuildInputs = [ cmake util-linux ];
diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index dd61b82d408..b217453b132 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, fetchpatch, ncurses, utmp, pam ? null }:
+{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, ncurses, utmp, pam ? null }:
 
 stdenv.mkDerivation rec {
   pname = "screen";
-  version = "4.8.0";
+  version = "4.9.0";
 
   src = fetchurl {
     url = "mirror://gnu/screen/${pname}-${version}.tar.gz";
-    sha256 = "18ascpjzsy70h6hk7wpg8zmzjwgdyrdr7c6z4pg5z4l9hhyv24bf";
+    sha256 = "1x1hqy4h47i7hk85f779lkwkm7gkq8h8mxwd0znkh5adpf0m4czr";
   };
 
   configureFlags= [
@@ -16,14 +16,7 @@ stdenv.mkDerivation rec {
     "--enable-colors256"
   ];
 
-  patches = [
-    (fetchpatch {
-      # Fixes denial of services in encoding.c, remove > 4.8.0
-      name = "CVE-2021-26937.patch";
-      url = "https://salsa.debian.org/debian/screen/-/raw/master/debian/patches/99_CVE-2021-26937.patch";
-      sha256 = "05f3p1c7s83nccwkhmavjzgaysxnvq41c7jffs31ra65kcpabqy0";
-    })
-  ] ++ lib.optional stdenv.hostPlatform.isMusl
+  patches = lib.optional stdenv.hostPlatform.isMusl
     (fetchpatch {
       url = "https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff";
       sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p";
@@ -36,14 +29,13 @@ stdenv.mkDerivation rec {
            -e 's/^as_fn_error .. \("cannot run test program while cross compiling\)/$as_echo \1/g'
     ''; # "
 
-  buildInputs = [ ncurses ] ++ lib.optional stdenv.isLinux pam
-                            ++ lib.optional stdenv.isDarwin utmp;
-
-  # Build fails due to missing dependencies on autogenerated header:
-  #   screen.h:48:10: fatal error: comm.h: No such file or directory
-  # It will be fixed in next screen-4.9.0 release. The patches are
-  # invasive. Disabling parallelism for 4.8.0.
-  enableParallelBuilding = false;
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+  buildInputs = [
+    ncurses
+  ] ++ lib.optional stdenv.isLinux pam
+    ++ lib.optional stdenv.isDarwin utmp;
 
   doCheck = true;
 
diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix
index 2e3fcca33e1..bfe609f8526 100644
--- a/pkgs/tools/networking/connman/connman.nix
+++ b/pkgs/tools/networking/connman/connman.nix
@@ -172,9 +172,9 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A daemon for managing internet connections";
-    homepage = "https://01.org/connman";
+    homepage = "https://git.kernel.org/pub/scm/network/connman/connman.git/";
     maintainers = [ maintainers.matejc ];
     platforms = platforms.linux;
-    license = licenses.gpl2;
+    license = licenses.gpl2Only;
   };
 }
diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix
index cb39de338ab..eb7a4f859eb 100644
--- a/pkgs/tools/networking/croc/default.nix
+++ b/pkgs/tools/networking/croc/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "croc";
-  version = "9.5.0";
+  version = "9.5.1";
 
   src = fetchFromGitHub {
     owner = "schollz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-BgUurfzgezbbH0pCTuRINocc5y6ANCM91VlWht86QeE=";
+    sha256 = "sha256-86uM58MCdmt0sSEIgRRQYPr6Gf4lphFOcqRU7WD5HnI=";
   };
 
-  vendorSha256 = "sha256-QVLl78X5gYuD1QgmHlpHz+yTfQF9VyDnhx7eMclqxyY=";
+  vendorSha256 = "sha256-xL7aiMlnSzZsAtX3NiWfNcrz8oW7BuCLBUnJvx1ng2Y=";
 
   doCheck = false;
 
diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix
index 1cdb5677eec..66c912b47f1 100644
--- a/pkgs/tools/networking/davix/default.nix
+++ b/pkgs/tools/networking/davix/default.nix
@@ -71,8 +71,8 @@ stdenv.mkDerivation rec {
     Davix provides an API and a set of command line tools";
 
     license = licenses.lgpl2Plus;
-    homepage = "http://dmc.web.cern.ch/projects/davix/home";
-    changelog = "https://github.com/cern-fts/davix/blob/devel/RELEASE-NOTES.md";
+    homepage = "https://github.com/cern-fts/davix";
+    changelog = "https://github.com/cern-fts/davix/blob/R_${lib.replaceStrings ["."] ["_"] version}/RELEASE-NOTES.md";
     maintainers = with maintainers; [ adev ];
     platforms = platforms.all;
   };
diff --git a/pkgs/tools/networking/dibbler/default.nix b/pkgs/tools/networking/dibbler/default.nix
index 1633505763c..4175de2e23c 100644
--- a/pkgs/tools/networking/dibbler/default.nix
+++ b/pkgs/tools/networking/dibbler/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Portable DHCPv6 implementation";
-    homepage = "http://www.klub.com.pl/dhcpv6/";
-    license = licenses.gpl2;
+    homepage = "https://klub.com.pl/dhcpv6/";
+    license = licenses.gpl2Only;
     platforms = platforms.all;
     maintainers = with maintainers; [ fpletz ];
   };
diff --git a/pkgs/tools/networking/fakeroute/default.nix b/pkgs/tools/networking/fakeroute/default.nix
index 6e5fbdb13d2..73e75627c03 100644
--- a/pkgs/tools/networking/fakeroute/default.nix
+++ b/pkgs/tools/networking/fakeroute/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
       Makes your machine appear to be anywhere on the internet
       to any host running a (UDP) unix traceroute
     '';
-    homepage = "https://moxie.org/software/fakeroute/";
+    homepage = "https://github.com/museoa/fakeroute"; # Formerly https://moxie.org/software/fakeroute/
     license = licenses.bsd3;
     platforms = platforms.linux;
   };
diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix
index 331738be532..5e4568914d8 100644
--- a/pkgs/tools/networking/horst/default.nix
+++ b/pkgs/tools/networking/horst/default.nix
@@ -34,9 +34,9 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Small and lightweight IEEE802.11 wireless LAN analyzer with a text interface";
-    homepage = "http://br1.einfach.org/tech/horst/";
+    homepage = "https://github.com/br101/horst";
     maintainers = [ maintainers.fpletz ];
-    license = licenses.gpl3;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index f51c6f034dd..88ee2d44cb9 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -6,9 +6,8 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     urls = [
-      "https://lftp.tech/ftp/${pname}-${version}.tar.xz"
-      "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${pname}-${version}.tar.xz"
       "https://lftp.yar.ru/ftp/${pname}-${version}.tar.xz"
+      "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${pname}-${version}.tar.xz"
       ];
     sha256 = "03b7y0h3mf4jfq5y8zw6hv9v44z3n6i8hc1iswax96y3z7sc85y5";
   };
@@ -31,8 +30,8 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "A file transfer program supporting a number of network protocols";
-    homepage = "https://lftp.tech/";
-    license = licenses.gpl3;
+    homepage = "https://lftp.yar.ru/";
+    license = licenses.gpl3Plus;
     platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };
diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix
index 91d739679e6..06a36473ec1 100644
--- a/pkgs/tools/networking/telepresence2/default.nix
+++ b/pkgs/tools/networking/telepresence2/default.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
     go run ./build-aux/package_embedded_chart/main.go ${src.rev}
   '';
 
-  vendorSha256 = "sha256-rl3vb5TbGnQNLfnEqj63c2h/U7UKkgPEy/zU3gmdtYU=";
+  vendorSha256 = "sha256-J7Qj0g479K6k0pXmZzQ3T4VG4Vdj7Sc9Xhuy4Ke/xkU=";
 
   ldflags = [
     "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}"
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 2b373360965..925931e6a3e 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Belgian electronic identity card (eID) middleware";
-    homepage = "https://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/";
+    homepage = "https://eid.belgium.be/en";
     license = licenses.lgpl3Only;
     longDescription = ''
       Allows user authentication and digital signatures with Belgian ID cards.
diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix
deleted file mode 100644
index 92d783dd5fd..00000000000
--- a/pkgs/tools/security/encryptr/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, lib, fetchurl, glib, nss, nspr, gconf, fontconfig, freetype
-, pango , cairo, libX11 , libXi, libXcursor, libXext, libXfixes
-, libXrender, libXcomposite , alsa-lib, libXdamage, libXtst, libXrandr
-, expat, libcap, systemd , dbus, gtk2 , gdk-pixbuf, libnotify
-}:
-
-let
-  arch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd"
-    else if stdenv.hostPlatform.system == "i686-linux" then "i386"
-    else throw "Encryptr for ${stdenv.hostPlatform.system} not supported!";
-
-  sha256 = if stdenv.hostPlatform.system == "x86_64-linux" then "1j3g467g7ar86hpnh6q9mf7mh2h4ia94mwhk1283zh739s2g53q2"
-    else if stdenv.hostPlatform.system == "i686-linux" then "02j9hg9b1jlv25q1sjfhv8d46mii33f94dj0ccn83z9z18q4y2cm"
-    else throw "Encryptr for ${stdenv.hostPlatform.system} not supported!";
-
-in stdenv.mkDerivation rec {
-  pname = "encryptr";
-  version = "2.0.0";
-
-  src = fetchurl {
-    url = "https://spideroak.com/dist/encryptr/signed/linux/targz/encryptr-${version}_${arch}.tar.gz";
-    inherit sha256;
-  };
-
-  dontBuild = true;
-
-  rpath = lib.makeLibraryPath [
-    glib nss nspr gconf fontconfig freetype pango cairo libX11 libXi
-    libXcursor libXext libXfixes libXrender libXcomposite alsa-lib
-    libXdamage libXtst libXrandr expat libcap dbus gtk2 gdk-pixbuf
-    libnotify stdenv.cc.cc
-  ];
-
-  installPhase = ''
-    mkdir -pv $out/bin $out/lib
-    cp -v {encryptr-bin,icudtl.dat,nw.pak} $out/bin
-    mv -v $out/bin/encryptr{-bin,}
-    cp -v lib* $out/lib
-    ln -sv ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
-
-    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-             --set-rpath $out/lib:${rpath} \
-             $out/bin/encryptr
-  '';
-
-  # If stripping, node-webkit does not find
-  # its application and shows a generic page
-  dontStrip = true;
-
-  meta = with lib; {
-    homepage = "https://spideroak.com/solutions/encryptr";
-    description = "Free, private and secure password management tool and e-wallet";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ guillaumekoenig ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix
deleted file mode 100644
index f6f6d367810..00000000000
--- a/pkgs/tools/security/gpgstats/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, stdenv, fetchurl, ncurses, gpgme }:
-
-stdenv.mkDerivation rec {
-  pname = "gpgstats";
-  version = "0.5";
-
-  src = fetchurl {
-    url = "https://www.vanheusden.com/gpgstats/${pname}-${version}.tgz";
-    sha256 = "1n3njqhjwgfllcxs0xmk89dzgirrpfpfzkj71kqyvq97gc1wbcxy";
-  };
-
-  buildInputs = [ ncurses gpgme ];
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp gpgstats $out/bin
-  '';
-
-  NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.is64bit)
-    "-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1";
-
-  meta = with lib; {
-    description = "Calculates statistics on the keys in your gpg key-ring";
-    longDescription = ''
-    GPGstats calculates statistics on the keys in your key-ring.
-    '';
-    homepage = "http://www.vanheusden.com/gpgstats/";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ davidak ];
-    platforms = platforms.unix;
-  };
-}
-
diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix
index 43bf90bf334..e91a35b808c 100644
--- a/pkgs/tools/security/step-cli/default.nix
+++ b/pkgs/tools/security/step-cli/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "step-cli";
-  version = "0.18.0";
+  version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "smallstep";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-kaOJHeTjn/f6teyssVXUEYh7cN4dCz6AtqlX+HkaPWQ=";
+    sha256 = "sha256-gMJFzfqQsxOXPRdRj48c3FKhXsPLEmegiENa2OHWEGo=";
   };
 
   ldflags = [
@@ -25,7 +25,7 @@ buildGoModule rec {
     rm command/certificate/remote_test.go
   '';
 
-  vendorSha256 = "sha256-JrLJlqHrlPUqEA4COlfcK2eAcff8xc2JHU3acmlJ2zM=";
+  vendorSha256 = "sha256-wnMQPnL8M57BOY9QmawLpqtWv+n3GdfIadJ3PwuicOU=";
 
   meta = with lib; {
     description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";
diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix
index 037adda92eb..90d4e0f509b 100644
--- a/pkgs/tools/security/vulnix/default.nix
+++ b/pkgs/tools/security/vulnix/default.nix
@@ -6,11 +6,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "vulnix";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "1d5mqpc4g1wkqcwxp8m9k130i3ii3q7n1n4b1fyb5wijidmyn3xv";
+    sha256 = "07v3ddvvhi3bslwrlin45kz48i3va2lzd6ny0blj5i2z8z40qcfm";
   };
 
   outputs = [ "out" "doc" "man" ];
diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix
index ad75374e309..bbf0dc2b080 100644
--- a/pkgs/tools/system/fakeroot/default.nix
+++ b/pkgs/tools/system/fakeroot/default.nix
@@ -1,47 +1,28 @@
-{ lib, stdenv, fetchurl, fetchpatch, getopt, libcap, gnused, nixosTests }:
+{ lib
+, stdenv
+, fetchurl
+, fetchpatch
+, getopt
+, libcap
+, gnused
+, nixosTests
+}:
 
 stdenv.mkDerivation rec {
-  version = "1.23";
+  version = "1.27";
   pname = "fakeroot";
 
   src = fetchurl {
-    url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.xz";
-    sha256 = "1xpl0s2yjyjwlf832b6kbkaa5921liybaar13k7n45ckd9lxd700";
+    url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${version}.orig.tar.gz";
+    sha256 = "1p5d3jq6l1pzk96agkf05dck7dbgvldx5sg2d4h7d8h230nyni9w";
   };
 
   patches = lib.optionals stdenv.isLinux [
     ./einval.patch
-
-    # glibc 2.33 patches from ArchLinux
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-1.patch";
-      sha256 = "sha256-F6BcxYInSLu7Fxg6OmMZDhTWoLqsc//yYPlTZqQQl68=";
-    })
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-2.patch";
-      sha256 = "sha256-ifpJxhk6MyQpFolC1hIAAUjcHmOHVU1D25tRwpu2S/k=";
-    })
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-3.patch";
-      sha256 = "sha256-o2Xm4C64Ny9TL8fjsZltjO1CdJ4VGwqZ+LnufVL5Sq8=";
-    })
-  ]
-  # patchset from brew
-  ++ lib.optionals stdenv.isDarwin [
     (fetchpatch {
-      name = "0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch";
-      url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch;att=1;bug=766649";
-      sha256 = "1m6ggrqwqy0in264sxqk912vniipiw629dxq7kibakvsswfk6bkk";
-    })
-    (fetchpatch {
-      name = "0002-OS-X-10.10-introduced-id_t-int-in-gs-etpriority.patch";
-      url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0002-OS-X-10.10-introduced-id_t-int-in-gs-etpriority.patch;att=2;bug=766649";
-      sha256 = "0rhayp42x4i1a6yc4d28kpshmf7lrmaprq64zfrjpdn4kbs0rkln";
-    })
-    (fetchpatch {
-      name = "fakeroot-always-pass-mode.patch";
-      url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=2;bug=766649;filename=fakeroot-always-pass-mode.patch;msg=20";
-      sha256 = "0i3zaca1v449dm9m1cq6wq4dy6hc2y04l05m9gg8d4y4swld637p";
+      name = "also-wrap-stat-library-call.patch";
+      url = "https://sources.debian.org/data/main/f/fakeroot/1.27-1/debian/patches/also-wrap-stat-library-call.patch";
+      sha256 = "0p7lq6m31k3rqsnjbi06a8ykdqa3cp4y5ngsjyk3q1269gx59x8b";
     })
   ];
 
@@ -53,18 +34,6 @@ stdenv.mkDerivation rec {
     sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${pname}-${version}/scripts/fakeroot.in
   '';
 
-  postConfigure = let
-    # additional patch from brew, but needs to be applied to a generated file
-    patch-wraptmpf = fetchpatch {
-      name = "fakeroot-patch-wraptmpf-h.patch";
-      url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=3;bug=766649;filename=fakeroot-patch-wraptmpf-h.patch;msg=20";
-      sha256 = "1jhsi4bv6nnnjb4vmmmbhndqg719ckg860hgw98bli8m05zwbx6a";
-    };
-  in lib.optional stdenv.isDarwin ''
-    make wraptmpf.h
-    patch -p1 < ${patch-wraptmpf}
-  '';
-
   passthru = {
     tests = {
       # A lightweight *unit* test that exercises fakeroot and fakechroot together:
@@ -79,5 +48,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [viric];
     platforms = lib.platforms.unix;
   };
-
 }
diff --git a/pkgs/tools/system/iops/default.nix b/pkgs/tools/system/iops/default.nix
deleted file mode 100644
index b2be488673e..00000000000
--- a/pkgs/tools/system/iops/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  pname = "iops";
-  version = "0.1";
-
-  src = fetchurl {
-    url = "https://www.vanheusden.com/iops/${pname}-${version}.tgz";
-    sha256 = "1knih6dwwiicycp5ml09bj3k8j7air9bng070sfnxwfv786y90bz";
-  };
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp iops $out/bin
-  '';
-
-  meta = with lib; {
-    description = "Measure I/O operations per second of a storage device";
-    longDescription = ''
-      Iops lets you measure how many I/O operations per second a storage device can perform.
-      Usefull for determing e.g. the best RAID-setting of your storage device.
-    '';
-    homepage = "http://www.vanheusden.com/iops/";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ davidak ];
-    platforms = platforms.linux; # build problems on Darwin
-  };
-}
-
diff --git a/pkgs/tools/text/gpt2tc/default.nix b/pkgs/tools/text/gpt2tc/default.nix
index 3714a418548..4d6ac33d61d 100644
--- a/pkgs/tools/text/gpt2tc/default.nix
+++ b/pkgs/tools/text/gpt2tc/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Text completion and compression using GPT-2";
-    homepage = "https://bellard.org/nncp/gpt2tc.html";
+    homepage = "https://bellard.org/libnc/gpt2tc.html";
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ anna328p ];
diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix
index 9f4b8832f39..c5bb05853bf 100644
--- a/pkgs/tools/video/dvgrab/default.nix
+++ b/pkgs/tools/video/dvgrab/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
       AVI type 2, Quicktime DV, a series of JPEG stills or MPEG2-TS.
     '';
 
-    homepage = "http://kinodv.org/";
+    homepage = "https://github.com/ddennedy/dvgrab"; # Formerly http://www.kinodv.org/
 
     license = licenses.gpl2Plus;
     platforms = platforms.gnu ++ platforms.linux;
diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix
index 6bc070d2cbb..9da4290dadd 100644
--- a/pkgs/tools/virtualization/cloud-init/default.nix
+++ b/pkgs/tools/virtualization/cloud-init/default.nix
@@ -1,11 +1,14 @@
 { lib
+, nixosTests
 , buildPythonApplication
 , cloud-utils
 , dmidecode
 , fetchFromGitHub
+, iproute2
 , openssh
 , python3
 , shadow
+, systemd
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -25,6 +28,13 @@ python3.pkgs.buildPythonApplication rec {
   prePatch = ''
     substituteInPlace setup.py \
       --replace /lib/systemd $out/lib/systemd
+
+    substituteInPlace cloudinit/net/networkd.py \
+      --replace "['/usr/sbin', '/bin']" "['/usr/sbin', '/bin', '${iproute2}/bin', '${systemd}/bin']"
+
+    substituteInPlace tests/unittests/test_net_activators.py \
+      --replace "['/usr/sbin', '/bin']" \
+        "['/usr/sbin', '/bin', '${iproute2}/bin', '${systemd}/bin']"
   '';
 
   postInstall = ''
@@ -108,6 +118,8 @@ python3.pkgs.buildPythonApplication rec {
     "cloudinit"
   ];
 
+  passthru.tests.cloud-init = nixosTests.cloud-init;
+
   meta = with lib; {
     homepage = "https://cloudinit.readthedocs.org";
     description = "Provides configuration and customization of cloud instance";
diff --git a/pkgs/tools/virtualization/ec2-utils/default.nix b/pkgs/tools/virtualization/ec2-utils/default.nix
deleted file mode 100644
index 28321910842..00000000000
--- a/pkgs/tools/virtualization/ec2-utils/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, lib, rpmextract, fetchurl, python2, tree }:
-
-stdenv.mkDerivation {
-  pname = "ec2-utils";
-  version = "0.5.1";
-
-  # The url can be determined by booting an "Amazon Linux 2" and running:
-  # > yumdownloader --urls ec2-utils
-  src = fetchurl {
-    url = "http://amazonlinux.ap-northeast-1.amazonaws.com/blobstore/a3b4d2c35c2300518fe10381a05b3bd7936ff5cdd3d351143a11bf84073d9e00/ec2-utils-0.5-1.amzn2.0.1.noarch.rpm";
-    sha256 = "004y7l3q9gqi78a53lykrpsnz4yp7dds1083w67m2013bk1x5d53";
-  };
-
-  nativeBuildInputs = [ rpmextract ];
-
-  buildInputs = [ python2 ];
-
-  unpackPhase = ''
-    mkdir source
-    cd source
-    rpmextract "$src"
-  '';
-
-  installPhase = ''
-    mkdir $out
-
-    mv --target-directory $out \
-      etc sbin usr/bin usr/lib
-  '';
-
-  postFixup = ''
-    for i in $out/etc/udev/rules.d/*.rules; do
-      substituteInPlace "$i" \
-        --replace '/sbin' "$out/bin"
-    done
-
-    substituteInPlace "$out/etc/udev/rules.d/70-ec2-nvme-devices.rules" \
-      --replace 'ec2nvme-nsid' "$out/lib/udev/ec2nvme-nsid"
-  '';
-
-  meta = {
-    description = "A set of tools for running in EC2";
-    homepage = "https://aws.amazon.com/amazon-linux-ami/";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ thefloweringash ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a254115fd39..be0d96b3bbe 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -223,11 +223,14 @@ mapAliases ({
   dbvisualizer = throw "dbvisualizer has been removed from nixpkgs, as it's unmaintained"; # Added 2020-09-20
   deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # Added 2018-02-23
   deadpixi-sam = deadpixi-sam-unstable;
-  debian_devscripts = debian-devscripts; # Added 2016-03-23
+
+  debian_devscripts = debian-devscripts; # added 2016-03-23
   debugedit-unstable = debugedit; # Added 2021-11-22
-  deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # Added 2020-08-31
-  deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # Added 2021-05-05
-  deltachat-electron = deltachat-desktop; # Added 2021-07-18
+  deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31
+  deepspeech = throw "deepspeech was removed in favor of stt. https://github.com/NixOS/nixpkgs/issues/119496"; # added 2021-05-05
+  deisctl = throw "deisctl was removed ; the service does not exist anymore"; # added 2022-02-06
+  deis = throw "deis was removed ; the service does not exist anymore"; # added 2022-02-06
+  deltachat-electron = deltachat-desktop; # added 2021-07-18
   diffuse = throw "diffuse has been removed from nixpkgs, as it's unmaintained"; # Added 2019-12-10
 
   deluge-1_x = throw ''
@@ -247,8 +250,8 @@ mapAliases ({
   dmtx = dmtx-utils; # Added 2018-04-25
   dnnl = oneDNN; # Added 2020-04-22
   docbook5_xsl = docbook_xsl_ns; # Added 2018-04-25
-  docbook_xml_xslt = docbook_xsl; # Added 2018-04-25
   docbookrx = throw "docbookrx has been removed since it was unmaintained"; # Added 2021-01-12
+  docbook_xml_xslt = docbook_xsl; # Added 2018-04-25
   docker_compose = docker-compose; # Added 2018-11-10
   dolphinEmu = dolphin-emu; # Added 2021-11-10
   dolphinEmuMaster = dolphin-emu-beta; # Added 2021-11-10
@@ -262,8 +265,10 @@ mapAliases ({
 
   ### E ###
 
+
   ec2_ami_tools = ec2-ami-tools; # Added 2021-10-08
   ec2_api_tools = ec2-api-tools; # Added 2021-10-08
+  ec2-utils = amazon-ec2-utils; # Added 2022-02-01
   elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # Added 2021-01-17
   elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09
 
@@ -286,6 +291,7 @@ mapAliases ({
   emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18
 
   enblendenfuse = enblend-enfuse; # Added 2015-09-30
+  encryptr = throw "encryptr was removed because it reached end of life"; # Added 2022-02-06
   envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained."; # Added 2021-08-05
   epoxy = libepoxy; # Added 2021-11-11
   esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12
@@ -305,16 +311,15 @@ mapAliases ({
   ffadoFull = ffado; # Added 2018-05-01
   firefox-esr-68 = throw "Firefox 68 ESR was removed because it reached end of life with its final release 68.12esr on 2020-08-25.";
   firefox-esr-wrapper = firefox-esr; # Added 2016-01
-  firefox-wrapper = firefox; # Added 2016-01
   firefoxWrapper = firefox; # Added 2015-09
-
+  firefox-wrapper = firefox; # Added 2016-01
   firestr = throw "firestr has been removed."; # Added 2019-12-08
   firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09
   fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # Added 2020-12-29, modified 2021-01-10
   flameGraph = flamegraph; # Added 2018-04-25
-  flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07
-  flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07
   flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07
+  flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07
+  flashplayer = throw "flashplayer has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07
   flashtool = throw "flashtool was removed from nixpkgs, because the download is down for copyright reasons and the site looks very fishy"; # Added 2021-06-31
   flink_1_5 = throw "flink_1_5 was removed, use flink instead"; # Added 2021-01-25
   flutter-beta = throw "Non-stable versions of Flutter have been removed. You can use flutterPackages.mkFlutter to generate a package for other Flutter versions."; # Added 2020-01-15
@@ -395,84 +400,90 @@ mapAliases ({
   }; # Added 2020-10-16
 
   gmock = gtest; # moved from top-level 2021-03-14
+
   gnome3 = gnome; # Added 2021-05-07
   gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# Added 2020-07-12
+  gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # Added 2022-01-16
   gnuradio-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16
   gnuradio-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16
   gnuradio-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16
   gnuradio-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16
   gnuradio-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16
   gnuradio-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16
-  gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # Added 2022-01-16
   gnustep-make = gnustep.make; # Added 2016-7-6
   gnuvd = throw "gnuvd was removed because the backend service is missing"; # Added 2020-01-14
-  go-pup = pup; # Added 2017-12-19
   gobby5 = gobby; # Added 2021-02-01
   gobjectIntrospection = gobject-introspection; # Added 2018-12-02
   goimports = gotools; # Added 2018-09-16
   gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # Added 2020-04-23
-  google-gflags = gflags; # Added 2019-07-25
-  google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07
-  google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07
   googleAuthenticator = google-authenticator; # Added 2016-10-16
   googleearth = throw "the non-pro version of Google Earth was removed because it was discontinued and downloading it isn't possible anymore"; # Added 2022-01-22
+  google-gflags = gflags; # Added 2019-07-25
+  google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07
+  google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07
+  go-pup = pup; # Added 2017-12-19
+  gpgstats = throw "gpgstats has been removed: upstream is gone"; # added 2022-02-06
+  graalvm11 = graalvm11-ce;
+  graalvm8-ce = throw "graalvm8-ce has been removed by upstream."; # Added 2021-10-19
+  graalvm8 = throw "graalvm8-ce has been removed by upstream."; # Added 2021-10-19
   gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16
+  grantlee5 = libsForQt5.grantlee; # Added 2015-12-19
   gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16
+  grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # Added 2022-01-05
   gr-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16
   gr-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16
   gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16
   gr-rds = gnuradio3_7.pkgs.rds; # Added 2019-05-27, changed 2020-10-16
-  graalvm11 = graalvm11-ce;
-  graalvm8 = throw "graalvm8-ce has been removed by upstream."; # Added 2021-10-19
-  graalvm8-ce = throw "graalvm8-ce has been removed by upstream."; # Added 2021-10-19
-  grantlee5 = libsForQt5.grantlee; # Added 2015-12-19
-  grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # Added 2022-01-05
   gsettings_desktop_schemas = gsettings-desktop-schemas; # Added 2018-02-25
-  gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # Added 2019-12-10
   gtk_doc = gtk-doc; # Added 2018-02-25
   gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01
+  gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # Added 2019-12-10
   guileCairo = guile-cairo; # Added 2017-09-24
-guile-gnome = throw "guile-gnome has been removed"; # Added 2022-01-16
+  guile-gnome = throw "guile-gnome has been removed"; # Added 2022-01-16
   guileGnome = throw "guile-gnome has been removed"; # Added 2022-01-16
-  guileLint = guile-lint; # Added 2017-09-27
   guile_lib = guile-lib; # Added 2017-09-24
+  guileLint = guile-lint; # Added 2017-09-27
   guile_ncurses = guile-ncurses; # Added 2017-09-24
   gupnp_av = gupnp-av; # Added 2018-02-25
   gupnp_dlna = gupnp-dlna; # Added 2018-02-25
   gupnp_igd = gupnp-igd; # Added 2018-02-25
   gupnptools = gupnp-tools; # Added 2015-12-19
   gutenberg = zola; # Added 2018-11-17
+  gwtdragdrop = throw "gwtdragdrop was removed: abandoned by upstream"; # Added 2022-02-06
+  gwtwidgets = throw "gwtwidgets was removed: unmaintained"; # Added 2022-02-06
 
   ### H ###
 
   hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated."; # Added 2021-02-07
   hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15
   heimdalFull = heimdal; # Added 2018-05-01
+  heme = throw "heme has been removed: upstream is gone"; # added 2022-02-06
   hepmc = hepmc2; # Added 2019-08-05
   hexen = throw "hexen (SDL port) has been removed: abandoned by upstream."; # Added 2019-12-11
   hicolor_icon_theme = hicolor-icon-theme; # Added 2018-02-25
   holochain-go = throw "holochain-go was abandoned by upstream"; # Added 2022-01-01
-  ht-rust = xh; # Added 2021-02-13
   htmlTidy = html-tidy; # Added 2014-12-06
+  ht-rust = xh; # Added 2021-02-13
   hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now."; # Added 2020-04-06
 
   ### I ###
 
-  i-score = throw "i-score has been removed: abandoned upstream."; # Added 2020-11-21
   iana_etc = iana-etc; # Added 2017-03-08
   iasl = throw "iasl has been removed, use acpica-tools instead"; # Added 2021-08-08
   icedtea8_web = adoptopenjdk-icedtea-web; # Added 2019-08-21
   icedtea_web = adoptopenjdk-icedtea-web; # Added 2019-08-21
   idea = jetbrains; # Added 2017-04-03
-  imagemagick7 = imagemagick; # Added 2021-02-22
   imagemagick7Big = imagemagickBig; # Added 2021-02-22
+  imagemagick7 = imagemagick; # Added 2021-02-22
   imagemagick7_light = imagemagick_light; # Added 2021-02-22
   impressive = throw "impressive has been removed due to lack of released python 2 support and maintainership in nixpkgs"; # Added 2022-01-27
+  i-score = throw "i-score has been removed: abandoned upstream."; # Added 2020-11-21
   inboxer = throw "inboxer has been removed as it is no longer maintained and no longer works as Google shut down the inbox service this package wrapped.";
   infiniband-diags = rdma-core; # Added 2019-08-09
   ino = throw "ino has been removed from nixpkgs, the project is stuck on python2 and upstream has archived the project."; # Added 2022-01-12
   inotifyTools = inotify-tools;
   inter-ui = inter; # Added 2021-03-27
+  iops = throw "iops was removed: upstream is gone"; # Added 2022-02-06
   iproute = iproute2; # moved from top-level 2021-03-14
   ipsecTools = throw "ipsecTools has benn removed, because it was no longer maintained upstream"; # Added 2021-12-15
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21e6f21339c..e377520fd53 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1166,10 +1166,18 @@ with pkgs;
 
   rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { };
 
+  rxvt-unicode-emoji = rxvt-unicode.override {
+    rxvt-unicode-unwrapped = rxvt-unicode-unwrapped-emoji;
+  };
+
   rxvt-unicode-plugins = import ../applications/terminal-emulators/rxvt-unicode-plugins { inherit callPackage; };
 
   rxvt-unicode-unwrapped = callPackage ../applications/terminal-emulators/rxvt-unicode { };
 
+  rxvt-unicode-unwrapped-emoji = rxvt-unicode-unwrapped.override {
+    emojiSupport = true;
+  };
+
   sakura = callPackage ../applications/terminal-emulators/sakura { };
 
   st = callPackage ../applications/terminal-emulators/st {
@@ -1521,8 +1529,6 @@ with pkgs;
     buildGoModule = buildGo117Module;
   };
 
-  ec2-utils = callPackage ../tools/virtualization/ec2-utils { };
-
   exoscale-cli = callPackage ../tools/admin/exoscale-cli { };
 
   altermime = callPackage ../tools/networking/altermime {};
@@ -1757,10 +1763,6 @@ with pkgs;
 
   emplace = callPackage ../tools/package-management/emplace { };
 
-  encryptr = callPackage ../tools/security/encryptr {
-    gconf = gnome2.GConf;
-  };
-
   enchive = callPackage ../tools/security/enchive { };
 
   enjarify = callPackage ../tools/misc/enjarify { };
@@ -2577,7 +2579,7 @@ with pkgs;
 
   clog-cli = callPackage ../development/tools/clog-cli { };
 
-  cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { };
+  cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { inherit systemd; };
 
   cloudbrute = callPackage ../tools/security/cloudbrute { };
 
@@ -2816,10 +2818,6 @@ with pkgs;
 
   dehydrated = callPackage ../tools/admin/dehydrated { };
 
-  deis = callPackage ../development/tools/deis {};
-
-  deisctl = callPackage ../development/tools/deisctl {};
-
   deja-dup = callPackage ../applications/backup/deja-dup { };
 
   dejsonlz4 = callPackage ../tools/compression/dejsonlz4 { };
@@ -6721,8 +6719,6 @@ with pkgs;
 
   ioping = callPackage ../tools/system/ioping { };
 
-  iops = callPackage ../tools/system/iops { };
-
   ior = callPackage ../tools/system/ior { };
 
   iouyap = callPackage ../tools/networking/iouyap { };
@@ -10288,9 +10284,7 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
-  telepresence2 = callPackage ../tools/networking/telepresence2 {
-    buildGoModule = buildGo116Module;
-  };
+  telepresence2 = callPackage ../tools/networking/telepresence2 { };
 
   teler = callPackage ../tools/security/teler { };
 
@@ -15142,9 +15136,7 @@ with pkgs;
     buildGoModule = buildGo117Module;
   };
 
-  k2tf = callPackage ../development/tools/misc/k2tf {
-    buildGoModule = buildGo116Module;
-  };
+  k2tf = callPackage ../development/tools/misc/k2tf { };
 
   kafka-delta-ingest = callPackage ../development/tools/kafka-delta-ingest { };
 
@@ -17088,8 +17080,6 @@ with pkgs;
 
   pgweb = callPackage ../development/tools/database/pgweb { };
 
-  gpgstats = callPackage ../tools/security/gpgstats { };
-
   gpshell = callPackage ../development/tools/misc/gpshell { };
 
   grantlee = callPackage ../development/libraries/grantlee { };
@@ -20801,10 +20791,6 @@ with pkgs;
 
   httpunit = callPackage ../development/libraries/java/httpunit { };
 
-  gwtdragdrop = callPackage ../development/libraries/java/gwt-dragdrop { };
-
-  gwtwidgets = callPackage ../development/libraries/java/gwt-widgets { };
-
   javaCup = callPackage ../development/libraries/java/cup {
     jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
@@ -21240,9 +21226,7 @@ with pkgs;
 
   grafana-agent = callPackage ../servers/monitoring/grafana-agent { };
 
-  grafana-loki = callPackage ../servers/monitoring/loki {
-    buildGoModule = buildGo116Module;
-  };
+  grafana-loki = callPackage ../servers/monitoring/loki { };
 
   promtail = grafana-loki.overrideAttrs (o: {
     pname = "promtail";
@@ -21426,7 +21410,7 @@ with pkgs;
   mod_timestamp = apacheHttpdPackages.mod_timestamp;
 
   inherit (callPackages ../servers/mpd {
-    stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv;
+    stdenv = if (with stdenv; cc.isClang && isx86_64) then llvmPackages_8.stdenv else stdenv;
     inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit;
   }) mpd mpd-small mpdWithFeatures;
 
@@ -26328,8 +26312,6 @@ with pkgs;
 
   helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { };
 
-  heme = callPackage ../applications/editors/heme { };
-
   herbe = callPackage ../applications/misc/herbe { };
 
   herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { };
@@ -29889,6 +29871,8 @@ with pkgs;
 
   wofi-emoji = callPackage ../applications/misc/wofi-emoji { };
 
+  cl-wordle = callPackage ../games/cl-wordle { };
+
   wordnet = callPackage ../applications/misc/wordnet {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
@@ -30248,7 +30232,8 @@ with pkgs;
 
   zanshin = libsForQt5.callPackage ../applications/office/zanshin { };
 
-  zathura = callPackage ../applications/misc/zathura { };
+  zathuraPkgs = callPackage ../applications/misc/zathura { };
+  zathura = zathuraPkgs.zathuraWrapper;
 
   zdns = callPackage ../tools/security/zdns { };
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7ba2001fae7..378c2c4385b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -115,8 +115,8 @@ in {
           packages.ghc8107Binary;
       inherit (buildPackages.python3Packages) sphinx;
       inherit (buildPackages.darwin) autoSignDarwinBinariesHook xattr;
-      buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_9;
-      llvmPackages = pkgs.llvmPackages_9;
+      buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
+      llvmPackages = pkgs.llvmPackages_12;
     };
     ghc921 = callPackage ../development/compilers/ghc/9.2.1.nix {
       bootPkgs =
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index ee3159c50d9..a29602dfb7d 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -140,7 +140,9 @@ let
 
     ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
 
-    cairo2 = callPackage ../development/ocaml-modules/cairo2 { };
+    cairo2 = callPackage ../development/ocaml-modules/cairo2 {
+      inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices;
+    };
 
     callipyge = callPackage ../development/ocaml-modules/callipyge { };
 
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 3f1a2ffebee..4cfe9d15b0c 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -57,6 +57,7 @@ mapAliases ({
   dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20
   eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03
   faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12
+  garminconnect-ha = garminconnect; # added 2022-02-05
   gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
   glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28
   google_api_python_client = google-api-python-client; # added 2021-03-19
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fb5b7c8ce59..e87b36d945a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3131,7 +3131,7 @@ in {
 
   garminconnect-aio = callPackage ../development/python-modules/garminconnect-aio { };
 
-  garminconnect-ha = callPackage ../development/python-modules/garminconnect-ha { };
+  garminconnect = callPackage ../development/python-modules/garminconnect { };
 
   gast = callPackage ../development/python-modules/gast { };
 
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index f006d5b2f11..82828a3d611 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -311,11 +311,7 @@ let
       cabal2nix = released;
       cabal2nix-unstable = released;
       funcmp = released;
-      haskell-language-server = [
-        compilerNames.ghc884
-        compilerNames.ghc8107
-        compilerNames.ghc902
-      ];
+      haskell-language-server = released;
       hoogle = released;
       hlint = released;
       hsdns = released;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 5980d88b01f..0c759095f56 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -136,6 +136,7 @@ let
             ++ lib.optionals supportDarwin.x86_64 [
               jobs.stdenv.x86_64-darwin
               jobs.cargo.x86_64-darwin
+              jobs.cachix.x86_64-darwin
               jobs.go.x86_64-darwin
               jobs.python2.x86_64-darwin
               jobs.python3.x86_64-darwin