Merge master into staging-next

2022-10-17 00:04:21 +00:00 · 2022-10-17 00:04:21 +00:00 · 18a6423900
commit 18a6423900
parent f52955a521 946774a4d1
76 changed files with 694 additions and 756 deletions
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@ -759,6 +759,16 @@
          <literal>[ &quot;lua54&quot; &quot;luau&quot; ]</literal>.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          <literal>pkgs.fetchNextcloudApp</literal> has been rewritten
+          to circumvent impurities in e.g. tarballs from GitHub and to
+          make it easier to apply patches. This means that your hashes
+          are out-of-date and the (previously required) attributes
+          <literal>name</literal> and <literal>version</literal> are no
+          longer accepted.
+        </para>
+      </listitem>
    </itemizedlist>
  </section>
  <section xml:id="sec-release-22.11-notable-changes">
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@ -242,6 +242,10 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).

 - `stylua` no longer accepts `lua52Support` and `luauSupport` overrides, use `features` instead, which defaults to `[ "lua54" "luau" ]`.

+- `pkgs.fetchNextcloudApp` has been rewritten to circumvent impurities in e.g. tarballs from GitHub and to make it easier to
+  apply patches. This means that your hashes are out-of-date and the (previously required) attributes `name` and `version`
+  are no longer accepted.
+
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

 ## Other Notable Changes {#sec-release-22.11-notable-changes}
