Merge staging-next into staging

2025-04-14 23:07:54 +00:00 · 2022-10-28 00:03:13 +00:00 · 2022-10-28 00:03:13 +00:00 · d4c6e9186b
commit d4c6e9186b
parent e28776c08e a1162fea6a
63 changed files with 1863 additions and 1502 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -7528,6 +7528,8 @@
  };
  laalsaas = {
    email = "laalsaas@systemli.org";
+    github = "laalsaas";
+    githubId = 43275254;
    name = "laalsaas";
  };
  lach = {
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@ -577,6 +577,17 @@
          this version for the entire lifecycle of the 22.11 release.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          The ipfs package and module were renamed to kubo. The kubo
+          module now uses an RFC42-style <literal>settings</literal>
+          option instead of <literal>extraConfig</literal> and the
+          <literal>gatewayAddress</literal>,
+          <literal>apiAddress</literal> and
+          <literal>swarmAddress</literal> options were renamed. Using
+          the old names will print a warning but still work.
+        </para>
+      </listitem>
      <listitem>
        <para>
          <literal>pkgs.cosign</literal> does not provide the
@ -1102,6 +1113,18 @@
          <literal>services.wordpress.sites.&lt;site&gt;.languages</literal>.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          The default package for
+          <literal>services.mullvad-vpn.package</literal> was changed to
+          <literal>pkgs.mullvad</literal>, allowing cross-platform usage
+          of Mullvad. <literal>pkgs.mullvad</literal> only contains the
+          Mullvad CLI tool, so users who rely on the Mullvad GUI will
+          want to change it back to <literal>pkgs.mullvad-vpn</literal>,
+          or add <literal>pkgs.mullvad-vpn</literal> to their
+          environment.
+        </para>
+      </listitem>
      <listitem>
        <para>
          There is a new module for the <literal>thunar</literal>
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@ -190,6 +190,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
 - PHP 7.4 is no longer supported due to upstream not supporting this
  version for the entire lifecycle of the 22.11 release.

+- The ipfs package and module were renamed to kubo. The kubo module now uses an RFC42-style `settings` option instead of `extraConfig` and the `gatewayAddress`, `apiAddress` and `swarmAddress` options were renamed. Using the old names will print a warning but still work.
+
 - `pkgs.cosign` does not provide the `cosigned` binary anymore. The `sget` binary has been moved into its own package.

 - Emacs now uses the Lucid toolkit by default instead of GTK because of stability and compatibility issues.
@ -342,6 +344,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).

 - The Wordpress module got support for installing language packs through `services.wordpress.sites.<site>.languages`.

+- The default package for `services.mullvad-vpn.package` was changed to `pkgs.mullvad`, allowing cross-platform usage of Mullvad. `pkgs.mullvad` only contains the Mullvad CLI tool, so users who rely on the Mullvad GUI will want to change it back to `pkgs.mullvad-vpn`, or add `pkgs.mullvad-vpn` to their environment.
+
 - There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and in a future release it may be removed.

 - There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service.
--- a/nixos/modules/services/network-filesystems/kubo.nix
+++ b/nixos/modules/services/network-filesystems/kubo.nix
@ -3,6 +3,8 @@ with lib;
 let
  cfg = config.services.kubo;

+  settingsFormat = pkgs.formats.json {};
+
  kuboFlags = utils.escapeSystemdExecArgs (
    optional cfg.autoMount "--mount" ++
    optional cfg.enableGC "--enable-gc" ++
@ -117,29 +119,6 @@ in
        description = lib.mdDoc "Where to mount the IPNS namespace to";
      };

-      gatewayAddress = mkOption {
-        type = types.str;
-        default = "/ip4/127.0.0.1/tcp/8080";
-        description = lib.mdDoc "Where the IPFS Gateway can be reached";
-      };
-
-      apiAddress = mkOption {
-        type = types.str;
-        default = "/ip4/127.0.0.1/tcp/5001";
-        description = lib.mdDoc "Where Kubo exposes its API to";
-      };
-
-      swarmAddress = mkOption {
-        type = types.listOf types.str;
-        default = [
-          "/ip4/0.0.0.0/tcp/4001"
-          "/ip6/::/tcp/4001"
-          "/ip4/0.0.0.0/udp/4001/quic"
-          "/ip6/::/udp/4001/quic"
-        ];
-        description = lib.mdDoc "Where Kubo listens for incoming p2p connections";
-      };
-
      enableGC = mkOption {
        type = types.bool;
        default = false;
@ -152,11 +131,38 @@ in
        description = lib.mdDoc "If set to true, the repo won't be initialized with help files";
      };

-      extraConfig = mkOption {
-        type = types.attrs;
+      settings = mkOption {
+        type = lib.types.submodule {
+          freeformType = settingsFormat.type;
+
+          options = {
+            Addresses.API = mkOption {
+              type = types.str;
+              default = "/ip4/127.0.0.1/tcp/5001";
+              description = lib.mdDoc "Where Kubo exposes its API to";
+            };
+
+            Addresses.Gateway = mkOption {
+              type = types.str;
+              default = "/ip4/127.0.0.1/tcp/8080";
+              description = lib.mdDoc "Where the IPFS Gateway can be reached";
+            };
+
+            Addresses.Swarm = mkOption {
+              type = types.listOf types.str;
+              default = [
+                "/ip4/0.0.0.0/tcp/4001"
+                "/ip6/::/tcp/4001"
+                "/ip4/0.0.0.0/udp/4001/quic"
+                "/ip6/::/udp/4001/quic"
+              ];
+              description = lib.mdDoc "Where Kubo listens for incoming p2p connections";
+            };
+          };
+        };
        description = lib.mdDoc ''
          Attrset of daemon configuration to set using {command}`ipfs config`, every time the daemon starts.
-          These are applied last, so may override configuration set by other options in this module.
+          See [https://github.com/ipfs/kubo/blob/master/docs/config.md](https://github.com/ipfs/kubo/blob/master/docs/config.md) for reference.
          Keep in mind that this configuration is stateful; i.e., unsetting anything in here does not reset the value to the default!
        '';
        default = { };
@ -244,6 +250,12 @@ in
      then [ cfg.package.systemd_unit ]
      else [ cfg.package.systemd_unit_hardened ];

+    services.kubo.settings = mkIf cfg.autoMount {
+      Mounts.FuseAllowOther = lib.mkDefault true;
+      Mounts.IPFS = lib.mkDefault cfg.ipfsMountDir;
+      Mounts.IPNS = lib.mkDefault cfg.ipnsMountDir;
+    };
+
    systemd.services.ipfs = {
      path = [ "/run/wrappers" cfg.package ];
      environment.IPFS_PATH = cfg.dataDir;
@ -259,22 +271,10 @@ in
      '' + ''
          ipfs --offline config profile apply ${profile} >/dev/null
        fi
-      '' + optionalString cfg.autoMount ''
-        ipfs --offline config Mounts.FuseAllowOther --json true
-        ipfs --offline config Mounts.IPFS ${cfg.ipfsMountDir}
-        ipfs --offline config Mounts.IPNS ${cfg.ipnsMountDir}
      '' + ''
        ipfs --offline config show \
-          | ${pkgs.jq}/bin/jq '. * $extraConfig' --argjson extraConfig ${
-              escapeShellArg (builtins.toJSON (
-                recursiveUpdate
-                  {
-                    Addresses.API = cfg.apiAddress;
-                    Addresses.Gateway = cfg.gatewayAddress;
-                    Addresses.Swarm = cfg.swarmAddress;
-                  }
-                  cfg.extraConfig
-              ))
+          | ${pkgs.jq}/bin/jq '. * $settings' --argjson settings ${
+              escapeShellArg (builtins.toJSON cfg.settings)
            } \
          | ipfs --offline config replace -
      '';
@ -294,12 +294,12 @@ in
      socketConfig = {
        ListenStream =
          let
-            fromCfg = multiaddrToListenStream cfg.gatewayAddress;
+            fromCfg = multiaddrToListenStream cfg.settings.Addresses.Gateway;
          in
          [ "" ] ++ lib.optional (fromCfg != null) fromCfg;
        ListenDatagram =
          let
-            fromCfg = multiaddrToListenDatagram cfg.gatewayAddress;
+            fromCfg = multiaddrToListenDatagram cfg.settings.Addresses.Gateway;
          in
          [ "" ] ++ lib.optional (fromCfg != null) fromCfg;
      };
@ -311,7 +311,7 @@ in
      # in the multiaddr.
      socketConfig.ListenStream =
        let
-          fromCfg = multiaddrToListenStream cfg.apiAddress;
+          fromCfg = multiaddrToListenStream cfg.settings.Addresses.API;
        in
        [ "" "%t/ipfs.sock" ] ++ lib.optional (fromCfg != null) fromCfg;
    };
@ -332,15 +332,19 @@ in
    (mkRenamedOptionModule [ "services" "ipfs" "autoMigrate" ] [ "services" "kubo" "autoMigrate" ])
    (mkRenamedOptionModule [ "services" "ipfs" "ipfsMountDir" ] [ "services" "kubo" "ipfsMountDir" ])
    (mkRenamedOptionModule [ "services" "ipfs" "ipnsMountDir" ] [ "services" "kubo" "ipnsMountDir" ])
-    (mkRenamedOptionModule [ "services" "ipfs" "gatewayAddress" ] [ "services" "kubo" "gatewayAddress" ])
-    (mkRenamedOptionModule [ "services" "ipfs" "apiAddress" ] [ "services" "kubo" "apiAddress" ])
-    (mkRenamedOptionModule [ "services" "ipfs" "swarmAddress" ] [ "services" "kubo" "swarmAddress" ])
+    (mkRenamedOptionModule [ "services" "ipfs" "gatewayAddress" ] [ "services" "kubo" "settings" "Addresses" "Gateway" ])
+    (mkRenamedOptionModule [ "services" "ipfs" "apiAddress" ] [ "services" "kubo" "settings" "Addresses" "API" ])
+    (mkRenamedOptionModule [ "services" "ipfs" "swarmAddress" ] [ "services" "kubo" "settings" "Addresses" "Swarm" ])
    (mkRenamedOptionModule [ "services" "ipfs" "enableGC" ] [ "services" "kubo" "enableGC" ])
    (mkRenamedOptionModule [ "services" "ipfs" "emptyRepo" ] [ "services" "kubo" "emptyRepo" ])
-    (mkRenamedOptionModule [ "services" "ipfs" "extraConfig" ] [ "services" "kubo" "extraConfig" ])
+    (mkRenamedOptionModule [ "services" "ipfs" "extraConfig" ] [ "services" "kubo" "settings" ])
    (mkRenamedOptionModule [ "services" "ipfs" "extraFlags" ] [ "services" "kubo" "extraFlags" ])
    (mkRenamedOptionModule [ "services" "ipfs" "localDiscovery" ] [ "services" "kubo" "localDiscovery" ])
    (mkRenamedOptionModule [ "services" "ipfs" "serviceFdlimit" ] [ "services" "kubo" "serviceFdlimit" ])
    (mkRenamedOptionModule [ "services" "ipfs" "startWhenNeeded" ] [ "services" "kubo" "startWhenNeeded" ])
+    (mkRenamedOptionModule [ "services" "kubo" "extraConfig" ] [ "services" "kubo" "settings" ])
+    (mkRenamedOptionModule [ "services" "kubo" "gatewayAddress" ] [ "services" "kubo" "settings" "Addresses" "Gateway" ])
+    (mkRenamedOptionModule [ "services" "kubo" "apiAddress" ] [ "services" "kubo" "settings" "Addresses" "API" ])
+    (mkRenamedOptionModule [ "services" "kubo" "swarmAddress" ] [ "services" "kubo" "settings" "Addresses" "Swarm" ])
  ];
 }
--- a/nixos/modules/services/networking/mullvad-vpn.nix
+++ b/nixos/modules/services/networking/mullvad-vpn.nix
@ -4,13 +4,24 @@ let
 in
 with lib;
 {
-  options.services.mullvad-vpn.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = lib.mdDoc ''
-      This option enables Mullvad VPN daemon.
-      This sets {option}`networking.firewall.checkReversePath` to "loose", which might be undesirable for security.
-    '';
+  options.services.mullvad-vpn = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = lib.mdDoc ''
+        This option enables Mullvad VPN daemon.
+        This sets {option}`networking.firewall.checkReversePath` to "loose", which might be undesirable for security.
+      '';
+    };
+
+    package = mkOption {
+      type = types.package;
+      default = pkgs.mullvad;
+      defaultText = literalExpression "pkgs.mullvad";
+      description = lib.mdDoc ''
+        The Mullvad package to use. `pkgs.mullvad` only provides the CLI tool, `pkgs.mullvad-vpn` provides both the CLI and the GUI.
+      '';
+    };
  };

  config = mkIf cfg.enable {
@ -39,12 +50,12 @@ with lib;
      startLimitBurst = 5;
      startLimitIntervalSec = 20;
      serviceConfig = {
-        ExecStart = "${pkgs.mullvad}/bin/mullvad-daemon -v --disable-stdout-timestamps";
+        ExecStart = "${cfg.package}/bin/mullvad-daemon -v --disable-stdout-timestamps";
        Restart = "always";
        RestartSec = 1;
      };
    };
  };

-  meta.maintainers = with maintainers; [ ymarkus ];
+  meta.maintainers = with maintainers; [ patricksjackson ymarkus ];
 }
--- a/nixos/modules/system/etc/setup-etc.pl
+++ b/nixos/modules/system/etc/setup-etc.pl
@ -137,7 +137,7 @@ foreach my $fn (@oldCopied) {

 # Rewrite /etc/.clean.
 close CLEAN;
-write_file("/etc/.clean", map { "$_\n" } @copied);
+write_file("/etc/.clean", map { "$_\n" } sort @copied);

 # Create /etc/NIXOS tag if not exists.
 # When /etc is not on a persistent filesystem, it will be wiped after reboot,
--- a/nixos/tests/kubo.nix
+++ b/nixos/tests/kubo.nix
@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
      enable = true;
      # Also will add a unix domain socket socket API address, see module.
      startWhenNeeded = true;
-      apiAddress = "/ip4/127.0.0.1/tcp/2324";
+      settings.Addresses.API = "/ip4/127.0.0.1/tcp/2324";
      dataDir = "/mnt/ipfs";
    };
  };
@ -17,7 +17,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
  nodes.fuse = { ... }: {
    services.kubo = {
      enable = true;
-      apiAddress = "/ip4/127.0.0.1/tcp/2324";
+      settings.Addresses.API = "/ip4/127.0.0.1/tcp/2324";
      autoMount = true;
    };
  };
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -281,12 +281,12 @@ final: prev:

  SchemaStore-nvim = buildVimPluginFrom2Nix {
    pname = "SchemaStore.nvim";
-    version = "2022-10-26";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "b0o";
      repo = "SchemaStore.nvim";
-      rev = "7876b7b33fedb6b4cca15b6a84947d7fb00a7d72";
-      sha256 = "0pyhkdimr9g5nkpnyqb7vd9w2q0crc1sj1yry0a09cdqb68k2gav";
+      rev = "a2b72f1b4c354e716b6d3349a5d67f21352469fd";
+      sha256 = "0b5dfrmx22fs1nb83pmr3ryhkd25xyd53zidbizi9hv43pgp1m5m";
    };
    meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
  };
@ -341,12 +341,12 @@ final: prev:

  SpaceVim = buildVimPluginFrom2Nix {
    pname = "SpaceVim";
-    version = "2022-10-26";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "SpaceVim";
      repo = "SpaceVim";
-      rev = "ed17f52bbb664ae9288e08be7b9af44c7bb93805";
-      sha256 = "1ldiy2fhy6m2f9zidvhh30lh56ybsvww0hdjhnx9ps0y6jbr39np";
+      rev = "e9ecbbc530d24712b9d79c6bc9f558a4964145be";
+      sha256 = "0zyya5622lsn3lrf3aphnp33fwbi42kd09dcgggvhzb4mhs4ngf0";
    };
    meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
  };
@ -486,12 +486,12 @@ final: prev:

  aerial-nvim = buildVimPluginFrom2Nix {
    pname = "aerial.nvim";
-    version = "2022-10-26";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "stevearc";
      repo = "aerial.nvim";
-      rev = "b4be3b7e503c45a0c3f7a9555d3457edcf4649fb";
-      sha256 = "0zaxfidd0lyf0y37d3mgh6jm44kp5i7kraqxd34r9n2802qdqhl2";
+      rev = "9c179f5932e3a6237f2dd29500e44b9b8cd47f48";
+      sha256 = "0n4b62jw40jxpb0ayp5za202as1wy53f3bv4q0z744zpkvfilqbk";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@ -703,12 +703,12 @@ final: prev:

  aurora = buildVimPluginFrom2Nix {
    pname = "aurora";
-    version = "2022-10-20";
+    version = "2022-10-26";
    src = fetchFromGitHub {
      owner = "ray-x";
      repo = "aurora";
-      rev = "e2f3b33f0a3ec1a33cc1c290951e50e287037036";
-      sha256 = "0p9fa6jsvign3r470www78m8dxkc8mrq9w10q6nr52slzzp2m382";
+      rev = "4a5a082e7ee778f3a5bc7cbde56bdc04ae56d858";
+      sha256 = "109hlng3xwxvq704wilik3z3cpr7asgiwyvxp4h7dqnar3wyp644";
    };
    meta.homepage = "https://github.com/ray-x/aurora/";
  };
@ -955,12 +955,12 @@ final: prev:

  calendar-vim = buildVimPluginFrom2Nix {
    pname = "calendar.vim";
-    version = "2022-08-10";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "itchyny";
      repo = "calendar.vim";
-      rev = "fe13024cc3575d83f158339562f0e2d97fb44375";
-      sha256 = "05yd27j35vicfj3kab2kbndzknmnn4ar100sibrvnag88m3ld5h5";
+      rev = "e4b6212f028f4293f965ed7d83e21516fe9d94c1";
+      sha256 = "10dblr72w8zjckjz8ikpfh0f06ljm07aby27m6cbgjyf0qmsyjjv";
    };
    meta.homepage = "https://github.com/itchyny/calendar.vim/";
  };
