Merge staging-next into staging

2024-11-22 06:53:01 +00:00 · 2024-09-12 18:04:48 +00:00 · 2024-09-12 18:04:48 +00:00 · 83e85079ff
commit 83e85079ff
parent bd879d4c44 51e983b196
63 changed files with 1323 additions and 1188 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -1094,6 +1094,12 @@
    githubId = 169249;
    name = "Alex Brandt";
  };
+  alx = {
+    email = "nix@alexgirard.com";
+    github = "alx";
+    githubId = 373;
+    name = "Alexandre Girard Davila";
+  };
  alxsimon = {
    email = "alexis.simon@normalesup.org";
    github = "alxsimon";
--- a/maintainers/scripts/kde/generate-sources.py
+++ b/maintainers/scripts/kde/generate-sources.py
@ -75,7 +75,7 @@ def main(set: str, version: str, nixpkgs: pathlib.Path, sources_url: Optional[st
            "gear": "releases",
            "plasma": "plasma",
        }[set]
-        sources_url = f"https://kde.org/info/sources/source-{set_url}-{version}.html"
+        sources_url = f"https://kde.org/info/sources/source-{set_url}-{version}/"

    sources = httpx.get(sources_url)
    sources.raise_for_status()
--- a/nixos/lib/testing/nixos-test-base.nix
+++ b/nixos/lib/testing/nixos-test-base.nix
@ -23,10 +23,10 @@ in
      };
    }
    ({ config, ... }: {
-      # Don't pull in switch-to-configuration by default, except when specialisations are involved.
+      # Don't pull in switch-to-configuration by default, except when specialisations or early boot shenanigans are involved.
      # This is mostly a Hydra optimization, so we don't rebuild all the tests every time switch-to-configuration-ng changes.
      key = "no-switch-to-configuration";
-      system.switch.enable = mkDefault (config.isSpecialisation || config.specialisation != {});
+      system.switch.enable = mkDefault (config.isSpecialisation || config.specialisation != {} || config.virtualisation.installBootLoader);
    })
  ];
 }
--- a/nixos/modules/services/web-apps/invidious.nix
+++ b/nixos/modules/services/web-apps/invidious.nix
@ -199,6 +199,41 @@ let
    };
  };

+  sigHelperConfig = lib.mkIf cfg.sig-helper.enable {
+    services.invidious.settings.signature_server = "tcp://${cfg.sig-helper.listenAddress}";
+    systemd.services.invidious-sig-helper = {
+      script = ''
+        exec ${lib.getExe cfg.sig-helper.package} --tcp "${cfg.sig-helper.listenAddress}"
+      '';
+      wantedBy = [ "multi-user.target" ];
+      before = [ "invidious.service" ];
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ];
+      serviceConfig = {
+        User = "invidious-sig-helper";
+        DynamicUser = true;
+        Restart = "always";
+
+        PrivateTmp = true;
+        PrivateUsers = true;
+        ProtectSystem = true;
+        ProtectProc = "invisible";
+        ProtectHome = true;
+        PrivateDevices = true;
+        NoNewPrivileges = true;
+        ProtectKernelTunables = true;
+        ProtectKernelModules = true;
+        ProtectControlGroups = true;
+        ProtectKernelLogs = true;
+        CapabilityBoundingSet = "";
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" "@network-io" ];
+        RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
+        RestrictNamespaces = true;
+      };
+    };
+  };
+
  nginxConfig = lib.mkIf cfg.nginx.enable {
    services.invidious.settings = {
      https_only = config.services.nginx.virtualHosts.${cfg.domain}.forceSSL;
@ -392,6 +427,30 @@ in

      package = lib.mkPackageOption pkgs "http3-ytproxy" { };
    };
+
+    sig-helper = {
+      enable = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = ''
+          Whether to enable and configure inv-sig-helper to emulate the youtube client's javascript. This is required
+          to make certain videos playable.
+
+          This will download and run completely untrusted javascript from youtube! While this service is sandboxed,
+          this may still be an issue!
+        '';
+      };
+
+      package = lib.mkPackageOption pkgs "inv-sig-helper" { };
+
+      listenAddress = lib.mkOption {
+        type = lib.types.str;
+        default = "127.0.0.1:2999";
+        description = ''
+          The IP address/port where inv-sig-helper should listen.
+        '';
+      };
+    };
  };

  config = lib.mkIf cfg.enable (lib.mkMerge [
@ -399,5 +458,6 @@ in
    localDatabaseConfig
    nginxConfig
    ytproxyConfig
+    sigHelperConfig
  ]);
 }
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@ -276,15 +276,7 @@ let
    onlyNixStore = false;
    label = rootFilesystemLabel;
    partitionTableType = selectPartitionTableLayout { inherit (cfg) useDefaultFilesystems useEFIBoot; };
-    # Bootloader should be installed on the system image only if we are booting through bootloaders.
-    # Though, if a user is not using our default filesystems, it is possible to not have any ESP
-    # or a strange partition table that's incompatible with GRUB configuration.
-    # As a consequence, this may lead to disk image creation failures.
-    # To avoid this, we prefer to let the user find out about how to install the bootloader on its ESP/disk.
-    # Usually, this can be through building your own disk image.
-    # TODO: If a user is interested into a more fine grained heuristic for `installBootLoader`
-    # by examining the actual contents of `cfg.fileSystems`, please send a PR.
-    installBootLoader = cfg.useBootLoader && cfg.useDefaultFilesystems;
+    installBootLoader = cfg.installBootLoader;
    touchEFIVars = cfg.useEFIBoot;
    diskSize = "auto";
    additionalSpace = "0M";
@ -840,6 +832,19 @@ in
          '';
      };

+    virtualisation.installBootLoader =
+      mkOption {
+        type = types.bool;
+        default = cfg.useBootLoader && cfg.useDefaultFilesystems;
+        defaultText = "cfg.useBootLoader && cfg.useDefaultFilesystems";
+        description = ''
+          Install boot loader to target image.
+
+          This is best-effort and may break with unconventional partition setups.
+          Use `virtualisation.useDefaultFilesystems` for a known-working configuration.
+        '';
+      };
+
    virtualisation.useEFIBoot =
      mkOption {
        type = types.bool;
@ -999,6 +1004,13 @@ in
                If you have a more advanced usecase, please open an issue or a pull request.
              '';
          }
+          {
+            assertion = cfg.installBootLoader -> config.system.switch.enable;
+            message = ''
+              `system.switch.enable` must be enabled for `virtualisation.installBootLoader` to work.
+              Please enable it in your configuration.
+            '';
+          }
        ];

    warnings =
--- a/nixos/tests/invidious.nix
+++ b/nixos/tests/invidious.nix
@ -37,6 +37,19 @@ import ./make-test-python.nix ({ pkgs, ... }: {
          };
          networking.hosts."127.0.0.1" = [ "invidious.example.com" ];
        };