--- a/nixos/modules/programs/neovim.nix
+++ b/nixos/modules/programs/neovim.nix
@ -11,7 +11,19 @@ let

 in {
  options.programs.neovim = {
-    enable = mkEnableOption (lib.mdDoc "Neovim");
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      example = true;
+      description = lib.mdDoc ''
+        Whether to enable Neovim.
+
+        When enabled through this option, Neovim is wrapped to use a
+        configuration managed by this module. The configuration file in the
+        user's home directory at {file}`~/.config/nvim/init.vim` is no longer
+        loaded by default.
+      '';
+    };

    defaultEditor = mkOption {
      type = types.bool;
--- a/nixos/modules/programs/tsm-client.nix
+++ b/nixos/modules/programs/tsm-client.nix
@ -223,7 +223,7 @@ let
      description = lib.mdDoc ''
        The TSM client derivation to be
        added to the system environment.
-        It will called with `.override`
+        It will be used with `.override`
        to add paths to the client system-options file.
      '';
    };
--- a/nixos/modules/services/networking/iwd.nix
+++ b/nixos/modules/services/networking/iwd.nix
@ -19,6 +19,15 @@ in
  options.networking.wireless.iwd = {
    enable = mkEnableOption (lib.mdDoc "iwd");

+    package = mkOption {
+      type = types.package;
+      default = pkgs.iwd;
+      defaultText = lib.literalExpression "pkgs.iwd";
+      description = lib.mdDoc ''
+        The iwd package to use.
+      '';
+    };
+
    settings = mkOption {
      type = ini.type;
      default = { };
@ -50,11 +59,11 @@ in
    environment.etc."iwd/${configFile.name}".source = configFile;

    # for iwctl
-    environment.systemPackages = [ pkgs.iwd ];
+    environment.systemPackages = [ cfg.package ];

-    services.dbus.packages = [ pkgs.iwd ];
+    services.dbus.packages = [ cfg.package ];

-    systemd.packages = [ pkgs.iwd ];
+    systemd.packages = [ cfg.package ];

    systemd.network.links."80-iwd" = {
      matchConfig.Type = "wlan";
--- a/nixos/modules/services/web-apps/wordpress.nix
+++ b/nixos/modules/services/web-apps/wordpress.nix
@ -22,6 +22,7 @@ let
      ln -s ${wpConfig hostName cfg} $out/share/wordpress/wp-config.php
      # symlink uploads directory
      ln -s ${cfg.uploadsDir} $out/share/wordpress/wp-content/uploads
+      ln -s ${cfg.fontsDir} $out/share/wordpress/wp-content/fonts

      # https://github.com/NixOS/nixpkgs/pull/53399
      #
@ -95,6 +96,15 @@ let
          '';
        };

+        fontsDir = mkOption {
+          type = types.path;
+          default = "/var/lib/wordpress/${name}/fonts";
+          description = lib.mdDoc ''
+            This directory is used to download fonts from a remote location, e.g.
+            to host google fonts locally.
+          '';
+        };
+
        plugins = mkOption {
          type = types.listOf types.path;
          default = [];
--- a/nixos/modules/services/x11/window-managers/dwm.nix
+++ b/nixos/modules/services/x11/window-managers/dwm.nix
@ -13,7 +13,27 @@ in
  ###### interface

  options = {
-    services.xserver.windowManager.dwm.enable = mkEnableOption (lib.mdDoc "dwm");
+    services.xserver.windowManager.dwm = {
+      enable = mkEnableOption (lib.mdDoc "dwm");
+      package = mkOption {
+        type        = types.package;
+        default     = pkgs.dwm;
+        defaultText = literalExpression "pkgs.dwm";
+        example     = literalExpression ''
+          pkgs.dwm.overrideAttrs (oldAttrs: rec {
+            patches = [
+              (super.fetchpatch {
+                url = "https://dwm.suckless.org/patches/steam/dwm-steam-6.2.diff";
+                sha256 = "1ld1z3fh6p5f8gr62zknx3axsinraayzxw3rz1qwg73mx2zk5y1f";
+              })
+            ];
+          })
+        '';
+        description = lib.mdDoc ''
+          dwm package to use.
+        '';
+      };
+    };
  };


@ -30,7 +50,7 @@ in
          '';
      };

-    environment.systemPackages = [ pkgs.dwm ];
+    environment.systemPackages = [ cfg.package ];

  };

--- a/pkgs/applications/audio/csound/csound-manual/default.nix
+++ b/pkgs/applications/audio/csound/csound-manual/default.nix
@ -1,18 +1,21 @@
-{
-  lib, stdenv, fetchFromGitHub, docbook_xsl,
-  docbook_xml_dtd_45, python, pygments,
-  libxslt
+{ lib
+, stdenv
+, fetchFromGitHub
+, docbook_xsl
+, docbook_xml_dtd_45
+, python3
+, libxslt
 }:

-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
  pname = "csound-manual";
-  version = "unstable-2019-02-22";
+  version = "6.17.0";

  src = fetchFromGitHub {
    owner = "csound";
    repo = "manual";
-    rev = "3b0bdc83f9245261b4b85a57c3ed636d5d924a4f";
-    sha256 = "074byjhaxraapyg54dxgg7hi1d4978aa9c1rmyi50p970nsxnacn";
+    rev = version;
+    sha256 = "sha256-8X9Egn/MIwlNDEKUmEEz4Dnw6rGa37jRjYsVEt8ziW8=";
  };

  prePatch = ''
@ -21,9 +24,7 @@ stdenv.mkDerivation {
                "${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd"
  '';

-  nativeBuildInputs = [ libxslt.bin ];
-
-  buildInputs = [ docbook_xsl python pygments ];
+  nativeBuildInputs = [ libxslt.bin docbook_xsl python3 python3.pkgs.pygments ];

  buildPhase = ''
    make XSL_BASE_PATH=${docbook_xsl}/share/xml/docbook-xsl html-dist
@ -34,11 +35,11 @@ stdenv.mkDerivation {
    cp -r ./html $out/share/doc/csound
  '';

-  meta = {
+  meta = with lib; {
    description = "The Csound Canonical Reference Manual";
    homepage = "https://github.com/csound/manual";
-    license = lib.licenses.fdl12Plus;
-    maintainers = [ lib.maintainers.hlolli ];
+    license = licenses.fdl12Plus;
+    maintainers = with maintainers; [ hlolli ];
    platforms = lib.platforms.all;
  };
 }
--- a/pkgs/applications/file-managers/xfe/default.nix
+++ b/pkgs/applications/file-managers/xfe/default.nix
@ -1,16 +1,16 @@
-{ lib, stdenv, fetchurl, fox, pkg-config, gettext, xlibsWrapper, gcc, intltool, file, libpng }:
+{ lib, stdenv, fetchurl, fox, pkg-config, gettext, xlibsWrapper, xcbutil, gcc, intltool, file, libpng }:

 stdenv.mkDerivation rec {
  pname = "xfe";
-  version = "1.42";
+  version = "1.44";

  src = fetchurl {
-    url = "mirror://sourceforge/xfe/xfe-${version}.tar.gz";
-    sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1";
+    url = "mirror://sourceforge/xfe/xfe-${version}.tar.xz";
+    sha256 = "594c14d185bdfc7e3132aefda7cf4e233625258ca9a1939359944a2c07c030b6";
  };

  nativeBuildInputs = [ pkg-config intltool ];
-  buildInputs = [ fox gettext xlibsWrapper gcc file libpng ];
+  buildInputs = [ fox gettext xlibsWrapper xcbutil gcc file libpng ];

  preConfigure = ''
    sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h
--- a/pkgs/applications/graphics/batik/default.nix
+++ b/pkgs/applications/graphics/batik/default.nix
@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
    homepage = "https://xmlgraphics.apache.org/batik";
    license = licenses.asl20;
    platforms = platforms.unix;
+    sourceProvenance = with sourceTypes; [ binaryBytecode ];
  };

  installPhase = ''
--- a/pkgs/applications/misc/dbx/default.nix
+++ b/pkgs/applications/misc/dbx/default.nix
@ -1,78 +1,78 @@
-{ buildPythonPackage
+{ lib
 , fetchFromGitHub
-, databricks-cli
-, scipy
-, path
-, pathspec
-, pydantic
-, protobuf
-, tqdm
-, mlflow
-, azure-identity
-, ruamel-yaml
-, emoji
-, cookiecutter
-, retry
-, azure-mgmt-datafactory
-, azure-mgmt-subscription
-, pytestCheckHook
-, pytest-asyncio
-, pytest-timeout
-, pytest-mock
-, lib
 , git
+, python3
 }:

-buildPythonPackage rec {
+python3.pkgs.buildPythonApplication rec {
  pname = "dbx";
-  version = "0.6.8";
+  version = "0.7.6";
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "databrickslabs";
    repo = "dbx";
    rev = "v${version}";
-    sha256 = "sha256-Ou+VdHFVQzmsxJiyaeDd/+FqHvJZeNGB+OXyoagJwtk=";
+    hash = "sha256-P/cniy0xYaDoUbKdvV7KCubCpmOAhYp3cg2VBRA+a6I=";
  };

-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3.pkgs; [
+    aiohttp
+    click
+    cookiecutter
+    cryptography
    databricks-cli
-    scipy
-    path
+    jinja2
+    mlflow
    pathspec
    pydantic
-    protobuf
-    tqdm
-    mlflow
-    azure-identity
-    ruamel-yaml
-    emoji
-    cookiecutter
+    pyyaml
+    requests
    retry
-    azure-mgmt-datafactory
-    azure-mgmt-subscription
-  ];
+    rich
+    typer
+    watchdog
+  ] ++ typer.optional-dependencies.all;

  checkInputs = [
-    pytestCheckHook
-    pytest-asyncio
-    pytest-timeout
-    pytest-mock
    git
-  ];
+  ] ++ (with python3.pkgs; [
+    pytest-asyncio
+    pytest-mock
+    pytest-timeout
+    pytestCheckHook
+  ]);

-  preCheck = ''
-    export HOME=$TMPDIR
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "mlflow-skinny>=1.28.0,<=2.0.0" "mlflow" \
+      --replace "rich==12.5.1" "rich"
  '';

+  preCheck = ''
+    export HOME=$(mktemp -d)
+    export PATH="$PATH:$out/bin"
+  '';
+
+  pytestFlagsArray = [
+    "tests/unit"
+  ];
+
  disabledTests = [
-    # fails because of dbfs CLI wrong call
+    # Fails because of dbfs CLI wrong call
    "test_dbfs_unknown_user"
    "test_dbfs_no_root"
+    # Requires pylint, prospector, pydocstyle
+    "test_python_basic_sanity_check"
+  ];
+
+  pythonImportsCheck = [
+    "dbx"
  ];

  meta = with lib; {
-    homepage = "https://github.com/databrickslabs/dbx";
    description = "CLI tool for advanced Databricks jobs management";
+    homepage = "https://github.com/databrickslabs/dbx";
    license = licenses.databricks-dbx;
    maintainers = with maintainers; [ GuillaumeDesforges ];
  };
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "gpsprune";
-  version = "22.1";
+  version = "22.2";

  src = fetchurl {
    url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
-    sha256 = "sha256-Its8w+4IAPlNnOYewrTItYWw/7IcAfCK1EnAzun4ScI=";
+    sha256 = "sha256-7T7UmS650VvYN29vQxemzsaxF5wPFF+yCNCTyXY7nmY=";
  };

  dontUnpack = true;
--- a/pkgs/applications/misc/organicmaps/default.nix
+++ b/pkgs/applications/misc/organicmaps/default.nix
@ -19,13 +19,13 @@

 mkDerivation rec {
  pname = "organicmaps";
-  version = "2022.07.27-3";
+  version = "2022.09.22-3";

  src = fetchFromGitHub {
    owner = "organicmaps";
    repo = "organicmaps";
    rev = "${version}-android";
-    sha256 = "sha256-nn24SWyTm8hhj3KrIJWIeOVotV3wn3l7CQopnSCVrX4=";
+    sha256 = "sha256-b+XPsKeDVj3crOTxb52CxXmldkurVlNcZ/ODuJIbQ2A=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -1110,6 +1110,15 @@
    "vendorHash": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag=",
    "version": "2.19.1"
  },
+  "tailscale": {
+    "hash": "sha256-/qC8TOtoVoBTWeAFpt2TYE8tlYBCCcn/mzVQ/DN51YQ=",
+    "owner": "tailscale",
+    "provider-source-address": "registry.terraform.io/tailscale/tailscale",
+    "repo": "terraform-provider-tailscale",
+    "rev": "v0.13.5",
+    "vendorHash": "sha256-8EIxqKkVO706oejlvN79K8aEZAF5H2vZRdr5vbQa0l4=",
+    "version": "0.13.5"
+  },
  "tencentcloud": {
    "hash": "sha256-kAbLfuENWHxu51Eu+7X1X4HiWkD8KAL4awZpGRg0BaU=",
    "owner": "tencentcloudstack",
--- a/pkgs/applications/networking/remote/wayvnc/default.nix
+++ b/pkgs/applications/networking/remote/wayvnc/default.nix
@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-/OKkQKt43lR0UCmQeSDMl1hXh03k+dX3UweigMWEUx4=";
  };

+  depsBuildBuild = [ pkg-config ];
  nativeBuildInputs = [ meson pkg-config ninja scdoc wayland-scanner ];
  buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml pam mesa ];

--- a/pkgs/applications/plasma-mobile/angelfish.nix
+++ b/pkgs/applications/plasma-mobile/angelfish.nix
@ -19,8 +19,8 @@
 , srcs

 # These must be updated in tandem with package updates.
-, cargoShaForVersion ? "22.06"
-, cargoSha256 ? "ckxShWgqGaApYoGQdrRQKCKOsbwUH5QP82x3BNM4Jx8="
+, cargoShaForVersion ? "22.09"
+, cargoSha256 ? "sha256-uxLvAhRV185srZZ0ZMsLRevAyMmajXERPRYotMcnLJA="
 }:

 # Guard against incomplete updates.
--- a/pkgs/applications/plasma-mobile/fetch.sh
+++ b/pkgs/applications/plasma-mobile/fetch.sh
@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/22.06/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/22.09/ -A '*.tar.xz' )
--- a/pkgs/applications/plasma-mobile/krecorder.nix
+++ b/pkgs/applications/plasma-mobile/krecorder.nix
@ -8,6 +8,7 @@
 , kcoreaddons
 , ki18n
 , kirigami2
+, kirigami-addons
 , qtmultimedia
 , qtquickcontrols2
 }:
@ -25,6 +26,7 @@ mkDerivation rec {
    kcoreaddons
    ki18n
    kirigami2
+    kirigami-addons
    qtmultimedia
    qtquickcontrols2
  ];
--- a/pkgs/applications/plasma-mobile/kweather.nix
+++ b/pkgs/applications/plasma-mobile/kweather.nix
@ -6,6 +6,7 @@

 , kconfig
 , ki18n
+, kirigami-addons
 , kirigami2
 , knotifications
 , kquickcharts
@ -26,6 +27,7 @@ mkDerivation rec {
  buildInputs = [
    kconfig
    ki18n
+    kirigami-addons
    kirigami2
    knotifications
    kquickcharts
--- a/pkgs/applications/plasma-mobile/plasma-dialer.nix
+++ b/pkgs/applications/plasma-mobile/plasma-dialer.nix
@ -9,15 +9,24 @@
 , kcoreaddons
 , kdbusaddons
 , ki18n
+, kio
 , kirigami2
 , knotifications
 , kpeople
 , libphonenumber
+, libselinux
+, libsepol
 , modemmanager-qt
+, pcre
+, plasma-wayland-protocols
 , protobuf
+, pulseaudio-qt
 , qtfeedback
 , qtmpris
 , qtquickcontrols2
+, util-linux
+, wayland
+, wayland-protocols
 }:

 mkDerivation rec {
@ -34,15 +43,36 @@ mkDerivation rec {
    kcoreaddons
    kdbusaddons
    ki18n
+    kio
    kirigami2
    knotifications
    kpeople
    libphonenumber
+    libselinux
+    libsepol
    modemmanager-qt
+    pcre
+    plasma-wayland-protocols
    protobuf # Needed by libphonenumber
+    pulseaudio-qt
    qtfeedback
    qtmpris
    qtquickcontrols2
+    util-linux
+    wayland
+    wayland-protocols
+  ];
+
+  postPatch = ''
+    substituteInPlace plasma-dialer/org.kde.phone.dialer.desktop \
+      --replace "/usr/bin/" "$out/bin/"
+  '';
+
+  # Plasma gear 22.09 shipped before KWin 5.26 was made available.
+  # This feature requires 5.26. Otherwise plasma-dialer segfaults.
+  # Note that we may need to keep it disabled until it stops segfaulting outside of KWin.
+  cmakeFlags = [
+    "-DDIALER_BUILD_SHELL_OVERLAY=OFF"
  ];

  meta = with lib; {
--- a/pkgs/applications/plasma-mobile/plasma-settings.nix
+++ b/pkgs/applications/plasma-mobile/plasma-settings.nix
@ -10,10 +10,16 @@
 , kcoreaddons
 , kdbusaddons
 , ki18n
+, kirigami-addons
+, kirigami2
 , kitemmodels
+, libselinux
+, libsepol
 , modemmanager-qt
 , networkmanager-qt
+, pcre
 , plasma-framework
+, util-linux
 }:

 mkDerivation rec {
@ -30,10 +36,16 @@ mkDerivation rec {
    kcoreaddons
    kdbusaddons
    ki18n
+    kirigami-addons
+    kirigami2
    kitemmodels
+    libselinux
+    libsepol
    modemmanager-qt
    networkmanager-qt
+    pcre
    plasma-framework
+    util-linux
  ];

  meta = with lib; {
--- a/pkgs/applications/plasma-mobile/spacebar.nix
+++ b/pkgs/applications/plasma-mobile/spacebar.nix
@ -4,6 +4,8 @@
 , cmake
 , extra-cmake-modules

+, c-ares
+, curl
 , kcontacts
 , ki18n
 , kio
@ -27,6 +29,8 @@ mkDerivation rec {
  ];

  buildInputs = [
+    c-ares
+    curl
    kcontacts
    ki18n
    kio
--- a/pkgs/applications/plasma-mobile/srcs.nix
+++ b/pkgs/applications/plasma-mobile/srcs.nix
@ -4,195 +4,195 @@

 {
  alligator = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/alligator-22.06.tar.xz";
-      sha256 = "1h4jawzmiikn81iajc62pkgdv0xlc2w9g80l04awfiz2546rcxmf";
-      name = "alligator-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/alligator-22.09.tar.xz";
+      sha256 = "0krys21df6mlyi2zxdxgqx02k1q7njliz0nsxcygxrd89ajxlslb";
+      name = "alligator-22.09.tar.xz";
    };
  };
  angelfish = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/angelfish-22.06.tar.xz";
-      sha256 = "0s9kzkw0ikb4r4x04nyd568kika7wvi5gj0k6735nwjn5qyp933f";
-      name = "angelfish-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/angelfish-22.09.tar.xz";
+      sha256 = "1blhn84xka11zjwqimr30qv94jp5slfcmc44xcjxginl3n6hicwx";
+      name = "angelfish-22.09.tar.xz";
    };
  };
  audiotube = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/audiotube-22.06.tar.xz";
-      sha256 = "0680cr90nsa5qc9qm9vpl7993zmz0r1ms0m4f63cds7k8zrwwal0";
-      name = "audiotube-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/audiotube-22.09.tar.xz";
+      sha256 = "1ay3qrg8lnw209kwmgm2ll5k1gbp2q694g6w837xl2wjy792vqw8";
+      name = "audiotube-22.09.tar.xz";
    };
  };
  calindori = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/calindori-22.06.tar.xz";
-      sha256 = "0fcbkk1yisdd6z1qvac9x6i55wfppqpdma87a0n5smm191lkjg07";
-      name = "calindori-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/calindori-22.09.tar.xz";
+      sha256 = "1pwgdqznp76mhk0ikzjhy3c67qgk91kgv69ygqwzlh5hwiw5sl4n";
+      name = "calindori-22.09.tar.xz";
    };
  };
  kalk = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/kalk-22.06.tar.xz";