@ -1723,12 +1723,12 @@ final: prev:

  coc-nvim = buildVimPluginFrom2Nix {
    pname = "coc.nvim";
-    version = "2022-10-26";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "neoclide";
      repo = "coc.nvim";
-      rev = "ce2eaea1aec1f1c00db5663c08232b2be73ed6f7";
-      sha256 = "0w71xbmn8ja3kg8n635mya4fkf0ifdi98nw9wk8d11fhic2hdx7d";
+      rev = "b422537936351881782d28755c97156b046156e4";
+      sha256 = "1kkyx4sxvsxg4f3pijhyvmzbp4yd2n8ay8iq3s6ramml5havjflw";
    };
    meta.homepage = "https://github.com/neoclide/coc.nvim/";
  };
@ -2011,24 +2011,24 @@ final: prev:

  coq-artifacts = buildVimPluginFrom2Nix {
    pname = "coq.artifacts";
-    version = "2022-10-26";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq.artifacts";
-      rev = "c136668e5023fb355c3824c7dc13147b8513d5e3";
-      sha256 = "01mcr9xwc4jbd79dbq5awyf89nd35mw1x1kdn97z3i1gaayw6h1j";
+      rev = "6cc7fd56b3f593d6c2eded31d56f59286a218c1b";
+      sha256 = "046z9f4avykflavc2s5b5jg2nv6zlxv75fq2rp70mza5i3niapdz";
    };
    meta.homepage = "https://github.com/ms-jpq/coq.artifacts/";
  };

  coq-thirdparty = buildVimPluginFrom2Nix {
    pname = "coq.thirdparty";
-    version = "2022-10-26";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq.thirdparty";
-      rev = "7b6fc77e8c1018581daae15b247c4c640e69f50d";
-      sha256 = "14mdn9g4004lpc8zxq5as7wxlbzpbn9yyzlrzyqag6gghpf7q8sc";
+      rev = "1766b40665c9bd5946c2dc612de285fbb1b6db99";
+      sha256 = "1mlcdslawk2z833pxwd3lay405sm1bk82h18gsfdvngj8c7zvprx";
    };
    meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
  };
@ -2047,12 +2047,12 @@ final: prev:

  coq_nvim = buildVimPluginFrom2Nix {
    pname = "coq_nvim";
-    version = "2022-10-26";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq_nvim";
-      rev = "2997e434965a7488911bb8acd7eba50f60038462";
-      sha256 = "1948jv3123cwzrs95szn8nfzwprfhz45iwx3a03rnxksdq1nvywk";
+      rev = "5714bca1767620f0f470c2968f66a750b82387f4";
+      sha256 = "02zavylg8arnqi13sm0478lz9sjy70nw8ijbmw44xwv30paajw3v";
    };
    meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
  };
@ -2613,12 +2613,12 @@ final: prev:

  dracula-nvim = buildVimPluginFrom2Nix {
    pname = "dracula.nvim";
-    version = "2022-10-21";
+    version = "2022-10-26";
    src = fetchFromGitHub {
      owner = "Mofiqul";
      repo = "dracula.nvim";
-      rev = "ca1fc7a554386c2d31996ee28c8ad70731117bce";
-      sha256 = "11jzhzr0yx67gci3gbxzif9hyvk7pw533ii0r24wbfv7nh9dvqh6";
+      rev = "55f24e76a978c73c63d22951b0700823f21253b7";
+      sha256 = "0lkc0589fpf32c13hmzpi04skw0jp2hsl022d385znxm7x51n1v3";
    };
    meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
  };
@ -2735,12 +2735,12 @@ final: prev:

  everforest = buildVimPluginFrom2Nix {
    pname = "everforest";
-    version = "2022-10-26";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "sainnhe";
      repo = "everforest";
-      rev = "6ef48f9dae89e0f98380fa83628606a2b4074016";
-      sha256 = "07j9amxy15mbiymf2mjgwbikpc2i3xz7ca090acvfb0860ndmdzb";
+      rev = "06fda351738668e1357b3670875a645772aa7862";
+      sha256 = "197h4jfidxd12rgpg1qpnihq0w8jifc0zw5wngmnxazq1z815yks";
    };
    meta.homepage = "https://github.com/sainnhe/everforest/";
  };
@ -3384,12 +3384,12 @@ final: prev:

  gruvbox-nvim = buildVimPluginFrom2Nix {
    pname = "gruvbox.nvim";
-    version = "2022-10-26";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "ellisonleao";
      repo = "gruvbox.nvim";
-      rev = "cb7a8a867cfaa7f0e8ded57eb931da88635e7007";
-      sha256 = "16c8jggbcs1ikibwbj2w56mf9z224g7zvsnd8h6zz81gxdqk3l93";
+      rev = "2fc4980dfa17e76f7c7e963caa69599051d2e75e";
+      sha256 = "0wk6bdf11lyrmm7z5bidsjphn76qgwdgjdndx802gn1dghjljp0v";
    };
    meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
  };
@ -3453,6 +3453,18 @@ final: prev:
    meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
  };

+  haskell-tools-nvim = buildVimPluginFrom2Nix {
+    pname = "haskell-tools.nvim";
+    version = "2022-10-26";
+    src = fetchFromGitHub {
+      owner = "MrcJkb";
+      repo = "haskell-tools.nvim";
+      rev = "f7f740901a667322bb0f70a50d405448afdf40c1";
+      sha256 = "1ncfpw0fyvg6xbvac6j0cwz0258q1hkvf5ci4ygp7apppymj5h80";
+    };
+    meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
+  };
+
  haskell-vim = buildVimPluginFrom2Nix {
    pname = "haskell-vim";
    version = "2021-01-19";
@ -3864,12 +3876,12 @@ final: prev:

  kanagawa-nvim = buildVimPluginFrom2Nix {
    pname = "kanagawa.nvim";
-    version = "2022-10-19";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "rebelot";
      repo = "kanagawa.nvim";
-      rev = "a6f8ea10900e8d891f9c93e0ed258f118010fb24";
-      sha256 = "085xazb21c27zj5zv5vynmj4mv6zda1xf8d4icfpw41z68p4c1la";
+      rev = "70d3139aaa8e59f3304ca7860e35fd6081b6caa5";
+      sha256 = "1rizw9s24m24a4rpq0wl5ca0h6m0ykcgr54arv638pkjyg3pqf7l";
    };
    meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
  };
@ -4024,8 +4036,8 @@ final: prev:
    src = fetchFromGitHub {
      owner = "mrjones2014";
      repo = "legendary.nvim";
-      rev = "accd6a0cdc8c99fc6ef529cc95e1a952c89804fc";
-      sha256 = "0lrzhm2pf9rnqnjdyv7hg3n6hz28zgbmfq5ci4jl1ab311iwkk5d";
+      rev = "32b6ffbebe88751ae07812a93d44b833fdf2d00e";
+      sha256 = "0mkixp8sv85x7zfs3sm8k8xmnqvxhh0pz58kmfadkjw1vxs09aiy";
    };
    meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
  };
@ -4932,12 +4944,12 @@ final: prev:

  neodev-nvim = buildVimPluginFrom2Nix {
    pname = "neodev.nvim";
-    version = "2022-10-26";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "neodev.nvim";
-      rev = "92ab5e8b9bce76352d8c45de5b194dc739125437";
-      sha256 = "0jnlngj0qdngc5fgyab3xsf0f5imjq20z6g0dblz1hqa670yrzyw";
+      rev = "9f2bd5ca1b7bdc184069a0b2db8d7be1c377d3ac";
+      sha256 = "0zqzjlq2x576vc7z4bc72a6d7vp5fvg5fq4qvppv7zyhvgwmg1jk";
    };
    meta.homepage = "https://github.com/folke/neodev.nvim/";
  };
@ -4956,12 +4968,12 @@ final: prev:

  neogit = buildVimPluginFrom2Nix {
    pname = "neogit";
-    version = "2022-10-26";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "TimUntersberger";
      repo = "neogit";
-      rev = "3ea1b9c5c572d6432ea44044347ed3a54c277604";
-      sha256 = "1jnrm5q885gdaan762ga15992i5ky93js43j6i5dbygzipgi3d2n";
+      rev = "1acb13c07b34622fe1054695afcecff537d9a00a";
+      sha256 = "1wihkwfqhxvaxazn2wsd18jh8qd9cc2rc1m0rd2bw3ywm7jm24aw";
    };
    meta.homepage = "https://github.com/TimUntersberger/neogit/";
  };
@ -5074,6 +5086,18 @@ final: prev:
    meta.homepage = "https://github.com/kassio/neoterm/";
  };

+  neotest-haskell = buildVimPluginFrom2Nix {
+    pname = "neotest-haskell";
+    version = "2022-10-15";
+    src = fetchFromGitHub {
+      owner = "MrcJkb";
+      repo = "neotest-haskell";
+      rev = "d89b5e3e676923e3a373965fd7b6bcd705e14e74";
+      sha256 = "1j13q6wz2ci58mzyyq4p5apn86xplywal96bnsm1dqwmn1bb1707";
+    };
+    meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
+  };
+
  neovim-ayu = buildVimPluginFrom2Nix {
    pname = "neovim-ayu";
    version = "2022-10-22";
@ -5196,12 +5220,12 @@ final: prev:

  nightfox-nvim = buildVimPluginFrom2Nix {
    pname = "nightfox.nvim";
-    version = "2022-10-26";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "EdenEast";
      repo = "nightfox.nvim";
-      rev = "73bb745cd459732e247ee81027ffeea4c63a7cf8";
-      sha256 = "0am93qvkic5wwj1k7b73zm65djxi5lflwyyc2j523l84ajplwnz0";
+      rev = "9df01a3fb3d41e1e388ded7a34fe97a19146a283";
+      sha256 = "0n995a33riwbp0dfawwrm5xama6iaak1fvnsgqcx2aigdbjzgmh2";
    };
    meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
  };
@ -5244,12 +5268,12 @@ final: prev:

  noice-nvim = buildVimPluginFrom2Nix {
    pname = "noice.nvim";
-    version = "2022-10-26";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "noice.nvim";
-      rev = "2851fc23a15a3651402ce6adfde92d0d35990e32";
-      sha256 = "1hqrf8dyymxy5ms0a15vvxhlajr88yg3n0rjmwm8yzdjscp36lnr";
+      rev = "ac29174bebeedb86983eea7436dabcf2b17dbc19";
+      sha256 = "0byphv8m0g0mj2msw2dcrd6g3pkj81ssabm1zh1980w85z0pkcj6";
    };
    meta.homepage = "https://github.com/folke/noice.nvim/";
  };
@ -5304,12 +5328,12 @@ final: prev:

  nui-nvim = buildVimPluginFrom2Nix {
    pname = "nui.nvim";
-    version = "2022-10-26";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "MunifTanjim";
      repo = "nui.nvim";
-      rev = "e3806ee34700727e9cc0b420be226f41929b7d22";
-      sha256 = "0vm0b65i3m98zf3pk4hrcphx5bcwcqsmmbp4pm2mrkzfplm49chz";
+      rev = "d12a6977846b2fa978bff89b439e509320854e10";
+      sha256 = "1ghj8kjv2skh2hd9m6sghvj6pya8d9jvr5m9l9q1r0sg1i5x1kjy";
    };
    meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
  };
@ -5364,12 +5388,12 @@ final: prev:

  nvim-autopairs = buildVimPluginFrom2Nix {
    pname = "nvim-autopairs";
-    version = "2022-10-01";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "windwp";
      repo = "nvim-autopairs";
-      rev = "4fc96c8f3df89b6d23e5092d31c866c53a346347";
-      sha256 = "09aka75d7a0acixrp2b7hfy08vdnjxxiknd5ngf2pk479k8z5zbj";
+      rev = "6b6e35fc9aca1030a74cc022220bc22ea6c5daf4";
+      sha256 = "1laskay0f6rf9283cgiv1db3ph4imzyfk10j0wn6f8zsm8n13m1v";
    };
    meta.homepage = "https://github.com/windwp/nvim-autopairs/";
  };
@ -5568,12 +5592,12 @@ final: prev:

  nvim-dap-ui = buildVimPluginFrom2Nix {
    pname = "nvim-dap-ui";
-    version = "2022-10-26";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "rcarriga";
      repo = "nvim-dap-ui";
-      rev = "31a0668b343b231898ab6641ce4a6f42f01c631e";
-      sha256 = "1zzg4x3vigrpv57lmacs52clpx5vvybfpab95gk71lq5qcng7kp0";
+      rev = "f889edb4f2b7fafa2a8f8101aea2dc499849b2ec";
+      sha256 = "18fi54hfybbywyafk0ik2bvgrl99i605qcs49i1a8gw3d6qx8zy1";
    };
    meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";
  };
@ -5628,12 +5652,12 @@ final: prev:

  nvim-gdb = buildVimPluginFrom2Nix {
    pname = "nvim-gdb";
-    version = "2022-10-25";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "sakhnik";
      repo = "nvim-gdb";
-      rev = "1226c3fa083b753962aa248f36d2e06612d475f2";
-      sha256 = "1g2pc5mx6cyayzkwkq66kk8qc5l2rwk7n73byxdqijj8rdsazp0c";
+      rev = "127087ec368212d4d763aeb58fdf585abc6a8a0e";
+      sha256 = "15f1crn83yf5amdv0m9cc54znq1w3m2x5nywh70bsz753a37a4ys";
    };
    meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
  };
@ -5808,12 +5832,12 @@ final: prev:

  nvim-luapad = buildVimPluginFrom2Nix {
    pname = "nvim-luapad";
-    version = "2022-07-09";
+    version = "2022-10-26";
    src = fetchFromGitHub {
      owner = "rafcamlet";
      repo = "nvim-luapad";
-      rev = "9815e2659ce8e2ef4b55e401531cf09b6423e0ea";
-      sha256 = "0fkrjrhgkygbm819xgx0fkqndy7n5p0hir47a0kfipv2h7jr5il0";
+      rev = "6efe3806c6e0d9ae684d756d4d7053cbdfb562eb";
+      sha256 = "0d0lcaxxqwg2cw8gx4zmddwvb49xxrvlc03ij68wwwmvjgvw2v01";
    };
    meta.homepage = "https://github.com/rafcamlet/nvim-luapad/";
  };
@ -6012,12 +6036,12 @@ final: prev:

  nvim-treesitter = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter";
-    version = "2022-10-26";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter";
-      rev = "2f5be4585ef18ac720810c08f678b4d55e2d5658";
-      sha256 = "060iq0ckn9ssiwbnw6hicw5cg6jahck5vbkbi35gxlgg3s5gy7mx";
+      rev = "c155b6bb308269ca4a376777a8621261efbd17cb";
+      sha256 = "0g95nl121gkqcs5w0r31qcn11mxy9g9ws829mcb41y3h5jkbly1a";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
  };
@ -7191,12 +7215,12 @@ final: prev:

  sphinx-nvim = buildVimPluginFrom2Nix {
    pname = "sphinx.nvim";
-    version = "2021-08-08";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "stsewd";
      repo = "sphinx.nvim";
-      rev = "65160298c586cab13d94e07ed3ebf4cff20f2be5";
-      sha256 = "0l0cvd8pzf1crb5g2zag3v6gxzfzs38i8pyq30ls3l16phaslnny";
+      rev = "ec53a6e7104c6bef75982fce15bcab546c590f7e";
+      sha256 = "15pxzq74sx9zwwpcfy478mq558s2kwv78pgzqz4jw03hd0ms2c1k";
    };
    meta.homepage = "https://github.com/stsewd/sphinx.nvim/";
  };
@ -7733,6 +7757,18 @@ final: prev:
    meta.homepage = "https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/";
  };