+        nginx-sig-helper.configuration = {
+          services.invidious = {
+            nginx.enable = true;
+            domain = "invidious.example.com";
+            sig-helper.enable = true;
+            settings.log_level = "Trace";
+          };
+          services.nginx.virtualHosts."invidious.example.com" = {
+            forceSSL = false;
+            enableACME = false;
+          };
+          networking.hosts."127.0.0.1" = [ "invidious.example.com" ];
+        };
        nginx-scale.configuration = {
          services.invidious = {
            nginx.enable = true;
@ -116,6 +129,14 @@ import ./make-test-python.nix ({ pkgs, ... }: {
    curl_assert_status_code("http://invidious.example.com/vi/dQw4w9WgXcQ/mqdefault.jpg", 502)
    machine.succeed("journalctl -eu http3-ytproxy.service | grep -o 'dQw4w9WgXcQ'")

+    activate_specialisation("nginx-sig-helper")
+    machine.wait_for_unit("invidious-sig-helper.service")
+    # we can't really test the sig helper that well without internet connection...
+    # invidious does connect to the sig helper though and crashes when the sig helper is not available
+    machine.wait_for_open_port(80)
+    curl_assert_status_code("http://invidious.example.com/search", 200)
+    machine.succeed("journalctl -eu invidious.service | grep -o \"SigHelper: Using helper at 'tcp://127.0.0.1:2999'\"")
+
    postgres_tcp.wait_for_unit("postgresql.service")
    activate_specialisation("postgres-tcp")
    machine.wait_for_open_port(port)
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -4247,18 +4247,6 @@ final: prev:
    meta.homepage = "https://github.com/eagletmt/ghcmod-vim/";
  };

-  gina-vim = buildVimPlugin {
-    pname = "gina.vim";
-    version = "2022-03-30";
-    src = fetchFromGitHub {
-      owner = "lambdalisue";
-      repo = "vim-gina";
-      rev = "ff6c2ddeca98f886b57fb42283c12e167d6ab575";
-      sha256 = "09jlnpix2dy6kggiz96mrm5l1f9x1gl5afpdmfrxgkighn2rwpzq";
-    };
-    meta.homepage = "https://github.com/lambdalisue/vim-gina/";
-  };
-
  git-blame-nvim = buildVimPlugin {
    pname = "git-blame.nvim";
    version = "2024-07-28";
@ -4861,13 +4849,14 @@ final: prev:

  himalaya-vim = buildVimPlugin {
    pname = "himalaya-vim";
-    version = "2024-05-27";
-    src = fetchgit {
-      url = "https://git.sr.ht/~soywod/himalaya-vim";
-      rev = "cea041c927a04a841aea53abcedd4a0d153d4ca8";
-      sha256 = "0yrilhvqklfbfknkdskywf95mfhbr9rfjs2gmppnzgfs7fg6jn63";
+    version = "2024-09-10";
+    src = fetchFromGitHub {
+      owner = "pimalaya";
+      repo = "himalaya-vim";
+      rev = "f25c003e8fe532348b4080bf8d738cfa1bbf1f5f";
+      sha256 = "0dv6mxwq6yv6if1lfb45j49rl6bghyr1hn1xfbz9g9cbb7fna2x1";
    };
-    meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim";
+    meta.homepage = "https://github.com/pimalaya/himalaya-vim/";
  };

  hlint-refactor-vim = buildVimPlugin {
@ -13696,6 +13685,18 @@ final: prev:
    meta.homepage = "https://github.com/raghur/vim-ghost/";
  };

+  vim-gina = buildVimPlugin {
+    pname = "vim-gina";
+    version = "2022-03-30";
+    src = fetchFromGitHub {
+      owner = "lambdalisue";
+      repo = "vim-gina";
+      rev = "ff6c2ddeca98f886b57fb42283c12e167d6ab575";
+      sha256 = "09jlnpix2dy6kggiz96mrm5l1f9x1gl5afpdmfrxgkighn2rwpzq";
+    };
+    meta.homepage = "https://github.com/lambdalisue/vim-gina/";
+  };
+
  vim-gist = buildVimPlugin {
    pname = "vim-gist";
    version = "2022-10-09";
@ -17000,6 +17001,18 @@ final: prev:
    meta.homepage = "https://github.com/michal-h21/vim-zettel/";
  };

+  vim-zscript = buildVimPlugin {
+    pname = "vim-zscript";
+    version = "2023-10-02";
+    src = fetchFromGitHub {
+      owner = "marrub--";
+      repo = "vim-zscript";
+      rev = "8c9352effb0847f838dbe32dc946ab38937b3d26";
+      sha256 = "1q619ial566gbf93d8v13njkhqx6blmcp402cpa3may4npf3qric";
+    };
+    meta.homepage = "https://github.com/marrub--/vim-zscript/";
+  };
+
  vim2hs = buildVimPlugin {
    pname = "vim2hs";
    version = "2014-04-16";
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -405,7 +405,7 @@ https://github.com/OXY2DEV/helpview.nvim/,HEAD,
 https://github.com/RaafatTurki/hex.nvim/,HEAD,
 https://github.com/Yggdroot/hiPairs/,,
 https://github.com/tzachar/highlight-undo.nvim/,HEAD,
-https://git.sr.ht/~soywod/himalaya-vim,,
+https://github.com/pimalaya/himalaya-vim/,,
 https://github.com/mpickering/hlint-refactor-vim/,,
 https://github.com/calops/hmts.nvim/,,
 https://github.com/edluffy/hologram.nvim/,,
@ -1430,6 +1430,7 @@ https://github.com/mg979/vim-xtabline/,,
 https://github.com/stephpy/vim-yaml/,,
 https://github.com/simonrw/vim-yapf/,,
 https://github.com/michal-h21/vim-zettel/,HEAD,
+https://github.com/marrub--/vim-zscript/,HEAD,
 https://github.com/dag/vim2hs/,,
 https://github.com/monkoose/vim9-stargate/,HEAD,
 https://github.com/dominikduda/vim_current_word/,,
--- a/pkgs/applications/misc/ausweisapp/default.nix
+++ b/pkgs/applications/misc/ausweisapp/default.nix
@ -15,13 +15,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "ausweisapp";
-  version = "2.2.0";
+  version = "2.2.1";

  src = fetchFromGitHub {
    owner = "Governikus";
    repo = "AusweisApp2";
    rev = finalAttrs.version;
-    hash = "sha256-YOsKAWc6z39OPzc4eWc/9RhRoOD+J5xHve4Low1UX+Q=";
+    hash = "sha256-+hkbtxw1Bj/lMgyf3OkwmRXyZL6CS3bTHUlGH9xxe/E=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/pw-viz/Cargo.lock
+++ b/pkgs/applications/misc/pw-viz/Cargo.lock
@ -92,28 +92,20 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "once_cell",
 "serde",
 "version_check",
 ]

 [[package]]
-name = "aho-corasick"
-version = "0.7.20"
+name = "annotate-snippets"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e"
 dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
+ "unicode-width",
+ "yansi-term",
 ]

 [[package]]
@ -189,25 +181,23 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"

 [[package]]
 name = "bindgen"
-version = "0.59.2"
+version = "0.69.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
+checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
 dependencies = [
- "bitflags",
+ "annotate-snippets",
+ "bitflags 2.5.0",
 "cexpr",
 "clang-sys",
- "clap",
- "env_logger",
+ "itertools",
 "lazy_static",
 "lazycell",
- "log",
- "peeking_take_while",
 "proc-macro2",
 "quote",
 "regex",
 "rustc-hash",
 "shlex",
- "which",
+ "syn 2.0.66",
 ]

 [[package]]
@ -216,6 +206,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

+[[package]]
+name = "bitflags"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+
 [[package]]
 name = "block"
 version = "0.1.6"
@ -264,7 +260,7 @@ checksum = "5fe233b960f12f8007e3db2d136e3cb1c291bfd7396e384ee76025fc1a3932b4"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.107",
 ]

 [[package]]
@ -316,12 +312,6 @@ dependencies = [
 "smallvec",
 ]

-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@ -354,21 +344,6 @@ dependencies = [
 "libloading",
 ]

-[[package]]
-name = "clap"
-version = "2.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags",
- "strsim 0.8.0",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
 [[package]]
 name = "clipboard-win"
 version = "4.4.2"
@ -395,7 +370,7 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 "block",
 "cocoa-foundation",
 "core-foundation",
@ -411,7 +386,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 "block",
 "core-foundation",
 "core-graphics-types",
@ -441,6 +416,15 @@ dependencies = [
 "memchr",
 ]

+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "cookie-factory"
 version = "0.3.2"
@ -469,7 +453,7 @@ version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 "core-foundation",
 "core-graphics-types",
 "foreign-types 0.3.2",
@ -482,7 +466,7 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 "core-foundation",
 "foreign-types 0.3.2",
 "libc",
@ -506,7 +490,7 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]

 [[package]]
@ -568,8 +552,8 @@ dependencies = [
 "ident_case",
 "proc-macro2",
 "quote",
- "strsim 0.10.0",
- "syn",
+ "strsim",
+ "syn 1.0.107",
 ]

 [[package]]
@ -582,7 +566,7 @@ dependencies = [
 "ident_case",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.107",
 ]

 [[package]]
@ -593,7 +577,7 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
 dependencies = [
 "darling_core 0.13.4",
 "quote",
- "syn",
+ "syn 1.0.107",
 ]

 [[package]]
@ -604,7 +588,7 @@ checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e"
 dependencies = [
 "darling_core 0.14.2",
 "quote",
- "syn",
+ "syn 1.0.107",
 ]

 [[package]]
@ -615,7 +599,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.107",
 ]

 [[package]]
@ -624,7 +608,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "dirs-sys-next",
 ]

@ -820,20 +804,7 @@ dependencies = [
 "darling 0.14.2",
 "proc-macro2",
 "quote",
- "syn",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
+ "syn 1.0.107",
 ]

 [[package]]
@ -853,27 +824,6 @@ dependencies = [
 "serde",
 ]

-[[package]]
-name = "errno"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
 [[package]]
 name = "error-code"
 version = "2.3.1"
@ -937,7 +887,7 @@ checksum = "c8469d0d40519bc608ec6863f1cc88f3f1deee15913f2f3b3e573d81ed38cccc"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.107",
 ]

 [[package]]
@ -967,7 +917,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74eadec9d0a5c28c54bb9882e54787275152a4e36ce206b45d7451384e5bf5fb"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 "freetype-sys",
 "libc",
 ]
@ -999,7 +949,7 @@ version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "libc",
 "wasi",
 ]
@ -1039,7 +989,7 @@ version = "0.30.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "524d807cd49a0c56a53ef9a6738cd15e7c8c4e9d37a3b7fdb3c250c1cd5bf7a3"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 "cfg_aliases",
 "cgl",
 "cocoa",
@ -1100,12 +1050,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@ -1128,12 +1072,21 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "js-sys",
 "wasm-bindgen",
 "web-sys",
 ]

+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.5"
@ -1199,9 +1152,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"

 [[package]]
 name = "libc"
-version = "0.2.139"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"

 [[package]]
 name = "libloading"