-      sha256 = "09c3rfnljjacw55vdrgcpp18vkbbjzq6brcfs6gb0nhfgbjj6ava";
-      name = "kalk-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/kalk-22.09.tar.xz";
+      sha256 = "0sci3jv3asjxahcdz2vkmh90fbffx8lfj1cy5kqnpijdxcm10gfq";
+      name = "kalk-22.09.tar.xz";
    };
  };
  kasts = {
-    version = "22.06";
+    version = "22.09.2";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/kasts-22.06.tar.xz";
-      sha256 = "0hznam4gxrhz1sbykl7wr0mqa6r23mskx5qhp0lq3sxaxiy9jlrk";
-      name = "kasts-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/kasts-22.09.2.tar.xz";
+      sha256 = "10i0b8k1k0ki8pq8hsj979y7np75iaq49bxkyj95zzci9g73vd59";
+      name = "kasts-22.09.2.tar.xz";
    };
  };
  kclock = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/kclock-22.06.tar.xz";
-      sha256 = "1rd2gxbc3p5h1xjwn59vqr5v2xdk8b0m0dx6qsmihx1qnr2k5vrj";
-      name = "kclock-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/kclock-22.09.tar.xz";
+      sha256 = "18b5lncgh9vc94bgrdmzigi853j4l7hqrvggk4hfcklj4pnv1bav";
+      name = "kclock-22.09.tar.xz";
    };
  };
  keysmith = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/keysmith-22.06.tar.xz";
-      sha256 = "0qwfvznjp85y93y3dry5pkcqz6y63wpk2h2p5m3qiymk3qckm9yj";
-      name = "keysmith-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/keysmith-22.09.tar.xz";
+      sha256 = "0w3vvmp9rn6ahly2fm9n6f4glfr7d84bfvj33mrs5pn7n99h7jgy";
+      name = "keysmith-22.09.tar.xz";
    };
  };
  khealthcertificate = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/khealthcertificate-22.06.tar.xz";
-      sha256 = "079j9df21hcfs62ikh2q8sjxq59qiqvinicjvghk708xf0dkl8nh";
-      name = "khealthcertificate-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/khealthcertificate-22.09.tar.xz";
+      sha256 = "16vkjpyxwx34pvdpnci0l6mx2bdjialiscjvbdx53xbsq9ff701k";
+      name = "khealthcertificate-22.09.tar.xz";
    };
  };
  koko = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/koko-22.06.tar.xz";
-      sha256 = "0fcwls7xq0dmb2ghn8x6xq26a4qa9ashnlm8ypcyfmfr4pvxwlml";
-      name = "koko-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/koko-22.09.tar.xz";
+      sha256 = "1z3ysc2f1agbkmm2cxa87x5rk2nx9fjv3czlvcsn8s5ssfdws3gl";
+      name = "koko-22.09.tar.xz";
    };
  };
  kongress = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/kongress-22.06.tar.xz";
-      sha256 = "1mlyqdv0y112z4c56a9746hc8x0xrcvw0qqafm7vvd7hy5idqsrb";
-      name = "kongress-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/kongress-22.09.tar.xz";
+      sha256 = "0pjp2s774sgw2dklqib8alm1a9fkixy3s92i2v8v00znx08zf2jz";
+      name = "kongress-22.09.tar.xz";
    };
  };
  krecorder = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/krecorder-22.06.tar.xz";
-      sha256 = "148gqz5xya1pxw0mhs82dns0wmpvl8h48hrb5hly9jwdymb7143g";
-      name = "krecorder-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/krecorder-22.09.tar.xz";
+      sha256 = "0kcgw7bsyw3bhai2djcq3qjn5ims7i4qbvpm7nwpjkm1p3m7fjii";
+      name = "krecorder-22.09.tar.xz";
    };
  };
  ktrip = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/ktrip-22.06.tar.xz";
-      sha256 = "123770qa8d4xhpgga6gbs7dnnfmka9jshsbkpckvbzl3ndcnlpql";
-      name = "ktrip-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/ktrip-22.09.tar.xz";
+      sha256 = "0x9s4yh2nvy7zmg3ds9bn8ir6wx10i8d0mvfaylbzb39rcabpmrl";
+      name = "ktrip-22.09.tar.xz";
    };
  };
  kweather = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/kweather-22.06.tar.xz";
-      sha256 = "0a47swzvp6z1fdn3vhgfnqz06583x6xsgvf01wsspkz4g2lxj5zk";
-      name = "kweather-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/kweather-22.09.tar.xz";
+      sha256 = "0z3z659y1r1jry02w0hxwcpghkgxgqiwj1kqck07vlg8ks7lz1jz";
+      name = "kweather-22.09.tar.xz";
    };
  };
  neochat = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/neochat-22.06.tar.xz";
-      sha256 = "16wxkc3h0bqlnb7jhkk6qh1v5hj06rwaj7khzqxbm9cj8zh29wdn";
-      name = "neochat-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/neochat-22.09.tar.xz";
+      sha256 = "1j8p6mv89q1krjjbc9n26r83csqpxwd03zzhvzxxm53334qwqdci";
+      name = "neochat-22.09.tar.xz";
    };
  };
  plasma-dialer = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/plasma-dialer-22.06.tar.xz";
-      sha256 = "07sbjmk9hzf1nhk7jhvavikwkb4nmy0bwccs7qa4nf9g2yzbli87";
-      name = "plasma-dialer-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/plasma-dialer-22.09.tar.xz";
+      sha256 = "1wk8q5lc15d53viqyknsww1hgci1rxmnra4hj887fabnj0id29rs";
+      name = "plasma-dialer-22.09.tar.xz";
    };
  };
  plasma-phonebook = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/plasma-phonebook-22.06.tar.xz";
-      sha256 = "00h9plfjgr4bmcay56la074pza2hp4l28a566nbqqivagpn1qz8w";
-      name = "plasma-phonebook-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/plasma-phonebook-22.09.tar.xz";
+      sha256 = "1wsv330sfjh78fg98kd2g6a4bsmdyf7gn9r3aqazci7p7i5n2ln0";
+      name = "plasma-phonebook-22.09.tar.xz";
    };
  };
  plasma-settings = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/plasma-settings-22.06.tar.xz";
-      sha256 = "096zyzxff0b948wnnmdykp9fm87r8xyn8kkndnjkrmacz2p3822m";
-      name = "plasma-settings-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/plasma-settings-22.09.tar.xz";
+      sha256 = "0jq2r7ckz27a8r41n4jn61wlrpcx0qwlasipig4jz7rc9i0ayfka";
+      name = "plasma-settings-22.09.tar.xz";
    };
  };
  plasmatube = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/plasmatube-22.06.tar.xz";
-      sha256 = "009kcba9blhyx8xhbsxawjxayq1vrpi2byig1n1ra848kij0hi3q";
-      name = "plasmatube-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/plasmatube-22.09.tar.xz";
+      sha256 = "00w9p5fcpv4s406lmcdcbrxf19sgkvf9yy8pfjmf1asvvvi8bpnk";
+      name = "plasmatube-22.09.tar.xz";
    };
  };
  qmlkonsole = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/qmlkonsole-22.06.tar.xz";
-      sha256 = "1h244bb566sgfgswgdqkljfdd70z4v52gxm0h5bmvmdqjhb6zg7n";
-      name = "qmlkonsole-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/qmlkonsole-22.09.tar.xz";
+      sha256 = "19bf9f4vxa8arnl1zjappg6kh21br131cbsx902qnpv6y0r3swz1";
+      name = "qmlkonsole-22.09.tar.xz";
    };
  };
  spacebar = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/spacebar-22.06.tar.xz";
-      sha256 = "0jl9gvhf8dfg9y8wwxp0c86rlsmj8inrl7syb25pz57z1mvv4kkr";
-      name = "spacebar-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/spacebar-22.09.tar.xz";
+      sha256 = "0fmk7fa7i67l8ff0amn80yxhf05vf0j9c42zj6qg5p30d1j31pbl";
+      name = "spacebar-22.09.tar.xz";
    };
  };
  telly-skout = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/telly-skout-22.06.tar.xz";