+  telescope-manix = buildVimPluginFrom2Nix {
+    pname = "telescope-manix";
+    version = "2022-10-19";
+    src = fetchFromGitHub {
+      owner = "MrcJkb";
+      repo = "telescope-manix";
+      rev = "9f91408328be8719ca1f6c49a3ccc1df6392d5e9";
+      sha256 = "03wkgmwq3fl92bd4d33ahfp328pdwcmpw0pcjqf9cfaplpi0fzk2";
+    };
+    meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
+  };
+
  telescope-media-files-nvim = buildVimPluginFrom2Nix {
    pname = "telescope-media-files.nvim";
    version = "2021-10-21";
@ -7999,12 +8035,12 @@ final: prev:

  todo-comments-nvim = buildVimPluginFrom2Nix {
    pname = "todo-comments.nvim";
-    version = "2022-10-14";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "todo-comments.nvim";
-      rev = "61240662fd9ffa4a546db57abcc50b97f6fab27b";
-      sha256 = "0a2wzkahq3dm6yszrl3arl0p6yd6ymi5kqhzdcgkk4vb7j0ff9k4";
+      rev = "1814feca54540497de99d474dd6c9de6b691cf01";
+      sha256 = "0qlbdmrq0c3fxc6d3rfwq6nckj4cg8ws9p98kwsx1s39ia56ycqf";
    };
    meta.homepage = "https://github.com/folke/todo-comments.nvim/";
  };
@ -8036,24 +8072,24 @@ final: prev:

  toggleterm-nvim = buildVimPluginFrom2Nix {
    pname = "toggleterm.nvim";
-    version = "2022-09-18";
+    version = "2022-10-26";
    src = fetchFromGitHub {
      owner = "akinsho";
      repo = "toggleterm.nvim";
-      rev = "2a787c426ef00cb3488c11b14f5dcf892bbd0bda";
-      sha256 = "01yb5i7y5lcm498pbkiyjqczh5p9kimxjgc0cw99ad8j9n23hq82";
+      rev = "8f302c9a05ff53fc3f891cbf09c5f959b10392a3";
+      sha256 = "1nvq4zridnz0pr9j9ivcl4b5w8srli8szhjy6ry22vw9c5xllzx3";
    };
    meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";
  };

  tokyonight-nvim = buildVimPluginFrom2Nix {
    pname = "tokyonight.nvim";
-    version = "2022-10-23";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "tokyonight.nvim";
-      rev = "16a294bea92dc8f16ad205c71ce61bf05e79deb3";
-      sha256 = "1vazlpml0f8hvn4w4jdahvphpyg8mkd5fak1w84cvn0814frz6w5";
+      rev = "8756c99d08f3605534600e70f9fae64035a287dc";
+      sha256 = "1g7j3fzvs94bi67h277xmjd6rafsqbs58fsgrc0jlhi1zhbablr3";
    };
    meta.homepage = "https://github.com/folke/tokyonight.nvim/";
  };
@ -8228,12 +8264,12 @@ final: prev:

  urlview-nvim = buildVimPluginFrom2Nix {
    pname = "urlview.nvim";
-    version = "2022-10-15";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "axieax";
      repo = "urlview.nvim";
-      rev = "8a52703b9303e206dd8dcf9b07f510f3d3ae87d5";
-      sha256 = "11cf98bbf8526x0w8mkm3096l2wk9y6zj3hwwccs1dfw9v3jfm5c";
+      rev = "f7dc336aff93ce421f3092aaec1fb008a86433ce";
+      sha256 = "0iq69smk3nn4mf9q0rv98kka6a4awrbpxabrss7nxjaghb2bs7v0";
    };
    meta.homepage = "https://github.com/axieax/urlview.nvim/";
  };
@ -10799,12 +10835,12 @@ final: prev:

  vim-matchup = buildVimPluginFrom2Nix {
    pname = "vim-matchup";
-    version = "2022-10-01";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "andymass";
      repo = "vim-matchup";
-      rev = "3fa1b2283e957784922fe891de361a2342b90bca";
-      sha256 = "0x86wmph3pb4bkqddb1zm381q9214hvf7cq9ydch4hjbx0vmbjwi";
+      rev = "09576fd767cc55ca934a95f9bdcf91aa12c32cd0";
+      sha256 = "08909dsf8gll8j3rky6zf9i4jlcp2cfkwmy15xmcm6avcy1ziagg";
    };
    meta.homepage = "https://github.com/andymass/vim-matchup/";
  };
@ -11087,12 +11123,12 @@ final: prev:

  vim-ocaml = buildVimPluginFrom2Nix {
    pname = "vim-ocaml";
-    version = "2022-10-25";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "ocaml";
      repo = "vim-ocaml";
-      rev = "50e759ee5b9dfcfc27e197eba60cc863ba0312b6";
-      sha256 = "0f17aky7rmrjayyp3fbhvpg4h9h1vxqi3csqc4kd8rdkpl9gmv7n";
+      rev = "5e581ecd1fd430415f1aacfd87697584c117bc06";
+      sha256 = "1f6yk5y1xmpc0wfp06mylfynra5aswb177n9j4yrifkzx3mabw5j";
    };
    meta.homepage = "https://github.com/ocaml/vim-ocaml/";
  };
@ -11975,12 +12011,12 @@ final: prev:

  vim-sneak = buildVimPluginFrom2Nix {
    pname = "vim-sneak";
-    version = "2021-10-17";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "justinmk";
      repo = "vim-sneak";
-      rev = "94c2de47ab301d476a2baec9ffda07367046bec9";
-      sha256 = "110f06rf1m6p0asr5h4sr80wpwji3krwna5vdn6aakvcr8a7qqdi";
+      rev = "93395f5b56eb203e4c8346766f258ac94ea81702";
+      sha256 = "0aylgy7k8k6f058z3zmz9vsmigff5f6lfjzciqyccksjaji9c0kr";
    };
    meta.homepage = "https://github.com/justinmk/vim-sneak/";
  };
@ -12155,12 +12191,12 @@ final: prev:

  vim-svelte = buildVimPluginFrom2Nix {
    pname = "vim-svelte";
-    version = "2022-02-17";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "evanleck";
      repo = "vim-svelte";
-      rev = "1080030d6a1bc6582389c133a07552ba0a442410";
-      sha256 = "0kwx0rkb6879v5c3jyavzh1hklxl2q1qwnm28x1p32kdcwqkccjp";
+      rev = "0e93ec53c3667753237282926fec626785622c1c";
+      sha256 = "1vv10bx2q463bjg7gvjy5lfxn0177s2r8i8xlwy2kg4620n0g5xi";
    };
    meta.homepage = "https://github.com/evanleck/vim-svelte/";
  };
@ -12912,12 +12948,12 @@ final: prev:

  vimspector = buildVimPluginFrom2Nix {
    pname = "vimspector";
-    version = "2022-10-24";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "puremourning";
      repo = "vimspector";
-      rev = "fbec71d82bf5d7a395bcd31d23faa5cf309dc1b7";
-      sha256 = "1pg1w7gj2qbqsp0bjh08hfzkinnsj2zsn2rcgchcy35jz5g240h6";
+      rev = "82b47b18262d70de140221f69279d80a2f096221";
+      sha256 = "05h67zk7lj52ry0clb0dqqiniscmyb49x46ss8zgi0dmfnp3avav";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/puremourning/vimspector/";
@ -12925,12 +12961,12 @@ final: prev:

  vimtex = buildVimPluginFrom2Nix {
    pname = "vimtex";
-    version = "2022-10-23";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "lervag";
      repo = "vimtex";
-      rev = "71e6e2d27520477975a5c86d568b1ed1b781bba3";
-      sha256 = "092nviq0n3yl7ccg13mqxypkw0pr63f3hizf0r7vvkvfjld27n9f";
+      rev = "2f799f47a85bca75deaec4e2c6a51cde9341ae01";
+      sha256 = "0m1j5xl994g5bxv5jnzk3a2sfga96b2k0kznwj8a6xqilk8gq798";
    };
    meta.homepage = "https://github.com/lervag/vimtex/";
  };
@ -13274,12 +13310,12 @@ final: prev:

  catppuccin-nvim = buildVimPluginFrom2Nix {
    pname = "catppuccin-nvim";
-    version = "2022-10-26";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "catppuccin";
      repo = "nvim";
-      rev = "98b2b7eb3e743289a674d7255e2557f3a20153ba";
-      sha256 = "1392y228l2rbg81yzii31c87xgxn4a6cvvj368glc5ss8pia7aih";
+      rev = "e695645298320e9714d10897aadee3cb5951567a";
+      sha256 = "0pbyq5z3l9sqfs412vfgg3s729smb04fvvgn673ib28i5kc5qk09";
    };
    meta.homepage = "https://github.com/catppuccin/nvim/";
  };
@ -13298,12 +13334,12 @@ final: prev:

  chad = buildVimPluginFrom2Nix {
    pname = "chad";
-    version = "2022-10-26";
+    version = "2022-10-27";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "chadtree";
-      rev = "e7b0e56b11407e0429565985e58bfb2cba598c93";
-      sha256 = "18i24v89skiyy82a7v7pvdb7xhvy8vgybhlgadcayd6qka8i7gsx";
+      rev = "830c86fb0d6096a0a3ff87855a574bb686f6fa97";
+      sha256 = "1b6b4hcyfjhbmwlq7h63ahb19zxla0kcb5xq9g2jfkvx4j0n2k4k";
    };
    meta.homepage = "https://github.com/ms-jpq/chadtree/";
  };
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -289,6 +289,7 @@ https://github.com/sjl/gundo.vim/,,
 https://github.com/junegunn/gv.vim/,,
 https://git.sr.ht/~sircmpwn/hare.vim,HEAD,
 https://github.com/ThePrimeagen/harpoon/,,
+https://github.com/MrcJkb/haskell-tools.nvim/,HEAD,
 https://github.com/neovimhaskell/haskell-vim/,,
 https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD,
 https://github.com/travitch/hasksyn/,,
@ -425,6 +426,7 @@ https://github.com/karb94/neoscroll.nvim/,,
 https://github.com/Shougo/neosnippet-snippets/,,
 https://github.com/Shougo/neosnippet.vim/,,
 https://github.com/kassio/neoterm/,,
+https://github.com/MrcJkb/neotest-haskell/,HEAD,
 https://github.com/rose-pine/neovim/,main,rose-pine
 https://github.com/Shatur/neovim-ayu/,,
 https://github.com/cloudhead/neovim-fuzzy/,,
@ -648,6 +650,7 @@ https://github.com/nvim-telescope/telescope-fzf-writer.nvim/,,
 https://github.com/nvim-telescope/telescope-fzy-native.nvim/,,
 https://github.com/nvim-telescope/telescope-github.nvim/,,
 https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/,,
+https://github.com/MrcJkb/telescope-manix/,HEAD,
 https://github.com/nvim-telescope/telescope-media-files.nvim/,HEAD,
 https://github.com/nvim-telescope/telescope-project.nvim/,,
 https://github.com/nvim-telescope/telescope-symbols.nvim/,,
--- a/pkgs/applications/misc/chrysalis/default.nix
+++ b/pkgs/applications/misc/chrysalis/default.nix
@ -2,7 +2,7 @@

 let
  pname = "chrysalis";
