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

Conflicts: - pkgs/development/python-modules/laundrify-aio/default.nix
2024-11-17 19:21:04 +00:00 · 2024-08-11 13:56:09 +02:00 · 2024-08-11 13:56:09 +02:00 · 182792a514
parent b110ca4fd1 e7f2456df4
commit 182792a514
52 changed files with 934 additions and 380 deletions
--- a/maintainers/scripts/pluginupdate.py
+++ b/maintainers/scripts/pluginupdate.py
@ -791,6 +791,11 @@ def update_plugins(editor: Editor, args):
    All input arguments are grouped in the `Editor`."""

    log.info("Start updating plugins")
+    if args.proc > 1 and args.github_token == None:
+        log.warning("You have enabled parallel updates but haven't set a github token.\n"
+        "You may be hit with `HTTP Error 429: too many requests` as a consequence."
+        "Either set --proc=1 or --github-token=YOUR_TOKEN. ")
+
    fetch_config = FetchConfig(args.proc, args.github_token)
    update = editor.get_update(args.input_file, args.outfile, fetch_config)

--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@ -1017,7 +1017,7 @@ Make sure to also check the many updates in the [Nixpkgs library](#sec-release-2

 - [trust-dns](https://trust-dns.org/), a Rust based DNS server built to be safe
  and secure from the ground up. Available as
-  [services.trust-dns](#opt-services.trust-dns.enable).
+  `services.trust-dns`.

 - [osquery](https://www.osquery.io/), a SQL powered operating system
  instrumentation, monitoring, and analytics. Available as
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@ -309,6 +309,8 @@

 - The `xdg.portal.gtkUsePortal` option has been removed, as it had been deprecated for over 2 years. Using the `GTK_USE_PORTAL` environment variable in this manner is not intended nor encouraged by the GTK developers, but can still be done manually via `environment.sessionVariables`.

+- The `services.trust-dns` module has been renamed to `services.hickory-dns`.
+
 ## Other Notable Changes {#sec-release-24.11-notable-changes}

 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -1047,6 +1047,7 @@
  ./services/networking/harmonia.nix
  ./services/networking/haproxy.nix
  ./services/networking/headscale.nix
+  ./services/networking/hickory-dns.nix
  ./services/networking/hostapd.nix
  ./services/networking/htpdate.nix
  ./services/networking/https-dns-proxy.nix
@ -1234,7 +1235,6 @@
  ./services/networking/tox-node.nix
  ./services/networking/toxvpn.nix
  ./services/networking/trickster.nix
-  ./services/networking/trust-dns.nix
  ./services/networking/tvheadend.nix
  ./services/networking/twingate.nix
  ./services/networking/ucarp.nix
--- a/nixos/modules/services/networking/hickory-dns.nix
+++ b/nixos/modules/services/networking/hickory-dns.nix
@ -1,9 +1,9 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.services.trust-dns;
+  cfg = config.services.hickory-dns;
  toml = pkgs.formats.toml { };

-  configFile = toml.generate "trust-dns.toml" (
+  configFile = toml.generate "hickory-dns.toml" (
    lib.filterAttrsRecursive (_: v: v != null) cfg.settings
  );

@ -26,7 +26,7 @@ let
          - "Forward" (a cached zone where all requests are forwarded to another resolver).

          For more details about these zone types, consult the documentation for BIND,
-          though note that trust-dns supports only a subset of BIND's zone types:
+          though note that hickory-dns supports only a subset of BIND's zone types:
          <https://bind9.readthedocs.io/en/v9_18_4/reference.html#type>
        '';
      };
@ -45,10 +45,19 @@ let
 in
 {
  meta.maintainers = with lib.maintainers; [ colinsane ];
+
+  imports = with lib; [
+    (mkRenamedOptionModule [ "services" "trust-dns" "enable" ] [ "services" "hickory-dns" "enable" ])
+    (mkRenamedOptionModule [ "services" "trust-dns" "package" ] [ "services" "hickory-dns" "package" ])
+    (mkRenamedOptionModule [ "services" "trust-dns" "settings" ] [ "services" "hickory-dns" "settings" ])
+    (mkRenamedOptionModule [ "services" "trust-dns" "quiet" ] [ "services" "hickory-dns" "quiet" ])
+    (mkRenamedOptionModule [ "services" "trust-dns" "debug" ] [ "services" "hickory-dns" "debug" ])
+  ];
+
  options = {
-    services.trust-dns = with lib; {
-      enable = mkEnableOption "trust-dns";
-      package = mkPackageOption pkgs "trust-dns" {
+    services.hickory-dns = with lib; {
+      enable = mkEnableOption "hickory-dns";
+      package = mkPackageOption pkgs "hickory-dns" {
        extraDescription = ''
          ::: {.note}
          The package must provide `meta.mainProgram` which names the server binary; any other utilities (client, resolver) are not needed.
@ -75,9 +84,9 @@ in
      };
      settings = mkOption {
        description = ''
-          Settings for trust-dns. The options enumerated here are not exhaustive.
+          Settings for hickory-dns. The options enumerated here are not exhaustive.
          Refer to upstream documentation for all available options:
-          - [Example settings](https://github.com/bluejekyll/trust-dns/blob/main/tests/test-data/test_configs/example.toml)
+          - [Example settings](https://github.com/hickory-dns/hickory-dns/blob/main/tests/test-data/test_configs/example.toml)
        '';
        type = types.submodule {
          freeformType = toml.type;
@ -106,9 +115,9 @@ in
            };
            directory = mkOption {
              type = types.str;
-              default = "/var/lib/trust-dns";
+              default = "/var/lib/hickory-dns";
              description = ''
-                The directory in which trust-dns should look for .zone files,
+                The directory in which hickory-dns should look for .zone files,
                whenever zones aren't specified by absolute path.
              '';
            };
@ -124,23 +133,23 @@ in
  };

  config = lib.mkIf cfg.enable {
-    systemd.services.trust-dns = {
-      description = "trust-dns Domain Name Server";
-      unitConfig.Documentation = "https://trust-dns.org/";
+    systemd.services.hickory-dns = {
+      description = "hickory-dns Domain Name Server";
+      unitConfig.Documentation = "https://hickory-dns.org/";
      serviceConfig = {
        ExecStart =
        let
          flags =  (lib.optional cfg.debug "--debug") ++ (lib.optional cfg.quiet "--quiet");
          flagsStr = builtins.concatStringsSep " " flags;
        in ''
-          ${cfg.package}/bin/${cfg.package.meta.mainProgram} --config ${configFile} ${flagsStr}
+          ${lib.getExe cfg.package} --config ${configFile} ${flagsStr}
        '';
        Type = "simple";
        Restart = "on-failure";
        RestartSec = "10s";
        DynamicUser = true;

-        StateDirectory = "trust-dns";
+        StateDirectory = "hickory-dns";
        ReadWritePaths = [ cfg.settings.directory ];

        AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@ -1,56 +1,60 @@
-{ lib
-, fetchFromGitHub
-, tag ? ""
+{
+  lib,
+  fetchFromGitHub,
+  fetchpatch,
+  tag ? "",

  # build time
-, gettext
-, gobject-introspection
-, wrapGAppsHook3
+  gettext,
+  gobject-introspection,
+  wrapGAppsHook3,

  # runtime
-, adwaita-icon-theme
-, gdk-pixbuf
-, glib
-, glib-networking
-, gtk3
-, gtksourceview
-, kakasi
-, keybinder3
-, libappindicator-gtk3
-, libmodplug
-, librsvg
-, libsoup
-, webkitgtk
+  adwaita-icon-theme,
+  gdk-pixbuf,
+  glib,
+  glib-networking,
+  gtk3,
+  gtksourceview,
+  kakasi,
+  keybinder3,
+  libappindicator-gtk3,
+  libmodplug,
+  librsvg,
+  libsoup,
+  webkitgtk,

  # optional features
-, withDbusPython ? false
-, withMusicBrainzNgs ? false
-, withPahoMqtt ? false
-, withPyInotify ? false
-, withPypresence ? false
-, withSoco ? false
+  withDbusPython ? false,
+  withMusicBrainzNgs ? false,
+  withPahoMqtt ? false,
+  withPypresence ? false,
+  withSoco ? false,

  # backends
-, withGstPlugins ? withGstreamerBackend
-, withGstreamerBackend ? true
-, gst_all_1
-, withXineBackend ? true
-, xine-lib
+  withGstPlugins ? withGstreamerBackend,
+  withGstreamerBackend ? true,
+  gst_all_1,
+  withXineBackend ? true,
+  xine-lib,

  # tests
-, dbus
-, glibcLocales
-, hicolor-icon-theme
-, python3
-, xvfb-run
+  dbus,
+  glibcLocales,
+  hicolor-icon-theme,
+  python3,
+  xvfb-run,
 }:

 python3.pkgs.buildPythonApplication rec {
  pname = "quodlibet${tag}";
  version = "4.6.0";
-  format = "pyproject";
+  pyproject = true;

-  outputs = [ "out" "doc" ];
+  outputs = [
+    "out"
+    "doc"
+  ];

  src = fetchFromGitHub {
    owner = "quodlibet";
@ -59,79 +63,107 @@ python3.pkgs.buildPythonApplication rec {
    hash = "sha256-dkO/CFN7Dk72xhtmcSDcwUciOPMeEjQS2mch+jSfiII=";
  };

-  nativeBuildInputs = [
-    gettext
-    gobject-introspection
-    wrapGAppsHook3
-  ] ++ (with python3.pkgs; [
-    sphinx-rtd-theme
-    sphinxHook
-    setuptools
-  ]);
-
-  buildInputs = [
-    adwaita-icon-theme
-    gdk-pixbuf
-    glib
-    glib-networking
-    gtk3
-    gtksourceview
-    kakasi
-    keybinder3
-    libappindicator-gtk3
-    libmodplug
-    libsoup
-    webkitgtk
-  ] ++ lib.optionals (withXineBackend) [
-    xine-lib
-  ] ++ lib.optionals (withGstreamerBackend) (with gst_all_1; [
-    gst-plugins-base
-    gstreamer
-  ] ++ lib.optionals (withGstPlugins) [
-    gst-libav
-    gst-plugins-bad
-    gst-plugins-good
-    gst-plugins-ugly
-  ]);
-
-  propagatedBuildInputs = with python3.pkgs; [
-    feedparser
-    gst-python
-    mutagen
-    pycairo
-    pygobject3
-  ]
-  ++ lib.optionals withDbusPython [ dbus-python ]
-  ++ lib.optionals withMusicBrainzNgs [ musicbrainzngs ]
-  ++ lib.optionals withPahoMqtt [ paho-mqtt ]
-  ++ lib.optionals withPyInotify [ pyinotify ]
-  ++ lib.optionals withPypresence [ pypresence ]
-  ++ lib.optionals withSoco [ soco ];
-
-  nativeCheckInputs = [
-    dbus
-    gdk-pixbuf
-    glibcLocales
-    hicolor-icon-theme
-    xvfb-run
-  ] ++ (with python3.pkgs; [
-    polib
-    pytest
-    pytest-xdist
-  ]);
-
-  pytestFlags = [
-    # missing translation strings in potfiles
-    "--deselect=tests/test_po.py::TPOTFILESIN::test_missing"
-    # require networking
-    "--deselect=tests/plugin/test_covers.py::test_live_cover_download"
-    "--deselect=tests/test_browsers_iradio.py::TInternetRadio::test_click_add_station"
-    # upstream does actually not enforce source code linting
-    "--ignore=tests/quality"
-  ] ++ lib.optionals (withXineBackend || !withGstPlugins) [
-    "--ignore=tests/plugin/test_replaygain.py"
+  patches = [
+    (fetchpatch {
+      name = "python-3.12-startup.patch";
+      url = "https://patch-diff.githubusercontent.com/raw/quodlibet/quodlibet/pull/4358.patch";
+      hash = "sha256-3IjtAX2mKO/Xi/iTwT5WBD5CMTRYFED7XMm/cx+29Zc=";
+    })
+    (fetchpatch {
+      name = "more-python-3.12-fixes.patch";
+      url = "https://patch-diff.githubusercontent.com/raw/quodlibet/quodlibet/pull/4364.patch";
+      hash = "sha256-VRIQ+4e+X0kjZYuxV2wEjrFr+x5biwBtIR50K6hSfCY=";
+      excludes = [ "poetry.lock" ];
+    })
+    ./fix-gdist-python-3.12.patch
  ];

+  build-system = [ python3.pkgs.setuptools ];
+
+  nativeBuildInputs =
+    [
+      gettext
+      gobject-introspection
+      wrapGAppsHook3
+    ]
+    ++ (with python3.pkgs; [
+      sphinx-rtd-theme
+      sphinxHook
+    ]);
+
+  buildInputs =
+    [
+      adwaita-icon-theme
+      gdk-pixbuf
+      glib
+      glib-networking
+      gtk3
+      gtksourceview
+      kakasi
+      keybinder3
+      libappindicator-gtk3
+      libmodplug
+      libsoup
+      webkitgtk
+    ]
+    ++ lib.optionals (withXineBackend) [ xine-lib ]
+    ++ lib.optionals (withGstreamerBackend) (
+      with gst_all_1;
+      [
+        gst-plugins-base
+        gstreamer
+      ]
+      ++ lib.optionals (withGstPlugins) [
+        gst-libav
+        gst-plugins-bad
+        gst-plugins-good
+        gst-plugins-ugly
+      ]
+    );
+
+  dependencies =
+    with python3.pkgs;
+    [
+      feedparser
+      gst-python
+      mutagen
+      pycairo
+      pygobject3
+    ]
+    ++ lib.optionals withDbusPython [ dbus-python ]
+    ++ lib.optionals withMusicBrainzNgs [ musicbrainzngs ]
+    ++ lib.optionals withPahoMqtt [ paho-mqtt ]
+    ++ lib.optionals withPypresence [ pypresence ]
+    ++ lib.optionals withSoco [ soco ];
+
+  nativeCheckInputs =
+    [
+      dbus
+      gdk-pixbuf
+      glibcLocales
+      hicolor-icon-theme
+      xvfb-run
+    ]
+    ++ (with python3.pkgs; [
+      polib
+      pytest
+      pytest-xdist
+    ]);
+
+  pytestFlags =
+    [
+      # missing translation strings in potfiles
+      "--deselect=tests/test_po.py::TPOTFILESIN::test_missing"
+      # require networking
+      "--deselect=tests/plugin/test_covers.py::test_live_cover_download"
+      "--deselect=tests/test_browsers_iradio.py::TInternetRadio::test_click_add_station"
+      # upstream does actually not enforce source code linting
+      "--ignore=tests/quality"
+    ]
+    ++ lib.optionals (withXineBackend || !withGstPlugins) [
+      "--ignore=tests/plugin/test_replaygain.py"
+    ];
+
  env.LC_ALL = "en_US.UTF-8";

  preCheck = ''
@ -171,6 +203,9 @@ python3.pkgs.buildPythonApplication rec {
    '';
    homepage = "https://quodlibet.readthedocs.io/en/latest";
    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ coroa pbogdan ];
+    maintainers = with maintainers; [
+      coroa
+      pbogdan
+    ];
  };
 }
--- a/pkgs/applications/audio/quodlibet/fix-gdist-python-3.12.patch
+++ b/pkgs/applications/audio/quodlibet/fix-gdist-python-3.12.patch
@ -0,0 +1,23 @@
+From b3980cf4c8766815e4c13ee1695cebfbf473a2e6 Mon Sep 17 00:00:00 2001
+From: Pavel Sobolev <contact@paveloom.dev>
+Date: Sun, 14 Jul 2024 11:30:11 +0300
+Subject: [PATCH] Import `setuptools` before importing `distutils`.
+
+---
+ gdist/__init__.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/gdist/__init__.py b/gdist/__init__.py
+index 71814af49..a54aac653 100644
+--- a/gdist/__init__.py
+++ b/gdist/__init__.py
+@@ -31,6 +31,7 @@ Also supports setuptools but needs to be imported after setuptools
+ (which does some monkey patching)
+ """
+
+import setuptools
+ import sys
+
+ from distutils.core import setup
+--
+2.45.2
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@ -9,16 +9,16 @@ let
    inherit tiling_wm;
  };
  stableVersion = {
-    version = "2024.1.1.12"; # "Android Studio Koala | 2024.1.1 Patch 1"
-    sha256Hash = "sha256-Qvi/Mc4NEk3dERlfZiowBk2Pmqsgbl5mg56HamvG7aI=";
+    version = "2024.1.1.13"; # "Android Studio Koala | 2024.1.1 Patch 2"
+    sha256Hash = "sha256-h8kOL/vULA1eCmVxP62T9I5oATTS40Qs2YAI4riRadY=";
  };
  betaVersion = {
-    version = "2024.1.2.10"; # "Android Studio Koala Feature Drop | 2024.1.2 Beta 2"
-    sha256Hash = "sha256-/LrHYyrOPfnSliM5XUOzENjJ+G+M1Ajw31tFAOsbfnQ=";
+    version = "2024.1.2.11"; # "Android Studio Koala Feature Drop | 2024.1.2 RC 1"
+    sha256Hash = "sha256-Qn5NNW2Rt6f9QiEUamIumme45uUVeTiMJ/9niAC6ilM=";
  };
  latestVersion = {
-    version = "2024.1.3.3"; # "Android Studio Ladybug | 2024.1.3 Canary 3"
-    sha256Hash = "sha256-Ps3jMtNAdfPitFeXIFKpjSyM4si4tp4MrS3r5VURFh4=";
+    version = "2024.2.1.1"; # "Android Studio Ladybug | 2024.2.1 Canary 5"
+    sha256Hash = "sha256-yfb23cYwRghUA04Ckf4I2yfqmdED9sf//0FSeWL+ze4=";
  };
 in {
  # Attributes are named by their corresponding release channels
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@ -55,40 +55,40 @@
        "src": {
            "owner": "libretro",
            "repo": "beetle-pce-libretro",
-            "rev": "03935421be14680a4aed799388e74ecab8167311",
-            "hash": "sha256-frZ+IYULs5QYGBSw8sp+kEM9U/ykEzZPM/XLdqPr7rs="
+            "rev": "d921176765d58da24d555bc02b73411a89b73976",
+            "hash": "sha256-0ak0n6FdHBCe+WDGkAuvmrIix8xiMqe2bnpMNt/VcDg="
        },
-        "version": "unstable-2024-07-26"
+        "version": "unstable-2024-08-09"
    },
    "beetle-pce-fast": {
        "fetcher": "fetchFromGitHub",
        "src": {
            "owner": "libretro",
            "repo": "beetle-pce-fast-libretro",
-            "rev": "7b7ad0760860f792f3f3a2768230397504e3f66d",
-            "hash": "sha256-KQLvjpUiA/p9wrUIrxd6jJddk91MEF7B58agPALmu/A="
+            "rev": "3f1c0a14b16802998f4f32ea27b0c8ad81d3b9e7",
+            "hash": "sha256-azdHkzMGDJYfZ3GrmLhJYhw9VGgdWBBXto3kqmpTdpQ="
        },
-        "version": "unstable-2024-07-26"
+        "version": "unstable-2024-08-09"
    },
    "beetle-pcfx": {
        "fetcher": "fetchFromGitHub",
        "src": {
            "owner": "libretro",
            "repo": "beetle-pcfx-libretro",
-            "rev": "94541ff5bf9c474aa2923fed3afc4297678c9ede",
-            "hash": "sha256-+E09lQmogRvLc+6TzI0FNfu18jRdZMOzEYJnQjYuldI="
+            "rev": "3a4e8d3665816a2938ea5029f05bc1537f0cbe40",
+            "hash": "sha256-IbFZHMqLH6T2kelNInbGcKIfdn/9li+Lo8BKbYRdEAU="
        },
-        "version": "unstable-2024-06-28"
+        "version": "unstable-2024-08-07"
    },
    "beetle-psx": {
        "fetcher": "fetchFromGitHub",
        "src": {
            "owner": "libretro",
            "repo": "beetle-psx-libretro",
-            "rev": "38d74b0b769e3a72e8ea574389b9cc80994e9cc8",
-            "hash": "sha256-1Lm7TYCTEx6hNa2tjSNWHJMh3vFhyR1oqwiuyVIu+XM="
+            "rev": "99a46bdb949a33ea1f827a1c6dfdd324e26486bf",
+            "hash": "sha256-DvHcT1SJdeVz7M5jRhiil9QaHRBs5cGve+9uNRbBbWI="
        },
-        "version": "unstable-2024-07-26"
+        "version": "unstable-2024-08-09"
    },
    "beetle-saturn": {
        "fetcher": "fetchFromGitHub",
@ -115,10 +115,10 @@
        "src": {
            "owner": "libretro",
            "repo": "beetle-supergrafx-libretro",
-            "rev": "1943f676c70a9ceeee51f05a7422093c525e83ca",
-            "hash": "sha256-ANoD95tfBtJyOokB0fdBmFA+d+iJQ4EcFTZyBNXbfMY="
+            "rev": "dfff1f9c032b9556a070ae6848d1e28df3023e4d",
+            "hash": "sha256-nMu+sXxTtMKA+OajEYa2/OMsLThRr7C3PEC5UwrtCzI="
        },
-        "version": "unstable-2024-07-26"
+        "version": "unstable-2024-08-09"
    },
    "beetle-vb": {
        "fetcher": "fetchFromGitHub",
@ -155,20 +155,20 @@
        "src": {
            "owner": "libretro",
            "repo": "bluemsx-libretro",
-            "rev": "1f6b5b393df17e746bec118902b1d1f6ed3e4109",
-            "hash": "sha256-yndOlTf4OKUP98L1EN+LW4mwtl6LWQ95ILYo8Y+2Geg="
+            "rev": "824690b5ac997ec9694e8db1595186459bb3b652",
+            "hash": "sha256-8UgVUTKGjSt2HwVgE6a/cs1npsOR8j9TxWBH/RA9VNk="
        },
-        "version": "unstable-2024-06-28"
+        "version": "unstable-2024-08-08"
    },
    "bsnes": {
        "fetcher": "fetchFromGitHub",
        "src": {
            "owner": "libretro",
            "repo": "bsnes-libretro",
-            "rev": "d63ec98054477d4be3398d108b6ec0a7b162349a",
-            "hash": "sha256-XONLqioPLJJkZMQ5e2wz0N2vMwZxsPG5FYkDeZgk+JU="
+            "rev": "7e81fc46a7aa7a58030413ed0ae0707832c8d9e6",
+            "hash": "sha256-I6ZPqvN2EL/mCfS7yPgRTbgdLp57xd9+uFfkP1l9DOc="
        },
-        "version": "unstable-2024-07-26"
+        "version": "unstable-2024-08-09"
    },
    "bsnes-hd": {
        "fetcher": "fetchFromGitHub",
@ -246,10 +246,10 @@
        "src": {
            "owner": "schellingb",
            "repo": "dosbox-pure",
-            "rev": "2b7544492940e2208147f2b44cf6209b97ce8493",
-            "hash": "sha256-felA+nEqtbgW7BJ/kJPrfqGmLcMsv8jqN4nWA4uCvOE="
+            "rev": "16a5f9cb92653426e1586cd4b0e52663b394dbac",
+            "hash": "sha256-UivkKTMYETfLP9juYB42de4BxItq/fJVZvk4FrWr2Kc="
        },
-        "version": "unstable-2024-08-01"
+        "version": "unstable-2024-08-10"
    },
    "easyrpg": {
        "fetcher": "fetchFromGitHub",
@ -287,10 +287,10 @@
        "src": {
            "owner": "libretro",
            "repo": "fbneo",
-            "rev": "6fbc30a830c54304c16ba7dccd3aca2cb30bb473",
-            "hash": "sha256-zVrkyVskf3VIwEz50gG+z0Zp5SUeMEAX2ls9lKcyLXY="
+            "rev": "981bd35179e0b4dc4471bdd4c8f093b206ed578b",
+            "hash": "sha256-x1VdryO2GBIPWD72tMI3EHDD/a7uUTSMjDrdr4m4ovg="
        },
-        "version": "unstable-2024-07-27"
+        "version": "unstable-2024-08-09"
    },
    "fceumm": {
        "fetcher": "fetchFromGitHub",
@ -348,20 +348,20 @@
        "src": {
            "owner": "libretro",
            "repo": "gambatte-libretro",
-            "rev": "607c19668426b8945011fd11e25cfce7849f7e13",
-            "hash": "sha256-8uLKOxLRWbczUkhsXqjXVH7SDlIqrp0LNdzVjmxbP2U="
+            "rev": "f122ffc63e3969e29b232de8700e57095c305a53",
+            "hash": "sha256-NqrH2ncfmPZRmldNboCDTCkznHokc6p2aKnDVmt0+Pc="
        },
-        "version": "unstable-2024-07-26"
+        "version": "unstable-2024-08-09"
    },
    "genesis-plus-gx": {
        "fetcher": "fetchFromGitHub",
        "src": {
            "owner": "libretro",
            "repo": "Genesis-Plus-GX",
-            "rev": "5567ea92c6a1b76d72fedaee679a997056038001",
-            "hash": "sha256-4NWA963BSJ9OTq8Lv1v8P3kYwY+mBTQ8uN6zspmkUB4="
+            "rev": "53a4af8fa4061fe7b60b9a1de5080dfa40617e57",
+            "hash": "sha256-Q5FtgIH0yIBUuZmPJ75k7LCon0wzlq+lzj3yo1BfCek="
        },
-        "version": "unstable-2024-07-26"
+        "version": "unstable-2024-08-09"
    },
    "gpsp": {
        "fetcher": "fetchFromGitHub",
@ -408,11 +408,11 @@
        "src": {
            "owner": "libretro",
            "repo": "mame",
-            "rev": "1e31f3a77644341e0ff9065aff3bc249fb024978",
-            "hash": "sha256-NqSPyyGRK1knL/RZ1Md8JjT3W6gRBpomgZiIH2Mp3co=",
+            "rev": "4159481825939a22d8e604b90aaae29ef9097b73",
+            "hash": "sha256-ebnkcHVJuIdttZ5dX8ENQR8JVpkumOrkY5Cf2w7VweI=",
            "fetchSubmodules": true
        },
-        "version": "unstable-2024-07-07"
+        "version": "unstable-2024-08-04"
    },
    "mame2000": {
        "fetcher": "fetchFromGitHub",
@ -429,20 +429,20 @@
        "src": {
            "owner": "libretro",
            "repo": "mame2003-libretro",
-            "rev": "c8f28b100851fa850e2be3b8b30e2839a2d175cc",
-            "hash": "sha256-IQ6s6mOMMHX8GjNNfc0pZFjSZyJurpm40FHcyErfOPM="
+            "rev": "f0d4ffbded87ead2cccd603a9d6f8b6c46c37b6f",
+            "hash": "sha256-rdOZLGoxB5cVOwhMwzoJiSum3gxPRkoNZXVz5QFvXf8="
        },
-        "version": "unstable-2024-06-29"
+        "version": "unstable-2024-08-08"
    },
    "mame2003-plus": {
        "fetcher": "fetchFromGitHub",
        "src": {
            "owner": "libretro",
            "repo": "mame2003-plus-libretro",
-            "rev": "8ffa3c773640956c02dfbcd7d5dc8e3a12fc6773",
-            "hash": "sha256-OzLXcXvrgNQa81n4z8MFEApqsYL4y1e9Cuela5kE34c="
+            "rev": "444bc10c2ab1553b3ed59b7d6afb54da39b891de",
+            "hash": "sha256-dfnISpXAt5JE0i7s75t2MdweTVJ0KarsGxKNtmFViCc="
        },
-        "version": "unstable-2024-07-28"
+        "version": "unstable-2024-08-08"
    },
    "mame2010": {
        "fetcher": "fetchFromGitHub",
@ -641,33 +641,33 @@
        "src": {
            "owner": "libretro",
            "repo": "picodrive",
-            "rev": "d6f625a1251c78caf6f2dc81c1ffdb724587bb24",
-            "hash": "sha256-3RjPYXVfv1ts8Khl/9hkWMdYalNoQmHb+S8xgNfstpo=",
+            "rev": "479f120b928153815a4543b7c4104c0aa355a660",
+            "hash": "sha256-FhixFmIPerXWLNzMDMRka5xWwN/pt0tKqvSbZpmLyPI=",
            "fetchSubmodules": true
        },
-        "version": "unstable-2024-06-30"
+        "version": "unstable-2024-08-09"
    },
    "play": {
        "fetcher": "fetchFromGitHub",
        "src": {
            "owner": "jpd002",
            "repo": "Play-",
-            "rev": "06517ef014305c8579f38fa7574ef3685181d037",
-            "hash": "sha256-b9lsxVRjkV85OzPE5569ZbeShji2kudbcz3amd9aXnA=",
+            "rev": "d1c28b63e0c684025886787c39c4b7f92014d79e",
+            "hash": "sha256-zNcrCIsRVP0AFzFs0S7i4Cuon0JIyFzPrK26hJFqijQ=",
            "fetchSubmodules": true
        },
-        "version": "unstable-2024-07-29"
+        "version": "unstable-2024-08-09"
    },
    "ppsspp": {
        "fetcher": "fetchFromGitHub",
        "src": {
            "owner": "hrydgard",
            "repo": "ppsspp",
-            "rev": "52cf10274c342c1dd97d91c273b109d5c859d227",
-            "hash": "sha256-/XDrbaMyDJgyCZd/5vYkAXw7OvIXx+oagbwqL51uCFI=",
+            "rev": "169736dff64cb426d8eba559f76475d2f762e368",
+            "hash": "sha256-93rZl2vec6NSlJ2WGJvn/M1nsA+bJgfOxiPESYv6oK8=",
            "fetchSubmodules": true
        },
-        "version": "unstable-2024-07-29"
+        "version": "unstable-2024-08-09"
    },
    "prboom": {
        "fetcher": "fetchFromGitHub",
@ -744,20 +744,20 @@
        "src": {
            "owner": "libretro",
            "repo": "smsplus-gx",
-            "rev": "29cd96822f5e9b71a8ccfa13a38c6c37ed83ccac",
-            "hash": "sha256-jdA5PDqwYCJ0V1MxTBJr2Lsm8r9jvZ+l2g2HgrhfP30="
+            "rev": "978d977119eff1bd7214c0095eb91b15b859bb61",
+            "hash": "sha256-GEzeyp6cuvWTuvRBuExamyqJfJW/PEU+2tB2lm+g6K0="
        },
-        "version": "unstable-2024-07-22"
+        "version": "unstable-2024-08-07"
    },
    "snes9x": {
        "fetcher": "fetchFromGitHub",
        "src": {
            "owner": "snes9xgit",
            "repo": "snes9x",
-            "rev": "e92b93ca9cd7936134abe0b90975bc9fc009fbf0",
-            "hash": "sha256-zsGf+3J0k7It/QEg/9SIZrb4yg8K8/6KXUE1/dK83yg="
+            "rev": "85591435763dede7ef111aab8070cdf2d5a7da49",
+            "hash": "sha256-hF+k9OQX/MPF3DLo2qCvsmJ/9NbnuxBigE6iu0iG9E0="
        },
-        "version": "unstable-2024-07-29"
+        "version": "unstable-2024-08-10"
    },
    "snes9x2002": {
        "fetcher": "fetchFromGitHub",
@ -794,10 +794,10 @@
        "src": {
            "owner": "stella-emu",
            "repo": "stella",
-            "rev": "56e6bd69bc070f1d31e13610f1a7ebb1ca8bacbf",
-            "hash": "sha256-M2pyCeBQ3N51E6Xy+NvnQwAcuAuXL8sRvZm3nuyeFv0="
+            "rev": "8e9149a233fa66e894261bef18d20afb575902b1",
+            "hash": "sha256-agMd0/FiMQ3tvNg8imEz55a4AqjyRu085eYL42cNBfI="
        },
-        "version": "unstable-2024-07-30"
+        "version": "unstable-2024-08-10"
    },
    "stella2014": {
        "fetcher": "fetchFromGitHub",
--- a/pkgs/applications/emulators/retroarch/retroarch-assets.nix
+++ b/pkgs/applications/emulators/retroarch/retroarch-assets.nix
@ -6,13 +6,13 @@

 stdenvNoCC.mkDerivation {
  pname = "retroarch-assets";
-  version = "1.19.0-unstable-2024-05-30";
+  version = "1.19.0-unstable-2024-08-08";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "retroarch-assets";
-    rev = "771e60b1eacd4edc57c19b61ab2c713200af0a3f";
-    hash = "sha256-304xYXY5cESjSxepb5xpfMeJBnG+EJBiaVnhSUE3icQ=";
+    rev = "8a74442fabfc6f72c623dbf1f7a59bfeba771b9f";
+    hash = "sha256-rlIxKciCZK0UDAHsnEcUpFlKT0Y7vd1WqN8UfUOn7cA=";
  };

  makeFlags = [
--- a/pkgs/applications/misc/clipqr/default.nix
+++ b/pkgs/applications/misc/clipqr/default.nix
@ -9,6 +9,7 @@
 , libXi
 , libXinerama
 , libXrandr
+, libXxf86vm
 , makeDesktopItem
 , mesa
 , pkg-config
@ -38,6 +39,7 @@ buildGoModule rec {
    libXi
    libXinerama
    libXrandr
+    libXxf86vm
    mesa
  ];

--- a/pkgs/applications/misc/gallery-dl/default.nix
+++ b/pkgs/applications/misc/gallery-dl/default.nix
@ -5,17 +5,18 @@
  requests,
  yt-dlp,
  pytestCheckHook,
+  nix-update-script,
 }:

 buildPythonApplication rec {
  pname = "gallery-dl";
-  version = "1.27.2";
+  version = "1.27.3";
  format = "setuptools";

  src = fetchPypi {
    inherit version;
    pname = "gallery_dl";
-    hash = "sha256-CTc6CBAFIxOX5Bd/hy3e65MbWyI2wFn+a6hj4ktuBjo=";
+    hash = "sha256-ILnnbnQiJnBBOV87mWw1xHU8DtCXIVVwRwz/PfzVSSI=";
  };

  propagatedBuildInputs = [
@ -36,6 +37,8 @@ buildPythonApplication rec {

  pythonImportsCheck = [ "gallery_dl" ];

+  passthru.updateScript = nix-update-script { };
+
  meta = {
    description = "Command-line program to download image-galleries and -collections from several image hosting sites";
    homepage = "https://github.com/mikf/gallery-dl";
--- a/pkgs/applications/networking/cluster/k3d/default.nix
+++ b/pkgs/applications/networking/cluster/k3d/default.nix
@ -15,13 +15,13 @@ let
 in
 buildGoModule rec {
  pname = "k3d";
-  version = "5.7.2";
+  version = "5.7.3";

  src = fetchFromGitHub {
    owner = "k3d-io";
    repo = "k3d";
    rev = "refs/tags/v${version}";
-    hash = "sha256-dZ3G5zucGeFl1ooNJ7mUpgtv99ZZgOk5deHNUtP7vt0=";
+    hash = "sha256-G9z4yJ7Oa2zmxYTRIMCiXlBPLlc3vGPUqUOoIohDKU8=";
  };

  vendorHash = "sha256-lFmIRtkUiohva2Vtg4AqHaB5McVOWW5+SFShkNqYVZ8=";
--- a/pkgs/applications/networking/cluster/tfupdate/default.nix
+++ b/pkgs/applications/networking/cluster/tfupdate/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "tfupdate";
-  version = "0.8.4";
+  version = "0.8.5";

  src = fetchFromGitHub {
    owner = "minamijoyo";
    repo = "tfupdate";
    rev = "v${version}";
-    sha256 = "sha256-/wkCd73SrspHccbOZV6lq0Htk+Vjgbu2uTZLiEeZAdc=";
+    sha256 = "sha256-iWiY1IuNZCqHpnAoib0SkWwAg1Mnuqr2QjKI3KZGYs0=";
  };

  vendorHash = "sha256-/ZNWVuGInZY/t0s317FQstEPeJpTKWMXUVo8cE44GkI=";
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix
@ -2,7 +2,7 @@
 callPackage ./generic.nix { } rec {
  pname = "signal-desktop";
  dir = "Signal";
-  version = "7.5.1";
+  version = "7.19.0";
  url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb";
-  hash = "sha256-X7B7eQQXTZ+ADLrrLI9XUsl7rHO9akMeW2zAgduXfLY=";
+  hash = "sha256-L5Wj1ofMR+QJezd4V6pAhkINLF6y9EB5VNFAIOZE5PU=";
 }
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
@ -2,7 +2,7 @@
 callPackage ./generic.nix { } rec {
  pname = "signal-desktop";
  dir = "Signal";
-  version = "7.18.0";
+  version = "7.19.0";
  url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-  hash = "sha256-xI3GCs9ZekENktuSf9NNxoOOGuYtKrOV8Ng3eFy493M=";
+  hash = "sha256-lO8GOCc/L4WO+aPR6qSn3HQlqeCB6t5pWAENRXOThdI=";
 }
--- a/pkgs/by-name/ca/cargo-geiger/fix-build-with-rust-1.80.patch
+++ b/pkgs/by-name/ca/cargo-geiger/fix-build-with-rust-1.80.patch
@ -0,0 +1,48 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 48c5606f..4c796675 100644
+--- a/Cargo.lock
+++ b/Cargo.lock
+@@ -2238,6 +2238,12 @@ dependencies = [
+  "winapi",
+ ]
+ 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+ [[package]]
+ name = "num-traits"
+ version = "0.2.17"
+@@ -3148,13 +3154,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "time"
+-version = "0.3.30"
+version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
+  "deranged",
+  "itoa",
+  "libc",
+ "num-conv",
+  "num_threads",
+  "powerfmt",
+  "serde",
+@@ -3170,10 +3177,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+ 
+ [[package]]
+ name = "time-macros"
+-version = "0.2.15"
+version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
+ "num-conv",
+  "time-core",
+ ]
+ 
--- a/pkgs/by-name/ca/cargo-geiger/package.nix
+++ b/pkgs/by-name/ca/cargo-geiger/package.nix
@ -20,7 +20,13 @@ rustPlatform.buildRustPackage rec {
    rev = "cargo-geiger@v${version}";
    hash = "sha256-/5yuayqneZV6aVQ6YFgqNS2XY3W6yETRQ0kE5ovc7p8=";
  };
-  cargoHash = "sha256-lhojo3dhsM9y1SxpVMH93yv+JeNfTL7VLsbTp9ErgIQ=";
+
+  cargoPatches = [
+    # https://github.com/geiger-rs/cargo-geiger/pull/528
+    ./fix-build-with-rust-1.80.patch
+  ];
+
+  cargoHash = "sha256-511KeTykHw3xbnsuwIt2QmBK3mG9yK23z0yrS3eIY74=";

  patches = [
    ./allow-warnings.patch
--- a/pkgs/by-name/di/dissent/package.nix
+++ b/pkgs/by-name/di/dissent/package.nix
@ -12,13 +12,13 @@

 buildGoModule rec {
  pname = "dissent";
-  version = "0.0.26";
+  version = "0.0.27";

  src = fetchFromGitHub {
    owner = "diamondburned";
    repo = "dissent";
    rev = "v${version}";
-    hash = "sha256-BvVu83XqiRQ7t7MtRHLfN3m1roSbRvZyHTxpQI7lGuA=";
+    hash = "sha256-aksQgkeisNvfp++Gobg4ITA1au2GzTgKmFtVCrLkfac=";
  };

  nativeBuildInputs = [
@ -47,7 +47,7 @@ buildGoModule rec {
    install -D -m 444 -t $out/share/dbus-1/services nix/so.libdb.dissent.service
  '';

-  vendorHash = "sha256-3mZUSN1Ul223vp8Zx12hULtCM7eVJl7y0q+Fk1tFEBs=";
+  vendorHash = "sha256-8LY7XEMe91rGOGLr6TJhoEnl2cWArcQ5VXMV9NpZaL8=";

  meta = with lib; {
    description = "A third-party Discord client designed for a smooth, native experience (formerly gtkcord4)";
--- a/pkgs/by-name/fi/files-cli/package.nix
+++ b/pkgs/by-name/fi/files-cli/package.nix
@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "files-cli";
-  version = "2.13.100";
+  version = "2.13.107";

  src = fetchFromGitHub {
    repo = "files-cli";
    owner = "files-com";
    rev = "v${version}";
-    hash = "sha256-Mfd7r+fVhhQ88rX1eH9lvbnaCf63lNnmWfyuOZ3kolU=";
+    hash = "sha256-fZp27mFnZi10kMHHNxvPL3E30jFCF6SOvuSo1whgmJ4=";
  };

-  vendorHash = "sha256-kHGamX6MHql7+RJDQMx/b5oLJmGOA0TykYw/wfA2KG8=";
+  vendorHash = "sha256-Cz8QP95guBTOWr8Fr9fej/K3WiNCKx5BjPRuwiQWNzM=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/fl/flashmq/package.nix
+++ b/pkgs/by-name/fl/flashmq/package.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "flashmq";
-  version = "1.15.4";
+  version = "1.16.0";

  src = fetchFromGitHub {
    owner = "halfgaar";
    repo = "FlashMQ";
    rev = "v${version}";
-    hash = "sha256-798BUwjVpsv4OW12mWWXbyqogGX1y182H/u/0Cz3Xow=";
+    hash = "sha256-oKH2cH1GuNrBzxAVvmO01+IfkuNzQEgGpL4gSfjpjqg=";
  };

  nativeBuildInputs = [ cmake installShellFiles ];
--- a/pkgs/by-name/gl/glasskube/package.nix
+++ b/pkgs/by-name/gl/glasskube/package.nix
@ -7,12 +7,12 @@
 }:

 let
-  version = "0.14.0";
+  version = "0.16.0";
  gitSrc = fetchFromGitHub {
    owner = "glasskube";
    repo = "glasskube";
    rev = "refs/tags/v${version}";
-    hash = "sha256-k2PjdPPRPOZBr5AUGR25LJVN4/4jWaeTEX2ILLA3o10=";
+    hash = "sha256-NZ7FQMJyQlJW5ZS8dNzsURhRcu0IQXyTn/6e91eGhEg=";
  };
  web-bundle = buildNpmPackage rec {
    inherit version;
@ -40,7 +40,7 @@ in buildGoModule rec {

  src = gitSrc;

-  vendorHash = "sha256-030lHyj3kkcz56S75l2wM3sVxTch7j9sKqUlkebStFo=";
+  vendorHash = "sha256-bh1ZQhd3xYoz4AEe/EZ4baBryQx4WfdacTQDP1Roi2Y=";

  CGO_ENABLED = 0;

--- a/pkgs/by-name/hi/hickory-dns/package.nix
+++ b/pkgs/by-name/hi/hickory-dns/package.nix
@ -6,7 +6,7 @@
 }:

 rustPlatform.buildRustPackage rec {
-  pname = "trust-dns";
+  pname = "hickory-dns";
  version = "0.24.1";

  src = fetchFromGitHub {
@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
    rev = "v${version}";
    hash = "sha256-szq21RuRmkhAfHlzhGQYpwjiIRkavFCPETOt+6TxhP4=";
  };
-  cargoHash = "sha256-zGn5vHwsHgpkgOr30QiyScqnfXjH55LQIVtxoUUox64=";
+  cargoHash = "sha256-LcMjHHEuDlhSfDXGIrSMXewraSxEgRw2g2DOoH4i5RU=";

  buildInputs = [ openssl ];
  nativeBuildInputs = [ pkg-config ];
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {

  meta = with lib; {
    description = "Rust based DNS client, server, and resolver";
-    homepage = "https://trust-dns.org/";
+    homepage = "https://hickory-dns.org/";
    maintainers = with maintainers; [ colinsane ];
    platforms = platforms.linux;
    license = with licenses; [ asl20 mit ];
--- a/pkgs/by-name/ja/jazz2/package.nix
+++ b/pkgs/by-name/ja/jazz2/package.nix
@ -13,13 +13,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "jazz2";
-  version = "2.7.0";
+  version = "2.8.0";

  src = fetchFromGitHub {
    owner = "deathkiller";
    repo = "jazz2-native";
    rev = finalAttrs.version;
-    hash = "sha256-iy5b5h6wpOlubtOwBs0X7P0wBD3QeAQwjMhgnd4YP+Q=";
+    hash = "sha256-qJVT7WCw3nfoLbSqLFfZCI5VLOuoD/iSVfC9B+XEhyg=";
  };

  patches = [ ./nocontent.patch ];
--- a/pkgs/by-name/me/mealie/package.nix
+++ b/pkgs/by-name/me/mealie/package.nix
@ -41,22 +41,20 @@ let
  };
 in

-pythonpkgs.buildPythonPackage rec {
+pythonpkgs.buildPythonApplication rec {
  pname = "mealie";
  inherit version src;
  pyproject = true;

-  nativeBuildInputs = [
-    pythonpkgs.poetry-core
-    makeWrapper
-  ];
+  build-system = with pythonpkgs; [ poetry-core ];
+
+  nativeBuildInputs = [ makeWrapper ];

  dontWrapPythonPrograms = true;

-  doCheck = false;
  pythonRelaxDeps = true;

-  propagatedBuildInputs = with pythonpkgs; [
+  dependencies = with pythonpkgs; [
    aiofiles
    alembic
    aniso8601
@ -121,18 +119,26 @@ pythonpkgs.buildPythonPackage rec {
      --replace-fail 'script_location = alembic' 'script_location = ${src}/alembic'

    makeWrapper ${start_script} $out/bin/mealie \
-      --set PYTHONPATH "$out/${python.sitePackages}:${python.pkgs.makePythonPath propagatedBuildInputs}" \
+      --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath dependencies}" \
      --set LD_LIBRARY_PATH "${crfpp}/lib" \
      --set STATIC_FILES "${frontend}" \
      --set PATH "${lib.makeBinPath [ crfpp ]}"

    makeWrapper ${init_db} $out/libexec/init_db \
-      --set PYTHONPATH "$out/${python.sitePackages}:${python.pkgs.makePythonPath propagatedBuildInputs}" \
+      --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath dependencies}" \
      --set OUT "$out"
  '';

-  checkInputs = with python.pkgs; [
-    pytestCheckHook
+  nativeCheckInputs = with pythonpkgs; [ pytestCheckHook ];
+
+  disabledTestPaths = [
+    # KeyError: 'alembic_version'
+    "tests/unit_tests/services_tests/backup_v2_tests/test_backup_v2.py"
+    "tests/unit_tests/services_tests/backup_v2_tests/test_alchemy_exporter.py"
+    # sqlite3.OperationalError: no such table
+    "tests/unit_tests/services_tests/scheduler/tasks/test_create_timeline_events.py"
+    "tests/unit_tests/test_ingredient_parser.py"
+    "tests/unit_tests/test_security.py"
  ];

  passthru.tests = {
--- a/pkgs/by-name/nz/nzbhydra2/package.nix
+++ b/pkgs/by-name/nz/nzbhydra2/package.nix
@ -9,11 +9,11 @@
 }:
 stdenv.mkDerivation rec {
  pname = "nzbhydra2";
-  version = "7.3.0";
+  version = "7.4.0";

  src = fetchzip {
    url = "https://github.com/theotherp/${pname}/releases/download/v${version}/${pname}-${version}-generic.zip";
-    hash = "sha256-ybI6nCw8yY2XceXiMkION7/p7gl58lrAPpUq6EpManU=";
+    hash = "sha256-9ZGnY7ccByexQrBmJeuxEHN2OZeCGdJdSP0lvtKRHOE=";
    stripRoot = false;
  };

--- a/pkgs/by-name/so/soplex/package.nix
+++ b/pkgs/by-name/so/soplex/package.nix
@ -0,0 +1,33 @@
+{
+  lib,
+  stdenv,
+  cmake,
+  fetchFromGitHub,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "soplex";
+  version = "7.1.0";
+
+  src = fetchFromGitHub {
+    owner = "scipopt";
+    repo = "soplex";
+    rev = "release-${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}";
+    hash = "sha256-yoXqfaSGYLHJbUcmBkxhmik553L/9XZtb7FjouaIGCg=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  strictDeps = true;
+
+  doCheck = true;
+
+  meta = {
+    homepage = "https://scipopt.org";
+    description = "Sequential object-oriented simPlex";
+    license = with lib.licenses; [ asl20 ];
+    mainProgram = "soplex";
+    maintainers = with lib.maintainers; [ david-r-cox ];
+    platforms = lib.platforms.unix;
+  };
+})
--- a/pkgs/by-name/ty/typst/Cargo.lock
+++ b/pkgs/by-name/ty/typst/Cargo.lock
@ -2376,9 +2376,9 @@ dependencies = [

 [[package]]
 name = "time"
-version = "0.3.34"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
 "deranged",
 "itoa",
@ -2397,9 +2397,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"

 [[package]]
 name = "time-macros"
-version = "0.2.17"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
 "num-conv",
 "time-core",
--- a/pkgs/by-name/ty/typst/package.nix
+++ b/pkgs/by-name/ty/typst/package.nix
@ -47,10 +47,13 @@ rustPlatform.buildRustPackage rec {
    OPENSSL_NO_VENDOR = true;
  };

-  # Fix for "Found argument '--test-threads' which wasn't expected, or isn't valid in this context"
  postPatch = ''
+    # Fix for "Found argument '--test-threads' which wasn't expected, or isn't valid in this context"
    substituteInPlace tests/src/tests.rs --replace-fail 'ARGS.num_threads' 'ARGS.test_threads'
    substituteInPlace tests/src/args.rs --replace-fail 'num_threads' 'test_threads'
+
+    # Fix build with Rust 1.80; remove on next release
+    ln -sf ${./Cargo.lock} Cargo.lock
  '';

  postInstall = ''
--- a/pkgs/by-name/xi/xiu/package.nix
+++ b/pkgs/by-name/xi/xiu/package.nix
@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "xiu";
-  version = "0.12.7";
+  version = "0.13.0";

  src = fetchFromGitHub {
    owner = "harlanc";
    repo = "xiu";
    rev = "v${version}";
-    hash = "sha256-tFArcI7NcIopM5uPshaOU3ExJW5URc5Mf2V0ZwwgwKo=";
+    hash = "sha256-EjyvCwqcPkOe69YnDiAExtBNPhsqqGa95ao+bn6wcyA=";
  };

-  cargoHash = "sha256-OBL1uDVogcU6saEz2d2sWJTwXM2KE/YfhsNZtH0Cnk8=";
+  cargoHash = "sha256-pW1VvnK7WDRvSVFOMUibtsPn+dhcFp64EpTW5beaJ+s=";

  nativeBuildInputs = [
    cmake
--- a/pkgs/data/fonts/intel-one-mono/default.nix
+++ b/pkgs/data/fonts/intel-one-mono/default.nix
@ -1,25 +1,28 @@
-{ lib, stdenvNoCC, fetchurl, unzip }:
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  unzip,
+}:

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "intel-one-mono";
-  version = "1.3.0";
+  version = "1.4.0";

  srcs = [
    (fetchurl {
      url = "https://github.com/intel/intel-one-mono/releases/download/V${finalAttrs.version}/otf.zip";
-      hash = "sha256-iZIfkXH+GplVwES4LaQBIaCWs7OKmEto9J2SpzvagSs=";
+      hash = "sha256-dO+O5mdAPHYHRbwS/F4ssWhFRBlPrT1TQJGcFzqCJ/w=";
    })
    (fetchurl {
      url = "https://github.com/intel/intel-one-mono/releases/download/V${finalAttrs.version}/ttf.zip";
-      hash = "sha256-EeUTEMuoTHKmuO5Uj0jjiDRF9t7jxbIy45nTWozlgfc=";
+      hash = "sha256-VIY1UtJdy5w/U2CylvyYDW4fv9AuDSFCJOi3jworzPA=";
    })
  ];

  sourceRoot = ".";

-  nativeBuildInputs = [
-    unzip
-  ];
+  nativeBuildInputs = [ unzip ];

  installPhase = ''
    runHook preInstall
@ -28,12 +31,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    runHook postInstall
  '';

-  meta = with lib; {
+  meta = {
    description = "Intel One Mono, an expressive monospaced font family that’s built with clarity, legibility, and the needs of developers in mind";
    homepage = "https://github.com/intel/intel-one-mono";
    changelog = "https://github.com/intel/intel-one-mono/releases/tag/V${finalAttrs.version}";
-    license = licenses.ofl;
-    maintainers = [ maintainers.simoneruffini ];
-    platforms = platforms.all;
+    license = lib.licenses.ofl;
+    maintainers = with lib.maintainers; [
+      luftmensch-luftmensch
+      simoneruffini
+    ];
+    platforms = lib.platforms.all;
  };
 })
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null;

 buildNpmPackage rec {
  pname = "Iosevka${toString set}";
-  version = "31.0.0";
+  version = "31.2.0";

  src = fetchFromGitHub {
    owner = "be5invis";
    repo = "iosevka";
    rev = "v${version}";
-    hash = "sha256-toC3Q5DkTu8yfrCwhRutUaPW0JJO/Vnhkh6PUKIa31I=";
+    hash = "sha256-G0+HuA9EQEc4AYH1PgS0UqaIbZBgYcmmF2/ZgrmD7Oo=";
  };

-  npmDepsHash = "sha256-PWzhpz+L1mNQI5PCHVsU/+vfb5im/V8NxhlUtdhSeMM=";
+  npmDepsHash = "sha256-gmVnUlZjrBbm/9H9Uv97A5H7TOtFGXHj9mRtmNplNgg=";

  nativeBuildInputs = [
    remarshal
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@ -418,11 +418,11 @@ buildLuarocksPackage {
  version = "2.8-1";
  knownRockspec = (fetchurl {
    url    = "mirror://luarocks/dkjson-2.8-1.rockspec";
-    sha256 = "060410qpbsvmw2kwbkwh5ivcpnqqcbmcj4dxhf8hvjgvwljsrdka";
+    hash = "sha256-arasJeX7yQ2Rg70RyepiGNvLdiyQz8Wn4HXrdTEIBBg=";
  }).outPath;
  src = fetchurl {
    url    = "http://dkolf.de/dkjson-lua/dkjson-2.8.tar.gz";
-    sha256 = "0js9z5ja3ws1i9gj2m673459rwm0gadxbf86mcif7d8286h61yh9";
+    hash = "sha256-JOjNO+uRwchh63uz+8m9QYu/+a1KpdBHGBYlgjajFTI=";
  };

  disabled = luaOlder "5.1" || luaAtLeast "5.5";
--- a/pkgs/development/python-modules/clip-anytorch/default.nix
+++ b/pkgs/development/python-modules/clip-anytorch/default.nix
@ -2,22 +2,23 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
-
-  # dependencies
+  fetchpatch,
  ftfy,
+  packaging,
+  pythonOlder,
  regex,
-  tqdm,
+  setuptools,
  torch,
  torchvision,
-
-  # tests
-  pytestCheckHook,
+  tqdm,
 }:

 buildPythonPackage rec {
  pname = "clip-anytorch";
  version = "2.6.0";
-  format = "setuptools";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";

  src = fetchFromGitHub {
    owner = "rom1504";
@ -26,9 +27,21 @@ buildPythonPackage rec {
    hash = "sha256-4A8R9aEiOWC05uhMQslhVSkQ4hyjs6VsqkFi76miodY=";
  };

-  propagatedBuildInputs = [
+  patches = [
+    # Import packaging to be compatible with setuptools==70.0.0, https://github.com/rom1504/CLIP/pull/10
+    (fetchpatch {
+      name = "setuptools-comp.patch";
+      url = "https://github.com/rom1504/CLIP/pull/10/commits/8137d899035d889623f6b0a0a0faae88c549dc50.patch";
+      hash = "sha256-CIcuDk4QH+0g8YEa6TbKGjIcKJQqFviymVH68sKmsyk=";
+    })
+  ];
+
+  build-system = [ setuptools ];
+
+  dependencies = [
    ftfy
    regex
+    packaging
    tqdm
    torch
    torchvision
@ -36,15 +49,9 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "clip" ];

-  # all tests require network access
+  # All tests require network access
  doCheck = false;

-  nativeCheckInputs = [ pytestCheckHook ];
-
-  preCheck = ''
-    export HOME=$TMPDIR
-  '';
-
  meta = with lib; {
    description = "Contrastive Language-Image Pretraining";
    homepage = "https://github.com/rom1504/CLIP";
--- a/pkgs/development/python-modules/laundrify-aio/default.nix
+++ b/pkgs/development/python-modules/laundrify-aio/default.nix
@ -13,6 +13,7 @@ buildPythonPackage rec {
  version = "1.2.2";
  pyproject = true;

+
  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
--- a/pkgs/development/python-modules/m3u8/default.nix
+++ b/pkgs/development/python-modules/m3u8/default.nix
@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "m3u8";
-  version = "5.2.0";
+  version = "6.0.0";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "globocom";
    repo = "m3u8";
    rev = "refs/tags/${version}";
-    hash = "sha256-hqthP0XOpE1Xl7a/IUWAG2GmoWMPYU8EwK6norvxdik=";
+    hash = "sha256-1SOuKKNBg67Yc0a6Iqb1goTE7sraptzpFIB2lvrbMQg=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/msal/default.nix
+++ b/pkgs/development/python-modules/msal/default.nix
@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "msal";
-  version = "1.28.1";
+  version = "1.29.0";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-1yu/4tXC8lVfS8YgW+RFDd/RKXZhDdmhapqw8Fxotk0=";
+    hash = "sha256-j2cl8Jl1JVP5sv6EEl4qXr5HtJ+S6syjPr7dOp66riU=";
  };

  nativeBuildInputs = [ setuptools ];
--- a/pkgs/development/python-modules/plantuml-markdown/default.nix
+++ b/pkgs/development/python-modules/plantuml-markdown/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "plantuml-markdown";
-  version = "3.10.0";
+  version = "3.10.2";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "mikitex70";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-t5OZ0n2TLQFaGievFWlYTXslP4yCvpQ3MyNQZ3/xYRs=";
+    hash = "sha256-DLpxT+t1EqF42SaVnhtjjONsXRsnTMAlx6YaTD8Zj7c=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/safety-schemas/default.nix
+++ b/pkgs/development/python-modules/safety-schemas/default.nix
@ -12,22 +12,20 @@

 buildPythonPackage rec {
  pname = "safety-schemas";
-  version = "0.0.2";
+  version = "0.0.3";
  pyproject = true;

  src = fetchPypi {
    pname = "safety_schemas";
    inherit version;
-    hash = "sha256-fRsEDsBkgPBc/2tF6nqT4JyJQt+GT7DQHd62fDI8+ow=";
+    hash = "sha256-s5VU+cAQ5PEffJ5Xc+sx0slsFk96WVwnOpiwdND7mPQ=";
  };

-  nativeBuildInputs = [
-    hatchling
-  ];
+  build-system = [ hatchling ];

  pythonRelaxDeps = [ "dparse" ];

-  propagatedBuildInputs = [
+  dependencies = [
    dparse
    packaging
    pydantic
--- a/pkgs/development/python-modules/safety/default.nix
+++ b/pkgs/development/python-modules/safety/default.nix
@ -2,7 +2,7 @@
  lib,
  buildPythonPackage,
  pythonOlder,
-  fetchPypi,
+  fetchFromGitHub,
  setuptools,
  click,
  urllib3,
@ -13,34 +13,37 @@
  jinja2,
  marshmallow,
  authlib,
-  jwt,
  rich,
  typer,
  pydantic,
  safety-schemas,
  typing-extensions,
  filelock,
+  psutil,
+  git,
  pytestCheckHook,
 }:

 buildPythonPackage rec {
  pname = "safety";
-  version = "3.2.4";
+  version = "3.2.5";

  disabled = pythonOlder "3.7";

  pyproject = true;

-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-usAgIBbXNqIRgFeWSg45g/og/yVj/RA8rD86we0/6hE=";
+  src = fetchFromGitHub {
+    owner = "pyupio";
+    repo = "safety";
+    rev = "refs/tags/${version}";
+    hash = "sha256-vLibQfSwxZF48KL/vfkCOUi2qH5QGMySbdakLQNP+Ug=";
  };

  postPatch = ''
    substituteInPlace safety/safety.py \
-      --replace-fail "telemetry=True" "telemetry=False"
+      --replace-fail "telemetry: bool = True" "telemetry: bool = False"
    substituteInPlace safety/util.py \
-      --replace-fail "telemetry = True" "telemetry = False"
+      --replace-fail "telemetry: bool = True" "telemetry: bool = False"
    substituteInPlace safety/cli.py \
      --replace-fail "disable-optional-telemetry', default=False" \
                     "disable-optional-telemetry', default=True"
@ -66,24 +69,26 @@ buildPythonPackage rec {
    jinja2
    marshmallow
    authlib
-    jwt
    rich
    typer
    pydantic
    safety-schemas
    typing-extensions
    filelock
+    psutil
  ];

-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    git
+    pytestCheckHook
+  ];

  # Disable tests depending on online services
  disabledTests = [
    "test_announcements_if_is_not_tty"
    "test_check_live"
-    "test_check_live_cached"
+    "test_debug_flag"
    "test_get_packages_licenses_without_api_key"
-    "test_validate_with_policy_file_using_invalid_keyword"
    "test_validate_with_basic_policy_file"
  ];

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

 buildGoModule rec {
  pname = "ctlptl";
-  version = "0.8.30";
+  version = "0.8.31";

  src = fetchFromGitHub {
    owner = "tilt-dev";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-qIuZfOgzoFaZznacJ2UEMMDKevsadmRkhwPXkb5rJiM=";
+    hash = "sha256-UzQm5WrLU79Fiwnd5da0CwkoDQylZZAFqEhiF76FS40=";
  };

-  vendorHash = "sha256-GeUuCMcx/huEw4SLNierkcmxyZiOvClKwpjGQZDP6nw=";
+  vendorHash = "sha256-9NIswLwcfTQoHLGPhOaW2RT4jKR4Re3XVl0nNJ8cTKw=";

  nativeBuildInputs = [ installShellFiles ];

--- 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.20";
+  version = "0.2.21";

  src = fetchurl {
    url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar";
-    sha256 = "sha256-c/EFacN8isuxghnxaMn/uqDK1r7w1qn/suV8xbnmvOo=";
+    sha256 = "sha256-w1STu6+OzEhZ3MnfXer6QRQauEfW15iMIiiMN+nxAe0=";
  };

  dontUnpack = true;
--- a/pkgs/development/tools/rust/cargo-update/default.nix
+++ b/pkgs/development/tools/rust/cargo-update/default.nix
@ -16,14 +16,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-update";
-  version = "13.4.0";
+  version = "14.0.0";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-/9igT1/3ck8Roy2poq1urf+cLblentOB7S9Hh6uqIEw=";
+    hash = "sha256-TSqvT5YjnlfXvNjsiG7lR4f8QIzFoTG9Z70Wy66MhNM=";
  };

-  cargoHash = "sha256-pdWVp9+CLnNO7+U0a8WXWHZ+EeGNYx9J7WWAI1MTDvc=";
+  cargoHash = "sha256-hkKr/3mTrnznOWfySTWY+tmeWYjn7nAk+sP4ISPlqHs=";

  nativeBuildInputs = [
    cmake
--- a/pkgs/games/quakespasm/vulkan.nix
+++ b/pkgs/games/quakespasm/vulkan.nix
@ -20,13 +20,13 @@

 stdenv.mkDerivation rec {
  pname = "vkquake";
-  version = "1.31.0";
+  version = "1.31.1.1";

  src = fetchFromGitHub {
    owner = "Novum";
    repo = "vkQuake";
    rev = version;
-    sha256 = "sha256-3xWwqN0EcwDMEhVxfLa0bMMClM+zELEFWzO/EJvPNs0=";
+    sha256 = "sha256-GSCH8U5N95I/gj5KIzAnpsU4i2xJuzXcccuKKAskk8Q=";
  };

  nativeBuildInputs = [
--- a/pkgs/tools/misc/antimicrox/default.nix
+++ b/pkgs/tools/misc/antimicrox/default.nix
@ -12,13 +12,13 @@

 mkDerivation rec {
  pname = "antimicrox";
-  version = "3.4.0";
+  version = "3.4.1";

  src = fetchFromGitHub {
    owner = "AntiMicroX";
    repo = pname;
    rev = version;
-    sha256 = "sha256-zBIEuZdmcyA99YdwC6tn0I3Ori8VyBOw50ablb/Lmvs=";
+    sha256 = "sha256-HikaNbgPwsiIYNQgdEZiVdVYJtYgZRiXVqEce68tyxM=";
  };

  nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ];
--- a/pkgs/tools/misc/dua/default.nix
+++ b/pkgs/tools/misc/dua/default.nix
@ -7,13 +7,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "dua";
-  version = "2.29.0";
+  version = "2.29.2";

  src = fetchFromGitHub {
    owner = "Byron";
    repo = "dua-cli";
    rev = "v${version}";
-    hash = "sha256-rO9k1/HOwVJF/QCT2sZy4L0Mv26CiUj9Zafliffj68A=";
+    hash = "sha256-tmlf5heOZ3UyFh8ZfwXXZhQO3vlSWwyvxL9/euQ2Fn4=";
    # Remove unicode file names which leads to different checksums on HFS+
    # vs. other filesystems because of unicode normalisation.
    postFetch = ''
@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
    '';
  };

-  cargoHash = "sha256-qn1QDiYHcygomOFwFEy00wsMykrQ9/84Ed4nAUTlA1k=";
+  cargoHash = "sha256-bqWYXcry+mCUNgYS+7+MWfiV+u+3oZZg1o3Q6Mac+vE=";

  buildInputs = lib.optionals stdenv.isDarwin [
    darwin.apple_sdk.frameworks.Foundation
--- a/pkgs/tools/networking/aardvark-dns/default.nix
+++ b/pkgs/tools/networking/aardvark-dns/default.nix
@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "aardvark-dns";
-  version = "1.12.0";
+  version = "1.12.1";

  src = fetchFromGitHub {
    owner = "containers";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-4mOX0PYj6qm1X8QQYhUAJbLUUi/O+BqRy4se9XvS4c0=";
+    hash = "sha256-x8cfLn8b9h6+rpAVXZHdaVTzkzlDSfyGWveDX9usIPE=";
  };

-  cargoHash = "sha256-IvDBtu2DSQUmFtfx81wW+Z82cvMtoWEEH+tyX0FjYFg=";
+  cargoHash = "sha256-eGA3oTDk3tGzYDeGJwe6+Tpum+ue534qXv79SotDy/o=";

  passthru.tests = { inherit (nixosTests) podman; };

--- a/pkgs/tools/networking/edgedb/Cargo.lock
+++ b/pkgs/tools/networking/edgedb/Cargo.lock
@ -43,6 +43,21 @@ dependencies = [
 "memchr",
 ]

+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "ansi-escapes"
 version = "0.1.1"
@ -362,6 +377,12 @@ version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"

+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
 [[package]]
 name = "base64ct"
 version = "1.6.0"
@ -540,7 +561,10 @@ version = "0.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b"
 dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
 "num-traits",
+ "windows-targets 0.52.0",
 ]

 [[package]]
@ -873,7 +897,7 @@ dependencies = [
 "crossterm_winapi",
 "libc",
 "mio",
- "parking_lot",
+ "parking_lot 0.12.1",
 "signal-hook",
 "signal-hook-mio",
 "winapi",
@ -1022,7 +1046,7 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"

 [[package]]
 name = "edgedb-cli"
-version = "5.1.0"
+version = "5.2.3"
 dependencies = [
 "ansi-escapes",
 "anyhow",
@ -1031,8 +1055,9 @@ dependencies = [
 "async-listen",
 "backtrace",
 "base32",
- "base64",
+ "base64 0.21.7",
 "bigdecimal",
+ "bitflags 1.3.2",
 "bitvec",
 "blake2b_simd",
 "blake3",
@ -1077,6 +1102,7 @@ dependencies = [
 "minimad",
 "native-tls",
 "nix 0.26.4",
+ "nom",
 "notify",
 "num-bigint 0.4.4",
 "once_cell",
@ -1089,11 +1115,14 @@ dependencies = [
 "prettytable-rs",
 "rand",
 "regex",
+ "renamore",
 "reqwest",
+ "reqwest-middleware",
+ "reqwest-retry",
 "rexpect",
 "ring",
 "rpassword",
- "rustls",
+ "rustls 0.22.2",
 "rustyline",
 "scram",
 "semver",
@ -1104,7 +1133,6 @@ dependencies = [
 "serde_str",
 "sha1",
 "sha2",
- "shared-client-tests",
 "shell-escape",
 "shutdown_hooks",
 "signal-hook",
@ -1123,6 +1151,7 @@ dependencies = [
 "tokio",
 "tokio-stream",
 "toml",
+ "tracing",
 "unicode-segmentation",
 "unicode-width",
 "url",
@ -1199,7 +1228,7 @@ dependencies = [
 "arc-swap",
 "async-trait",
 "base16ct",
- "base64",
+ "base64 0.21.7",
 "bytes",
 "crc16",
 "dirs 5.0.1",
@ -1209,9 +1238,9 @@ dependencies = [
 "log",
 "once_cell",
 "rand",
- "rustls",
+ "rustls 0.22.2",
 "rustls-native-certs",
- "rustls-pemfile 2.1.0",
+ "rustls-pemfile",
 "rustls-webpki",
 "scram",
 "serde",
@ -1423,7 +1452,7 @@ checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
 dependencies = [
 "cfg-if",
 "libc",
- "redox_syscall",
+ "redox_syscall 0.4.1",
 "windows-sys 0.52.0",
 ]

@ -1517,6 +1546,21 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"

+[[package]]
+name = "futures"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
 [[package]]
 name = "futures-channel"
 version = "0.3.30"
@ -1533,6 +1577,17 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"

+[[package]]
+name = "futures-executor"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
 [[package]]
 name = "futures-io"
 version = "0.3.30"
@ -1596,10 +1651,13 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
+ "futures-channel",
 "futures-core",
+ "futures-io",
 "futures-macro",
 "futures-sink",
 "futures-task",
+ "memchr",
 "pin-project-lite",
 "pin-utils",
 "slab",
@ -1632,8 +1690,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
 dependencies = [
 "cfg-if",
+ "js-sys",
 "libc",
 "wasi",
+ "wasm-bindgen",
 ]

 [[package]]
@ -1671,7 +1731,26 @@ dependencies = [
 "futures-core",
 "futures-sink",
 "futures-util",
- "http",
+ "http 0.2.11",
+ "indexmap 2.2.3",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "h2"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http 1.1.0",
 "indexmap 2.2.3",
 "slab",
 "tokio",
@ -1703,10 +1782,10 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
 dependencies = [
- "base64",
+ "base64 0.21.7",
 "bytes",
 "headers-core",
- "http",
+ "http 0.2.11",
 "httpdate",
 "mime",
 "sha1",
@ -1718,7 +1797,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
 dependencies = [
- "http",
+ "http 0.2.11",
 ]

 [[package]]
@ -1780,6 +1859,17 @@ dependencies = [
 "itoa",
 ]

+[[package]]
+name = "http"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
 [[package]]
 name = "http-body"
 version = "0.4.6"
@ -1787,7 +1877,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
 "bytes",
- "http",
+ "http 0.2.11",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http 1.1.0",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.1",
 "pin-project-lite",
 ]

@ -1829,9 +1942,9 @@ dependencies = [
 "futures-channel",
 "futures-core",
 "futures-util",
- "h2",
- "http",
- "http-body",
+ "h2 0.3.24",
+ "http 0.2.11",
+ "http-body 0.4.6",
 "httparse",
 "httpdate",
 "itoa",
@ -1844,16 +1957,99 @@ dependencies = [
 ]

 [[package]]
-name = "hyper-tls"
-version = "0.5.0"
+name = "hyper"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
 dependencies = [
 "bytes",
- "hyper",
+ "futures-channel",
+ "futures-util",
+ "h2 0.4.5",
+ "http 1.1.0",
+ "http-body 1.0.1",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
+dependencies = [
+ "futures-util",
+ "http 1.1.0",
+ "hyper 1.4.1",
+ "hyper-util",
+ "rustls 0.23.7",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls 0.26.0",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-util",
 "native-tls",
 "tokio",
 "tokio-native-tls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.1",
+ "hyper 1.4.1",
+ "pin-project-lite",
+ "socket2 0.5.5",
+ "tokio",
+ "tower",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
 ]

 [[package]]
@ -1955,6 +2151,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
 "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
 ]

 [[package]]
@ -2087,7 +2286,7 @@ checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
 dependencies = [
 "bitflags 2.4.2",
 "libc",
- "redox_syscall",
+ "redox_syscall 0.4.1",
 ]

 [[package]]
@ -2481,6 +2680,17 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"

+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@ -2488,7 +2698,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
 "lock_api",
- "parking_lot_core",
+ "parking_lot_core 0.9.9",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
 ]

 [[package]]
@ -2499,7 +2723,7 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
 dependencies = [
 "cfg-if",
 "libc",
- "redox_syscall",
+ "redox_syscall 0.4.1",
 "smallvec",
 "windows-targets 0.48.5",
 ]
@ -2539,7 +2763,7 @@ version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310"
 dependencies = [
- "base64",
+ "base64 0.21.7",
 "serde",
 ]

@ -2846,6 +3070,15 @@ dependencies = [
 "getrandom",
 ]

+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.4.1"
@ -2896,21 +3129,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"

 [[package]]
-name = "reqwest"
-version = "0.11.24"
+name = "renamore"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251"
+checksum = "0f5bced8a18df26d088a61a8f314d853ad18705b0aee59b43ccc088ca4bc3670"
 dependencies = [
- "base64",
+ "cc",
+ "tempfile",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
+dependencies = [
+ "base64 0.22.1",
 "bytes",
 "encoding_rs",
 "futures-core",
 "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
+ "h2 0.4.5",
+ "http 1.1.0",
+ "http-body 1.0.1",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-rustls",
 "hyper-tls",
+ "hyper-util",
 "ipnet",
 "js-sys",
 "log",
@ -2919,7 +3165,7 @@ dependencies = [
 "once_cell",
 "percent-encoding",
 "pin-project-lite",
- "rustls-pemfile 1.0.4",
+ "rustls-pemfile",
 "serde",
 "serde_json",
 "serde_urlencoded",
@ -2932,7 +3178,53 @@ dependencies = [
 "wasm-bindgen",
 "wasm-bindgen-futures",
 "web-sys",
- "winreg 0.50.0",
+ "winreg 0.52.0",
+]
+
+[[package]]
+name = "reqwest-middleware"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39346a33ddfe6be00cbc17a34ce996818b97b230b87229f10114693becca1268"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "http 1.1.0",
+ "reqwest",
+ "serde",
+ "thiserror",
+ "tower-service",
+]
+
+[[package]]
+name = "reqwest-retry"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf2a94ba69ceb30c42079a137e2793d6d0f62e581a24c06cd4e9bb32e973c7da"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "chrono",
+ "futures",
+ "getrandom",
+ "http 1.1.0",
+ "hyper 1.4.1",
+ "parking_lot 0.11.2",
+ "reqwest",
+ "reqwest-middleware",
+ "retry-policies",
+ "tokio",
+ "tracing",
+ "wasm-timer",
+]
+
+[[package]]
+name = "retry-policies"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5875471e6cab2871bc150ecb8c727db5113c9338cc3354dc5ee3425b6aa40a1c"
+dependencies = [
+ "rand",
 ]

 [[package]]
@ -3026,6 +3318,19 @@ dependencies = [
 "zeroize",
 ]

+[[package]]
+name = "rustls"
+version = "0.23.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebbbdb961df0ad3f2652da8f3fdc4b36122f568f968f45ad3316f26c025c677b"
+dependencies = [
+ "once_cell",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-native-certs"
 version = "0.7.0"
@ -3033,28 +3338,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792"
 dependencies = [
 "openssl-probe",
- "rustls-pemfile 2.1.0",
+ "rustls-pemfile",
 "rustls-pki-types",
 "schannel",
 "security-framework",
 ]

-[[package]]
-name = "rustls-pemfile"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
-dependencies = [
- "base64",
-]
-
 [[package]]
 name = "rustls-pemfile"
 version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c333bb734fcdedcea57de1602543590f545f127dc8b533324318fd492c5c70b"
 dependencies = [
- "base64",
+ "base64 0.21.7",
 "rustls-pki-types",
 ]

@ -3144,7 +3440,7 @@ name = "scram"
 version = "0.7.0"
 source = "git+https://github.com/elprans/scram#b1f594638f1022ed7e6550a63ad94bb95256a097"
 dependencies = [
- "base64",
+ "base64 0.21.7",
 "rand",
 "ring",
 ]
@ -3469,9 +3765,9 @@ dependencies = [

 [[package]]
 name = "sync_wrapper"
-version = "0.1.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"

 [[package]]
 name = "system-configuration"
@ -3726,7 +4022,7 @@ version = "0.10.0-pre"
 source = "git+https://github.com/elprans/rust-tls-api.git?branch=rustls-22#b73652c53e1cbdc676f4f1cd3645cab00be514e5"
 dependencies = [
 "anyhow",
- "rustls",
+ "rustls 0.22.2",
 "rustls-webpki",
 "thiserror",
 "tls-api",
@ -3796,7 +4092,18 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
 dependencies = [
- "rustls",
+ "rustls 0.22.2",
+ "rustls-pki-types",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+dependencies = [
+ "rustls 0.23.7",
 "rustls-pki-types",
 "tokio",
 ]
@ -3835,6 +4142,27 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project",
+ "pin-project-lite",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+
 [[package]]
 name = "tower-service"
 version = "0.3.2"
@ -3849,9 +4177,21 @@ checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
 "log",
 "pin-project-lite",
+ "tracing-attributes",
 "tracing-core",
 ]

+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "tracing-core"
 version = "0.1.32"
@ -4044,20 +4384,20 @@ dependencies = [
 "futures-channel",
 "futures-util",
 "headers",
- "http",
- "hyper",
+ "http 0.2.11",
+ "hyper 0.14.28",
 "log",
 "mime",
 "mime_guess",
 "percent-encoding",
 "pin-project",
- "rustls-pemfile 2.1.0",
+ "rustls-pemfile",
 "scoped-tls",
 "serde",
 "serde_json",
 "serde_urlencoded",
 "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.25.0",
 "tokio-util",
 "tower-service",
 "tracing",
@ -4135,6 +4475,21 @@ version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"

+[[package]]
+name = "wasm-timer"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
+dependencies = [
+ "futures",
+ "js-sys",
+ "parking_lot 0.11.2",
+ "pin-utils",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "wchar"
 version = "0.6.1"
@ -4229,6 +4584,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.0",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.42.0"
@ -4453,9 +4817,9 @@ dependencies = [

 [[package]]
 name = "winreg"
-version = "0.50.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
 dependencies = [
 "cfg-if",
 "windows-sys 0.48.0",
--- a/pkgs/tools/networking/edgedb/default.nix
+++ b/pkgs/tools/networking/edgedb/default.nix
@ -19,13 +19,13 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "edgedb";
-  version = "5.1.0";
+  version = "5.2.3";

  src = fetchFromGitHub {
    owner = "edgedb";
    repo = "edgedb-cli";
    rev = "v${version}";
-    hash = "sha256-znxAtfSeepLQqkPsEzQBp3INZym5BLap6m29C/9z+h8=";
+    hash = "sha256-WlXX1ACSZZNV0VBCoZjC1wLDF0qjIdjNJ4rQu6fBGfM=";
    fetchSubmodules = true;
  };

--- a/pkgs/tools/networking/xdp-tools/default.nix
+++ b/pkgs/tools/networking/xdp-tools/default.nix
@ -15,13 +15,13 @@
 }:
 stdenv.mkDerivation rec {
  pname = "xdp-tools";
-  version = "1.4.2";
+  version = "1.4.3";

  src = fetchFromGitHub {
    owner = "xdp-project";
    repo = "xdp-tools";
    rev = "v${version}";
-    hash = "sha256-kWgjt7mYwHtf8I4sXPzzrQJkWQyC8AC85ulGOWmQNZI=";
+    hash = "sha256-eI4sqzTaA4iRmhEY3SgySxWiCzGJ7nVebC2RVlk7OHk=";
  };

  outputs = [ "out" "lib" ];
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -1467,6 +1467,7 @@ mapAliases ({
  transifex-client = transifex-cli; # Added 2023-12-29
  trezor_agent = trezor-agent; # Added 2024-01-07
  openai-triton-llvm = triton-llvm; # added 2024-07-18
+  trust-dns = hickory-dns; # Added 2024-08-07
  trustedGrub = throw "trustedGrub has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10
  trustedGrub-for-HP = throw "trustedGrub-for-HP has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10
  tumpa = throw "tumpa has been removed, as it is broken"; # Added 2024-07-15
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -27367,8 +27367,6 @@ with pkgs;
    inherit (darwin.apple_sdk.frameworks) Security;
  };

-  trust-dns = callPackage ../servers/dns/trust-dns { };
-
  trustymail = callPackage ../tools/security/trustymail { };

  tunctl = callPackage ../os-specific/linux/tunctl { };
@ -33206,7 +33204,6 @@ with pkgs;
    withDbusPython = true;
    withMusicBrainzNgs = true;
    withPahoMqtt = true;
-    withPyInotify = true;
    withPypresence = true;
    withSoco = true;
  };