-      sha256 = "09ibm424x5k1kjbay1cn48car6xacz82dk6qwi8ww3jph32jm4pf";
-      name = "telly-skout-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/telly-skout-22.09.tar.xz";
+      sha256 = "1byakylbjjxyz6bh59dydqnvh8c627jpx39ih1ylrdl8jlkd0scy";
+      name = "telly-skout-22.09.tar.xz";
    };
  };
  tokodon = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/tokodon-22.06.tar.xz";
-      sha256 = "0cgg42ys7liab754n9nwbanwl3i7iz587933vvhf5k9zmvx4jqhb";
-      name = "tokodon-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/tokodon-22.09.tar.xz";
+      sha256 = "123vyq9vfl48l7ssrymvkhxlkwihplnssal0wvz4n2dk59byl46p";
+      name = "tokodon-22.09.tar.xz";
    };
  };
  vakzination = {
-    version = "22.06";
+    version = "22.09";
    src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/vakzination-22.06.tar.xz";
-      sha256 = "0wa58a9fps9i0brbppcdkda1przxckg7sir8f2p8k842k2qnsvbp";
-      name = "vakzination-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/vakzination-22.09.tar.xz";
+      sha256 = "01xzc1di57j0fgzkqwa39jng0fd90laya0rj85vjda7mbh2lxxk6";
+      name = "vakzination-22.09.tar.xz";
    };
  };
 }