-  version = "0.11.9";
+  version = "0.12.0";
 in appimageTools.wrapAppImage rec {
  name = "${pname}-${version}-binary";

@ -10,7 +10,7 @@ in appimageTools.wrapAppImage rec {
    inherit name;
    src = fetchurl {
      url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
-      sha256 = "sha256-Ce6aq4JZ271jTzAoUZx6bZpmQUXmhhFgaemfZfokS24=";
+      sha256 = "sha256-sQoEO1UII4Gbp7UbHCCyejsd94lkBbi93TH325EamFc=";
    };
  };

--- a/pkgs/applications/misc/waybar/default.nix
+++ b/pkgs/applications/misc/waybar/default.nix
@ -29,7 +29,7 @@
 , traySupport     ? true,  libdbusmenu-gtk3
 , udevSupport     ? true,  udev
 , upowerSupport   ? true,  upower
-, withMediaPlayer ? false, glib, gobject-introspection, python3, python38Packages, playerctl
+, withMediaPlayer ? false, glib, gobject-introspection, python3, playerctl
 }:

 stdenv.mkDerivation rec {
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
  propagatedBuildInputs = lib.optionals withMediaPlayer [
    glib
    playerctl
-    python38Packages.pygobject3
+    python3.pkgs.pygobject3
  ];
  strictDeps = false;

--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@ -293,7 +293,6 @@ let
      rtc_use_pipewire = true;
      # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient):
      chrome_pgo_phase = 0;
-    } // optionalAttrs (chromiumVersionAtLeast "107") {
      clang_base_path = "${llvmPackages.clang}";
      use_qt = false;
      use_system_libwayland_server = true;
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@ -19,9 +19,9 @@
    }
  },
  "beta": {
-    "version": "107.0.5304.62",
-    "sha256": "1w77id89gszichqxsrqgkb3v0kf26fic5p3y1ndgrw86d8kilgpj",
-    "sha256bin64": "0lc08mc1540w4chscq813pmiavvx32qfb581w7lh9ayby15j2nkk",
+    "version": "107.0.5304.68",
+    "sha256": "0k5qrmby1k2gw3lj96x3qag20kka61my578pv0zyrqqj5sdz3i5a",
+    "sha256bin64": "15ijvsm9k28iwr7dxi2vbrlb7z5nz63yvpx7cg766z1z1q5jcg7m",
    "deps": {
      "gn": {
        "version": "2022-09-14",
@ -32,9 +32,9 @@
    }
  },
  "dev": {
-    "version": "108.0.5359.10",
-    "sha256": "1wmb3qxd126j3466h8wb2fsfy92218rv812sxxqdbpyf2z66m8pj",
-    "sha256bin64": "0vv64hqx5wf8qsm3z518wv9phipb7nbg6kj5mghx55rn20qmfpbr",
+    "version": "108.0.5359.19",
+    "sha256": "1093anaymbmza6rf9hisl6qdf9jfaa27kyd3gbv5xyc0i450ypg5",
+    "sha256bin64": "0yi6qi7asmh3kx6y86p22smjf5bpay1nrj09zg7l2qd3gi836xp0",
    "deps": {
      "gn": {
        "version": "2022-10-05",
@ -45,19 +45,19 @@
    }
  },
  "ungoogled-chromium": {
-    "version": "106.0.5249.119",
-    "sha256": "14niglj8q6mfkmgbbjhaipmyhv6vryx93crswb1xa871a14in28g",
-    "sha256bin64": "1kcf8l6ivqzx6qaiy7vx2l6mhfqn4lq93dkgcx1bdadikwcpq0dd",
+    "version": "107.0.5304.68",
+    "sha256": "0k5qrmby1k2gw3lj96x3qag20kka61my578pv0zyrqqj5sdz3i5a",
+    "sha256bin64": "1x9svz5s8fm2zhnpzjpqckzfp37hjni3nf3pm63rwnvbd06y48ja",
    "deps": {
      "gn": {
-        "version": "2022-08-11",
+        "version": "2022-09-14",
        "url": "https://gn.googlesource.com/gn",
-        "rev": "0bcd37bd2b83f1a9ee17088037ebdfe6eab6d31a",
-        "sha256": "13zks2z65kg7fzzsysq4mswd4bhhy3h7ycdrpxfilcvixx2n2gac"
+        "rev": "fff29c1b3f9703ea449f720fe70fa73575ef24e5",
+        "sha256": "1c0dvpp4im1hf277bs5w7rgqxz3g2bax266i2g6smi3pl7a8jpnp"
      },
      "ungoogled-patches": {
-        "rev": "106.0.5249.119-1",
-        "sha256": "0mgyakq0g3v24b1qn76zblhjf9zzbiv1fq95w7w42nv3fvxfrxr2"
+        "rev": "107.0.5304.68-1",
+        "sha256": "0rjdi2lr71xjjf4x27183ys87fc95m85yp5x3kk6i39ppksvsj6b"
      }
    }
  }
--- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
@ -4,6 +4,7 @@
 , buildGoModule
 , esbuild
 , fetchFromGitHub
+, fetchpatch
 , libdeltachat
 , makeDesktopItem
 , makeWrapper
@ -31,6 +32,13 @@ let
      name = "${old.pname}-${version}";
      hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk=";
    };
+    patches = [
+      (fetchpatch {
+        name = "turn-off-hard-errors-for-lints.patch";
+        url = "https://github.com/deltachat/deltachat-core-rust/commit/7598c50dbaa2abcbd417d96a02743269f666597b.patch";
+        hash = "sha256-Xss44v6Wf6mL3FK9hH+oFYZ0fBA9rSh4wDrr7nSUibQ=";
+      })
+    ];
  });
  esbuild' = esbuild.override {
    buildGoModule = args: buildGoModule (args // rec {
--- a/pkgs/applications/office/paperless-ngx/default.nix
+++ b/pkgs/applications/office/paperless-ngx/default.nix
@ -22,7 +22,7 @@ let

      # use paperless-ngx version of django-q
      # see https://github.com/paperless-ngx/paperless-ngx/pull/1014
-      django-q = super.django-q.overridePythonAttrs (oldAttrs: rec {
+      django-q = super.django-q.overridePythonAttrs (oldAttrs: {
        src = fetchFromGitHub {
          owner = "paperless-ngx";
          repo = "django-q";
@ -42,8 +42,39 @@ let
        };
      });

-      eth-keys = super.eth-keys.overridePythonAttrs (_: {
-        doCheck = false;
+      # downgrade redis due to https://github.com/paperless-ngx/paperless-ngx/pull/1802
+      # and https://github.com/django/channels_redis/issues/332
+      channels-redis = super.channels-redis.overridePythonAttrs (oldAttrs: rec {
+        version = "3.4.1";
+        src = fetchFromGitHub {
+          owner = "django";
+          repo = "channels_redis";
+          rev = version;
+          hash = "sha256-ZQSsE3pkM+nfDhWutNuupcyC5MDikUu6zU4u7Im6bRQ=";
+        };
+      });
+
+      channels = super.channels.overridePythonAttrs (oldAttrs: rec {
+        version = "3.0.5";
+        pname = "channels";
+        src = fetchFromGitHub {
+          owner = "django";
+          repo = pname;
+          rev = version;
+          sha256 = "sha256-bKrPLbD9zG7DwIYBst1cb+zkDsM8B02wh3D80iortpw=";
+        };
+        propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ self.daphne ];
+      });
+
+      daphne = super.daphne.overridePythonAttrs (oldAttrs: rec {
+        version = "3.0.2";
+        pname = "daphne";
+        src = fetchFromGitHub {
+          owner = "django";
+          repo = pname;
+          rev = version;
+          hash = "sha256-KWkMV4L7bA2Eo/u4GGif6lmDNrZAzvYyDiyzyWt9LeI=";
+        };
      });
    };
  };
@ -198,7 +229,9 @@ python.pkgs.pythonPackages.buildPythonApplication rec {
    pytestCheckHook
  ];

-  pytestFlagsArray = [ "src" ];
+  pytestFlagsArray = [
+    "src"
+  ];

  # The tests require:
  # - PATH with runtime binaries
@ -214,14 +247,15 @@ python.pkgs.pythonPackages.buildPythonApplication rec {
      --replace "--cov --cov-report=html" ""
  '';

+
  passthru = {
    inherit python path;
    tests = { inherit (nixosTests) paperless; };
  };

  meta = with lib; {
-    description = "A supercharged version of paperless: scan, index, and archive all of your physical documents";
-    homepage = "https://paperless-ngx.readthedocs.io/en/latest/";
+    description = "Tool to scan, index, and archive all of your physical documents";
+    homepage = "https://paperless-ngx.readthedocs.io/";
    license = licenses.gpl3Only;
    maintainers = with maintainers; [ lukegb gador erikarvstedt ];
  };
--- a/pkgs/applications/version-management/jujutsu/default.nix
+++ b/pkgs/applications/version-management/jujutsu/default.nix
@ -15,16 +15,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "jujutsu";
-  version = "0.4.0";
+  version = "0.5.1";

  src = fetchFromGitHub {
    owner = "martinvonz";
    repo = "jj";
    rev = "v${version}";
-    sha256 = "sha256-G8Y8ooi3aX6v/Ied62eSfo6PvXbZtx455bF0wVkZN30=";
+    sha256 = "sha256-ITYpdCUh+WzP2RrAkSep3DsQ7dztvOMuwESKimn8JBQ=";
  };

-  cargoSha256 = "sha256-7nWrwpv3xAffKiaUsnoA+h6ledjgG9tQeQ69WNl6e8o=";
+  cargoSha256 = "sha256-eH8/R4dwQ08Q7Dyw8CnE+DGjneAmtTdsRben2cxpG8Q=";

  # Needed to get openssl-sys to use pkg-config.
  OPENSSL_NO_VENDOR = 1;
--- a/pkgs/applications/window-managers/taffybar/default.nix
+++ b/pkgs/applications/window-managers/taffybar/default.nix
@ -6,7 +6,7 @@ let
  ] ++ packages self);
 in stdenv.mkDerivation {
  pname = "taffybar-with-packages";
-  inherit (taffybarEnv) version;
+  inherit (taffybar) version;

  nativeBuildInputs = [ makeWrapper ];

--- a/pkgs/data/icons/colloid-icon-theme/default.nix
+++ b/pkgs/data/icons/colloid-icon-theme/default.nix
@ -13,18 +13,18 @@ let
  pname = "colloid-icon-theme";

 in
-lib.checkListOfEnum "${pname}: scheme variants" [ "default" "nord" "dracula" ] schemeVariants
+lib.checkListOfEnum "${pname}: scheme variants" [ "default" "nord" "dracula" "all" ] schemeVariants
 lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] colorVariants

 stdenvNoCC.mkDerivation rec {
  inherit pname;
-  version = "2022-04-22";
+  version = "2022-10-26";

  src = fetchFromGitHub {
    owner = "vinceliuice";
    repo = pname;
    rev = version;
-    hash = "sha256-0lUdsTjIfZ76Mm327jE1uudxtKVQbt17fsel6c2RdVM=";
+    hash = "sha256-eHLfWrtY69S37OPvQdLwI/PRvoKCheF2MRsHG5+5BR0=";
  };

  nativeBuildInputs = [
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@ -1,6 +1,6 @@
 {
-  "commit": "d9b306138608746f6f686e7f3af6f35e635eacc8",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d9b306138608746f6f686e7f3af6f35e635eacc8.tar.gz",
-  "sha256": "11c7x0b1ivcx8z96yr7rwnsby5bmjrwsjbak2pa4kknsklxd1iba",
-  "msg": "Update from Hackage at 2022-10-05T14:24:18Z"
+  "commit": "2c8100e0ec017b1ab20fcf4679176087b10fbd45",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2c8100e0ec017b1ab20fcf4679176087b10fbd45.tar.gz",
+  "sha256": "16jvcyn4cxc2f0p92f71yk1n2p6jmblnhqm8is5ipn0j4xz6l0bl",
+  "msg": "Update from Hackage at 2022-10-11T19:16:50Z"
 }
--- a/pkgs/data/themes/mojave/default.nix
+++ b/pkgs/data/themes/mojave/default.nix
@ -1,5 +1,5 @@
 { lib
-, stdenv
+, stdenvNoCC
 , fetchFromGitHub
 , fetchurl
 , glib
@ -29,16 +29,16 @@ lib.checkListOfEnum "${pname}: color variants" [ "light" "dark" ] colorVariants
 lib.checkListOfEnum "${pname}: opacity variants" [ "standard" "solid" ] opacityVariants
 lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants

-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation rec {
  inherit pname;
-  version = "2022-06-07";
+  version = "2022-10-21";

  srcs = [
    (fetchFromGitHub {
      owner = "vinceliuice";
      repo = pname;
      rev = version;
-      sha256 = "sha256-OEqB2PSZ5KoxXAUhlyT1PRUzckVz+jTCIoAqP8gVqTk=";
+      sha256 = "sha256-0OqQXyv/fcbKTzvQUVIbUw5Y27hU1bzwx/0DelMEZIs=";
    })
  ]
  ++
@ -114,9 +114,9 @@ stdenv.mkDerivation rec {
      install -D -t $out/share/wallpapers ../"macOS Mojave Wallpapers"/*
    ''}

-    # Replace duplicate files with hardlinks to the first file in each
+    # Replace duplicate files with soft links to the first file in each
    # set of duplicates, reducing the installed size in about 53%
-    jdupes -L -r $out/share
+    jdupes --quiet --link-soft --recurse $out/share

    runHook postInstall
  '';
--- a/pkgs/desktops/enlightenment/econnman/default.nix
+++ b/pkgs/desktops/enlightenment/econnman/default.nix
@ -1,24 +1,46 @@
-{ lib, stdenv, fetchurl, pkg-config, efl, python3Packages, dbus, makeWrapper }:
+{ lib
+, stdenv
+, fetchurl
+, makeWrapper
+, pkg-config
+, dbus
+, efl
+, python3Packages
+, directoryListingUpdater
+}:

 stdenv.mkDerivation rec {
  pname = "econnman";
  version = "1.1";

  src = fetchurl {
-    url = "http://download.enlightenment.org/rel/apps/econnman/${pname}-${version}.tar.gz";
-    sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0";
+    url = "http://download.enlightenment.org/rel/apps/econnman/${pname}-${version}.tar.xz";
+    sha256 = "sha256-DM6HaB+ufKcPHmPP4K5l/fF7wzRycFQxfiXjiXYZ7YU=";
  };

-  nativeBuildInputs = [ makeWrapper pkg-config python3Packages.wrapPython ];
+  nativeBuildInputs = [
+    makeWrapper
+    pkg-config
+    python3Packages.wrapPython
+  ];

-  buildInputs = [ efl python3Packages.python dbus ];
+  buildInputs = [
+    dbus
+    efl
+    python3Packages.python
+  ];

-  pythonPath = [ python3Packages.pythonefl python3Packages.dbus-python ];
+  pythonPath = [
+    python3Packages.dbus-python
+    python3Packages.pythonefl
+  ];

  postInstall = ''
    wrapPythonPrograms
  '';

+  passthru.updateScript = directoryListingUpdater { };
+
  meta = with lib; {
    description = "A user interface for the connman network connection manager";
    homepage = "https://enlightenment.org/";
--- a/pkgs/desktops/enlightenment/ecrire/default.nix
+++ b/pkgs/desktops/enlightenment/ecrire/default.nix
@ -5,6 +5,7 @@
 , ninja
 , pkg-config
 , efl
+, directoryListingUpdater
 }:

 stdenv.mkDerivation rec {
@ -26,6 +27,8 @@ stdenv.mkDerivation rec {
    efl
  ];

+  passthru.updateScript = directoryListingUpdater { };
+
  meta = with lib; {
    description = "EFL simple text editor";
    homepage = "https://www.enlightenment.org/";
--- a/pkgs/desktops/enlightenment/efl/default.nix
+++ b/pkgs/desktops/enlightenment/efl/default.nix
@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchurl
 , meson
 , ninja
@ -52,6 +53,7 @@
 , writeText
 , xorg
 , zlib
+, directoryListingUpdater
 }:

 stdenv.mkDerivation rec {
@ -203,6 +205,8 @@ stdenv.mkDerivation rec {
    patchelf --add-needed ${libsndfile.out}/lib/libsndfile.so $out/lib/libecore_audio.so
  '';

+  passthru.updateScript = directoryListingUpdater { };
+
  meta = with lib; {
    description = "Enlightenment foundation libraries";
    homepage = "https://enlightenment.org/";
--- a/pkgs/desktops/enlightenment/ephoto/default.nix
+++ b/pkgs/desktops/enlightenment/ephoto/default.nix
@ -5,6 +5,7 @@
 , ninja
 , pkg-config
 , efl
+, directoryListingUpdater
 }:

 stdenv.mkDerivation rec {
@ -26,6 +27,8 @@ stdenv.mkDerivation rec {
    efl
  ];

+  passthru.updateScript = directoryListingUpdater { };
+
  meta = with lib; {
    description = "Image viewer and editor written using the Enlightenment Foundation Libraries";
    homepage = "https://www.smhouston.us/ephoto/";
--- a/pkgs/desktops/enlightenment/evisum/default.nix
+++ b/pkgs/desktops/enlightenment/evisum/default.nix
@ -5,6 +5,7 @@
 , ninja
 , pkg-config
 , efl
+, directoryListingUpdater
 }:

 stdenv.mkDerivation rec {
@ -26,6 +27,8 @@ stdenv.mkDerivation rec {
    efl
  ];

+  passthru.updateScript = directoryListingUpdater { };
+
  meta = with lib; {
    description = "System and process monitor written with EFL";
    homepage = "https://www.enlightenment.org";
--- a/pkgs/desktops/enlightenment/rage/default.nix
+++ b/pkgs/desktops/enlightenment/rage/default.nix
@ -7,6 +7,7 @@
 , efl
 , gst_all_1
 , wrapGAppsHook
+, directoryListingUpdater
 }:

 stdenv.mkDerivation rec {
@ -34,6 +35,8 @@ stdenv.mkDerivation rec {
    gst_all_1.gst-libav
  ];

+  passthru.updateScript = directoryListingUpdater { };
+
  meta = with lib; {
    description = "Video and audio player along the lines of mplayer";
    homepage = "https://enlightenment.org/";
--- a/pkgs/desktops/enlightenment/terminology/default.nix
+++ b/pkgs/desktops/enlightenment/terminology/default.nix
@ -1,4 +1,14 @@
-{ lib, stdenv, fetchurl, meson, ninja, pkg-config, python3, efl, nixosTests }:
+{ lib
+, stdenv
+, fetchurl
+, meson
+, ninja
+, pkg-config
+, python3
+, efl
+, nixosTests
+, directoryListingUpdater
+}:

 stdenv.mkDerivation rec {
  pname = "terminology";
@ -26,6 +36,8 @@ stdenv.mkDerivation rec {

  passthru.tests.test = nixosTests.terminal-emulators.terminology;

+  passthru.updateScript = directoryListingUpdater { };
+
  meta = with lib; {
    description = "Powerful terminal emulator based on EFL";
    homepage = "https://www.enlightenment.org/about-terminology";
--- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix
@ -8,10 +8,10 @@
 }:
 mkDerivation {
  pname = "cabal2nix";
-  version = "unstable-2022-10-10";
+  version = "unstable-2022-10-22";
  src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/b3ae6f9240d07ba103f1eb7ab22f6055e9cdb7dc.tar.gz";
-    sha256 = "0ym6lyp4br57442b6a9cg9bczbjqz8nz984rxwiacldqzndk8jbr";
+    url = "https://github.com/NixOS/cabal2nix/archive/bf7cc8f202e332953f7fbfc1d90490e4c197d287.tar.gz";
+    sha256 = "0fmpfl2nl215aids9yxdmdik77w7cppk900rnx23m07rmwg4xa4f";
  };
  postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
  isLibrary = true;
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -2431,10 +2431,6 @@ self: super: {
  # 2022-02-25: Unmaintained and to strict upper bounds
  paths = doJailbreak super.paths;

-  # Too strict bounds on hspec, fixed on main branch, but unreleased
-  colourista = assert super.colourista.version == "0.1.0.1";
-    doJailbreak super.colourista;
-
  # 2022-02-26: https://github.com/emilypi/base64/issues/39
  base64 = dontCheck super.base64;

@ -2548,32 +2544,9 @@ self: super: {
  # Remove once version 1.* is released
  monad-bayes = doJailbreak super.monad-bayes;

-  crypt-sha512 = overrideCabal (drv: {
-    librarySystemDepends = [
-      pkgs.libxcrypt
-    ];
-    # Test failure after libxcrypt migration, reported upstrem at
-    # https://github.com/phadej/crypt-sha512/issues/13
-    doCheck = false;
-  }) super.crypt-sha512;
-
-  nano-cryptr = overrideCabal (drv: {
-    librarySystemDepends = [
-      pkgs.libxcrypt
-    ];
-  }) super.nano-cryptr;
-
-  Unixutils = overrideCabal (drv: {
-    librarySystemDepends = [
-      pkgs.libxcrypt
-    ];
-  }) super.Unixutils;
-
-  xmonad-utils = overrideCabal (drv: {
-    librarySystemDepends = [
-      pkgs.libxcrypt
-    ];
-  }) super.xmonad-utils;
+  # Test failure after libxcrypt migration, reported upstrem at
+  # https://github.com/phadej/crypt-sha512/issues/13
+  crypt-sha512 = dontCheck super.crypt-sha512;

 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let
  # We need to build purescript with these dependencies and thus also its reverse
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@ -387,7 +387,6 @@ broken-packages:
  - bind-marshal
  - binembed
  - bins
-  - binsm
  - bio
  - BiobaseBlast
  - BiobaseNewick
@ -459,6 +458,7 @@ broken-packages:
  - Bravo
  - brians-brain
  - brick-dropdownmenu
+  - brick-panes
  - bricks-internal
  - brillig
  - broccoli
@ -860,7 +860,6 @@ broken-packages:
  - control-monad-failure-mtl
  - Control-Monad-ST2
  - contstuff
-  - copilot-c99
  - copilot-sbv
  - copr
  - coquina
@ -878,6 +877,7 @@ broken-packages:
  - couchdb-conduit
  - couch-hs
  - counter
+  - country
  - courier
  - court
  - coverage
@ -972,7 +972,6 @@ broken-packages:
  - database-study
  - data-check
  - data-combinator-gen
-  - data-compat
  - data-concurrent-queue
  - data-construction
  - data-constructors
@ -2283,6 +2282,7 @@ broken-packages:
  - hnn
  - hnop
  - hoauth
+  - hoauth2-providers
  - hoauth2-tutorial
  - hobbes
  - hobbits
@ -2421,6 +2421,7 @@ broken-packages:
  - hslogger-reader
  - hslogger-template
  - hs-logo
+  - hslua-list
  - hsluv-haskell
  - hsmagick
  - HSmarty
@ -2508,7 +2509,6 @@ broken-packages:
  - http-client-request-modifiers
  - http-client-session
  - http-client-streams
-  - http-client-websockets
  - http-conduit-browser
  - http-conduit-downloader
  - http-directory
@ -2560,6 +2560,7 @@ broken-packages:
  - hw-playground-linear
  - hwsl2
  - hx
+  - hxmppc
  - HXQ
  - hxt-cache
  - hxt-pickle-utils
@ -2630,6 +2631,7 @@ broken-packages:
  - imports
  - impossible
  - imprint
+  - incipit
  - indentation-core
  - index-core
  - indexed-containers
@ -3418,6 +3420,7 @@ broken-packages:
  - mzv
  - n2o-protocols
  - nagios-plugin-ekg
+  - named-binary-tag
  - named-lock
  - named-servant
  - named-sop
@ -3588,6 +3591,7 @@ broken-packages:
  - Omega
  - om-elm
  - om-fail
+  - om-http
  - om-http-logging
  - omnifmt
  - on-a-horse
@ -4145,6 +4149,7 @@ broken-packages:
  - quibble-core
  - QuickAnnotate
  - quickcheck-arbitrary-template
+  - quickcheck-lockstep
  - quickcheck-property-comb
  - quickcheck-property-monad
  - quickcheck-rematch
@ -4453,7 +4458,6 @@ broken-packages:
  - scottish
  - scotty-binding-play
  - scotty-blaze
-  - scotty-form
  - scotty-format
  - scotty-params-parser
  - scotty-resource
@ -4702,7 +4706,6 @@ broken-packages:
  - smiles
  - smoothie
  - smsaero
-  - smt2-parser
  - smt-lib
  - SmtLib
  - smtlib2
@ -4957,6 +4960,7 @@ broken-packages:
  - swagger
  - swagger-petstore
  - swagger-test
+  - swarm
  - swearjure
  - swf
  - swift-lda
@ -5083,6 +5087,7 @@ broken-packages:
  - test-framework-skip
  - test-framework-testing-feat
  - test-framework-th-prime
+  - test-lib
  - testloop
  - testpack
  - testpattern
@ -5363,6 +5368,7 @@ broken-packages:
  - unicode-prelude
  - unicode-symbols
  - unicode-tricks
+  - union
  - union-map
  - uniprot-kb
  - uniqueid
@ -5430,12 +5436,10 @@ broken-packages:
  - uuagc-diagrams
  - uu-cco
  - uuid-aeson
-  - uuid-bytes
  - uvector
  - uxadt
  - vabal-lib
  - vacuum
-  - vado
  - validated-types
  - Validation
  - validations
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@ -1,4 +1,4 @@
-# Stackage LTS 19.27
+# Stackage LTS 19.28
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@ -79,15 +79,15 @@ default-package-overrides:
  - arrow-extras ==0.1.0.1
  - arrows ==0.4.4.2
  - ascii ==1.1.3.0
-  - ascii-case ==1.0.0.10
-  - ascii-char ==1.0.0.14
+  - ascii-case ==1.0.0.11
+  - ascii-char ==1.0.0.15
  - asciidiagram ==1.3.3.3
-  - ascii-group ==1.0.0.12
+  - ascii-group ==1.0.0.13
  - ascii-numbers ==1.0.0.0
  - ascii-predicates ==1.0.0.10
  - ascii-progress ==0.3.3.0
  - ascii-superset ==1.0.1.13
-  - ascii-th ==1.0.0.10
+  - ascii-th ==1.0.0.11
  - asn1-encoding ==0.9.6
  - asn1-parse ==0.9.5
  - asn1-types ==0.3.4
@ -299,8 +299,8 @@ default-package-overrides:
  - cast ==0.1.0.2
  - caster ==0.0.3.0
  - cayley-client ==0.4.17
-  - cborg ==0.2.7.0
-  - cborg-json ==0.2.4.0
+  - cborg ==0.2.8.0
+  - cborg-json ==0.2.5.0
  - cdar-mBound ==0.1.0.4
  - c-enum ==0.1.1.3
  - cereal ==0.5.8.3
@ -352,7 +352,7 @@ default-package-overrides:
  - clumpiness ==0.17.0.2
  - ClustalParser ==1.3.0
  - cmark ==0.6
-  - cmark-gfm ==0.2.4
+  - cmark-gfm ==0.2.5
  - cmark-lucid ==0.1.0.0
  - cmdargs ==0.10.21
  - codec-beam ==0.2.0
@ -373,7 +373,7 @@ default-package-overrides:
  - comfort-fftw ==0.0
  - comfort-graph ==0.0.3.2
  - commonmark ==0.2.2
-  - commonmark-extensions ==0.2.3.2
+  - commonmark-extensions ==0.2.3.3
  - commonmark-pandoc ==0.2.1.2
  - commutative ==0.0.2
  - comonad ==5.0.8
@ -395,7 +395,7 @@ default-package-overrides:
  - concurrent-supply ==0.1.8
  - cond ==0.4.1.1
  - conduino ==0.2.2.0
-  - conduit ==1.3.4.2
+  - conduit ==1.3.4.3
  - conduit-aeson ==0.1.0.1
  - conduit-algorithms ==0.0.13.0
  - conduit-combinators ==1.3.0
@ -418,7 +418,7 @@ default-package-overrides:
  - constraints ==0.13.4
  - constraints-extras ==0.3.2.1
  - constraint-tuples ==0.1.2
-  - construct ==0.3.1
+  - construct ==0.3.1.1
  - containers-unicode-symbols ==0.3.1.3
  - contravariant ==1.5.5
  - contravariant-extras ==0.3.5.3
@ -429,7 +429,7 @@ default-package-overrides:
  - convertible ==1.1.1.1
  - cookie ==0.4.5
  - copr-api ==0.1.0
-  - core-data ==0.3.6.0
+  - core-data ==0.3.8.0
  - core-program ==0.4.6.4
  - core-text ==0.3.8.0
  - countable ==1.0
@ -813,14 +813,14 @@ default-package-overrides:
  - function-builder ==0.3.0.1
  - functor-classes-compat ==2.0.0.2
  - functor-combinators ==0.4.1.0
-  - fused-effects ==1.1.2.0
+  - fused-effects ==1.1.2.1
  - fusion-plugin ==0.2.5
  - fusion-plugin-types ==0.1.0
  - fuzzcheck ==0.1.1
  - fuzzy ==0.1.0.1
  - fuzzy-dates ==0.1.1.2
  - fuzzyset ==0.2.3
-  - fuzzy-time ==0.2.0.1
+  - fuzzy-time ==0.2.0.3
  - gauge ==0.2.5
  - gd ==3000.7.3
  - gdp ==0.0.3.0
@ -1149,7 +1149,7 @@ default-package-overrides:
  - hspec-leancheck ==0.0.6
  - hspec-megaparsec ==2.2.0
  - hspec-meta ==2.7.8
-  - hspec-need-env ==0.1.0.9
+  - hspec-need-env ==0.1.0.10
  - hspec-parsec ==0
  - hspec-smallcheck ==0.5.2
  - hspec-tmp-proc ==0.5.1.2
@ -1257,7 +1257,7 @@ default-package-overrides:
  - immortal-queue ==0.1.0.1
  - inbox ==0.2.0
  - include-file ==0.1.0.4
-  - incremental-parser ==0.5.0.3
+  - incremental-parser ==0.5.0.4
  - indents ==0.5.0.1
  - indexed ==0.1.3
  - indexed-containers ==0.1.0.2
@ -1292,7 +1292,7 @@ default-package-overrides:
  - invariant ==0.5.6
  - invert ==1.0.0.2
  - invertible ==0.2.0.7
-  - invertible-grammar ==0.1.3.2
+  - invertible-grammar ==0.1.3.3
  - io-machine ==0.2.0.0
  - io-manager ==0.1.0.3
  - io-memoize ==1.1.1.0
@ -1605,7 +1605,7 @@ default-package-overrides:
  - murmur3 ==1.0.5
  - murmur-hash ==0.1.0.10
  - MusicBrainz ==0.4.1
-  - mutable-containers ==0.3.4
+  - mutable-containers ==0.3.4.1
  - mwc-probability ==2.3.1
  - mwc-random ==0.15.0.2
  - mwc-random-monad ==0.7.3.1
@ -2115,9 +2115,9 @@ default-package-overrides:
  - sample-frame ==0.0.3
  - sample-frame-np ==0.0.4.1
  - sampling ==0.3.5
-  - sandwich ==0.1.0.11
+  - sandwich ==0.1.1.2
  - sandwich-quickcheck ==0.1.0.6
-  - sandwich-slack ==0.1.0.6
+  - sandwich-slack ==0.1.1.0
  - say ==0.1.0.1
  - sbp ==4.1.6
  - sbv ==8.17
@ -2155,7 +2155,7 @@ default-package-overrides:
  - sequence-formats ==1.6.6.1
  - sequenceTools ==1.5.2
  - serf ==0.1.1.0
-  - serialise ==0.2.5.0
+  - serialise ==0.2.6.0
  - servant ==0.19
  - servant-auth ==0.4.1.0
  - servant-auth-client ==0.4.1.0
@ -2202,7 +2202,7 @@ default-package-overrides:
  - setlocale ==1.0.0.10
  - set-monad ==0.3.0.0
  - sets ==0.0.6.2
-  - sexp-grammar ==2.3.3.1
+  - sexp-grammar ==2.3.4.0
  - sexpr-parser ==0.2.2.0
  - SHA ==1.6.4.4
  - shake ==0.19.7
@ -2252,7 +2252,7 @@ default-package-overrides:
  - skylighting-core ==0.12.3.1
  - slack-progressbar ==0.1.0.1
  - slave-thread ==1.1.0.1
-  - slist ==0.2.0.0
+  - slist ==0.2.0.1
  - slynx ==0.6.1.1
  - smallcheck ==1.2.1
  - smash ==0.1.3
@ -2277,7 +2277,7 @@ default-package-overrides:
  - sourcemap ==0.1.7
  - sox ==0.2.3.1
  - soxlib ==0.0.3.1
-  - spacecookie ==1.0.0.1
+  - spacecookie ==1.0.0.2
  - sparse-linear-algebra ==0.3.1
  - spatial-math ==0.5.0.1
  - special-values ==0.1.0.0
@ -2350,7 +2350,7 @@ default-package-overrides:
  - strict ==0.4.0.1
  - strict-concurrency ==0.2.4.3
  - strict-list ==0.1.7
-  - strict-tuple ==0.1.5.1
+  - strict-tuple ==0.1.5.2
  - strict-tuple-lens ==0.2
  - strict-wrapper ==0.0.0.0
  - stringbuilder ==0.5.1
@ -2595,7 +2595,7 @@ default-package-overrides:
  - type-spec ==0.4.0.0
  - typography-geometry ==1.0.1.0
  - tz ==0.1.3.6
-  - tzdata ==0.2.20220815.0
+  - tzdata ==0.2.20220923.0
  - ua-parser ==0.7.7.0
  - uglymemo ==0.1.0.1
  - unagi-chan ==0.4.1.4
@ -2608,8 +2608,8 @@ default-package-overrides:
  - unexceptionalio ==0.5.1
  - unexceptionalio-trans ==0.5.1
  - unicode ==0.0.1.1
-  - unicode-collation ==0.1.3.2
-  - unicode-data ==0.3.0
+  - unicode-collation ==0.1.3.3
+  - unicode-data ==0.3.1
  - unicode-show ==0.1.1.1
  - unicode-transforms ==0.4.0.1
  - unidecode ==0.1.0.4
@ -2764,7 +2764,7 @@ default-package-overrides:
  - Win32-notify ==0.3.0.3
  - windns ==0.1.0.1
  - wire-streams ==0.1.1.0
-  - witch ==1.0.0.4
+  - witch ==1.0.2.0
 with-compiler: ghc-9.0.2
  - withdependencies ==0.3.0
  - witherable ==0.4.2
@ -2841,7 +2841,7 @@ with-compiler: ghc-9.0.2
  - yesod-bin ==1.6.2.2
  - yesod-core ==1.6.24.0
  - yesod-eventsource ==1.6.0.1
-  - yesod-form ==1.7.2
+  - yesod-form ==1.7.3
  - yesod-form-bootstrap4 ==3.0.1
  - yesod-gitrepo ==0.3.0
  - yesod-gitrev ==0.2.2
@ -2870,7 +2870,7 @@ with-compiler: ghc-9.0.2
  - zim-parser ==0.2.1.0
  - zio ==0.1.0.2
  - zip ==1.7.2
-  - zip-archive ==0.4.2.1
+  - zip-archive ==0.4.2.2
  - zipper-extra ==0.1.3.2
  - zippers ==0.3.2
  - zip-stream ==0.2.1.0
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@ -739,6 +739,8 @@ dont-distribute-packages:
 - battleships
 - bayes-stack
 - bbi
+ - bcp47
+ - bcp47-orphans
 - bdcs
 - bdcs-api
 - beam-automigrate
@ -1100,6 +1102,7 @@ dont-distribute-packages:
 - cursedcsv
 - cv-combinators
 - cypher
+ - dahdit
 - dapi
 - darcs-benchmark
 - darcs-beta
@ -2103,6 +2106,7 @@ dont-distribute-packages:
 - hmt-diagrams
 - hnormalise
 - ho-rewriting
+ - hoauth2-providers-tutorial
 - hob
 - hogre
 - hogre-examples
@ -2780,6 +2784,7 @@ dont-distribute-packages:
 - mysql-haskell-nem
 - mysql-haskell-openssl
 - mysql-simple-typed
+ - mywork
 - n2o-web
 - nakadi-client
 - named-servant-client
@ -2865,6 +2870,8 @@ dont-distribute-packages:
 - ohloh-hs
 - ois-input-manager
 - olwrapper
+ - om-kubernetes
+ - om-legion
 - online
 - online-csv
 - opc-xml-da-client
@ -3903,6 +3910,7 @@ dont-distribute-packages:
 - vector-text
 - venzone
 - verdict-json
+ - verifiable-expressions
 - vessel
 - vflow-types
 - vfr-waypoints
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
--- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
+++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
@ -16,13 +16,13 @@

 stdenv.mkDerivation rec {
  pname = "qtstyleplugin-kvantum";
-  version = "1.0.5";
+  version = "1.0.6";

  src = fetchFromGitHub {
    owner = "tsujan";
    repo = "Kvantum";
    rev = "V${version}";
-    sha256 = "DJRTOpmmiB3VivZt66qaQwz7tp+sEMP+3E0dwUAkvXU=";
+    sha256 = "35PrC4UZJJJgDUMv/xoz4R9HA9hidZ9HmXSgte6B+a8=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/ocaml-modules/angstrom/default.nix
+++ b/pkgs/development/ocaml-modules/angstrom/default.nix
@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildDunePackage, ocaml, ocaml-syntax-shims, alcotest, result, bigstringaf, ppx_let }:
+{ lib, fetchFromGitHub, buildDunePackage, ocaml, ocaml-syntax-shims, alcotest, result, bigstringaf, ppx_let, gitUpdater }:

 buildDunePackage rec {
  pname = "angstrom";
@ -19,6 +19,8 @@ buildDunePackage rec {
  propagatedBuildInputs = [ bigstringaf result ];
  doCheck = lib.versionAtLeast ocaml.version "4.08";

+  passthru.updateScript = gitUpdater { };
+
  meta = {
    homepage = "https://github.com/inhabitedtype/angstrom";
    description = "OCaml parser combinators built for speed and memory efficiency";
--- a/pkgs/development/ocaml-modules/earlybird/default.nix
+++ b/pkgs/development/ocaml-modules/earlybird/default.nix
@ -1,5 +1,6 @@
-{ lib, fetchurl, ocaml, buildDunePackage
+{ lib, fetchFromGitHub, ocaml, buildDunePackage
 , cmdliner, dap, fmt, iter, logs, lru, lwt_ppx, lwt_react, menhir, menhirLib, path_glob, ppx_deriving_yojson
+, gitUpdater
 }:

 if lib.versionAtLeast ocaml.version "4.13"
@ -14,13 +15,17 @@ buildDunePackage rec {

  minimumOCamlVersion = "4.11";

-  src = fetchurl {
-    url = "https://github.com/hackwaly/ocamlearlybird/releases/download/${version}/${pname}-${version}.tbz";
-    sha256 = "1pwzhcr3pw24ra4j4d23vz71h0psz4xkyp7b12l2wl1slxzjbrxa";
+  src = fetchFromGitHub {
+    owner = "hackwaly";
+    repo = "ocamlearlybird";
+    rev = version;
+    hash = "sha256-8JHZWsgpz2pzpDxST3bkMSmPHtj7MDzD5G3ujqMW+MU=";
  };

  buildInputs = [ cmdliner dap fmt iter logs lru lwt_ppx lwt_react menhir menhirLib path_glob ppx_deriving_yojson ];

+  passthru.updateScript = gitUpdater { };
+
  meta = {
    homepage = "https://github.com/hackwaly/ocamlearlybird";
    description = "OCaml debug adapter";
--- a/pkgs/development/ocaml-modules/mdx/default.nix
+++ b/pkgs/development/ocaml-modules/mdx/default.nix
@ -1,7 +1,9 @@
-{ lib, fetchurl, buildDunePackage, ocaml
+{ lib, fetchFromGitHub, buildDunePackage, ocaml
 , alcotest
 , astring, cmdliner, cppo, fmt, logs, ocaml-version, odoc-parser, ocaml_lwt, re, result, csexp
-, pandoc}:
+, pandoc
+, gitUpdater
+}:

 buildDunePackage rec {
  pname = "mdx";
@ -9,9 +11,11 @@ buildDunePackage rec {

  minimalOCamlVersion = "4.08";

-  src = fetchurl {
-    url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz";
-    sha256 = "sha256-ol1zy8LODDYdcnv/jByE0pnqJ5ujQuMALq3v9y7td/o=";
+  src = fetchFromGitHub {
+    owner = "realworldocaml";
+    repo = pname;
+    rev = version;
+    hash = "sha256-p7jmksltgfLFTSkPxMuJWJexLq2VvPWT/DJtDveOL/A=";
  };

  nativeBuildInputs = [ cppo ];
@ -30,6 +34,8 @@ buildDunePackage rec {
    runHook postInstall
  '';

+  passthru.updateScript = gitUpdater { };
+
  meta = {
    description = "Executable OCaml code blocks inside markdown files";
    homepage = "https://github.com/realworldocaml/mdx";
--- a/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix
@ -5,6 +5,7 @@
 , cmdliner
 , ppx_deriving
 , ppxlib
+, gitUpdater
 }:

 buildDunePackage rec {
@ -31,6 +32,8 @@ buildDunePackage rec {
    alcotest
  ];

+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+
  meta = with lib; {
    description = "Ppx_deriving plugin for generating command line interfaces from types for OCaml";
    homepage = "https://github.com/hammerlab/ppx_deriving_cmdliner";
--- a/pkgs/development/ocaml-modules/printbox/default.nix
+++ b/pkgs/development/ocaml-modules/printbox/default.nix
@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildDunePackage, ocaml, mdx }:
+{ lib, fetchFromGitHub, buildDunePackage, ocaml, mdx, gitUpdater }:

 buildDunePackage rec {
  pname = "printbox";
@ -20,6 +20,8 @@ buildDunePackage rec {
  # mdx is not available for OCaml < 4.08
  doCheck = lib.versionAtLeast ocaml.version "4.08";

+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+
  meta = {
    homepage = "https://github.com/c-cube/printbox/";
    description = "Allows to print nested boxes, lists, arrays, tables in several formats";
--- a/pkgs/development/ocaml-modules/xml-light/default.nix
+++ b/pkgs/development/ocaml-modules/xml-light/default.nix
@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, ocaml, findlib }:
+{ stdenv, lib, fetchFromGitHub, ocaml, findlib, gitUpdater }:

 stdenv.mkDerivation rec {
  pname = "ocaml${ocaml.version}-xml-light";
@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
    runHook postInstall
  '';

+  passthru.updateScript = gitUpdater { };
+
  meta = {
    description = "Minimal Xml parser and printer for OCaml";
    longDescription = ''
--- a/pkgs/development/python-modules/aiocsv/default.nix
+++ b/pkgs/development/python-modules/aiocsv/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "aiocsv";
-  version = "1.2.2";
+  version = "1.2.3";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "MKuranowski";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-lh+yHyHU+XrK4nk1xxrxgF5zGH7lP9jHdJ+m9ncfprw=";
+    hash = "sha256-cgPD9JdauPIHOdCNxsWInJWytj4niXozFAzJxKn52bE=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "aioesphomeapi";
-  version = "11.1.1";
+  version = "11.2.0";
  format = "setuptools";

  disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "esphome";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-fyY3G2tsrqy5aTXYI+KGqMahWspdTjjjkS9JK/ohjhc=";
+    hash = "sha256-Y7BQzms2BUtc0fw1PxrsSYDMZLt5NX42M1sUNuiVoCs=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/channels-redis/default.nix
+++ b/pkgs/development/python-modules/channels-redis/default.nix
@ -3,7 +3,8 @@
 , asgiref
 , buildPythonPackage
 , channels
-, fetchPypi
+, cryptography
+, fetchFromGitHub
 , hiredis
 , msgpack
 , pythonOlder
@ -12,34 +13,47 @@

 buildPythonPackage rec {
  pname = "channels-redis";
-  version = "3.4.1";
+  version = "4.0.0";
+  format = "setuptools";

-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";

-  src = fetchPypi {
-    inherit version;
-    pname = "channels_redis";
-    sha256 = "sha256-eOSi8rKnRP5ah4SOw2te5J9SLGgIzv5sWDZj0NUx+qg=";
+  src = fetchFromGitHub {
+    owner = "django";
+    repo = "channels_redis";
+    rev = version;
+    hash = "sha256-YiLNrMRroa8T4uPNwa5ussFoFYjyg31waGpBGhAETmY=";
  };

-  buildInputs = [ redis hiredis ];
+  buildInputs = [
+    hiredis
+    redis
+  ];

-  propagatedBuildInputs = [ channels msgpack aioredis asgiref ];
+  propagatedBuildInputs = [
+    aioredis
+    asgiref
+    channels
+    msgpack
+  ];
+
+  passthru.optional-dependencies = {
+    cryptography = [
+      cryptography
+    ];
+  };

  # Fails with : ConnectionRefusedError: [Errno 111] Connect call failed ('127.0.0.1', 6379)
  # (even with a local Redis instance running)
  doCheck = false;

-  postPatch = ''
-    sed -i "s/msgpack~=0.6.0/msgpack/" setup.py
-    sed -i "s/aioredis~=1.0/aioredis/" setup.py
-  '';
-
-  pythonImportsCheck = [ "channels_redis" ];
+  pythonImportsCheck = [
+    "channels_redis"
+  ];

  meta = with lib; {
-    homepage = "https://github.com/django/channels_redis/";
    description = "Redis-backed ASGI channel layer implementation";
+    homepage = "https://github.com/django/channels_redis/";
    license = licenses.bsd3;
    maintainers = with maintainers; [ mmai ];
  };
--- a/pkgs/development/python-modules/channels/default.nix
+++ b/pkgs/development/python-modules/channels/default.nix
@ -1,47 +1,58 @@
 { lib
-, buildPythonPackage
-, fetchFromGitHub
 , asgiref
-, django
+, buildPythonPackage
 , daphne
+, django
+, fetchFromGitHub
 , pytest-asyncio
 , pytest-django
 , pytestCheckHook
+, pythonOlder
 }:

 buildPythonPackage rec {
  pname = "channels";
-  version = "3.0.5";
+  version = "4.0.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "django";
    repo = pname;
    rev = version;
-    sha256 = "sha256-bKrPLbD9zG7DwIYBst1cb+zkDsM8B02wh3D80iortpw=";
+    hash = "sha256-n88MxwYQ4O2kBy/W0Zvi3FtIlhZQQRCssB/lYrFNvps=";
  };

  propagatedBuildInputs = [
    asgiref
    django
-    daphne
  ];

+  passthru.optional-dependencies = {
+    daphne = [
+      daphne
+    ];
+  };
+
  checkInputs = [
    pytest-asyncio
    pytest-django
    pytestCheckHook
-  ];
+  ] ++ passthru.optional-dependencies.daphne;

  pytestFlagsArray = [
    "--asyncio-mode=legacy"
  ];

-  pythonImportsCheck = [ "channels" ];
+  pythonImportsCheck = [
+    "channels"
+  ];

  meta = with lib; {
    description = "Brings event-driven capabilities to Django with a channel system";
-    license = licenses.bsd3;
    homepage = "https://github.com/django/channels";
+    license = licenses.bsd3;
    maintainers = with maintainers; [ fab ];
  };
 }
--- a/pkgs/development/python-modules/daphne/default.nix
+++ b/pkgs/development/python-modules/daphne/default.nix
@ -1,35 +1,60 @@
-{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub
-, asgiref, autobahn, twisted, pytest-runner
-, hypothesis, pytest, pytest-asyncio, service-identity, pyopenssl
+{ lib
+, stdenv
+, asgiref
+, autobahn
+, buildPythonPackage
+, django
+, fetchFromGitHub
+, hypothesis
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+, twisted
 }:
+
 buildPythonPackage rec {
  pname = "daphne";
-  version = "3.0.2";
+  version = "4.0.0";
+  format = "setuptools";

-  disabled = !isPy3k;
+  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "django";
    repo = pname;
    rev = version;
-    sha256 = "sha256-KWkMV4L7bA2Eo/u4GGif6lmDNrZAzvYyDiyzyWt9LeI=";
+    hash = "sha256-vPMrmC2B0Pcvk8Y1FsJ4PXnzIMtPod7lL2u0IYNVUxc=";
  };

-  nativeBuildInputs = [ pytest-runner ];
+  propagatedBuildInputs = [
+    asgiref
+    autobahn
+    twisted
+  ] ++ twisted.optional-dependencies.tls;

-  propagatedBuildInputs = [ asgiref autobahn twisted service-identity pyopenssl ];
+  checkInputs = [
+    django
+    hypothesis
+    pytest-asyncio
+    pytestCheckHook
+  ];

-  checkInputs = [ hypothesis pytest pytest-asyncio ];
-
-  doCheck = !stdenv.isDarwin; # most tests fail on darwin
-
-  checkPhase = ''
-    py.test
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "pytest-runner" ""
  '';

+  # Most tests fail on darwin
+  doCheck = !stdenv.isDarwin;
+
+  pythonImportsCheck = [
+    "daphne"
+  ];
+
  meta = with lib; {
    description = "Django ASGI (HTTP/WebSocket) server";
-    license = licenses.bsd3;
    homepage = "https://github.com/django/daphne";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
  };
 }
--- a/pkgs/development/python-modules/mat2/default.nix
+++ b/pkgs/development/python-modules/mat2/default.nix
@ -4,6 +4,7 @@
 , unittestCheckHook
 , pythonOlder
 , fetchFromGitLab
+, fetchpatch
 , substituteAll
 , bubblewrap
 , exiftool
@ -53,6 +54,11 @@ buildPythonPackage rec {
      src = ./fix_poppler.patch;
      poppler_path = "${poppler_gi}/lib/girepository-1.0";
    })
+    # https://0xacab.org/jvoisin/mat2/-/issues/178
+    (fetchpatch {
+      url = "https://0xacab.org/jvoisin/mat2/-/commit/618e0a8e3984fd534b95ef3dbdcb8a76502c90b5.patch";
+      hash = "sha256-l9UFim3hGj+d2uKITiDG1OnqGeo2McBIiRSmK0Vidg8=";
+    })
  ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [
    (substituteAll {
      src = ./bubblewrap-path.patch;
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@ -7,6 +7,7 @@
 , pytestCheckHook
 , pkg-config
 , cairo
+, libxcrypt
 , python
 }:

@ -33,6 +34,8 @@ buildPythonPackage rec {

  buildInputs = [
    cairo
+  ] ++ lib.optionals (pythonOlder "3.9") [
+    libxcrypt
  ];

  checkInputs = [
--- a/pkgs/development/python-modules/python-efl/default.nix
+++ b/pkgs/development/python-modules/python-efl/default.nix
@ -6,6 +6,7 @@
 , dbus-python
 , packaging
 , enlightenment
+, directoryListingUpdater
 }:

 # Should be bumped along with EFL!
@ -39,6 +40,8 @@ buildPythonPackage rec {

  doCheck = false;

+  passthru.updateScript = directoryListingUpdater { };
+
  meta = with lib; {
    description = "Python bindings for Enlightenment Foundation Libraries";
    homepage = "https://github.com/DaveMDS/python-efl";
--- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix
+++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
@ -3,7 +3,9 @@ let
  ihaskellEnv = ghcWithPackages (self: [
    self.ihaskell
    self.ihaskell-blaze
-    self.ihaskell-diagrams
+    # Doesn't work with latest ihaskell versions missing an unrelated change
+    # https://github.com/IHaskell/IHaskell/issues/1378
+    # self.ihaskell-diagrams
  ] ++ packages self);
  ihaskellSh = writeScriptBin "ihaskell-notebook" ''
    #! ${stdenv.shell}
@ -24,9 +26,4 @@ buildEnv {
      fi
    done
  '';
-  meta = {
-    # ihaskell has an indirect dependency on the Python package mistune, which
-    # is marked insecure.
-    hydraPlatforms = lib.platforms.none;
-  };
 }
--- a/pkgs/development/tools/protoscope/default.nix
+++ b/pkgs/development/tools/protoscope/default.nix
@ -0,0 +1,24 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "protoscope";
+  version = "unstable-2022-10-04";
+
+  src = fetchFromGitHub {
+    owner = "protocolbuffers";
+    repo = "protoscope";
+    rev = "8b1d63939ee1a5d922b38f3976e1e58cae525163";
+    sha256 = "sha256-/vt02rvKVsryJZ+Bw4QLaGzDErGI04/4NUbSBkbbN3Y=";
+  };
+
+  vendorSha256 = "sha256-mK8eGo6oembs4nofvROn4g0+oO5E5/zQrmPKMe3xXik=";
+
+  ldflags = [ "-s" "-w" ];
+
+  meta = with lib; {
+    description = "Simple, human-editable language for representing and emitting the Protobuf wire format";
+    homepage = "https://github.com/protocolbuffers/protoscope";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ aaronjheng ];
+  };
+}
--- a/pkgs/servers/baserow/default.nix
+++ b/pkgs/servers/baserow/default.nix
@ -8,14 +8,14 @@ let

  baserow_premium = with python3.pkgs; ( buildPythonPackage rec {
    pname = "baserow_premium";
-    version = "1.10.2";
+    version = "1.12.1";
    foramt = "setuptools";

    src = fetchFromGitLab {
      owner = "bramw";
      repo = pname;
      rev = "refs/tags/${version}";
-      hash = "sha256-4BrhTwAxHboXz8sMZL0V68skgNw2D2/YJuiWVNe0p4w=";
+      hash = "sha256-zT2afl3QNE2dO3JXjsZXqSmm1lv3EorG3mYZLQQMQ2Q=";
    };

    sourceRoot = "source/premium/backend";
@ -27,14 +27,14 @@ in

 with python3.pkgs; buildPythonPackage rec {
  pname = "baserow";
-  version = "1.10.2";
+  version = "1.12.1";
  format = "setuptools";

  src = fetchFromGitLab {
    owner = "bramw";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-4BrhTwAxHboXz8sMZL0V68skgNw2D2/YJuiWVNe0p4w=";
+    hash = "sha256-zT2afl3QNE2dO3JXjsZXqSmm1lv3EorG3mYZLQQMQ2Q=";
  };

  sourceRoot = "source/backend";
@ -46,9 +46,12 @@ with python3.pkgs; buildPythonPackage rec {
    sed 's/\[standard\]//' -i requirements/base.in requirements/base.txt
  '';

-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [
+    makeWrapper
+  ];

  propagatedBuildInputs = [
+    autobahn
    advocate
    antlr4-python3-runtime
    boto3
@ -56,6 +59,7 @@ with python3.pkgs; buildPythonPackage rec {
    celery-redbeat
    channels
    channels-redis
+    daphne
    dj-database-url
    django-celery-beat
    django-celery-email
@ -111,8 +115,8 @@ with python3.pkgs; buildPythonPackage rec {
    cp -r src/baserow/core/management/backup $out/lib/${python.libPrefix}/site-packages/baserow/core/management/
  '';

-  # Disable linting checks
  disabledTests = [
+    # Disable linting checks
    "flake8_plugins"
  ];

@ -130,8 +134,8 @@ with python3.pkgs; buildPythonPackage rec {
  DJANGO_SETTINGS_MODULE = "baserow.config.settings.test";

  meta = with lib; {
-    homepage = "https://baserow.io";
    description = "No-code database and Airtable alternative";
+    homepage = "https://baserow.io";
    license = licenses.mit;
    maintainers = with maintainers; [ onny ];
  };
--- a/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix
+++ b/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix
@ -1,66 +0,0 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
-[
-  {
-    goPackagePath = "github.com/beorn7/perks";
-    fetch = {
-      type = "git";
-      url = "https://github.com/beorn7/perks";
-      rev = "3a771d992973f24aa725d07868b467d1ddfceafb";
-      sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
-    };
-  }
-  {
-    goPackagePath = "github.com/golang/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/golang/protobuf";
-      rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
-      sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
-    };
-  }
-  {
-    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
-    fetch = {
-      type = "git";
-      url = "https://github.com/matttproud/golang_protobuf_extensions";
-      rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
-      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/client_golang";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_golang";
-      rev = "82f5ff156b29e276022b1a958f7d385870fb9814";
-      sha256 = "111j329yrlgvh73dm80gawwxsh9dgjkw74254kyj5c2rfmra7znz";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/client_model";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_model";
-      rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
-      sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/common";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/common";
-      rev = "d811d2e9bf898806ecfb6ef6296774b13ffc314c";
-      sha256 = "0r4067r4ysmljksqw3awcxx5qplqhykahc5igdzgkky7i4bvaik1";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/procfs";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/procfs";
-      rev = "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e";
-      sha256 = "0x128p15h35mgwqxkigfkk1lfrcz9g697ahl8v6xp9kwvcqvjrrf";
-    };
-  }
-]
--- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
@ -1,55 +1,39 @@
-{ lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests
-, systemd, withSystemdSupport ? true }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, makeWrapper
+, nixosTests
+, systemd
+, withSystemdSupport ? true
+}:

-with lib;
-
-buildGoPackage rec {
+buildGoModule rec {
  pname = "postfix_exporter";
-  version = "0.1.2";
-
-  goPackagePath = "github.com/kumina/postfix_exporter";
+  version = "0.3.0";

  src = fetchFromGitHub {
    owner = "kumina";
    repo = "postfix_exporter";
    rev = version;
-    sha256 = "1b9ib3scxni6hlw55wv6f0z1xfn27l0p29as24f71rs70pyzy4hm";
+    sha256 = "sha256-63ze51Qbjm+3CV1OFGFa9cS4ucZ+gMKaJyBF2b//CfM=";
  };

-  nativeBuildInputs = optional withSystemdSupport makeWrapper;
-  buildInputs = optional withSystemdSupport systemd;
-  tags = optional (!withSystemdSupport) "nosystemd";
+  vendorSha256 = "sha256-a4Lk4wh4mvXEjLgFksZIVVtbp+zTUyjtLVuk7vuot2k=";

-  goDeps = ./postfix-exporter-deps.nix;
-  extraSrcs = optionals withSystemdSupport [
-    {
-      goPackagePath = "github.com/coreos/go-systemd";
-      src = fetchFromGitHub {
-        owner = "coreos";
-        repo = "go-systemd";
-        rev = "d1b7d058aa2adfc795ad17ff4aaa2bc64ec11c78";
-        sha256 = "1nz3v1b90hnmj2vjjwq96pr6psxlndqjyd30v9sgiwygzb7db9mv";
-      };
-    }
-    {
-      goPackagePath = "github.com/coreos/pkg";
-      src = fetchFromGitHub {
-        owner = "coreos";
-        repo = "pkg";
-        rev = "97fdf19511ea361ae1c100dd393cc47f8dcfa1e1";
-        sha256 = "1srn87wih25l09f75483hnxsr8fc6rq3bk7w1x8125ym39p6mg21";
-      };
-    }
-  ];
+  ldflags = [ "-s" "-w" ];

-  postInstall = optionalString withSystemdSupport ''
+  nativeBuildInputs = lib.optionals withSystemdSupport [ makeWrapper ];
+  buildInputs = lib.optionals withSystemdSupport [ systemd ];
+  tags = lib.optionals (!withSystemdSupport) "nosystemd";
+
+  postInstall = lib.optionals withSystemdSupport ''
    wrapProgram $out/bin/postfix_exporter \
      --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib"
  '';

  passthru.tests = { inherit (nixosTests.prometheus-exporters) postfix; };

-  meta = {
+  meta = with lib; {
    inherit (src.meta) homepage;
    description = "A Prometheus exporter for Postfix";
    license = licenses.asl20;
--- a/pkgs/servers/redpanda/default.nix
+++ b/pkgs/servers/redpanda/default.nix
@ -1,13 +1,13 @@
 { lib, stdenv, fetchzip }:

 let
-  version = "22.2.6";
+  version = "22.2.7";
  platform = if stdenv.isLinux then "linux" else "darwin";
  arch = if stdenv.isAarch64 then "arm" else "amd";
  sha256s = {
    darwin.amd = "sha256-AXk3aP1SGiHTfHTCBRTagX0DAVmdcVVIkxWaTnZxB8g=";
    darwin.arm = "sha256-pvOVvNc8lZ2d2fVZVYWvumVWYpnLORNY/3o1t4BN2N4=";
-    linux.amd = "sha256-azh9/NaKR11Ssd7gxYXsasSWuLfxSqz1C8tHmqjd3Xs=";
+    linux.amd = "sha256-hUChGYimCFXEvSxb49QgPo/LYlef0ZMVhKNy9i3SpVA=";
    linux.arm = "sha256-WHjYAbytiu747jFqN0KZ/CkIwAVI7fb32ywtRiQOBm8=";
  };
 in stdenv.mkDerivation rec {
--- a/pkgs/servers/web-apps/whitebophir/default.nix
+++ b/pkgs/servers/web-apps/whitebophir/default.nix
@ -1,13 +1,12 @@
 { stdenv
 , pkgs
 , lib
-, nodejs-14_x
+, nodejs-16_x
 , runtimeShell
 }:

 let
-  # nodejs-16_x fails with ENOTCACHED
-  nodejs = nodejs-14_x;
+  nodejs = nodejs-16_x;

  nodePackages = import ./node-packages.nix {
    inherit pkgs nodejs;
--- a/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
+++ b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
@ -1,43 +1,34 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.11.1. Do not edit!

 {nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:

 let
  sources = {
-    "@financial-times/polyfill-useragent-normaliser-1.10.1" = {
+    "@financial-times/polyfill-useragent-normaliser-1.10.2" = {
      name = "_at_financial-times_slash_polyfill-useragent-normaliser";
      packageName = "@financial-times/polyfill-useragent-normaliser";
-      version = "1.10.1";
+      version = "1.10.2";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@financial-times/polyfill-useragent-normaliser/-/polyfill-useragent-normaliser-1.10.1.tgz";
-        sha512 = "u+VCD2ISgkh6eoxdyb0L8bTApdU8t3fvHLS9ZXokC02b8iQD8nkRcpui5BIbuF+aYkWkTpaJhUInCueAGDBVAw==";
+        url = "https://registry.npmjs.org/@financial-times/polyfill-useragent-normaliser/-/polyfill-useragent-normaliser-1.10.2.tgz";
+        sha512 = "/9xHARfrKdWHt1ZXoT+/GpKx2N7uX88U1m6tF61AYSGaJFYaFlSoL1I4WbQOGH4eTQVb1z0a9LfwXaWblpRTBg==";
      };
    };
-    "@financial-times/useragent_parser-1.6.0" = {
+    "@financial-times/useragent_parser-1.6.3" = {
      name = "_at_financial-times_slash_useragent_parser";
      packageName = "@financial-times/useragent_parser";
-      version = "1.6.0";
+      version = "1.6.3";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@financial-times/useragent_parser/-/useragent_parser-1.6.0.tgz";
-        sha512 = "v6Ucl//xSVhpyTtHMVCA9uv9W7CVwj8vBAQFKFDkfGC1DquBobOMhnzH9Odc+Tunf+i4WRnNgt90fQ7CSAbU3g==";
+        url = "https://registry.npmjs.org/@financial-times/useragent_parser/-/useragent_parser-1.6.3.tgz";
+        sha512 = "TlQiXt/vS5ZwY0V3salvlyQzIzMGZEyw9inmJA25A8heL2kBVENbToiEc64R6ETNf5YHa2lwnc2I7iNHP9SqeQ==";
      };
    };
-    "@socket.io/base64-arraybuffer-1.0.2" = {
-      name = "_at_socket.io_slash_base64-arraybuffer";
-      packageName = "@socket.io/base64-arraybuffer";
-      version = "1.0.2";
+    "@socket.io/component-emitter-3.1.0" = {
+      name = "_at_socket.io_slash_component-emitter";
+      packageName = "@socket.io/component-emitter";
+      version = "3.1.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz";
-        sha512 = "dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==";
-      };
-    };
-    "@types/component-emitter-1.2.11" = {
-      name = "_at_types_slash_component-emitter";
-      packageName = "@types/component-emitter";
-      version = "1.2.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz";
-        sha512 = "SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==";
+        url = "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz";
+        sha512 = "+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==";
      };
    };
    "@types/cookie-0.4.1" = {
@ -58,13 +49,13 @@ let
        sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==";
      };
    };
-    "@types/node-17.0.14" = {
+    "@types/node-18.11.4" = {
      name = "_at_types_slash_node";
      packageName = "@types/node";
-      version = "17.0.14";
+      version = "18.11.4";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-17.0.14.tgz";
-        sha512 = "SbjLmERksKOGzWzPNuW7fJM7fk3YXVTFiZWB/Hs99gwhk+/dnrQRPBQjPW9aO+fi1tAffi9PrwFvsmOKmDTyng==";
+        url = "https://registry.npmjs.org/@types/node/-/node-18.11.4.tgz";
+        sha512 = "BxcJpBu8D3kv/GZkx/gSMz6VnTJREBj/4lbzYOQueUOELkt8WrO6zAcSPmp9uRPEW/d+lUO8QK0W2xnS1hEU0A==";
      };
    };
    "accept-language-parser-1.5.0" = {
@ -73,7 +64,7 @@ let
      version = "1.5.0";
      src = fetchurl {
        url = "https://registry.npmjs.org/accept-language-parser/-/accept-language-parser-1.5.0.tgz";
-        sha1 = "8877c54040a8dcb59e0a07d9c1fde42298334791";
+        sha512 = "QhyTbMLYo0BBGg1aWbeMG4ekWtds/31BrEU+DONOg/7ax23vxpL03Pb7/zBmha2v7vdD3AyzZVWBVGEZxKOXWw==";
      };
    };
    "accepts-1.3.8" = {
@ -109,16 +100,16 @@ let
      version = "1.0.1";
      src = fetchurl {
        url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz";
-        sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
+        sha512 = "zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==";
      };
    };
-    "component-emitter-1.3.0" = {
-      name = "component-emitter";
-      packageName = "component-emitter";
-      version = "1.3.0";
+    "bufferutil-4.0.7" = {
+      name = "bufferutil";
+      packageName = "bufferutil";
+      version = "4.0.7";
      src = fetchurl {
-        url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz";
-        sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==";
+        url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.7.tgz";
+        sha512 = "kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw==";
      };
    };
    "cookie-0.4.2" = {
@ -157,31 +148,31 @@ let
        sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
      };
    };
-    "debug-4.3.3" = {
+    "debug-4.3.4" = {
      name = "debug";
      packageName = "debug";
-      version = "4.3.3";
+      version = "4.3.4";
      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz";
-        sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==";
+        url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz";
+        sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==";
      };
    };
-    "depd-1.1.2" = {
+    "depd-2.0.0" = {
      name = "depd";
      packageName = "depd";
-      version = "1.1.2";
+      version = "2.0.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz";
-        sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9";
+        url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz";
+        sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==";
      };
    };
-    "destroy-1.0.4" = {
+    "destroy-1.2.0" = {
      name = "destroy";
      packageName = "destroy";
-      version = "1.0.4";
+      version = "1.2.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz";
-        sha1 = "978857442c44749e4206613e37946205826abd80";
+        url = "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz";
+        sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==";
      };
    };
    "ecdsa-sig-formatter-1.0.11" = {
@ -199,7 +190,7 @@ let
      version = "1.1.1";
      src = fetchurl {
        url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz";
-        sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
+        sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==";
      };
    };
    "encodeurl-1.0.2" = {
@ -208,25 +199,25 @@ let
      version = "1.0.2";
      src = fetchurl {
        url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz";
-        sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
+        sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==";
      };
    };
-    "engine.io-6.1.2" = {
+    "engine.io-6.2.0" = {
      name = "engine.io";
      packageName = "engine.io";
-      version = "6.1.2";
+      version = "6.2.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz";
-        sha512 = "v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ==";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-6.2.0.tgz";
+        sha512 = "4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg==";
      };
    };
-    "engine.io-parser-5.0.3" = {
+    "engine.io-parser-5.0.4" = {
      name = "engine.io-parser";
      packageName = "engine.io-parser";
-      version = "5.0.3";
+      version = "5.0.4";
      src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz";
-        sha512 = "BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==";
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz";
+        sha512 = "+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==";
      };
    };
    "escape-html-1.0.3" = {
@ -235,7 +226,7 @@ let
      version = "1.0.3";
      src = fetchurl {
        url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz";
-        sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988";
+        sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==";
      };
    };
    "etag-1.8.1" = {
@ -244,7 +235,7 @@ let
      version = "1.8.1";
      src = fetchurl {
        url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz";
-        sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
+        sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==";
      };
    };
    "fresh-0.5.2" = {
@ -253,7 +244,7 @@ let
      version = "0.5.2";
      src = fetchurl {
        url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz";
-        sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7";
+        sha512 = "zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==";
      };
    };
    "from2-2.3.0" = {
@ -262,7 +253,7 @@ let
      version = "2.3.0";
      src = fetchurl {
        url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz";
-        sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
+        sha512 = "OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==";
      };
    };
    "from2-string-1.1.0" = {
@ -271,16 +262,16 @@ let
      version = "1.1.0";
      src = fetchurl {
        url = "https://registry.npmjs.org/from2-string/-/from2-string-1.1.0.tgz";
-        sha1 = "18282b27d08a267cb3030cd2b8b4b0f212af752a";
+        sha512 = "m8vCh+KnXXXBtfF2VUbiYlQ+nczLcntB0BrtNgpmLkHylhObe9WF1b2LZjBBzrZzA6P4mkEla6ZYQoOUTG8cYA==";
      };
    };
-    "graceful-fs-4.2.9" = {
+    "graceful-fs-4.2.10" = {
      name = "graceful-fs";
      packageName = "graceful-fs";
-      version = "4.2.9";
+      version = "4.2.10";
      src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz";
-        sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz";
+        sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==";
      };
    };
    "handlebars-4.7.7" = {
@ -292,13 +283,13 @@ let
        sha512 = "aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==";
      };
    };
-    "http-errors-1.8.1" = {
+    "http-errors-2.0.0" = {
      name = "http-errors";
      packageName = "http-errors";
-      version = "1.8.1";
+      version = "2.0.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz";
-        sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==";
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz";
+        sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==";
      };
    };
    "inherits-2.0.4" = {
@ -316,7 +307,7 @@ let
      version = "1.0.0";
      src = fetchurl {
        url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
-        sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
+        sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==";
      };
    };
    "jsonwebtoken-8.5.1" = {
@ -352,7 +343,7 @@ let
      version = "4.3.0";
      src = fetchurl {
        url = "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz";
-        sha1 = "60bb98a87cb923c68ca1e51325483314849f553f";
+        sha512 = "W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==";
      };
    };
    "lodash.isboolean-3.0.3" = {
@ -361,7 +352,7 @@ let
      version = "3.0.3";
      src = fetchurl {
        url = "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz";
-        sha1 = "6c2e171db2a257cd96802fd43b01b20d5f5870f6";
+        sha512 = "Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==";
      };
    };
    "lodash.isinteger-4.0.4" = {
@ -370,7 +361,7 @@ let
      version = "4.0.4";
      src = fetchurl {
        url = "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz";
-        sha1 = "619c0af3d03f8b04c31f5882840b77b11cd68343";
+        sha512 = "DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==";
      };
    };
    "lodash.isnumber-3.0.3" = {
@ -379,7 +370,7 @@ let
      version = "3.0.3";
      src = fetchurl {
        url = "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz";
-        sha1 = "3ce76810c5928d03352301ac287317f11c0b1ffc";
+        sha512 = "QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==";
      };
    };
    "lodash.isplainobject-4.0.6" = {
@ -388,7 +379,7 @@ let
      version = "4.0.6";
      src = fetchurl {
        url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz";
-        sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb";
+        sha512 = "oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==";
      };
    };
    "lodash.isstring-4.0.1" = {
@ -397,7 +388,7 @@ let
      version = "4.0.1";
      src = fetchurl {
        url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz";
-        sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451";
+        sha512 = "0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==";
      };
    };
    "lodash.once-4.1.1" = {
@ -406,7 +397,7 @@ let
      version = "4.1.1";
      src = fetchurl {
        url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz";
-        sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac";
+        sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==";
      };
    };
    "lru-cache-6.0.0" = {
@ -436,31 +427,31 @@ let
        sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
      };
    };
-    "mime-db-1.51.0" = {
+    "mime-db-1.52.0" = {
      name = "mime-db";
      packageName = "mime-db";
-      version = "1.51.0";
+      version = "1.52.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz";
-        sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==";
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz";
+        sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==";
      };
    };
-    "mime-types-2.1.34" = {
+    "mime-types-2.1.35" = {
      name = "mime-types";
      packageName = "mime-types";
-      version = "2.1.34";
+      version = "2.1.35";
      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz";
-        sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==";
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz";
+        sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==";
      };
    };
-    "minimist-1.2.5" = {
+    "minimist-1.2.7" = {
      name = "minimist";
      packageName = "minimist";
-      version = "1.2.5";
+      version = "1.2.7";
      src = fetchurl {
-        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz";
-        sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==";
+        url = "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz";
+        sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==";
      };
    };
    "mnemonist-0.38.5" = {
@ -478,7 +469,7 @@ let
      version = "2.0.0";
      src = fetchurl {
        url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
-        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
+        sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==";
      };
    };
    "ms-2.1.2" = {
@ -517,31 +508,40 @@ let
        sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==";
      };
    };
+    "node-gyp-build-4.5.0" = {
+      name = "node-gyp-build";
+      packageName = "node-gyp-build";
+      version = "4.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz";
+        sha512 = "2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==";
+      };
+    };
    "object-assign-4.1.1" = {
      name = "object-assign";
      packageName = "object-assign";
      version = "4.1.1";
      src = fetchurl {
        url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz";
-        sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863";
+        sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==";
      };
    };
-    "obliterator-2.0.1" = {
+    "obliterator-2.0.4" = {
      name = "obliterator";
      packageName = "obliterator";
-      version = "2.0.1";
+      version = "2.0.4";
      src = fetchurl {
-        url = "https://registry.npmjs.org/obliterator/-/obliterator-2.0.1.tgz";
-        sha512 = "XnkiCrrBcIZQitJPAI36mrrpEUvatbte8hLcTcQwKA1v9NkCKasSi+UAguLsLDs/out7MoRzAlmz7VXvY6ph6w==";
+        url = "https://registry.npmjs.org/obliterator/-/obliterator-2.0.4.tgz";
+        sha512 = "lgHwxlxV1qIg1Eap7LgIeoBWIMFibOjbrYPIPJZcI1mmGAI2m3lNYpK12Y+GBdPQ0U1hRwSord7GIaawz962qQ==";
      };
    };
-    "on-finished-2.3.0" = {
+    "on-finished-2.4.1" = {
      name = "on-finished";
      packageName = "on-finished";
-      version = "2.3.0";
+      version = "2.4.1";
      src = fetchurl {
-        url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz";
-        sha1 = "20f1336481b083cd75337992a16971aa2d906947";
+        url = "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz";
+        sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==";
      };
    };
    "parseurl-1.3.3" = {
@ -553,13 +553,13 @@ let
        sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==";
      };
    };
-    "polyfill-library-3.110.1" = {
+    "polyfill-library-3.111.0" = {
      name = "polyfill-library";
      packageName = "polyfill-library";
-      version = "3.110.1";
+      version = "3.111.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/polyfill-library/-/polyfill-library-3.110.1.tgz";
-        sha512 = "OTgQPd6If8DQSrAXcFU2soHXrCHAJpGkBgWRSqEEcydauxzmuU3T1s15wOPfSd1gj8mXbiIrPaDndt0zy4hFTA==";
+        url = "https://registry.npmjs.org/polyfill-library/-/polyfill-library-3.111.0.tgz";
+        sha512 = "BLh/1m/QPKrH3fEmIICpHHOVoYb9naWKImWkYuGoh26sHFiNO01arJ1KXEQMYLfVl4btpCoX/bRdqQY9kIR/eQ==";
      };
    };
    "process-nextick-args-2.0.1" = {
@ -577,7 +577,7 @@ let
      version = "1.1.6";
      src = fetchurl {
        url = "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-1.1.6.tgz";
-        sha1 = "cd04eff46f5c95c3a7d045591d79b5e3e01f12d7";
+        sha512 = "7rrONfyLkDEc7OJ5QBkqa4KI4EBhCd340xRuIUPGCfu13znS+vx+VDdrT9ODAJHlXm7w4lbxN3DRjyv58EuzDg==";
      };
    };
    "range-parser-1.2.1" = {
@ -625,31 +625,31 @@ let
        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
      };
    };
-    "semver-7.3.5" = {
+    "semver-7.3.8" = {
      name = "semver";
      packageName = "semver";
-      version = "7.3.5";
+      version = "7.3.8";
      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz";
-        sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==";
+        url = "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz";
+        sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==";
      };
    };
-    "send-0.17.2" = {
+    "send-0.18.0" = {
      name = "send";
      packageName = "send";
-      version = "0.17.2";
+      version = "0.18.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.17.2.tgz";
-        sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==";
+        url = "https://registry.npmjs.org/send/-/send-0.18.0.tgz";
+        sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==";
      };
    };
-    "serve-static-1.14.2" = {
+    "serve-static-1.15.0" = {
      name = "serve-static";
      packageName = "serve-static";
-      version = "1.14.2";
+      version = "1.15.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz";
-        sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==";
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz";
+        sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==";
      };
    };
    "setprototypeof-1.2.0" = {
@ -661,31 +661,31 @@ let
        sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==";
      };
    };
-    "socket.io-4.4.1" = {
+    "socket.io-4.5.3" = {
      name = "socket.io";
      packageName = "socket.io";
-      version = "4.4.1";
+      version = "4.5.3";
      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz";
-        sha512 = "s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-4.5.3.tgz";
+        sha512 = "zdpnnKU+H6mOp7nYRXH4GNv1ux6HL6+lHL8g7Ds7Lj8CkdK1jJK/dlwsKDculbyOHifcJ0Pr/yeXnZQ5GeFrcg==";
      };
    };
-    "socket.io-adapter-2.3.3" = {
+    "socket.io-adapter-2.4.0" = {
      name = "socket.io-adapter";
      packageName = "socket.io-adapter";
-      version = "2.3.3";
+      version = "2.4.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz";
-        sha512 = "Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==";
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz";
+        sha512 = "W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==";
      };
    };
-    "socket.io-parser-4.0.4" = {
+    "socket.io-parser-4.2.1" = {
      name = "socket.io-parser";
      packageName = "socket.io-parser";
-      version = "4.0.4";
+      version = "4.2.1";
      src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz";
-        sha512 = "t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==";
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz";
+        sha512 = "V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==";
      };
    };
    "source-map-0.6.1" = {
@ -706,13 +706,13 @@ let
        sha512 = "+sGCE6FednJ/vI7vywErOg/mhVqmf6Zlktz7cdGRnF/cQWXD9ifMgtqU1CIIXmhSwm11SCk4zDN+bwNCvIR/Kg==";
      };
    };
-    "statuses-1.5.0" = {
+    "statuses-2.0.1" = {
      name = "statuses";
      packageName = "statuses";
-      version = "1.5.0";
+      version = "2.0.1";
      src = fetchurl {
-        url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz";
-        sha1 = "161c7dac177659fd9811f43771fa99381478628c";
+        url = "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz";
+        sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==";
      };
    };
    "stream-from-promise-1.0.0" = {
@ -721,7 +721,7 @@ let
      version = "1.0.0";
      src = fetchurl {
        url = "https://registry.npmjs.org/stream-from-promise/-/stream-from-promise-1.0.0.tgz";
-        sha1 = "763687f7dd777e4c894f6408333fc6b3fc8a61bb";
+        sha512 = "j84KLkudt+gr8KJ21RB02btPLx61uGbrLnewsWz6QKmsz8/c4ZFqXw6mJh5+G4oRN7DgDxdbjPxnpySpg1mUig==";
      };
    };
    "stream-to-string-1.2.0" = {
@ -757,25 +757,34 @@ let
      version = "2.0.2";
      src = fetchurl {
        url = "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz";
-        sha1 = "ae21768175d1559d48bef35420b2f4962f09c330";
+        sha512 = "0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==";
      };
    };
-    "tslib-2.3.1" = {
+    "tslib-2.4.0" = {
      name = "tslib";
      packageName = "tslib";
-      version = "2.3.1";
+      version = "2.4.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz";
-        sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==";
+        url = "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz";
+        sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==";
      };
    };
-    "uglify-js-3.15.0" = {
+    "uglify-js-3.17.4" = {
      name = "uglify-js";
      packageName = "uglify-js";
-      version = "3.15.0";
+      version = "3.17.4";
      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.0.tgz";
-        sha512 = "x+xdeDWq7FiORDvyIJ0q/waWd4PhjBNOm5dQUOq2AKC0IEjxOS66Ha9tctiVDGcRQuh69K7fgU5oRuTK4cysSg==";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz";
+        sha512 = "T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==";
+      };
+    };
+    "utf-8-validate-5.0.10" = {
+      name = "utf-8-validate";
+      packageName = "utf-8-validate";
+      version = "5.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz";
+        sha512 = "Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==";
      };
    };
    "util-deprecate-1.0.2" = {
@ -784,7 +793,7 @@ let
      version = "1.0.2";
      src = fetchurl {
        url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
-        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+        sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==";
      };
    };
    "vary-1.1.2" = {
@ -793,7 +802,7 @@ let
      version = "1.1.2";
      src = fetchurl {
        url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz";
-        sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc";
+        sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==";
      };
    };
    "wordwrap-1.0.0" = {
@ -802,7 +811,7 @@ let
      version = "1.0.0";
      src = fetchurl {
        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz";
-        sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
+        sha512 = "gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==";
      };
    };
    "ws-8.2.3" = {
@ -826,33 +835,32 @@ let
  };
 in
 {
-  "whitebophir-git+https://github.com/lovasoa/whitebophir.git#v1.17.0" = nodeEnv.buildNodePackage {
+  "whitebophir-git+https://github.com/lovasoa/whitebophir.git#v1.19.1" = nodeEnv.buildNodePackage {
    name = "whitebophir";
    packageName = "whitebophir";
-    version = "1.17.0";
+    version = "1.19.1";
    src = fetchgit {
      url = "https://github.com/lovasoa/whitebophir.git";
-      rev = "7fd1b7bbeaf9a178ba76ff60ebc4c9870bc599f3";
-      sha256 = "a343b29069e5da8ab129588a8d21ddefd03af5a69f04db6b35082ecfcef75d40";
+      rev = "8a42a787a05c974e910c2d87736e0af0a1108a48";
+      sha256 = "e13eecf56ae9c8754f730d106340b4b1ccc32582b30386c001f12ff2ada93b2e";
    };
    dependencies = [
-      (sources."@financial-times/polyfill-useragent-normaliser-1.10.1" // {
+      (sources."@financial-times/polyfill-useragent-normaliser-1.10.2" // {
        dependencies = [
-          sources."semver-7.3.5"
+          sources."semver-7.3.8"
        ];
      })
-      sources."@financial-times/useragent_parser-1.6.0"
-      sources."@socket.io/base64-arraybuffer-1.0.2"
-      sources."@types/component-emitter-1.2.11"
+      sources."@financial-times/useragent_parser-1.6.3"
+      sources."@socket.io/component-emitter-3.1.0"
      sources."@types/cookie-0.4.1"
      sources."@types/cors-2.8.12"
-      sources."@types/node-17.0.14"
+      sources."@types/node-18.11.4"
      sources."accept-language-parser-1.5.0"
      sources."accepts-1.3.8"
      sources."async-mutex-0.3.2"
      sources."base64id-2.0.0"
      sources."buffer-equal-constant-time-1.0.1"
-      sources."component-emitter-1.3.0"
+      sources."bufferutil-4.0.7"
      sources."cookie-0.4.2"
      sources."core-util-is-1.0.3"
      sources."cors-2.8.5"
@ -861,26 +869,26 @@ in
          sources."ms-2.0.0"
        ];
      })
-      sources."depd-1.1.2"
-      sources."destroy-1.0.4"
+      sources."depd-2.0.0"
+      sources."destroy-1.2.0"
      sources."ecdsa-sig-formatter-1.0.11"
      sources."ee-first-1.1.1"
      sources."encodeurl-1.0.2"
-      (sources."engine.io-6.1.2" // {
+      (sources."engine.io-6.2.0" // {
        dependencies = [
-          sources."debug-4.3.3"
+          sources."debug-4.3.4"
          sources."ms-2.1.2"
        ];
      })
-      sources."engine.io-parser-5.0.3"
+      sources."engine.io-parser-5.0.4"
      sources."escape-html-1.0.3"
      sources."etag-1.8.1"
      sources."fresh-0.5.2"
      sources."from2-2.3.0"
      sources."from2-string-1.1.0"
-      sources."graceful-fs-4.2.9"
+      sources."graceful-fs-4.2.10"
      sources."handlebars-4.7.7"
-      sources."http-errors-1.8.1"
+      sources."http-errors-2.0.0"
      sources."inherits-2.0.4"
      sources."isarray-1.0.0"
      sources."jsonwebtoken-8.5.1"
@ -896,18 +904,19 @@ in
      sources."lru-cache-6.0.0"
      sources."merge2-1.4.1"
      sources."mime-1.6.0"
-      sources."mime-db-1.51.0"
-      sources."mime-types-2.1.34"
-      sources."minimist-1.2.5"
+      sources."mime-db-1.52.0"
+      sources."mime-types-2.1.35"
+      sources."minimist-1.2.7"
      sources."mnemonist-0.38.5"
      sources."ms-2.1.3"
      sources."negotiator-0.6.3"
      sources."neo-async-2.6.2"
+      sources."node-gyp-build-4.5.0"
      sources."object-assign-4.1.1"
-      sources."obliterator-2.0.1"
-      sources."on-finished-2.3.0"
+      sources."obliterator-2.0.4"
+      sources."on-finished-2.4.1"
      sources."parseurl-1.3.3"
-      sources."polyfill-library-3.110.1"
+      sources."polyfill-library-3.111.0"
      sources."process-nextick-args-2.0.1"
      sources."promise-polyfill-1.1.6"
      sources."range-parser-1.2.1"
@ -918,25 +927,25 @@ in
      })
      sources."safe-buffer-5.2.1"
      sources."semver-5.7.1"
-      sources."send-0.17.2"
-      sources."serve-static-1.14.2"
+      sources."send-0.18.0"
+      sources."serve-static-1.15.0"
      sources."setprototypeof-1.2.0"
-      (sources."socket.io-4.4.1" // {
+      (sources."socket.io-4.5.3" // {
        dependencies = [
-          sources."debug-4.3.3"
+          sources."debug-4.3.4"
          sources."ms-2.1.2"
        ];
      })
-      sources."socket.io-adapter-2.3.3"
-      (sources."socket.io-parser-4.0.4" // {
+      sources."socket.io-adapter-2.4.0"
+      (sources."socket.io-parser-4.2.1" // {
        dependencies = [
-          sources."debug-4.3.3"
+          sources."debug-4.3.4"
          sources."ms-2.1.2"
        ];
      })
      sources."source-map-0.6.1"
      sources."statsd-client-0.4.7"
-      sources."statuses-1.5.0"
+      sources."statuses-2.0.1"
      sources."stream-from-promise-1.0.0"
      sources."stream-to-string-1.2.0"
      (sources."string_decoder-1.1.1" // {
@ -946,8 +955,9 @@ in
      })
      sources."toidentifier-1.0.1"
      sources."toposort-2.0.2"
-      sources."tslib-2.3.1"
-      sources."uglify-js-3.15.0"
+      sources."tslib-2.4.0"
+      sources."uglify-js-3.17.4"
+      sources."utf-8-validate-5.0.10"
      sources."util-deprecate-1.0.2"
      sources."vary-1.1.2"
      sources."wordwrap-1.0.0"
--- a/pkgs/servers/web-apps/whitebophir/node-packages.json
+++ b/pkgs/servers/web-apps/whitebophir/node-packages.json
@ -1,3 +1,3 @@
 [
-  { "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.17.0" }
+  { "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.19.1" }
 ]
--- a/pkgs/servers/web-apps/whitebophir/node-packages.nix
+++ b/pkgs/servers/web-apps/whitebophir/node-packages.nix
@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.11.1. Do not edit!

 {pkgs ? import <nixpkgs> {
    inherit system;
--- a/pkgs/tools/nix/npins/default.nix
+++ b/pkgs/tools/nix/npins/default.nix
@ -21,7 +21,7 @@ in rustPlatform.buildRustPackage rec {
  version = src.version;
  src = passthru.mkSource sources.npins;

-  cargoSha256 = "0rwnzkmx91cwcz9yw0rbbqv73ba6ggim9f4qgz5pgy6h696ld2k8";
+  cargoSha256 = "sha256-NDu4nl4Os7Mgal8gBHC6bsZ2Z+Fqt0PlGdLHiPd/8T4=";

  buildInputs = lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]);
  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/tools/nix/npins/sources.json
+++ b/pkgs/tools/nix/npins/sources.json
@ -9,11 +9,11 @@
      },
      "pre_releases": false,
      "version_upper_bound": null,
-      "version": "0.1.0",
-      "revision": "5c9253ff6010f435ab73fbe1e50ae0fdca0ec07b",
-      "url": "https://api.github.com/repos/andir/npins/tarball/0.1.0",
-      "hash": "019fr9xsirld8kap75k18in3krkikqhjn4mglpy3lyhbhc5n1kh6"
+      "version": "0.2.0",
+      "revision": "1205a5c7ff9c05fa2607220345eefcb539429419",
+      "url": "https://api.github.com/repos/andir/npins/tarball/0.2.0",
+      "hash": "0knk20ygz4id8hw38fd61d70hm44gzjskrs1ij2ghkqcw02pcq1j"
    }
  },
-  "version": 2
+  "version": 3
 }
--- a/pkgs/tools/security/tpm2-tools/default.nix
+++ b/pkgs/tools/security/tpm2-tools/default.nix
@ -4,11 +4,11 @@

 stdenv.mkDerivation rec {
  pname = "tpm2-tools";
-  version = "5.2";
+  version = "5.3";

  src = fetchurl {
    url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-wLQC9qezRW6OskRSEeLUHEbH52ngX+TYkJ/2QRn3pjA=";
+    sha256 = "sha256-584v0271zb14ctgjpELodUpPDKfFS2DvzbdcEqH5j48=";
  };

  nativeBuildInputs = [ pandoc pkg-config makeWrapper ];
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -10484,6 +10484,8 @@ with pkgs;

  proot = callPackage ../tools/system/proot { };

+  protoscope = callPackage ../development/tools/protoscope { };
+
  prototypejs = callPackage ../development/libraries/prototypejs { };

  inherit (callPackages ../tools/security/proxmark3 { gcc-arm-embedded = gcc-arm-embedded-8; })
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@ -12503,11 +12503,11 @@ let

  ImageExifTool = buildPerlPackage rec {
    pname = "Image-ExifTool";
-    version = "12.39";
+    version = "12.49";

    src = fetchurl {
      url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz";
-      hash = "sha256-QDq1KTpEcl8EWj9a/bxF0TwghUulH30O5yDV0wsxy6I=";
+      hash = "sha256-l21p2ak+pe9GSWOatsGQ9YvyZfAFfKV3xB38rzexcVs=";
    };

    nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
@ -12531,7 +12531,7 @@ let
      homepage = "https://exiftool.org/";

      license = with lib.licenses; [ gpl1Plus /* or */ artistic2 ];
-      maintainers = [ maintainers.kiloreux ];
+      maintainers = with maintainers; [ kiloreux anthonyroussel ];
      mainProgram = "exiftool";
    };
  };