@ -1209,33 +1162,35 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "winapi",
 ]

 [[package]]
 name = "libspa"
-version = "0.5.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8bb02bbc8d550e2f0a31989c61e1ac3c883bab2edee49ffcb5d5ca18266786d"
+checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810"
 dependencies = [
- "bitflags",
+ "bitflags 2.5.0",
 "cc",
+ "convert_case",
 "cookie-factory",
- "errno",
 "libc",
 "libspa-sys",
+ "nix 0.27.1",
 "nom",
 "system-deps",
 ]

 [[package]]
 name = "libspa-sys"
-version = "0.5.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8d2e38d6cdd10d7d78eb0cb409c127cf16da2c296d9623375551e309616d4d"
+checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f"
 dependencies = [
 "bindgen",
+ "cc",
 "system-deps",
 ]

@ -1255,7 +1210,7 @@ version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]

 [[package]]
@ -1330,7 +1285,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 "jni-sys",
 "ndk-sys",
 "num_enum",
@ -1370,7 +1325,7 @@ dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.107",
 ]

 [[package]]
@ -1382,27 +1337,14 @@ dependencies = [
 "jni-sys",
 ]

-[[package]]
-name = "nix"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce"
-dependencies = [
- "bitflags",
- "cc",
- "cfg-if 0.1.10",
- "libc",
- "void",
-]
-
 [[package]]
 name = "nix"
 version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
 dependencies = [
- "bitflags",
- "cfg-if 1.0.0",
+ "bitflags 1.3.2",
+ "cfg-if",
 "libc",
 "memoffset",
 ]
@ -1414,12 +1356,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4"
 dependencies = [
 "autocfg",
- "bitflags",
- "cfg-if 1.0.0",
+ "bitflags 1.3.2",
+ "cfg-if",
 "libc",
 "memoffset",
 ]

+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.5.0",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "nohash-hasher"
 version = "0.2.0"
@ -1454,7 +1407,7 @@ dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.107",
 ]

 [[package]]
@ -1552,7 +1505,7 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "libc",
 "redox_syscall",
 "smallvec",
@ -1565,12 +1518,6 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"

-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
 [[package]]
 name = "percent-encoding"
 version = "2.2.0"
@ -1585,27 +1532,26 @@ checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"

 [[package]]
 name = "pipewire"
-version = "0.5.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d80fef8219c37f479f3d62d70167f3daaa90b71a083f7fd88d69e49f05f0ecdc"
+checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda"
 dependencies = [
 "anyhow",
- "bitflags",
- "errno",
+ "bitflags 2.5.0",
 "libc",
 "libspa",
 "libspa-sys",
+ "nix 0.27.1",
 "once_cell",
 "pipewire-sys",
- "signal",
 "thiserror",
 ]

 [[package]]
 name = "pipewire-sys"
-version = "0.5.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6d4262ea1fd3b01786046d1892cc49e9578d872faf8723d95dc7affc810ee4"
+checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112"
 dependencies = [
 "bindgen",
 "libspa-sys",
@ -1624,7 +1570,7 @@ version = "0.17.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 "crc32fast",
 "flate2",
 "miniz_oxide",
@ -1649,16 +1595,16 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.49"
+version = "1.0.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
+checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "pw-viz"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
 "eframe",
 "egui",
@ -1673,9 +1619,9 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "1.0.23"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
 "proc-macro2",
 ]
@ -1734,7 +1680,7 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]

 [[package]]
@ -1754,8 +1700,6 @@ version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
 dependencies = [
- "aho-corasick",
- "memchr",
 "regex-syntax",
 ]

@ -1772,7 +1716,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff"
 dependencies = [
 "base64",
- "bitflags",
+ "bitflags 1.3.2",
 "serde",
 ]

@ -1841,7 +1785,7 @@ checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.107",
 ]

 [[package]]
@ -1871,16 +1815,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"

-[[package]]
-name = "signal"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f6ce83b159ab6984d2419f495134972b48754d13ff2e3f8c998339942b56ed9"
-dependencies = [
- "libc",
- "nix 0.14.1",
-]
-
 [[package]]
 name = "simple_logger"
 version = "4.0.0"
@ -1915,7 +1849,7 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 "calloop",
 "dlib",
 "lazy_static",
@ -1944,12 +1878,6 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"

-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
 [[package]]
 name = "strsim"
 version = "0.10.0"
@ -1967,6 +1895,17 @@ dependencies = [
 "unicode-ident",
 ]

+[[package]]
+name = "syn"
+version = "2.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "system-deps"
 version = "6.0.3"
@ -1980,24 +1919,6 @@ dependencies = [
 "version-compare",
 ]

-[[package]]
-name = "termcolor"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.38"
@ -2015,7 +1936,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.107",
 ]

 [[package]]
@ -2056,7 +1977,7 @@ dependencies = [
 "arrayref",
 "arrayvec 0.5.2",
 "bytemuck",
- "cfg-if 1.0.0",
+ "cfg-if",
 "png",
 "safe_arch",
 "tiny-skia-path",
@ -2102,7 +2023,7 @@ version = "0.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "pin-project-lite",
 "tracing-core",
 ]
@ -2143,6 +2064,12 @@ dependencies = [
 "tinyvec",
 ]

+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
 [[package]]
 name = "unicode-width"
 version = "0.1.10"
@ -2178,12 +2105,6 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"

-[[package]]
-name = "void"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-
 [[package]]
 name = "walkdir"
 version = "2.3.2"
@ -2207,7 +2128,7 @@ version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "wasm-bindgen-macro",
 ]

@ -2222,7 +2143,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.107",
 "wasm-bindgen-shared",
 ]

@ -2232,7 +2153,7 @@ version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "js-sys",
 "wasm-bindgen",
 "web-sys",
@ -2256,7 +2177,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.107",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@ -2273,7 +2194,7 @@ version = "0.29.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 "downcast-rs",
 "libc",
 "nix 0.24.3",
@ -2312,7 +2233,7 @@ version = "0.29.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 "wayland-client",
 "wayland-commons",
 "wayland-scanner",
@ -2380,17 +2301,6 @@ dependencies = [
 "windows 0.43.0",
 ]

-[[package]]
-name = "which"
-version = "4.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
-dependencies = [
- "either",
- "libc",
- "once_cell",
-]
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@ -2470,7 +2380,7 @@ checksum = "9539b6bd3eadbd9de66c9666b22d802b833da7e996bc06896142e09854a61767"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 1.0.107",
 ]

 [[package]]
@ -2579,7 +2489,7 @@ version = "0.27.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 "cocoa",
 "core-foundation",
 "core-graphics",
@ -2662,3 +2572,12 @@ name = "xml-rs"
 version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
+
+[[package]]
+name = "yansi-term"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1"
+dependencies = [
+ "winapi",
+]
--- a/pkgs/applications/misc/pw-viz/default.nix
+++ b/pkgs/applications/misc/pw-viz/default.nix
@ -14,13 +14,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "pw-viz";
-  version = "0.2.0";
+  version = "0.3.0";

  src = fetchFromGitHub {
    owner = "ax9d";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-lw4whdh8tNoS5XUlamQCq8f8z8K59uD90PSSo3skeyo=";
+    sha256 = "sha256-fB7PnWWahCMKhGREg6neLmOZjh2OWLu61Vpmfsl03wA=";
  };

  cargoLock = {
--- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
@ -1,21 +1,39 @@
-{ lib, stdenv, fetchFromGitHub, cmake, darwin, openssl, sqlite }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+
+  cmake,
+  pkg-config,
+
+  darwin,
+  dbus,
+  openssl,
+  sqlite,
+}:

 stdenv.mkDerivation rec {
  pname = "signalbackup-tools";
-  version = "20240830";
+  version = "20240910";

  src = fetchFromGitHub {
    owner = "bepaald";
    repo = "signalbackup-tools";
    rev = version;
-    hash = "sha256-d93f/kKOd7D7FdtgrhrJhQS1DxiUKsdcf2JuUTmRDrw=";
+    hash = "sha256-VOC13xXWRGHq7K5ju1U/+SNj+qgkJCSYN11l01hwYhI=";
  };

-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+  ] ++ lib.optionals stdenv.isLinux [
+    pkg-config
+  ];

  buildInputs = [
    openssl
    sqlite
+  ] ++ lib.optionals stdenv.isLinux [
+    dbus
  ] ++ lib.optionals stdenv.isDarwin [
    darwin.apple_sdk_11_0.frameworks.Security
  ];