--- a/pkgs/applications/radio/hackrf/default.nix
+++ b/pkgs/applications/radio/hackrf/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "hackrf";
-  version = "2021.03.1";
+  version = "2022.09.1";

  src = fetchFromGitHub {
    owner = "greatscottgadgets";
    repo = "hackrf";
    rev = "v${version}";
-    sha256 = "sha256-2kEfTco95I9YLz/18nfjJSd7U/HE5sBCEioWL2t804k=";
+    sha256 = "sha256-c+9DEMxioIbEDNTdLSOnxX1zpFk07K9rlGP9goEJMlU=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@ -14,12 +14,12 @@

 buildGoPackage rec {
  pname = "gitea";
-  version = "1.17.2";
+  version = "1.17.3";

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

  patches = [
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@ -10,24 +10,24 @@ with lib;

 let
  pname = "gitkraken";
-  version = "8.8.0";
+  version = "8.9.1";

  throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";

  srcs = {
    x86_64-linux = fetchzip {
      url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
-      sha256 = "sha256-F/uqV6CL/zFERS6nKVD8kEqCZQ2O9AGGzU5uCJ94qwk=";
+      sha256 = "sha256-taz610BIAZm8TB2GQSHLjcDLVjfvtcyLqJ2XBaD6NRE=";
    };

    x86_64-darwin = fetchzip {
      url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
-      sha256 = "sha256-TWkwN39SxPRvUUjAPSBxv4octWasjRiA91FNCWRya44=";
+      sha256 = "sha256-TMcXtRO9ANQlmHPULgC/05qrqQC6oN58G3ytokRr/Z8=";
    };

    aarch64-darwin = fetchzip {
      url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
-      sha256 = "sha256-drAj0t8BRUETQ6mZPdHXgkuFAKeYsGLE8oLtf/imHk4=";
+      sha256 = "sha256-vuk0nfl+Ga5yiZWNwDd9o8qOjmiTLe5tQjGhia0bIk0=";
    };
  };

--- a/pkgs/applications/video/vdr/softhddevice/default.nix
+++ b/pkgs/applications/video/vdr/softhddevice/default.nix
@ -12,12 +12,12 @@
 }:
 stdenv.mkDerivation rec {
  pname = "vdr-softhddevice";
-  version = "1.9.2";
+  version = "1.9.3";

  src = fetchFromGitHub {
    owner = "ua0lnj";
    repo = "vdr-plugin-softhddevice";
-    sha256 = "sha256-2kh8qMxaAjekvgjMVRmm1nPzlN2wjY/6qYjFyo6CLlg=";
+    sha256 = "sha256-0jtA64RVlh57zjrGDJAR/tt8V6sSksAx9kBDRW1m+WM=";
    rev = "v${version}";
  };

--- a/pkgs/build-support/fetchnextcloudapp/default.nix
+++ b/pkgs/build-support/fetchnextcloudapp/default.nix
@ -1,32 +1,27 @@
-{ stdenv, fetchurl, ... }:
-{ name
-, url
-, version
+{ stdenv, fetchzip, applyPatches, ... }:
+{ url
 , sha256
 , patches ? [ ]
+, name ? null
+, version ? null
 }:
-stdenv.mkDerivation {
-  pname = "nc-app-${name}";
-  inherit version patches;
-
-  src = fetchurl {
+if name != null || version != null then throw ''
+  `pkgs.fetchNextcloudApp` has been changed to use `fetchzip`.
+  To update, please
+  * remove `name`/`version`
+  * update the hash
+''
+else applyPatches {
+  inherit patches;
+  src = fetchzip {
    inherit url sha256;
+    postFetch = ''
+      pushd $out &>/dev/null
+      if [ ! -f ./appinfo/info.xml ]; then
+        echo "appinfo/info.xml doesn't exist in $out, aborting!"
+        exit 1
+      fi
+      popd &>/dev/null
+    '';
  };
-
-  unpackPhase = ''
-    tar -xzpf $src
-  '';
-
-  installPhase = ''
-    approot="$(dirname $(dirname $(find -path '*/appinfo/info.xml' | head -n 1)))"
-
-    if [ -d "$approot" ];
-    then
-      mv "$approot/" $out
-      chmod -R a-w $out
-    else
-      echo "Could not find appinfo/info.xml"
-      exit 1;
-    fi
-  '';
 }
--- a/pkgs/data/themes/qogir/default.nix
+++ b/pkgs/data/themes/qogir/default.nix
@ -24,13 +24,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "image" "square" "round" ] tweaks

 stdenv.mkDerivation rec {
  inherit pname;
-  version = "2022-07-17";
+  version = "2022-10-16";

  src = fetchFromGitHub {
    owner = "vinceliuice";
    repo = pname;
    rev = version;
-    sha256 = "NGgTToaSJBwmHnZjWbJ3dSJg9Mmfchj3W0xgK0CMb9M=";
+    sha256 = "S9pLwkgWdnk1AezHE2D4vpV+JSmRW3vr6G5qYoup1ko=";
  };

  nativeBuildInputs = [
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {

    rm $out/share/themes/*/{AUTHORS,COPYING}

-    jdupes --link-soft --recurse $out/share
+    jdupes --quiet --link-soft --recurse $out/share

    runHook postInstall
  '';
--- a/pkgs/desktops/gnome/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome/apps/file-roller/default.nix
@ -21,7 +21,6 @@
 , libarchive
 , libportal-gtk3
 , nautilus
-, unzip
 }:

 stdenv.mkDerivation rec {
@ -61,13 +60,6 @@ stdenv.mkDerivation rec {
    patchShebangs data/set-mime-type-entry.py
  '';

-  preFixup = ''
-    # Workaround because of https://gitlab.gnome.org/GNOME/file-roller/issues/40
-    gappsWrapperArgs+=(
-      --prefix PATH : ${lib.makeBinPath [ unzip ]}
-    )
-  '';
-
  passthru = {
    updateScript = gnome.updateScript {
      packageName = "file-roller";
--- a/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix
@ -66,6 +66,11 @@ mkDerivation {
    mobile-broadband-provider-info
    openconnect
  ];
+
+  cmakeFlags = [
+    "-DBUILD_MOBILE=ON"
+  ];
+
  patches = [
    (substituteAll {
      src = ./0002-openvpn-binary-path.patch;
--- a/pkgs/development/compilers/ciao/default.nix
+++ b/pkgs/development/compilers/ciao/default.nix
@ -2,12 +2,12 @@

 stdenv.mkDerivation rec {
  pname = "ciao";
-  version = "1.21.0-m1";
+  version = "1.22.0-m1";
  src = fetchFromGitHub {
    owner = "ciao-lang";
    repo = "ciao";
    rev = "v${version}";
-    sha256 = "sha256-o9EQS7KsoTg458Uw+1shgKE6NlZO495XE/rLq6/1S4g=";
+    sha256 = "sha256-p7QNSsDI8hVMPPfkX3PNjJo01hsPGKZ7jMR9Kmj2qxY=";
  };

  configurePhase = ''
--- a/pkgs/development/libraries/kirigami-addons/default.nix
+++ b/pkgs/development/libraries/kirigami-addons/default.nix
@ -12,14 +12,14 @@

 mkDerivation rec {
  pname = "kirigami-addons";
-  version = "21.05";
+  version = "0.4";

  src = fetchFromGitLab {
    domain = "invent.kde.org";
    owner = "libraries";
    repo = pname;
    rev = "v${version}";
-    sha256 = "0pwkpag15mvzhd3hvdwx0a8ajwq9j30r6069vsx85bagnag3zanh";
+    sha256 = "sha256-3RPOab10kLcMVBngcRILDXbhOBI/BhjkMZqWVC0IPlM=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/kweathercore/default.nix
+++ b/pkgs/development/libraries/kweathercore/default.nix
@ -2,23 +2,25 @@
 , lib
 , fetchFromGitLab
 , extra-cmake-modules
+, kholidays
 , ki18n
 , qtlocation
 }:

 mkDerivation rec {
  pname = "kweathercore";
-  version = "0.5";
+  version = "0.6";

  src = fetchFromGitLab {
    domain = "invent.kde.org";
    owner = "libraries";
    repo = pname;
    rev = "v${version}";
-    sha256 = "08ipabskhsbspkzzdlpwl89r070q8d0vc9500ma6d5i9fnpmkz6d";
+    sha256 = "sha256-LIgUSXKHcRqcBwGTRxU5Z4eHuWmPLerorlrnI6Cf9k4=";
  };

  buildInputs = [
+    kholidays
    ki18n
    qtlocation
  ];
--- a/pkgs/development/libraries/olm/default.nix
+++ b/pkgs/development/libraries/olm/default.nix
@ -2,14 +2,14 @@

 stdenv.mkDerivation rec {
  pname = "olm";
-  version = "3.2.12";
+  version = "3.2.13";

  src = fetchFromGitLab {
    domain = "gitlab.matrix.org";
    owner = "matrix-org";
    repo = pname;
    rev = version;
-    sha256 = "sha256-EvqQvg7khsJ2OrcoHBImd9fTgjA65pVRqbJuMV5MG80=";
+    sha256 = "sha256-s1OleVRvJRFvN9MwXT7lAjDjyHkbIkbpl/F8P/91oaU=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@ -7,7 +7,7 @@

 buildPythonPackage rec {
  pname = "adafruit-platformdetect";
-  version = "3.31.0";
+  version = "3.32.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "Adafruit-PlatformDetect";
    inherit version;
-    hash = "sha256-gXANW2nXoOVv8bZearpgQRhFAgyErUIgoJ4isnmgnnU=";
+    hash = "sha256-MbrRf7kcPNYb1i+5cSkCvO9SJbvrPAeKGWxtfi1FmaQ=";
  };

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

 buildPythonPackage rec {
  pname = "aiobiketrax";
-  version = "0.2.1";
+  version = "0.3.0";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "basilfx";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-jZBs1h+01Mbwpvy3hg5/DEIU5EPKW4P/iMqp4eb4EpM=";
+    hash = "sha256-goS+BLIeFJ2fXQ2srbhKRfEjsMFX3+eA7iWzpBWMqZQ=";
  };

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

 buildPythonPackage rec {
  pname = "aiohomekit";
-  version = "2.0.1";
+  version = "2.0.2";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "Jc2k";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-yuZKgDbdxQ7pGGLVB1/B3cD3Ep08uE9jjCqVzc+DF3c=";
+    hash = "sha256-pZEZHhsU/1tEX1VOFQ8b+ERJ8tU1pzRJMRYD28nfTb0=";
  };

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

 buildPythonPackage rec {
  pname = "androidtv";
-  version = "0.0.68";
+  version = "0.0.69";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "JeffLIrion";
    repo = "python-androidtv";
    rev = "v${version}";
-    hash = "sha256-cRupsdHpzzxV57ZsuWqZBvtbMYWwXFSVLqsNJ7kfpPA=";
+    hash = "sha256-GfwXYugDrxOe9ekC1M7mi0BuqmohHdgZVTO4J8+B5iI=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/cirq-aqt/default.nix
+++ b/pkgs/development/python-modules/cirq-aqt/default.nix
@ -26,4 +26,9 @@ buildPythonPackage rec {

  # cirq's importlib hook doesn't work here
  #pythonImportsCheck = [ "cirq_aqt" ];
+
+  disabledTestPaths = [
+    # No need to test the version number
+    "cirq_aqt/_version_test.py"
+  ];
 }
--- a/pkgs/development/python-modules/cirq-core/default.nix
+++ b/pkgs/development/python-modules/cirq-core/default.nix
@ -1,5 +1,5 @@
-{ stdenv
-, lib
+{ lib
+, stdenv
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
@ -31,15 +31,16 @@

 buildPythonPackage rec {
  pname = "cirq-core";
-  version = "0.15.0";
+  version = "1.0.0";
+  format = "setuptools";

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

  src = fetchFromGitHub {
    owner = "quantumlib";
    repo = "cirq";
    rev = "v${version}";
-    sha256 = "sha256-E36zXpv+9WBNYvv/shItS7Q34gYqUyADlqWd+m4Jpps=";
+    hash = "sha256-KJ+z4zGrdGIXcGZzqHtWMf8aAzcn9CtltFawcHVldMQ=";
  };

  sourceRoot = "source/${pname}";
@ -48,8 +49,7 @@ buildPythonPackage rec {
    substituteInPlace requirements.txt \
      --replace "matplotlib~=3.0" "matplotlib" \
      --replace "networkx~=2.4" "networkx" \
-      --replace "numpy~=1.16" "numpy" \
-      --replace "sympy<1.10" "sympy"
+      --replace "numpy~=1.16" "numpy"
  '';

  propagatedBuildInputs = [
@ -80,20 +80,25 @@ buildPythonPackage rec {
  ];

  disabledTestPaths = lib.optionals (!withContribRequires) [
-    # requires external (unpackaged) libraries, so untested.
+    # Requires external (unpackaged) libraries, so untested
    "cirq/contrib/"
+    # No need to test the version number
+    "cirq/_version_test.py"
  ];
+
  disabledTests = [
-    "test_metadata_search_path" # tries to import flynt, which isn't in Nixpkgs
-    "test_benchmark_2q_xeb_fidelities" # fails due pandas MultiIndex. Maybe issue with pandas version in nix?
+    # Tries to import flynt, which isn't in Nixpkgs
+    "test_metadata_search_path"
+    # Fails due pandas MultiIndex. Maybe issue with pandas version in nix?
+    "test_benchmark_2q_xeb_fidelities"
  ];

  meta = with lib; {
-    broken = (stdenv.isLinux && stdenv.isAarch64);
    description = "Framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits";
    homepage = "https://github.com/quantumlib/cirq";
    changelog = "https://github.com/quantumlib/Cirq/releases/tag/v${version}";
    license = licenses.asl20;
    maintainers = with maintainers; [ drewrisinger fab ];
+    broken = (stdenv.isLinux && stdenv.isAarch64);
  };
 }
--- a/pkgs/development/python-modules/cirq-google/default.nix
+++ b/pkgs/development/python-modules/cirq-google/default.nix
@ -2,7 +2,6 @@
 , cirq-core
 , google-api-core
 , protobuf
-# test inputs
 , pytestCheckHook
 , freezegun
 }:
@ -15,7 +14,8 @@ buildPythonPackage rec {

  postPatch = ''
    substituteInPlace requirements.txt \
-      --replace "google-api-core[grpc] >= 1.14.0, < 2.0.0dev" "google-api-core[grpc] >= 1.14.0, < 3.0.0dev"
+      --replace "google-api-core[grpc] >= 1.14.0, < 2.0.0dev" "google-api-core[grpc] >= 1.14.0, < 3.0.0dev" \
+      --replace "protobuf >= 3.15.0, < 4" "protobuf >= 3.15.0"
  '';

  propagatedBuildInputs = [
@ -29,9 +29,15 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

+  disabledTestPaths = [
+    # No need to test the version number
+    "cirq_google/_version_test.py"
+  ];
+
  disabledTests = [
    # unittest.mock.InvalidSpecError: Cannot autospec attr 'QuantumEngineServiceClient'
    "test_get_engine_sampler_explicit_project_id"
    "test_get_engine_sampler"
  ];
+
 }
--- a/pkgs/development/python-modules/cirq-ionq/default.nix
+++ b/pkgs/development/python-modules/cirq-ionq/default.nix
@ -26,4 +26,9 @@ buildPythonPackage rec {

  # cirq's importlib hook doesn't work here
  #pythonImportsCheck = [ "cirq_ionq" ];
+
+  disabledTestPaths = [
+    # No need to test the version number
+    "cirq_ionq/_version_test.py"
+  ];
 }
--- a/pkgs/development/python-modules/cirq-pasqal/default.nix
+++ b/pkgs/development/python-modules/cirq-pasqal/default.nix
@ -26,4 +26,9 @@ buildPythonPackage rec {

  # cirq's importlib hook doesn't work here
  #pythonImportsCheck = [ "cirq_pasqal" ];
+
+  disabledTestPaths = [
+    # No need to test the version number
+    "cirq_pasqal/_version_test.py"
+  ];
 }
--- a/pkgs/development/python-modules/cirq-rigetti/default.nix
+++ b/pkgs/development/python-modules/cirq-rigetti/default.nix
@ -75,6 +75,11 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

+  disabledTestPaths = [
+    # No need to test the version number
+    "cirq_rigetti/_version_test.py"
+  ];
+
  # cirq's importlib hook doesn't work here
  #pythonImportsCheck = [ "cirq_rigetti" ];
 }
--- a/pkgs/development/python-modules/cirq-web/default.nix
+++ b/pkgs/development/python-modules/cirq-web/default.nix
@ -19,4 +19,9 @@ buildPythonPackage rec {

  # cirq's importlib hook doesn't work here
  #pythonImportsCheck = [ "cirq_web" ];
+
+  disabledTestPaths = [
+    # No need to test the version number
+    "cirq_web/_version_test.py"
+  ];
 }
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "hahomematic";
-  version = "2022.10.5";
+  version = "2022.10.6";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "danielperna84";
    repo = pname;
    rev = "refs/tags/${version}";
-    sha256 = "sha256-E4sKIfrdEqdUqbXciIBAfIOuT/jpkS509P3+lVE3p1M=";
+    sha256 = "sha256-rZb1VlJvzRt3YxEK5jrzqYTZXEPbiPJek8XtkUhzgm8=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/json-logging/default.nix
+++ b/pkgs/development/python-modules/json-logging/default.nix
@ -1,44 +1,56 @@
 { lib
 , buildPythonPackage
-, fetchFromGitHub
-, fetchpatch
-, pytestCheckHook
-, wheel
-, flask
-, sanic
 , fastapi
-, uvicorn
+, fetchFromGitHub
+, flask
+, pytestCheckHook
+, pythonOlder
 , requests
+, sanic
+, uvicorn
+, wheel
 }:

 buildPythonPackage rec {
  pname = "json-logging";
-  version = "1.3.0";
+  version = "1.5.0-rc0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "bobbui";
    repo = "json-logging-python";
    rev = version;
-    hash = "sha256-0eIhOi30r3ApyVkiBdTQps5tNj7rI+q8TjNWxTnhtMQ=";
+    hash = "sha256-WOAEY1pONH+Gx1b8zHZDMNgJJSn7jvMO60LYTA8z/dE=";
  };
-  patches = [
-    # Fix tests picking up test modules instead of real packages.
-    (fetchpatch {
-      url = "https://github.com/bobbui/json-logging-python/commit/6fdb64deb42fe48b0b12bda0442fd5ac5f03107f.patch";
-      sha256 = "sha256-BLfARsw2FdvY22NCaFfdFgL9wTmEZyVIi3CQpB5qU0Y=";
-    })
+
+  checkInputs = [
+    fastapi
+    flask
+    pytestCheckHook
+    # quart
+    requests
+    sanic
+    uvicorn
+    wheel
+  ];
+
+  pythonImportsCheck = [
+    "json_logging"
+  ];
+
+  disabledTests = [
+    "quart"
  ];

-  # - Quart is not packaged for Nixpkgs.
-  checkInputs = [ wheel flask /*quart*/ sanic fastapi uvicorn requests pytestCheckHook ];
-  disabledTests = [ "quart" ];
-  # Tests spawn servers and try to connect to them.
  __darwinAllowLocalNetworking = true;

  meta = with lib; {
    description = "Python library to emit logs in JSON format";
    longDescription = ''
-      Python logging library to emit JSON log that can be easily indexed and searchable by logging infrastructure such as ELK, EFK, AWS Cloudwatch, GCP Stackdriver.
+      Python logging library to emit JSON log that can be easily indexed and searchable by logging
+      infrastructure such as ELK, EFK, AWS Cloudwatch, GCP Stackdriver.
    '';
    homepage = "https://github.com/bobbui/json-logging-python";
    license = licenses.asl20;
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "meshtastic";
-  version = "1.3.39";
+  version = "1.3.40";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "meshtastic";
    repo = "Meshtastic-python";
    rev = version;
-    hash = "sha256-ymh8PNis9qh6mgc2IrDiFSwGm9sxC/6YWTxQ9HD0TJo=";
+    hash = "sha256-ft29c9I13gwduigIPERQQWJmQZs/j/e4leA66DbmEOQ=";
  };

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

 buildPythonPackage rec {
  pname = "plugwise";
-  version = "0.25.1";
+  version = "0.25.2";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -30,7 +30,7 @@ buildPythonPackage rec {
    owner = pname;
    repo = "python-plugwise";
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-7LwQwtzNLB9dvV79CFBNdC5I8uw+BP+H108ljacQjgY=";
+    sha256 = "sha256-wHlIBysNZ0TmgdEL6sT+rqaAcH772V7k16rua2UEEso=";
  };

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

 buildPythonPackage rec {
  pname = "qingping-ble";
-  version = "0.7.0";
+  version = "0.8.0";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "bluetooth-devices";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-DBkwi++gmyd8/hAMSO+Ktsou1FtcbfoY8PR+c43MOXw=";
+    hash = "sha256-oUmehWOeweHSqhFmr+SQg2I6Au/6pYfl2s069yWMymo=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/withings-api/default.nix
+++ b/pkgs/development/python-modules/withings-api/default.nix
@ -0,0 +1,56 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, poetry-core
+, arrow
+, requests-oauthlib
+, typing-extensions
+, pydantic
+, responses
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "withings-api";
+  version = "2.4.0";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "vangorra";
+    repo = "python_withings_api";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-8cOLHYnodPGk1b1n6xbVyW2iju3cG6MgnzYTKDsP/nw=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'requests-oauth = ">=0.4.1"' ''' \
+      --replace 'addopts = "--capture no --cov ./withings_api --cov-report html:build/coverage_report --cov-report term --cov-report xml:build/coverage.xml"' '''
+  '';
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    arrow
+    requests-oauthlib
+    typing-extensions
+    pydantic
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    responses
+  ];
+
+  meta = with lib; {
+    description = "Library for the Withings Health API";
+    homepage = "https://github.com/vangorra/python_withings_api";
+    license = licenses.mit;
+    maintainers = with maintainers; [ kittywitch ];
+  };
+}
--- a/pkgs/development/tools/go-task/default.nix
+++ b/pkgs/development/tools/go-task/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "go-task";
-  version = "3.16.0";
+  version = "3.17.0";

  src = fetchFromGitHub {
    owner = pname;
    repo = "task";
    rev = "v${version}";
-    sha256 = "sha256-CHltaS2OJJTwsX6kvgyeQwR1bus03XnMOWSpJ0EDCJ0=";
+    sha256 = "sha256-pbroxBHo+Y4mjcZVVth2zfDs/5sz9WDhdYMK5v5KeSg=";
  };

-  vendorSha256 = "sha256-xp1s1aixPyXq9oVD8IZYSlUiL8UkIx5c8gYJRpIRD7I=";
+  vendorSha256 = "sha256-nOrzOSLIFZvEuFAfKOXXIVoSzumQHRRcQcOAPH5fCSU=";

  doCheck = false;

--- a/pkgs/development/tools/jql/default.nix
+++ b/pkgs/development/tools/jql/default.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "jql";
-  version = "5.1.0";
+  version = "5.1.1";

  src = fetchFromGitHub {
    owner = "yamafaktory";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-8qL6ryCbCdHA9Zl/yScQ8tJh+i0Vr4JeH+fQYGb+wPE=";
+    sha256 = "sha256-d2DETEASOe73mpyuk5NZzSzKln1LPttCbnmWEiFnAks=";
  };

-  cargoSha256 = "sha256-E7uuvE2xVyAiDfMEFbvVHt4agPEEt7JwF+SRFe+fqYk=";
+  cargoSha256 = "sha256-se5tGgZysetH4dlh+oe41FRhVqFQIw218fEKwqa3WCA=";

  meta = with lib; {
    description = "A JSON Query Language CLI tool built with Rust";
--- a/pkgs/development/tools/kafkactl/default.nix
+++ b/pkgs/development/tools/kafkactl/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "kafkactl";
-  version = "2.5.0";
+  version = "3.0.0";

  src = fetchFromGitHub {
    owner = "deviceinsight";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-cCAmqiriiNSEpo5fHLPsarmLLhBE9QILa9xFNLlCorM=";
+    sha256 = "sha256-W+4JLJIc/wkT8cu5GYx1YpnbBBe3XboMTFihvrmDmR0=";
  };

-  vendorSha256 = "sha256-Y0Muihh9S8g3SLH12jw1MYyq5mpbrTJWJu4cSNTCqmE=";
+  vendorSha256 = "sha256-ba7amhYuCB3k1esu1qYBCgUZMjlq5iac498TMqeGuz0=";
  doCheck = false;

  meta = with lib; {
--- a/pkgs/development/tools/misc/polylith/default.nix
+++ b/pkgs/development/tools/misc/polylith/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "polylith";
-  version = "0.2.14-alpha";
+  version = "0.2.15-alpha";

  src = fetchurl {
    url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar";
-    sha256 = "sha256-0yJLSveKd49nBnCtBVfwcACXfIH43ZgqTLoo2aLPE2g=";
+    sha256 = "sha256-RAFxOwQykERpW+KEjTQDJN+XRv3JudREyBOk99A/qV8=";
  };

  dontUnpack = true;
--- a/pkgs/development/tools/rust/cargo-auditable/Cargo.lock
+++ b/pkgs/development/tools/rust/cargo-auditable/Cargo.lock
@ -1,391 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "ahash"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-dependencies = [
- "getrandom",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "auditable-extract"
-version = "0.3.1"
-dependencies = [
- "binfarce",
-]
-
-[[package]]
-name = "auditable-serde"
-version = "0.5.0"
-dependencies = [
- "cargo-lock",
- "cargo_metadata",
- "semver",
- "serde",
- "serde_json",
- "topological-sort",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "binfarce"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18464ccbb85e5dede30d70cc7676dc9950a0fb7dbf595a43d765be9123c616a2"
-
-[[package]]
-name = "camino"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cargo-auditable"
-version = "0.5.1"
-dependencies = [
- "auditable-extract",
- "auditable-serde",
- "cargo_metadata",
- "miniz_oxide",
- "object",
- "pico-args",
- "serde_json",
-]
-
-[[package]]
-name = "cargo-lock"
-version = "8.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c4c54d47a4532db3494ef7332c257ab57b02750daae3250d49e01ee55201ce8"
-dependencies = [
- "semver",
- "serde",
- "toml",
- "url",
-]
-
-[[package]]
-name = "cargo-platform"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "cargo_metadata"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3abb7553d5b9b8421c6de7cb02606ff15e0c6eea7d8eadd75ef013fd636bec36"
-dependencies = [
- "camino",
- "cargo-platform",
- "semver",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "crc32fast"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "form_urlencoded"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-dependencies = [
- "ahash",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "idna"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
-
-[[package]]
-name = "libc"
-version = "0.2.132"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
-
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "object"
-version = "0.28.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
-dependencies = [
- "crc32fast",
- "hashbrown 0.11.2",
- "indexmap",
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
-
-[[package]]
-name = "percent-encoding"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
-
-[[package]]
-name = "pico-args"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rust-audit-info"
-version = "0.4.0"
-dependencies = [
- "auditable-extract",
- "miniz_oxide",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
-
-[[package]]
-name = "semver"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.144"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.144"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.85"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
-[[package]]
-name = "toml"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "topological-sort"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d"
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "url"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
-]
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
--- a/pkgs/development/tools/rust/cargo-auditable/default.nix
+++ b/pkgs/development/tools/rust/cargo-auditable/default.nix
@ -2,26 +2,20 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-auditable";
-  version = "0.5.1";
+  version = "0.5.2";

  src = fetchFromGitHub {
    owner = "rust-secure-code";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-m3M2uTQIOLK14VJ5mQfHw72hgAyJBVO2OAzDglByLmo=";
+    sha256 = "sha256-4CHuthi7GXZKHenOE2Bk+Ps1AJlPkhvMIGHmV9Z00hA=";
  };

-  # not using fetchCrate since it has two binary crates
-  cargoLock.lockFile = ./Cargo.lock;
-
-  postPatch = ''
-    cp ${./Cargo.lock} Cargo.lock
-  '';
+  cargoSha256 = "sha256-puq8BgYuynFZCepYZdQ9ggDYJlFDks7s/l3UxM9F7ag=";

  meta = with lib; {
    description = "A tool to make production Rust binaries auditable";
    homepage = "https://github.com/rust-secure-code/cargo-auditable";
-    changelog = "https://github.com/rust-secure-code/cargo-auditable/blob/v${version}/CHANGELOG.md";
    license = with licenses; [ mit /* or */ asl20 ];
    maintainers = with maintainers; [ figsoda ];
  };
--- a/pkgs/development/tools/rust/cargo-espflash/default.nix
+++ b/pkgs/development/tools/rust/cargo-espflash/default.nix
@ -1,4 +1,4 @@
-{ lib, rustPlatform, fetchFromGitHub, pkg-config, udev }:
+{ lib, rustPlatform, fetchFromGitHub, pkg-config, udev, stdenv, Security }:

 rustPlatform.buildRustPackage rec {
  pname = "cargo-espflash";
@ -15,8 +15,10 @@ rustPlatform.buildRustPackage rec {
    pkg-config
  ];

-  buildInputs = [
+  buildInputs = lib.optionals stdenv.isLinux [
    udev
+  ] ++ lib.optionals stdenv.isDarwin [
+    Security
  ];

  cargoSha256 = "sha256-82o3B6qmBVPpBVAogClmTbxrBRXY8Lmd2sHmonP5/s8=";
--- a/pkgs/development/tools/rust/cargo-sort/default.nix
+++ b/pkgs/development/tools/rust/cargo-sort/default.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-sort";
-  version = "1.0.7";
+  version = "1.0.9";

  src = fetchFromGitHub {
    owner = "devinr528";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-jESz3SujznGLJeR23LvxORNC0Tj4VcEzdzhIRwyvjd0=";
+    sha256 = "sha256-fqmyL4ZSz+nKfUIrcrfLRT9paEas5d00Y/kvEqyz2vw=";
  };

-  cargoSha256 = "sha256-1iOZ1EEP4bObTweTN4Wjtb9Y9ysJQ/9xnNpprxKIaho=";
+  cargoSha256 = "sha256-JON6cE1ZHeI+0vU9AJp0e1TIbiH3AWjHyn0jd9PNqQU=";

  meta = with lib; {
    description = "A tool to check that your Cargo.toml dependencies are sorted alphabetically";
--- a/pkgs/development/tools/rust/rust-audit-info/default.nix
+++ b/pkgs/development/tools/rust/rust-audit-info/default.nix
@ -0,0 +1,20 @@
+{ lib, rustPlatform, fetchCrate }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rust-audit-info";
+  version = "0.5.1";
+
+  src = fetchCrate {
+    inherit pname version;
+    sha256 = "sha256-oxlbtFDQj6nyBXzNczG6ZhSOHvVQjK1FimWm/pSZHtY=";
+  };
+
+  cargoSha256 = "sha256-Y+5OUfsmUhDP9Fn8s9nso0W25eTFodDIVEVusn6HRmk=";
+
+  meta = with lib; {
+    description = "A command-line tool to extract the dependency trees embedded in binaries by cargo-auditable";
+    homepage = "https://github.com/rust-secure-code/cargo-auditable/tree/master/rust-audit-info";
+    license = with licenses; [ mit /* or */ asl20 ];
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@ -8,11 +8,11 @@

 stdenv.mkDerivation rec {
  pname = "atlassian-jira";
-  version = "8.22.4";
+  version = "9.2.0";

  src = fetchurl {
    url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "sha256-Zog0m8tsx8mDLU1rsW5zhhHgyRmi4JGWuy9DV8yp9nY=";
+    sha256 = "sha256-+QlZ5/3LZnW7lPvm0it7/pC7kVySbHgf1AQTyPJ+L+U=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@ -3420,7 +3420,8 @@
    ]; # missing inputs: wirelesstagpy
    "withings" = ps: with ps; [
      aiohttp-cors
-    ]; # missing inputs: withings-api
+      withings-api
+    ];
    "wiz" = ps: with ps; [
      aiohttp-cors
      ifaddr
@ -4267,6 +4268,7 @@
    "whois"
    "wiffi"
    "wilight"
+    "withings"
    "wiz"
    "wled"
    "workday"
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@ -2,18 +2,18 @@

 buildGoModule rec {
  pname = "mautrix-whatsapp";
-  version = "0.7.0";
+  version = "0.7.1";

  src = fetchFromGitHub {
    owner = "mautrix";
    repo = "whatsapp";
    rev = "v${version}";
-    hash = "sha256-OUGFp25M8wn8eWMuQHDh8Zp67x+VHVbyvuBHq+UE+NY=";
+    hash = "sha256-5wZtWFB5y695S4E1Cv8nTSPUy6rPQ/j91w6kI0DAkGs=";
  };

  buildInputs = [ olm ];

-  vendorSha256 = "sha256-9pOe7jHgyrFP1Sj8O1KEVxcEaUPEE0+41HUfQoPxa2E=";
+  vendorSha256 = "sha256-v2Zf9nmAzal/nAtbQLunGJR/CUcdbwSUQ1077e7hVrQ=";

  doCheck = false;

--- a/pkgs/tools/backup/tsm-client/default.nix
+++ b/pkgs/tools/backup/tsm-client/default.nix
@ -52,17 +52,17 @@
 # going to the `downloadPage` (see `meta` below).
 # Find the "Backup-archive client" table on that page.
 # Look for "Download Documents" of the latest release.
-# Here, two links must be checked:
+# Here, two links must be checked if existing:
 # * "IBM Spectrum Protect Client ... Downloads and READMEs":
 #   In the table at the page's bottom,
 #   check the date of the "Linux x86_64 client"
 # * "IBM Spectrum Protect BA client ... interim fix downloads"
-# Look for the "Linux x86_64 client" rows
+# Look for the "Linux x86_64 client ..." rows
 # in the table at the bottom of each page.
 # Follow the "HTTPS" link of the row with the latest date stamp.
 # In the directory listing to show up, pick the big `.tar` file.
 #
-# (as of 2022-08-13)
+# (as of 2022-09-29)


 let
@ -107,10 +107,10 @@ let

  unwrapped = stdenv.mkDerivation rec {
    name = "tsm-client-${version}-unwrapped";
-    version = "8.1.15.1";
+    version = "8.1.15.2";
    src = fetchurl {
      url = mkSrcUrl version;
-      hash = "sha512-DURIMlWlmu+l2UT3bAMaFPlwO+UlrfgaYCsm/JonvvC0K0WallhNKFd7sp0amPkU+4QHE2fkFrTGE3/lY+fghQ==";
+      hash = "sha512-ljygVoW7zR+LVHf4LSoBn3qEHISobsxheLxs9NyKWQiwPWpfhSgJO+bX4QRzAmrpSTNrETxHkuXqzGSHaaBlzg==";
    };
    inherit meta passthru;

--- a/pkgs/tools/misc/edk2-uefi-shell/default.nix
+++ b/pkgs/tools/misc/edk2-uefi-shell/default.nix
@ -0,0 +1,33 @@
+{ lib
+, edk2
+, util-linux
+, nasm
+, python3
+}:
+edk2.mkDerivation "ShellPkg/ShellPkg.dsc" (finalAttrs: {
+  pname = "edk2-uefi-shell";
+  inherit (edk2) version;
+
+  nativeBuildInputs = [ util-linux nasm python3 ];
+  strictDeps = true;
+
+  # We only have a .efi file in $out which shouldn't be patched or stripped
+  dontPatchELF = true;
+  dontStrip = true;
+
+  # GUID hardcoded to match ShellPkg.dsc
+  installPhase = ''
+    runHook preInstall
+    install -D -m0644 Build/Shell/RELEASE*/*/Shell_EA4BB293-2D7F-4456-A681-1F22F42CD0BC.efi $out/shell.efi
+    runHook postInstall
+  '';
+
+  passthru.efi = "${finalAttrs.finalPackage}/shell.efi";
+
+  meta = {
+    inherit (edk2.meta) license platforms;
+    description = "UEFI Shell from Tianocore EFI development kit";
+    homepage = "https://github.com/tianocore/tianocore.github.io/wiki/ShellPkg";
+    maintainers = with lib.maintainers; [ LunNova ];
+  };
+})
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@ -55,6 +55,7 @@ with python.pkgs; buildPythonApplication rec {
    protobuf
    pyserial
    pyyaml
+    requests
    tornado
    tzdata
    tzlocal
--- a/pkgs/tools/misc/libcpuid/default.nix
+++ b/pkgs/tools/misc/libcpuid/default.nix
@ -1,27 +1,16 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook }:

 stdenv.mkDerivation rec {
  pname = "libcpuid";
-  version = "0.5.1";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "anrieff";
    repo = "libcpuid";
    rev = "v${version}";
-    sha256 = "sha256-m10LdtwBk1Lx31AJ4HixEYaCkT7EHpF9+tOV1rSA6VU=";
+    sha256 = "sha256-XX+XFd1ehahIUGONAx2iOxetU0s6vONc7m91zEOWz5o=";
  };

-  patches = [
-    # Work around https://github.com/anrieff/libcpuid/pull/102.
-    ./stdint.patch
-    # Fixes cross-compilation to NetBSD, remove me for libcpuid > 0.5.1
-    (fetchpatch {
-      name = "use-popcount-from-libc.patch";
-      url = "https://github.com/anrieff/libcpuid/commit/1acaf9980b55ae180cc08db218b9face28202519.patch";
-      sha256 = "0lvsv9baq0sria1f1ncn1b2783js29lfs5fv8milp54pg1wd5b7q";
-    })
-  ];
-
  nativeBuildInputs = [ autoreconfHook ];

  meta = with lib; {
--- a/pkgs/tools/misc/libcpuid/stdint.patch
+++ b/pkgs/tools/misc/libcpuid/stdint.patch
@ -1,5 +0,0 @@
--- a/libcpuid/libcpuid.h
-+++ b/libcpuid/libcpuid.h
-@@ -88 +88 @@
-#include "libcpuid_types.h"
-+#include <stdint.h>
--- a/pkgs/tools/misc/nvimpager/default.nix
+++ b/pkgs/tools/misc/nvimpager/default.nix
@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  pname = "nvimpager";
-  version = "0.10.4";
+  version = "0.11.0";

  src = fetchFromGitHub {
    owner = "lucc";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-0guSL4RvYQFwok7zGuevhQY6DHjnETRLpEIEQfGslcg=";
+    sha256 = "sha256-tjnmY7dJUE5k8hlAfNKcHqmpw0ciS6T5WJOpDvvt2V0=";
  };

  buildInputs = [
@ -30,9 +30,10 @@ stdenv.mkDerivation rec {

  doCheck = true;
  checkInputs = [ lua51Packages.busted util-linux neovim ];
+  # filter out one test that fails in the sandbox of nix
  checkPhase = ''
    runHook preCheck
-    script -c "busted --lpath './?.lua' test"
+    script -ec "busted --lpath './?.lua' --filter-out 'handles man' test"
    runHook postCheck
  '';

--- a/pkgs/tools/misc/pokemonsay/default.nix
+++ b/pkgs/tools/misc/pokemonsay/default.nix
@ -0,0 +1,65 @@
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+, cowsay
+, coreutils
+, findutils
+}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "pokemonsay";
+  version = "unstable-2021-10-05";
+
+  src = fetchFromGitHub {
+    owner = "HRKings";
+    repo = "pokemonsay-newgenerations";
+    rev = "baccc6d2fe1897c48f60d82ff9c4d4c018f5b594";
+    hash = "sha256-IDTAZmOzkUg0kLUM0oWuVbi8EwE4sEpLWrNAtq/he+g=";
+  };
+
+  postPatch = ''
+    substituteInPlace pokemonsay.sh \
+      --replace \
+        'INSTALL_PATH=''${HOME}/.bin/pokemonsay' \
+        "" \
+      --replace \
+        'POKEMON_PATH=''${INSTALL_PATH}/pokemons' \
+        'POKEMON_PATH=${placeholder "out"}/share/pokemonsay' \
+      --replace \
+        '$(find ' \
+        '$(${findutils}/bin/find ' \
+      --replace \
+        '$(basename ' \
+        '$(${coreutils}/bin/basename ' \
+      --replace \
+        'cowsay -f ' \
+        '${cowsay}/bin/cowsay -f ' \
+      --replace \
+        'cowthink -f ' \
+        '${cowsay}/bin/cowthink -f '
+
+    substituteInPlace pokemonthink.sh \
+      --replace \
+        './pokemonsay.sh' \
+        "${placeholder "out"}/bin/pokemonsay"
+  '';
+
+  installPhase = ''
+    mkdir -p $out/{bin,share/pokemonsay}
+    cp pokemonsay.sh $out/bin/pokemonsay
+    cp pokemonthink.sh $out/bin/pokemonthink
+    cp pokemons/*.cow $out/share/pokemonsay
+  '';
+
+  checkPhase = ''
+    $out/bin/pokemonsay --list-pokemon
+  '';
+
+  meta = with lib; {
+    description = "Print pokemon in the CLI! An adaptation of the classic cowsay";
+    homepage = "https://github.com/HRKings/pokemonsay-newgenerations";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ pbsds ];
+  };
+}
--- a/pkgs/tools/package-management/nvd/default.nix
+++ b/pkgs/tools/package-management/nvd/default.nix
@ -2,15 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "nvd";
-  version = "0.1.2";
+  version = "0.2.0";

  src = fetchFromGitLab {
    owner = "khumba";
    repo = pname;
-    # There is a 0.1.2 release but no tag yet
-    # https://gitlab.com/khumba/nvd/-/issues/7
-    rev = "13d3ab1255e0de03693cecb7da9764c9afd5d472";
-    sha256 = "1537s7j0m0hkahf0s1ai7bm94xj9fz6b9x78py0dn3cgnl9bfzla";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-kOPcQP2tSym69qSOBwVc2XFO8+uy7bgYIQq4L/orS+A=";
  };

  buildInputs = [ python3 ];
--- a/pkgs/tools/security/pass/extensions/genphrase.nix
+++ b/pkgs/tools/security/pass/extensions/genphrase.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub, python3 }:

 stdenv.mkDerivation rec {
  pname = "pass-genphrase";
@ -13,6 +13,8 @@ stdenv.mkDerivation rec {

  dontBuild = true;

+  buildInputs = [ python3 ];
+
  installTargets = [ "globalinstall" ];

  installFlags = [ "PREFIX=$(out)" ];
--- a/pkgs/tools/text/mdbook-mermaid/default.nix
+++ b/pkgs/tools/text/mdbook-mermaid/default.nix
@ -1,26 +1,17 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, CoreServices }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }:

 rustPlatform.buildRustPackage rec {
  pname = "mdbook-mermaid";
-  version = "0.11.2";
+  version = "0.12.0";

  src = fetchFromGitHub {
    owner = "badboy";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-zXgXgcMF7MOa9Vx3rhv9aavqRCfMcyRLtaWEvYlyaTs=";
+    hash = "sha256-1w132lpkn0m2ZoMyFKFGjwn9Gd3UDksEKr5vq8l4ANQ=";
  };

-  cargoPatches = [
-    # https://github.com/badboy/mdbook-mermaid/pull/23
-    (fetchpatch {
-      name = "update-mdbook-for-rust-1.64.patch";
-      url = "https://github.com/badboy/mdbook-mermaid/commit/5a3432d1b28ef9a065dd37aa77b82a3593358793.patch";
-      hash = "sha256-NkCxGmRdwJ+jdkgxp5gWfGpgpLpEpKUd44LyPx0kyEE=";
-    })
-  ];
-
-  cargoHash = "sha256-IkMBnBuobrJzR6+030/Wfbu2ZCjvFnjBV+6sSWdiNUw=";
+  cargoHash = "sha256-OKE8RcCE4pIRtQDW7KNzUVrNpyZzWg6QHchJg0XWmYQ=";

  buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -3697,7 +3697,7 @@ with pkgs;

  dbus-broker = callPackage ../os-specific/linux/dbus-broker { };

-  dbx = python3Packages.callPackage ../applications/misc/dbx { };
+  dbx = callPackage ../applications/misc/dbx { };

  ioport = callPackage ../os-specific/linux/ioport {};

@ -6022,6 +6022,8 @@ with pkgs;

  edk2 = callPackage ../development/compilers/edk2 { };

+  edk2-uefi-shell = callPackage ../tools/misc/edk2-uefi-shell { };
+
  eff = callPackage ../development/interpreters/eff { };

  eflite = callPackage ../applications/audio/eflite {};
@ -6121,8 +6123,13 @@ with pkgs;

  timeline = callPackage ../applications/office/timeline { };

-  tsm-client = callPackage ../tools/backup/tsm-client { };
-  tsm-client-withGui = callPackage ../tools/backup/tsm-client { enableGui = true; };
+  tsm-client = callPackage ../tools/backup/tsm-client {
+    openssl = openssl_1_1;
+  };
+  tsm-client-withGui = callPackage ../tools/backup/tsm-client {
+    openssl = openssl_1_1;
+    enableGui = true;
+  };

  tracker = callPackage ../development/libraries/tracker { };

@ -14763,7 +14770,9 @@ with pkgs;
  buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };
  cratesIO = callPackage ../build-support/rust/crates-io.nix { };

-  cargo-espflash = callPackage ../development/tools/rust/cargo-espflash { };
+  cargo-espflash = callPackage ../development/tools/rust/cargo-espflash {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };

  cargo-web = callPackage ../development/tools/rust/cargo-web {
    inherit (darwin.apple_sdk.frameworks) CoreServices Security;
@ -14982,6 +14991,7 @@ with pkgs;
    inherit (darwin.apple_sdk.frameworks) CoreServices;
  };
  rust-analyzer = callPackage ../development/tools/rust/rust-analyzer/wrapper.nix { };
+  rust-audit-info = callPackage ../development/tools/rust/rust-audit-info { };
  rust-bindgen-unwrapped = callPackage ../development/tools/rust/bindgen/unwrapped.nix { };
  rust-bindgen = callPackage ../development/tools/rust/bindgen { };
  rust-cbindgen = callPackage ../development/tools/rust/cbindgen {
@ -27470,10 +27480,7 @@ with pkgs;
    inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AudioUnit CoreAudio CoreMIDI;
  };

-  csound-manual = callPackage ../applications/audio/csound/csound-manual {
-    python = python27;
-    pygments = python27Packages.pygments;
-  };
+  csound-manual = callPackage ../applications/audio/csound/csound-manual { };

  csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt {
    python = python27;
@ -30991,6 +30998,8 @@ with pkgs;

  poke = callPackage ../applications/editors/poke { };

+  pokemonsay = callPackage ../tools/misc/pokemonsay { };
+
  polar-bookshelf = callPackage ../applications/misc/polar-bookshelf { };

  poezio = python3Packages.poezio;
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -11951,6 +11951,8 @@ in {

  winsspi = callPackage ../development/python-modules/winsspi { };

+  withings-api = callPackage ../development/python-modules/withings-api { };
+
  wktutils = callPackage ../development/python-modules/wktutils { };

  wled = callPackage ../development/python-modules/wled { };