--- a/pkgs/applications/virtualization/conmon-rs/default.nix
+++ b/pkgs/applications/virtualization/conmon-rs/default.nix
@ -7,13 +7,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "conmon-rs";
-  version = "0.6.5";
+  version = "0.6.6";

  src = fetchFromGitHub {
    owner = "containers";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-qb7n6AcRkv/nF0BQbPgdFqaklfJeC+PRzMh6EIykobY=";
+    hash = "sha256-1kGAUAmiPI9zE8LE7G2r0Gy0YM+BUy2MxY7IQOu2ZDQ=";
  };

  nativeBuildInputs = [ capnproto protobuf ];
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@ -323,15 +323,15 @@ rec {
  };

  docker_27 = callPackage dockerGen rec {
-    version = "27.1.1";
+    version = "27.2.0";
    cliRev = "v${version}";
-    cliHash = "sha256-r9figEMYHHSbMYVFiw7GUMzjZBhlF+jyZqKixyCpoQ0=";
+    cliHash = "sha256-Fa1EUwJjxh5jzhQJ4tllDZBfB7KACHDEe9ETVzMfUNY=";
    mobyRev = "v${version}";
-    mobyHash = "sha256-LuCEdQQ3eWt8VyzmWkQTxlxTok9h/UlACTVls5LcI7g=";
+    mobyHash = "sha256-grxKlsbhxumQZNOyM96aURSiVFE1Fe5NFxUoPzFX/Qk=";
    runcRev = "v1.1.13";
    runcHash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8=";
-    containerdRev = "v1.7.20";
-    containerdHash = "sha256-Q9lTzz+G5PSoChy8MZtbOpO81AyNWXC+CgGkdOg14uY=";
+    containerdRev = "v1.7.21";
+    containerdHash = "sha256-cL1RKFg+B2gTPMg963DKup5BCLLgF9t9VZn2WlmmWPI=";
    tiniRev = "v0.19.0";
    tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
  };
--- a/pkgs/by-name/as/astartectl/package.nix
+++ b/pkgs/by-name/as/astartectl/package.nix
@ -7,10 +7,6 @@ buildGoModule rec {
  pname = "astartectl";
  version = "24.5.0";

-  # Workaround for go vendor failing
-  # https://github.com/astarte-platform/astartectl/pull/244
-  postPatch = "go mod edit -go=1.22";
-
  src = fetchFromGitHub {
    owner = "astarte-platform";
    repo = "astartectl";
--- a/pkgs/by-name/bu/buffer/package.nix
+++ b/pkgs/by-name/bu/buffer/package.nix
@ -16,14 +16,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "buffer";
-  version = "0.9.2";
+  version = "0.9.5";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    owner = "cheywood";
    repo = "buffer";
    rev = finalAttrs.version;
-    hash = "sha256-EIyaFL2AEez8FIErL8+x7QNHnCYxj4mOuz7E+Svvh5I=";
+    hash = "sha256-WhUSiZ2Nty5CdaJC8zZVkUptP5cRnMByZKy3e9TAyjs=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/di/dissent/package.nix
+++ b/pkgs/by-name/di/dissent/package.nix
@ -7,18 +7,20 @@
 , libcanberra-gtk3
 , pkg-config
 , sound-theme-freedesktop
+, libspelling
+, gtksourceview5
 , wrapGAppsHook4
 }:

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

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

  nativeBuildInputs = [
@ -37,6 +39,8 @@ buildGoModule rec {
    libadwaita
    libcanberra-gtk3
    sound-theme-freedesktop
+    libspelling
+    gtksourceview5
  ];

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

-  vendorHash = "sha256-8LY7XEMe91rGOGLr6TJhoEnl2cWArcQ5VXMV9NpZaL8=";
+  vendorHash = "sha256-TXqdO+DjnDD/+zwm3gK3+sxMTEVSHuceKz4ZJVH5Y34=";

  meta = with lib; {
    description = "A third-party Discord client designed for a smooth, native experience (formerly gtkcord4)";
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@ -47,13 +47,13 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
  pname = "fastfetch";
-  version = "2.23.0";
+  version = "2.24.0";

  src = fetchFromGitHub {
    owner = "fastfetch-cli";
    repo = "fastfetch";
    rev = finalAttrs.version;
-    hash = "sha256-ry7FWja/FGSTQU1IhfXUA778yO0T3O1cvYsS4pcqURY=";
+    hash = "sha256-MnN+XZTiIjXGVM6rF5J7sDTndLijGCdgsBF8oYzRHqY=";
  };

  outputs = [
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@ -164,11 +164,11 @@ let

  linux = stdenv.mkDerivation (finalAttrs: {
    inherit pname meta passthru;
-    version = "128.0.6613.113";
+    version = "128.0.6613.137";

    src = fetchurl {
      url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-jdgZFmkPZwNt+4nb6/4ahCM4jNEKUkIfaI9MqOcjHys=";
+      hash = "sha256-Ggah8tabckPemWtKehx8So1Y55J0UdhAFf5rPRSwV6Q=";
    };

    # With strictDeps on, some shebangs were not being patched correctly
@ -258,11 +258,11 @@ let

  darwin = stdenvNoCC.mkDerivation (finalAttrs: {
    inherit pname meta passthru;
-    version = "128.0.6613.114";
+    version = "128.0.6613.138";

    src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/j7qfyaczqq4hpgxunewwclxnky_128.0.6613.114/GoogleChrome-128.0.6613.114.dmg";
-      hash = "sha256-6y99T+9abmUS9wKglNgPgj9M/cyLxb85rxpgCLxXR3E=";
+      url = "http://dl.google.com/release2/chrome/gtm24cqmnwgcp7dtscvlmsbrwa_128.0.6613.138/GoogleChrome-128.0.6613.138.dmg";
+      hash = "sha256-wd6n3AeKxKdz+5X9XxTi1QHzmByzKRgIWcc3iBHhtZs=";
    };

    dontPatch = true;
--- a/pkgs/by-name/gt/gtimelog/package.nix
+++ b/pkgs/by-name/gt/gtimelog/package.nix
@ -4,16 +4,20 @@

 python3Packages.buildPythonApplication rec {
  pname = "gtimelog";
-  version = "unstable-2023-10-05";
-  format = "setuptools";
+  version = "0.12.0";
+  pyproject = true;

  src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
-    rev = "ba606cbe8eef0e3dc098c6ab3bcbe381bf7ef410";
-    hash = "sha256-+iBHfbUJtAtI/vcHj0Y8f9OxAp1SnhQyMqedVzSYPZQ=";
+    owner = "gtimelog";
+    repo = "gtimelog";
+    rev = "refs/tags/${version}";
+    hash = "sha256-NlKAgAnZWodXF4eybcNOSxexjhegRgQEWoAPd+KWzsw=";
  };

+  build-system = with python3Packages; [
+    setuptools-scm
+  ];
+
  nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ];
  buildInputs = [ glibcLocales gtk3 libsoup_3 libsecret ];
  propagatedBuildInputs = with python3Packages; [
--- a/pkgs/by-name/pc/pcsx2/sources.nix
+++ b/pkgs/by-name/pc/pcsx2/sources.nix
@ -9,14 +9,14 @@ let
  pcsx2 = let
    self = {
      pname = "pcsx2";
-      version = "2.1.102";
+      version = "2.1.127";
      src = fetchFromGitHub {
        pname = "pcsx2-source";
        inherit (self) version;
        owner = "PCSX2";
        repo = "pcsx2";
        rev = "v${self.version}";
-        hash = "sha256-OBxrdZVx6HbSFO6sc2D2HP6iYH3ZKDj+uEqM7cxZNm0=";
+        hash = "sha256-zvvrGxGjIQjSmo18BDG2J3+PoysXj8WxpwtrcXK8LH8=";
      };
    };
  in
@ -27,14 +27,14 @@ let
  pcsx2_patches = let
    self = {
      pname = "pcsx2_patches";
-      version = "0-unstable-2024-08-12";
+      version = "0-unstable-2024-09-05";
      src = fetchFromGitHub {
        pname = "pcsx2_patches-source";
        inherit (self) version;
        owner = "PCSX2";
        repo = "pcsx2_patches";
-        rev = "9ea7fca481e1e4c2263ca69f9a5c9a70c92626dc";
-        hash = "sha256-T0yTTW6P/NrZsANoduj+gCXyd5qqDRETxLblmnVnP/o=";
+        rev = "377f30ae19acde655cc412086fa1840d16d54a93";
+        hash = "sha256-g2SMMC/oHSF0G3+zwvk1vOoQgYFrPd3eaZ0jgGJIr5g=";
      };
    };
  in
--- a/pkgs/by-name/pe/peertube-viewer/package.nix
+++ b/pkgs/by-name/pe/peertube-viewer/package.nix
@ -0,0 +1,27 @@
+{
+  lib,
+  fetchFromGitLab,
+  rustPlatform,
+  youtube-dl,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "peertube-viewer";
+  version = "1.8.6";
+
+  src = fetchFromGitLab {
+    owner = "peertube-viewer";
+    repo = "peertube-viewer-rs";
+    rev = "v1.8.6";
+    hash = "sha256-ZzeWk01migUrKR7GndtNo0kLYSCUXCg0H0eCXgrDXaM==";
+  };
+
+  cargoHash = "sha256-5u5240PL5cKhnHsT7sRdccrbZBAbRN+fa+FhJP1gX/4==";
+
+  meta = with lib; {
+    description = "A simple CLI browser for the peertube federated video platform";
+    homepage = "https://gitlab.com/peertube-viewer/peertube-viewer-rs";
+    license = licenses.agpl3Only;
+    maintainers = with maintainers; [ haruki7049 ];
+  };
+}
--- a/pkgs/by-name/sa/sauerbraten/package.nix
+++ b/pkgs/by-name/sa/sauerbraten/package.nix
@ -1,22 +1,30 @@
-{ lib
-, stdenv
-, fetchzip
-, SDL2
-, SDL2_image
-, SDL2_mixer
-, zlib
-, makeWrapper
-, copyDesktopItems
-, makeDesktopItem
+{
+  lib,
+  stdenv,
+  fetchzip,
+
+  # nativeBuildInputs
+  makeWrapper,
+  copyDesktopItems,
+
+  # buildInputs
+  SDL2,
+  SDL2_image,
+  SDL2_mixer,
+  zlib,
+
+  makeDesktopItem,
 }:

 stdenv.mkDerivation rec {
  pname = "sauerbraten";
-  version = "2020-12-27";
+  version = "2020-12-29";

  src = fetchzip {
-    url = "mirror://sourceforge/sauerbraten/sauerbraten_${builtins.replaceStrings [ "-" ] [ "_" ] version}_linux.tar.bz2";
-    sha256 = "0llknzj23vx6f3y452by9c7wlhzclyq4bqi22qd52m3l916z2mn5";
+    url = "mirror://sourceforge/sauerbraten/sauerbraten_${
+      builtins.replaceStrings [ "-" ] [ "_" ] version
+    }_linux.tar.bz2";
+    hash = "sha256-os3SmonqHRw1+5dIRVt7EeXfnSq298GiyKpusS1K3rM=";
  };

  nativeBuildInputs = [
@ -26,8 +34,8 @@ stdenv.mkDerivation rec {

  buildInputs = [
    SDL2
-    SDL2_mixer
    SDL2_image
+    SDL2_mixer
    zlib
  ];

@ -42,7 +50,11 @@ stdenv.mkDerivation rec {
      icon = "sauerbraten";
      desktopName = "Sauerbraten";
      comment = "FPS that uses an improved version of the Cube engine";
-      categories = [ "Application" "Game" "ActionGame" ];
+      categories = [
+        "Application"
+        "Game"
+        "ActionGame"
+      ];
    })
  ];

@ -64,16 +76,19 @@ stdenv.mkDerivation rec {
    runHook postInstall
  '';

-  meta = with lib; {
+  meta = {
    description = "Free multiplayer & singleplayer first person shooter, the successor of the Cube FPS";
    homepage = "http://sauerbraten.org";
-    maintainers = with maintainers; [ raskin ajs124 ];
+    maintainers = with lib.maintainers; [
+      raskin
+      ajs124
+    ];
    mainProgram = "sauerbraten_client";
    hydraPlatforms =
      # raskin: tested amd64-linux;
      # not setting platforms because it is 0.5+ GiB of game data
      [ ];
    license = "freeware"; # as an aggregate - data files have different licenses code is under zlib license
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
  };
 }
--- a/pkgs/by-name/te/textlint-plugin-org/package.nix
+++ b/pkgs/by-name/te/textlint-plugin-org/package.nix
@ -0,0 +1,37 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildNpmPackage,
+  textlint,
+  textlint-plugin-org,
+  textlint-rule-max-comma,
+}:
+
+buildNpmPackage rec {
+  pname = "textlint-plugin-org";
+  version = "0.3.7";
+
+  src = fetchFromGitHub {
+    owner = "kijimaD";
+    repo = "textlint-plugin-org";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-BW+b09nv9Mzl3cUcOOpHoRz8tGLxuGGo4UCY6kdUlXA=";
+  };
+
+  npmDepsHash = "sha256-J1ksstPED7FwB80N4CzfZ1i2xc3Wmu7s4T3acOrWA9s=";
+
+  passthru.tests = textlint.testPackages {
+    inherit (textlint-plugin-org) pname;
+    rule = textlint-rule-max-comma;
+    plugin = textlint-plugin-org;
+    testFile = ./test.org;
+  };
+
+  meta = {
+    description = "Org mode support for textlint";
+    homepage = "https://github.com/kijimaD/textlint-plugin-org";
+    changelog = "https://github.com/kijimaD/textlint-plugin-org/releases/tag/v${version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ natsukium ];
+  };
+}
--- a/pkgs/by-name/te/textlint-plugin-org/test.org
+++ b/pkgs/by-name/te/textlint-plugin-org/test.org
@ -0,0 +1,2 @@
+#+title: textlint-plugin-org test
+Nix, is a tool, that takes a unique approach to package management and system configuration, Learn how to make reproducible, declarative, and reliable systems.
--- a/pkgs/desktops/lomiri/applications/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri/default.nix
@ -79,6 +79,13 @@ stdenv.mkDerivation (finalAttrs: {
      hash = "sha256-J9ySZgWd7KR7aU1cCRu5iirq7bi3NdLR9SZs9Pd1I8w=";
    })

+    # Remove when https://gitlab.com/ubports/development/core/lomiri/-/merge_requests/181 merged & in release
+    (fetchpatch {
+      name = "0101-lomiri-Fix-accountsservice-property-defaults.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri/-/commit/369c7aac242f1798ce46b1415ab6112ac5e9d095.patch";
+      hash = "sha256-ieJCA1F/ljmgwEfGXWCTQNG1A/bmiJhNH9uzzULpUEc=";
+    })
+
    # Fix greeter & related settings
    # These patches are seemingly not submitted upstream yet
    (fetchpatch {
--- a/pkgs/development/libraries/httplib/default.nix
+++ b/pkgs/development/libraries/httplib/default.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "httplib";
-  version = "0.17.0";
+  version = "0.17.3";

  src = fetchFromGitHub {
    owner = "yhirose";
    repo = "cpp-httplib";
    rev = "v${version}";
-    hash = "sha256-F/+w7viOWesdPZR8bBXEO9D/5sLQnKp2hyXCMSS6E/k=";
+    hash = "sha256-yvaPIbRqJGkiob3Nrv3H1ieFAC5b+h1tTncJWTy4dmk=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@ -4,6 +4,7 @@
 , withZlib ? false, zlib
 , enableSSL2 ? false
 , enableSSL3 ? false
+, enableMD2 ? false
 , enableKTLS ? stdenv.isLinux
 , static ? stdenv.hostPlatform.isStatic
 # path to openssl.cnf file. will be placed in $etc/etc/ssl/openssl.cnf to replace the default
@ -130,7 +131,8 @@ let
    ] ++ lib.optionals withCryptodev [
      "-DHAVE_CRYPTODEV"
      "-DUSE_CRYPTODEV_DIGESTS"
-    ] ++ lib.optional enableSSL2 "enable-ssl2"
+    ] ++ lib.optional enableMD2 "enable-md2"
+      ++ lib.optional enableSSL2 "enable-ssl2"
      ++ lib.optional enableSSL3 "enable-ssl3"
      # We select KTLS here instead of the configure-time detection (which we patch out).
      # KTLS should work on FreeBSD 13+ as well, so we could enable it if someone tests it.
--- a/pkgs/development/ocaml-modules/mrmime/default.nix
+++ b/pkgs/development/ocaml-modules/mrmime/default.nix
@ -2,14 +2,12 @@
 , alcotest
 , angstrom
 , base64
-, bigarray-compat
 , bigarray-overlap
 , bigstringaf
 , buildDunePackage
 , cmdliner
 , emile
-, fetchzip
-, fmt
+, fetchurl
 , fpath
 , hxd
 , ipaddr
@ -17,56 +15,49 @@
 , ke
 , lib
 , mirage-crypto-rng
-, ocaml
 , pecu
 , prettym
 , ptime
 , rosetta
-, rresult
 , unstrctrd
 , uutf
 }:

 buildDunePackage rec {
  pname = "mrmime";
-  version = "0.5.0";
+  version = "0.6.1";

-  src = fetchzip {
-    url = "https://github.com/mirage/mrmime/releases/download/v${version}/mrmime-v${version}.tbz";
-    sha256 = "14k67v0b39b8jq3ny2ymi8g8sqx2gd81mlzsjphdzdqnlx6fk716";
+  src = fetchurl {
+    url = "https://github.com/mirage/mrmime/releases/download/v${version}/mrmime-${version}.tbz";
+    hash = "sha256-Dzsr7xPzu5RIzIdubF4OAAjHJY7CdBVnHRZxQbcCsBY=";
  };

-  duneVersion = "3";
-
-  buildInputs = [ cmdliner hxd ];
-
  propagatedBuildInputs = [
    angstrom
    base64
    emile
-    fmt
    ipaddr
    ke
    pecu
    prettym
    ptime
    rosetta
-    rresult
    unstrctrd
    uutf
-    afl-persistent
-    bigarray-compat
    bigarray-overlap
    bigstringaf
-    fpath
-    mirage-crypto-rng
  ];

  checkInputs = [
+    afl-persistent
    alcotest
+    cmdliner
+    fpath
+    hxd
    jsonm
+    mirage-crypto-rng
  ];
-  doCheck = lib.versionOlder ocaml.version "5.0";
+  doCheck = true;

  meta = {
    description = "Parser and generator of mail in OCaml";
--- a/pkgs/development/ocaml-modules/piaf/default.nix
+++ b/pkgs/development/ocaml-modules/piaf/default.nix
@ -1,6 +1,7 @@
 { alcotest-lwt
 , buildDunePackage
 , ocaml
+, bigarray-compat
 , dune-site
 , fetchurl
 , gluten-lwt-unix
@ -9,6 +10,7 @@
 , magic-mime
 , mrmime
 , psq
+, rresult
 , uri
 }:

@ -19,8 +21,6 @@ buildDunePackage rec {
  pname = "piaf";
  version = "0.1.0";

-  duneVersion = "3";
-
  src = fetchurl {
    url = "https://github.com/anmonteiro/piaf/releases/download/${version}/piaf-${version}.tbz";
    hash = "sha256-AMO+ptGox33Bi7u/H0SaeCU88XORrRU3UbLof3EwcmU=";
@ -31,10 +31,12 @@ buildDunePackage rec {
  '';

  propagatedBuildInputs = [
+    bigarray-compat
    logs
    magic-mime
    mrmime
    psq
+    rresult
    uri
    gluten-lwt-unix
  ];
--- a/pkgs/development/octave-modules/image-acquisition/default.nix
+++ b/pkgs/development/octave-modules/image-acquisition/default.nix
@ -7,18 +7,21 @@

 buildOctavePackage rec {
  pname = "image-acquisition";
-  version = "0.2.2";
+  version = "0.2.6";

  src = fetchurl {
    url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "1amp6npkddnnz2i5rm6gvn65qrbn0nxzl2cja3dvc2xqg396wrhh";
+    sha256 = "sha256-Uehwk68GZ/M4WL5M3GF++mCPUg3M08Y0gkdO36/yhNI=";
  };

  buildInputs = [
-    libv4l
    fltk
  ];

+  propagatedBuildInputs = [
+    libv4l
+  ];
+
  meta = with lib; {
    homepage = "https://octave.sourceforge.io/image-acquisition/index.html";
    license = licenses.gpl3Plus;
@ -28,7 +31,5 @@ buildOctavePackage rec {
      The Octave-forge Image Aquisition package provides functions to
      capture images from connected devices. Currently only v4l2 is supported.
    '';
-    # Got broke with octave 8.x update, and wasn't updated since 2015
-    broken = true;
  };
 }
--- a/pkgs/development/python-modules/aiovlc/default.nix
+++ b/pkgs/development/python-modules/aiovlc/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "aiovlc";
-  version = "0.4.3";
+  version = "0.4.4";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "MartinHjelmare";
    repo = "aiovlc";
    rev = "refs/tags/v${version}";
-    hash = "sha256-kiF2BRqaQLNpd+EoKrI9/9m3E1DlyJqM3Ng0qA0TfyQ=";
+    hash = "sha256-lIcArNodNeC6Wtmsir6f0SwgHlafC3lh72mLU4UGBtg=";
  };

  build-system = [ poetry-core ];
--- a/pkgs/development/python-modules/censys/default.nix
+++ b/pkgs/development/python-modules/censys/default.nix
@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "censys";
-  version = "2.2.13";
+  version = "2.2.14";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "censys";
    repo = "censys-python";
    rev = "refs/tags/v${version}";
-    hash = "sha256-ejAgPSHeE2842WvGjH+2HbaA7HoNDuIGNvmqXgCjuLE=";
+    hash = "sha256-3evll1Ll8krvAfelGoJHOrmH7RvkeM/ZU1j13cTuXR4=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
@ -16,7 +16,7 @@

 buildPythonPackage rec {
  pname = "google-cloud-bigquery-datatransfer";
-  version = "3.15.6";
+  version = "3.15.7";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "google_cloud_bigquery_datatransfer";
    inherit version;
-    hash = "sha256-oO370z1iS61vWVxHi+XYNNRjwi033zIG6YhLi7BnYXg=";
+    hash = "sha256-GLarRvI2eud/iNwj7ujZwIpK/b0ClhO0XUdBi4J9Lp0=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/lxmf/default.nix
+++ b/pkgs/development/python-modules/lxmf/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "lxmf";
-  version = "0.5.0";
+  version = "0.5.1";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "markqvist";
    repo = "lxmf";
    rev = "refs/tags/${version}";
-    hash = "sha256-X5QBWcmBq6RVDVGWop4nrlWXnui6asdvSdabT5YN3Ck=";
+    hash = "sha256-RYPWdFDZvvLJVCSQPXdJw0xMrUN3Kr8QRWTYZfBB9og=";
  };

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

 buildPythonPackage rec {
  pname = "mailchecker";
-  version = "6.0.8";
+  version = "6.0.9";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-3Og42v2DAquCPvzL6sRnKbs5nZuAO2AWa+UkltWR43Y=";
+    hash = "sha256-8X6Qf/5vb67cJD9X6wyclR9h3smvjpaSLB3NCTOJuI0=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/meshtastic/default.nix
+++ b/pkgs/development/python-modules/meshtastic/default.nix
@ -33,7 +33,7 @@

 buildPythonPackage rec {
  pname = "meshtastic";
-  version = "2.4.1";
+  version = "2.4.3";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -42,7 +42,7 @@ buildPythonPackage rec {
    owner = "meshtastic";
    repo = "Meshtastic-python";
    rev = "refs/tags/${version}";
-    hash = "sha256-j5J/cWZwayt9RZFeMkTgzhRJznfxNUhXzV5lBLZNBhM=";
+    hash = "sha256-cI3ETBz/3Megd3T/JVFdsN7Ap7SPj89IEIaA316INTk=";
  };

  pythonRelaxDeps = [
--- a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix
+++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "microsoft-kiota-serialization-json";
-  version = "1.3.1";
+  version = "1.3.2";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "microsoft";
    repo = "kiota-serialization-json-python";
    rev = "refs/tags/v${version}";
-    hash = "sha256-V1s2MMO987ADp2nRxpIFlyx+OHNhSv8xCt3JOTzQCOM=";
+    hash = "sha256-Unscul4mznB3yJmn8Y/Zcvbk59V1WLqdSgmEhCUgkeA=";
  };

  build-system = [ flit-core ];
--- a/pkgs/development/python-modules/ms-active-directory/default.nix
+++ b/pkgs/development/python-modules/ms-active-directory/default.nix
@ -3,7 +3,6 @@
  buildPythonPackage,
  dnspython,
  fetchFromGitHub,
-  fetchpatch,
  ldap3,
  pyasn1,
  pycryptodome,
@ -15,7 +14,7 @@

 buildPythonPackage rec {
  pname = "ms-active-directory";
-  version = "1.14.0";
+  version = "1.14.1";
  pyproject = true;

  disabled = pythonOlder "3.10";
@ -24,18 +23,9 @@ buildPythonPackage rec {
    owner = "zorn96";
    repo = "ms_active_directory";
    rev = "refs/tags/v${version}";
-    hash = "sha256-E0GzKkpQU9pJ1a1N0NZjB2Q99yMlJkzNR0QzyiUzOpg=";
+    hash = "sha256-ZFIeG95+G9ofk54bYZpqu8uVfzjqsOrwWlIZvQgIWRI=";
  };

-  patches = [
-    # Fix introduced syntax errors, https://github.com/zorn96/ms_active_directory/pull/88
-    (fetchpatch {
-      name = "fix-syntax.patch";
-      url = "https://github.com/zorn96/ms_active_directory/pull/88/commits/35da06a224b9bff6d36ddbd2dee8fdedab7e17bc.patch";
-      hash = "sha256-0WGyr3Q4vcfFU72fox3/3AdHCmjzf6jGCGPx5vhhUvM=";
-    })
-  ];
-
  build-system = [ setuptools ];

  dependencies = [
--- a/pkgs/development/python-modules/msgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/msgraph-sdk/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "msgraph-sdk";
-  version = "1.6.0";
+  version = "1.7.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "microsoftgraph";
    repo = "msgraph-sdk-python";
    rev = "refs/tags/v${version}";
-    hash = "sha256-Mrw77ln/7P/nNOGlxkqsoBH39ghp1Pc/a17ggbKuaUA=";
+    hash = "sha256-ivpk3zZFp6xiFAqdDjjdV/7fg2GBR6NyK7+nPWgs1QA=";
  };

  build-system = [ flit-core ];
--- a/pkgs/development/python-modules/nomadnet/default.nix
+++ b/pkgs/development/python-modules/nomadnet/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "nomadnet";
-  version = "0.5.1";
+  version = "0.5.2";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "markqvist";
    repo = "NomadNet";
    rev = "refs/tags/${version}";
-    hash = "sha256-Tx6pcPGYItjTuWGnQc3O+O3HC1gld/2J5T4O63MOD+U=";
+    hash = "sha256-4CT5WBpWoK7c8bS7hw0F5mL8MDg8ud+f3SITC5lEVFM=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "plugwise";
-  version = "1.2.0";
+  version = "1.3.1";
  pyproject = true;

  disabled = pythonOlder "3.11";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "plugwise";
    repo = "python-plugwise";
    rev = "refs/tags/v${version}";
-    hash = "sha256-I9GCFPgTSHquRxvXS0R22q7lxdhKRC76kALIx4hFAAM=";
+    hash = "sha256-lwg+iyYRW1eFjMxBDQf6MFXlLbo81jGRpQSh3rUqGKY=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "publicsuffixlist";
-  version = "1.0.2.20240911";
+  version = "1.0.2.20240912";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-U3gcjBmDGThIFXNw8E6yxEL3sYULfrEdOxgIWzGbhSk=";
+    hash = "sha256-BF5puZ4AL1IoXun+vZ71WrKREShYj60Zdsy4uzh5h9I=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/python-kasa/default.nix
+++ b/pkgs/development/python-modules/python-kasa/default.nix
@ -6,9 +6,9 @@
  buildPythonPackage,
  cryptography,
  fetchFromGitHub,
+  hatchling,
  kasa-crypt,
  orjson,
-  poetry-core,
  ptpython,
  pydantic,
  pytest-asyncio,
@ -22,7 +22,7 @@

 buildPythonPackage rec {
  pname = "python-kasa";
-  version = "0.7.2";
+  version = "0.7.3";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -31,10 +31,10 @@ buildPythonPackage rec {
    owner = "python-kasa";
    repo = "python-kasa";
    rev = "refs/tags/${version}";
-    hash = "sha256-JfTFed591z1ZxTKP5FqYyaMBq8uCs4StlnqKp3Tc7Ug=";
+    hash = "sha256-41FY1KaPDQxOHtxgaKRakNbiBm/qPYCICpvzxVAmSD8=";
  };

-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];

  dependencies = [
    aiohttp
--- a/pkgs/development/python-modules/python-motionmount/default.nix
+++ b/pkgs/development/python-modules/python-motionmount/default.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "python-motionmount";
-  version = "2.0.0";
+  version = "2.1.0";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "vogelsproducts";
    repo = "python-MotionMount";
    rev = "refs/tags/${version}";
-    hash = "sha256-jmHFsJwnmdSUKz2W9pWtc9KpUAs6QWnO2V5KROwmTGs=";
+    hash = "sha256-BOzv0IuEXK0uzJuO1F1k8baL8KmzV/KFWcKJPSHORsU=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "tencentcloud-sdk-python";
-  version = "3.0.1229";
+  version = "3.0.1230";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "TencentCloud";
    repo = "tencentcloud-sdk-python";
    rev = "refs/tags/${version}";
-    hash = "sha256-sFI16249sSnBAEQOTqO/QaVSoF3Fy44X5GaAkYi9ukQ=";
+    hash = "sha256-wuEbocPbQL/oG6b78Q92+kfWP3ZkIIf8k97tSBZg9nc=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/ufmt/default.nix
+++ b/pkgs/development/python-modules/ufmt/default.nix
@ -19,16 +19,16 @@

 buildPythonPackage rec {
  pname = "ufmt";
-  version = "2.7.0";
+  version = "2.7.2";
  pyproject = true;

-  disabled = pythonOlder "3.";
+  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "omnilib";
    repo = "ufmt";
    rev = "refs/tags/v${version}";
-    hash = "sha256-hIbzW7yDqk8siob+RhcnbOonkl+67sl/IGHimIeMM+Q=";
+    hash = "sha256-nWdGaW/RlU6kV2ORKpVuJ634QoemhZR2zdcOOO1W9Wk=";
  };

  build-system = [ flit-core ];
--- a/pkgs/development/python-modules/weatherflow4py/default.nix
+++ b/pkgs/development/python-modules/weatherflow4py/default.nix
@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "weatherflow4py";
-  version = "0.3.3";
+  version = "1.0.4";
  pyproject = true;

  disabled = pythonOlder "3.11";
@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "jeeftor";
    repo = "weatherflow4py";
    rev = "refs/tags/v${version}";
-    hash = "sha256-mJxRfjkkBruGjz+UthrzlMqz6Rlk9zrGHjzB4qYYlQ0=";
+    hash = "sha256-6LSxv1Lh9UUo0Y7I/BvxEPtIkOjIAYon32mcoS1Gxxs=";
  };

  build-system = [ poetry-core ];
--- a/pkgs/games/quake3/quake3e/default.nix
+++ b/pkgs/games/quake3/quake3e/default.nix
@ -22,13 +22,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "Quake3e";
-  version = "2022-04-01-dev";
+  version = "2024-09-02-dev";

  src = fetchFromGitHub {
    owner = "ec-";
    repo = pname;
-    rev = "c6cec00b858aa5955eb1d6eb65b9bfd41fd869cb";
-    sha256 = "0qd13fndbhgkkmhxbprpzmj2l2v9ihacxagpdqi9sg9nrzvahr9h";
+    rev = "b6e7ce4f78711e1c9d2924044a9a9d8a9db7020f";
+    sha256 = "sha256-tQgrHiP+QhBzcUnHRwzaDe38Th0uDt450fra8O3Vjqc=";
  };

  nativeBuildInputs = [ makeWrapper copyDesktopItems ];
@ -75,6 +75,6 @@ stdenv.mkDerivation rec {
    description = "Improved Quake III Arena engine";
    license = licenses.gpl2Plus;
    platforms = platforms.linux;
-    maintainers = with maintainers; [ pmiddend ];
+    maintainers = with maintainers; [ pmiddend alx ];
  };
 }
--- a/pkgs/kde/gear/akonadi-search/default.nix
+++ b/pkgs/kde/gear/akonadi-search/default.nix
@ -7,7 +7,7 @@
  cargo,
  rustc,
  # provided as callPackage input to enable easier overrides through overlays
-  cargoHash ? "sha256-XZ40qGBPRz7xyem3EP4+hzTliryxxDyGtvfjbNNVDQo=",
+  cargoHash ? "sha256-myS9icWi2ZeQCCHZRP3xEMKToAa+afc8C+s3T8y19RE=",
 }:
 mkKdeDerivation rec {
  pname = "akonadi-search";
--- a/pkgs/kde/gear/angelfish/default.nix
+++ b/pkgs/kde/gear/angelfish/default.nix
@ -8,7 +8,7 @@
  cargo,
  rustc,
  # provided as callPackage input to enable easier overrides through overlays
-  cargoHash ? "sha256-y7iJGN3ATK3IT8ko64puGlFXBM9OZw9u8JenrOBDuFA=",
+  cargoHash ? "sha256-xZkFVINKcJlJizHpBFLsMheQ45GsgWafzlDmxUydf5k=",
  qcoro,
 }:
 mkKdeDerivation rec {
--- a/pkgs/kde/gear/kdepim-addons/default.nix
+++ b/pkgs/kde/gear/kdepim-addons/default.nix
@ -8,7 +8,7 @@
  corrosion,
  alpaka,
  # provided as callPackage input to enable easier overrides through overlays
-  cargoHash ? "sha256-ZKLoX6sMKc6o7cnmxPYXL0d+Lmh8+n6Ko6VR/CzfZGs=",
+  cargoHash ? "sha256-hIiJEuUk950g29Qkka4oS7EsZDbPvm8Q3CrqxQG40bU=",
 }:
 mkKdeDerivation rec {
  pname = "kdepim-addons";
--- a/pkgs/kde/generated/sources/gear.json
+++ b/pkgs/kde/generated/sources/gear.json
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@ -1,31 +1,31 @@
 {
    "testing": {
-        "version": "6.11-rc6",
-        "hash": "sha256:15lx6da4kdsipxlv7my8wamss5i001r4cc2ab1icvw1ms207b5in"
+        "version": "6.11-rc7",
+        "hash": "sha256:17c8vwvra042mib1s60nqqai0s7qc0qkvrf0j7ziqmy2llq8cbxy"
    },
    "6.1": {
-        "version": "6.1.109",
-        "hash": "sha256:1h8sq3p075wyfgs2vjg8y1dbj27dj16c4rbxpgfwahinqq5g8bvk"
+        "version": "6.1.110",
+        "hash": "sha256:0slgvwldjdyi5vzhgriamkmrj4p942yacclgcw29331gfjs39gly"
    },
    "5.15": {
-        "version": "5.15.166",
-        "hash": "sha256:1krri2sf0hvvgai0z9lp8h12gcmpigapb42qxs2pcnxqb7ialv75"
+        "version": "5.15.167",
+        "hash": "sha256:0c6s6l5sz9ibws7bymb393ww0z9i3amsk1yx0bahipz3xhc1yxdi"
    },
    "5.10": {
-        "version": "5.10.225",
-        "hash": "sha256:0770757ildcc0cs6alnb5cspg6ysg2wqly9z5q1vjf3mh0xbzmw5"
+        "version": "5.10.226",
+        "hash": "sha256:19hwwl5sbya65mch7fwmji2cli9b8796zjqbmkybjrarg1j9m8gn"
    },
    "5.4": {
-        "version": "5.4.283",
-        "hash": "sha256:15zpw5vwi8c4yjap28lzrwdvj3yrynnbx6vw8aqiqamlk4qnl315"
+        "version": "5.4.284",
+        "hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp"
    },
    "4.19": {
-        "version": "4.19.321",
-        "hash": "sha256:1n86dfv8qcm21z3inrz0n7gnwik7s51xfrabyq8ajy15b93a2fpi"
+        "version": "4.19.322",
+        "hash": "sha256:0qj106lj554y1kdqj8kwyf7pk9bvrrpgz6s8zyh7d61mk7wws9sf"
    },
    "6.6": {
-        "version": "6.6.50",
-        "hash": "sha256:0vp8sbm9fqj09vh7fib39rw18n5cj8zfydqsr5h00898mxny6rf0"
+        "version": "6.6.51",
+        "hash": "sha256:1cq8l3n12gnk6kgms5c7v71l199ip8lc9fpx7s8w8y88cla9l30w"
    },
    "6.8": {
        "version": "6.8.12",
@ -36,7 +36,7 @@
        "hash": "sha256:08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss"
    },
    "6.10": {
-        "version": "6.10.9",
-        "hash": "sha256:0n385x7hc5pqxiiy26ampgzf56wqfvydg70va27xrhm7w1q9nj54"
+        "version": "6.10.10",
+        "hash": "sha256:1kcvh1g3p1sj4q34ylcmm43824f97z4k695lcxnzp7pbnlsyg1z6"
    }
 }
--- a/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/pkgs/os-specific/linux/kernel/linux-libre.nix
@ -1,8 +1,8 @@
 { stdenv, lib, fetchsvn, linux
 , scripts ? fetchsvn {
    url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
-    rev = "19624";
-    sha256 = "0q3kg7dqvsiar3m70mvmn6bkkm4k1zn4fbh5r8ynib753wlhf504";
+    rev = "19631";
+    sha256 = "0hydmrdwqrrmrnk6r583m7c2hq1k68c9c8yqjc0bd6q4x7ys32ci";
  }
 , ...
 } @ args:
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@ -21,16 +21,16 @@ let
 in
 buildGoModule rec {
  pname = "minio";
-  version = "2024-08-29T01-40-52Z";
+  version = "2024-09-09T16-59-28Z";

  src = fetchFromGitHub {
    owner = "minio";
    repo = "minio";
    rev = "RELEASE.${version}";
-    hash = "sha256-J+SwtW5HEUQD7YgHgXpOS4EXFLL2iaiBrIfjS+Q1hrM=";
+    hash = "sha256-mFt1oo48GC9mVnGXSWc3SgtgQZlu1L9zAfM7nBYd9jE=";
  };

-  vendorHash = "sha256-L4mmQyXd/NQkKBHMKCLWs4A9XFKdrpcy+SYx2ExvqQE=";
+  vendorHash = "sha256-otRSkxMoshDHLwUn/VA+svvb/fJhkBqZth1lfOUBytY=";

  doCheck = false;

--- a/pkgs/servers/mir/common.nix
+++ b/pkgs/servers/mir/common.nix
@ -196,16 +196,16 @@ stdenv.mkDerivation (finalAttrs: {
    updateScript = ./update.sh;
  };

-  meta = with lib; {
+  meta = {
    description = "Display server and Wayland compositor developed by Canonical";
    homepage = "https://mir-server.io";
    changelog = "https://github.com/canonical/mir/releases/tag/v${finalAttrs.version}";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [
      onny
      OPNA2608
    ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
    pkgConfigModules = [
      "miral"
      "mircommon"
--- a/pkgs/servers/mir/default.nix
+++ b/pkgs/servers/mir/default.nix
@ -5,8 +5,8 @@ let
 in
 {
  mir = common {
-    version = "2.17.0";
-    hash = "sha256-iDJ7NIFoSSXjMrHK2I6Linf7z0hvShj8fr6BGxgK5gE=";
+    version = "2.17.2";
+    hash = "sha256-OwOGt3X7+UchksyPf/sodit2PHpSlpP2S3gkCPcdzfE=";
  };

  mir_2_15 = common {
--- a/pkgs/tools/networking/webwormhole/default.nix
+++ b/pkgs/tools/networking/webwormhole/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "webwormhole";
-  version = "unstable-2023-02-25";
+  version = "0-unstable-2023-11-15";

  src = fetchFromGitHub {
    owner = "saljam";
    repo = pname;
-    rev = "25b68f4f4c1aaa0c6c1949b60bd4ef52ec972ebb";
-    hash = "sha256-JFmfwHBa/lNGTOIIgnMFc4VMlsXtjX9v9Tn2XpdVMfA=";
+    rev = "6ceee76274ee881e828bd48c5cc15c758b9ad77c";
+    hash = "sha256-C9r6wFhP5BkIClgTQol7LyMUHXOzyrX9Pn91VqBaqFQ=";
  };

  vendorHash = "sha256-+7ctAm2wnjmfMd6CHXlcAUwiUMS7cH4koDAvlEUAXEg=";
--- a/pkgs/tools/security/kubernetes-polaris/default.nix
+++ b/pkgs/tools/security/kubernetes-polaris/default.nix
@ -1,17 +1,17 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles, packr, ... }:
+{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:

 buildGoModule rec {
  pname = "kubernetes-polaris";
-  version = "8.5.5";
+  version = "9.3.0";

  src = fetchFromGitHub {
    owner = "FairwindsOps";
    repo = "polaris";
    rev = version;
-    sha256 = "sha256-DKfCXtFrZgmR0jiXwCD1iuwx/8aNEjwZ/fCQNeRhSu4=";
+    sha256 = "sha256-qJAhxwVM/tYdCWLL1snUYjXGfgdcHkBFrI9xBg1/EXU=";
  };

-  vendorHash = "sha256-ZWetW+Xar4BXXlR0iG+O/NRqYk41x+PPVCGis2W2Nkk=";
+  vendorHash = "sha256-6sxzRI22xiZOQds20iU5OsU+JqcNB2wOUrOZrOH1Sa4=";

  nativeBuildInputs = [ installShellFiles ];

@ -22,10 +22,6 @@ buildGoModule rec {
    "-X main.Commit=${version}"
  ];

-  preBuild = ''
-    ${packr}/bin/packr2 -v --ignore-imports
-  '';
-
  postInstall = ''
    installShellCompletion --cmd polaris \
      --bash <($out/bin/polaris completion bash) \
--- a/pkgs/tools/system/zx/default.nix
+++ b/pkgs/tools/system/zx/default.nix
@ -3,20 +3,24 @@
  buildNpmPackage,
  fetchFromGitHub,
  nix-update-script,
+  versionCheckHook,
 }:

 buildNpmPackage rec {
  pname = "zx";
-  version = "8.1.5";
+  version = "8.1.6";

  src = fetchFromGitHub {
    owner = "google";
    repo = "zx";
    rev = version;
-    hash = "sha256-CeFUALi5MXQqd/LwSsyi6sBTFJpZGfCCMuD7Moyk9hM=";
+    hash = "sha256-bjYfeEsKO4hkLfGBVqFTomh0P3dhlvvq+PqEiZHySLs=";
  };

-  npmDepsHash = "sha256-yhy2bTXeBYxGaLYb2by+7Y5DfKJ04hroYiOIvwcBojY=";
+  npmDepsHash = "sha256-bAxqxxqhRE3Vw6NtKK5dnM41ypgq7FIpgK0hEpZ53/Q=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;

  passthru.updateScript = nix-update-script { };

--- a/pkgs/tools/text/diffsitter/default.nix
+++ b/pkgs/tools/text/diffsitter/default.nix
@ -4,6 +4,8 @@
 , makeWrapper
 , rustPlatform
 , tree-sitter
+, gitUpdater
+, versionCheckHook
 }:

 let
@ -53,6 +55,11 @@ rustPlatform.buildRustPackage rec {
    makeWrapper
  ];

+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
  postInstall = ''
    # completions are not yet implemented
    # so we can safely remove this without installing the completions
@ -71,6 +78,8 @@ rustPlatform.buildRustPackage rec {
  #     tests::diff_hunks_snapshot::_short_python_py_true_expects
  #     tests::diff_hunks_snapshot::_short_rust_rs_true_expects

+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+
  meta = with lib; {
    homepage = "https://github.com/afnanenayet/diffsitter";
    description = "Tree-sitter based AST difftool to get meaningful semantic diffs";
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -35984,8 +35984,6 @@ with pkgs;
    openjdk = openjdk8;
  };

-  sauerbraten = callPackage ../games/sauerbraten { };
-
  scid = callPackage ../games/scid { };

  scid-vs-pc = callPackage ../games/scid-vs-pc { };