Merge master into staging-next

2025-02-19 18:44:13 +00:00 · 2024-10-23 18:04:32 +00:00 · 2024-10-23 18:04:32 +00:00 · 606bd3114c
commit 606bd3114c
parent 949b508902 4545ad6779
78 changed files with 4432 additions and 1164 deletions
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@ -194,6 +194,8 @@

 - [Zapret](https://github.com/bol-van/zapret), a DPI bypass tool. Available as [services.zapret](option.html#opt-services.zapret).

+- [tiny-dfr](https://github.com/WhatAmISupposedToPutHere/tiny-dfr), a dynamic function row daemon for the Touch Bar found on some Apple laptops. Available as [hardware.apple.touchBar.enable](options.html#opt-hardware.apple.touchBar.enable).
+
 ## Backward Incompatibilities {#sec-release-24.11-incompatibilities}

 - The `sound` options have been removed or renamed, as they had a lot of unintended side effects. See [below](#sec-release-24.11-migration-sound) for details.
@ -768,6 +770,8 @@
 - `services.localtimed.enable = true` will now set `time.timeZone = null`.
  This is to avoid silently shadowing a user's explicitly defined timezone without recognition on the user's part.

+- `qgis` and `qgis-ltr` are now built without `grass` by default. `grass` support can be enabled with `qgis.override { withGrass = true; }`.
+
 ## Detailed migration information {#sec-release-24.11-migration}

 ### `sound` options removal {#sec-release-24.11-migration-sound}
--- a/nixos/modules/hardware/apple-touchbar.nix
+++ b/nixos/modules/hardware/apple-touchbar.nix
@ -0,0 +1,43 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.hardware.apple.touchBar;
+  format = pkgs.formats.toml { };
+  cfgFile = format.generate "config.toml" cfg.settings;
+in
+{
+  options.hardware.apple.touchBar = {
+    enable = lib.mkEnableOption "support for the Touch Bar on some Apple laptops using tiny-dfr";
+    package = lib.mkPackageOption pkgs "tiny-dfr" { };
+
+    settings = lib.mkOption {
+      type = format.type;
+      default = { };
+      description = ''
+        Configuration for tiny-dfr. See [example configuration][1] for available options.
+
+        [1]: https://github.com/WhatAmISupposedToPutHere/tiny-dfr/blob/master/share/tiny-dfr/config.toml
+      '';
+      example = lib.literalExpression ''
+        {
+          MediaLayerDefault = true;
+          ShowButtonOutlines = false;
+          EnablePixelShift = true;
+        }
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.packages = [ cfg.package ];
+    services.udev.packages = [ cfg.package ];
+
+    environment.etc."tiny-dfr/config.toml".source = cfgFile;
+    systemd.services.tiny-dfr.restartTriggers = [ cfgFile ];
+  };
+}
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -48,6 +48,7 @@
  ./config/zram.nix
  ./hardware/acpilight.nix
  ./hardware/all-firmware.nix
+  ./hardware/apple-touchbar.nix
  ./hardware/bladeRF.nix
  ./hardware/brillo.nix
  ./hardware/ckb-next.nix
--- a/nixos/modules/services/monitoring/nezha-agent.nix
+++ b/nixos/modules/services/monitoring/nezha-agent.nix
@ -31,6 +31,20 @@ in
          Enable GPU monitoring.
        '';
      };
+      temperature = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = ''
+          Enable temperature monitoring.
+        '';
+      };
+      useIPv6CountryCode = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = ''
+          Use ipv6 countrycode to report location.
+        '';
+      };
      disableCommandExecute = lib.mkOption {
        type = lib.types.bool;
        default = true;
@ -96,7 +110,7 @@ in
      startLimitBurst = 3;
      script = lib.concatStringsSep " " (
        [
-          "${cfg.package}/bin/agent"
+          "${lib.getExe cfg.package}"
          "--disable-auto-update"
          "--disable-force-update"
          "--password $(cat ${cfg.passwordFile})"
@ -109,6 +123,8 @@ in
        ++ lib.optional cfg.skipProcess "--skip-procs"
        ++ lib.optional cfg.tls "--tls"
        ++ lib.optional cfg.gpu "--gpu"
+        ++ lib.optional cfg.temperature "--temperature"
+        ++ lib.optional cfg.useIPv6CountryCode "--use-ipv6-countrycode"
      );
      wantedBy = [ "multi-user.target" ];
    };
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@ -699,8 +699,8 @@ in {
  nixops = handleTest ./nixops/default.nix {};
  nixos-generate-config = handleTest ./nixos-generate-config.nix {};
  nixos-rebuild-install-bootloader = handleTestOn ["x86_64-linux"] ./nixos-rebuild-install-bootloader.nix {};
-  nixos-rebuild-specialisations = handleTestOn ["x86_64-linux"] ./nixos-rebuild-specialisations.nix {};
-  nixos-rebuild-target-host = handleTest ./nixos-rebuild-target-host.nix {};
+  nixos-rebuild-specialisations = runTestOn ["x86_64-linux"] ./nixos-rebuild-specialisations.nix;
+  nixos-rebuild-target-host = runTest ./nixos-rebuild-target-host.nix;
  nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; };
  nixseparatedebuginfod = handleTest ./nixseparatedebuginfod.nix {};
  node-red = handleTest ./node-red.nix {};
--- a/nixos/tests/nixos-rebuild-specialisations.nix
+++ b/nixos/tests/nixos-rebuild-specialisations.nix
@ -1,6 +1,10 @@
-import ./make-test-python.nix ({ pkgs, ... }: {
+{ hostPkgs, ... }: {
  name = "nixos-rebuild-specialisations";

+  # TODO: remove overlay from  nixos/modules/profiles/installation-device.nix
+  #        make it a _small package instead, then remove pkgsReadOnly = false;.
+  node.pkgsReadOnly = false;
+
  nodes = {
    machine = { lib, pkgs, ... }: {
      imports = [
@ -32,7 +36,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {

  testScript =
    let
-      configFile = pkgs.writeText "configuration.nix" ''
+      configFile = hostPkgs.writeText "configuration.nix" ''
        { lib, pkgs, ... }: {
          imports = [
            ./hardware-configuration.nix
@ -119,4 +123,4 @@ import ./make-test-python.nix ({ pkgs, ... }: {
          machine.fail("nixos-rebuild boot --specialisation foo")
          machine.fail("nixos-rebuild boot -c foo")
    '';
-})
+}
--- a/nixos/tests/nixos-rebuild-target-host.nix
+++ b/nixos/tests/nixos-rebuild-target-host.nix
@ -1,8 +1,12 @@
-import ./make-test-python.nix ({ pkgs, ... }: {
+{ hostPkgs, ... }: {
  name = "nixos-rebuild-target-host";

+  # TODO: remove overlay from  nixos/modules/profiles/installation-device.nix
+  #        make it a _small package instead, then remove pkgsReadOnly = false;.
+  node.pkgsReadOnly = false;
+
  nodes = {
-    deployer = { lib, ... }: let
+    deployer = { lib, pkgs, ... }: let
      inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;
    in {
      imports = [ ../modules/profiles/installation-device.nix ];
@ -24,7 +28,8 @@ import ./make-test-python.nix ({ pkgs, ... }: {

      system.build.privateKey = snakeOilPrivateKey;
      system.build.publicKey = snakeOilPublicKey;
-      # needed to provide STC implementation for target
+      # We don't switch on `deployer`, but we need it to have the dependencies
+      # available, to be picked up by system.includeBuildDependencies above.
      system.switch.enable = true;
    };

@ -57,6 +62,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
          system.build = {
            inherit targetConfig;
          };
+          system.switch.enable = true;

          networking.hostName = "target";
        }
@ -71,13 +77,13 @@ import ./make-test-python.nix ({ pkgs, ... }: {
        StrictHostKeyChecking=no
      '';

-      targetConfigJSON = pkgs.writeText "target-configuration.json"
+      targetConfigJSON = hostPkgs.writeText "target-configuration.json"
        (builtins.toJSON nodes.target.system.build.targetConfig);

-      targetNetworkJSON = pkgs.writeText "target-network.json"
+      targetNetworkJSON = hostPkgs.writeText "target-network.json"
        (builtins.toJSON nodes.target.system.build.networkConfig);

-      configFile = hostname: pkgs.writeText "configuration.nix" ''
+      configFile = hostname: hostPkgs.writeText "configuration.nix" ''
        { lib, modulesPath, ... }: {
          imports = [
            (modulesPath + "/virtualisation/qemu-vm.nix")
@ -140,4 +146,4 @@ import ./make-test-python.nix ({ pkgs, ... }: {
        deployer.succeed(f"mkdir -p {tmp_dir}")
        deployer.succeed(f"TMPDIR={tmp_dir} nixos-rebuild switch -I nixos-config=/root/configuration-1.nix --target-host root@target &>/dev/console")
    '';
-})
+}
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/pkgs/applications/audio/jalv/default.nix
@ -1,25 +0,0 @@
-{ lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkg-config, python3
-, serd, sord , sratom, suil, wafHook }:
-
-stdenv.mkDerivation  rec {
-  pname = "jalv";
-  version = "1.6.6";
-
-  src = fetchurl {
-    url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-ktFBeBtmQ3MgfDQ868XpuM7UYfryb9zLld8AB7BjnhY=";
-  };
-
-  nativeBuildInputs = [ pkg-config wafHook ];
-  buildInputs = [
-    gtk2 libjack2 lilv lv2 python3 serd sord sratom suil
-  ];
-
-  meta = with lib; {
-    description = "Simple but fully featured LV2 host for Jack";
-    homepage = "http://drobilla.net/software/jalv";
-    license = licenses.isc;
-    maintainers = [ ];
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/applications/editors/scite/default.nix
+++ b/pkgs/applications/editors/scite/default.nix
@ -1,42 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, gtk2 }:
-
-stdenv.mkDerivation {
-  pname = "scite";
-  version = "5.2.2";
-
-  src = fetchurl {
-    url = "https://www.scintilla.org/scite522.tgz";
-    sha256 = "1q46clclx8r0b8zbq2zi89sygszgqf9ra5l83r2fs0ghvjgh2cxd";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ gtk2 ];
-  sourceRoot = "scintilla/gtk";
-
-  CXXFLAGS = [
-    # GCC 13: error: 'intptr_t' does not name a type
-    "-include cstdint"
-    "-include system_error"
-  ];
-
-  buildPhase = ''
-    make
-    cd ../../lexilla/src
-    make
-    cd ../../scite/gtk
-    make prefix=$out/
-  '';
-
-  installPhase = ''
-    make install prefix=$out/
-  '';
-
-  meta = with lib; {
-    homepage = "https://www.scintilla.org/SciTE.html";
-    description = "SCIntilla based Text Editor";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.rszibele ];
-    mainProgram = "SciTE";
-  };
-}
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -149,8 +149,7 @@ in
      vim-fugitive
      vim-rhubarb
    ];
-    # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged
-    # nvimRequireCheck = "advanced_git_search.utils";
+    nvimRequireCheck = "advanced_git_search.utils";
  };

  animation-nvim = super.animation-nvim.overrideAttrs {
@ -236,8 +235,7 @@ in
      plenary-nvim
      telescope-nvim
    ];
-    # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged
-    # nvimRequireCheck = "chatgpt";
+    nvimRequireCheck = "chatgpt";
  };

  clang_complete = super.clang_complete.overrideAttrs {
@ -1588,8 +1586,7 @@ in
      nvim-lspconfig
      nvim-navic
    ];
-    # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged
-    # nvimRequireCheck = "nvim-navbuddy";
+    nvimRequireCheck = "nvim-navbuddy";
  };

  vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs {
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -697,8 +697,8 @@ let
        mktplcRef = {
          name = "biome";
          publisher = "biomejs";
-          version = "2024.5.251958";
-          hash = "sha256-Pxbvj6e3nRwuLKmPEtE02JdHmZbyuXNh4T+FZKjBkWo=";
+          version = "2024.10.131712";
+          hash = "sha256-wslaPz0YwavLgP/gLXDIKsk2dvVmFgkSDCI9OfpKwwI=";
        };
        meta = {
          changelog = "https://github.com/biomejs/biome-vscode/blob/main/CHANGELOG.md";
@ -5194,8 +5194,8 @@ let
        mktplcRef = {
          name = "vscode-icons";
          publisher = "vscode-icons-team";
-          version = "12.8.0";
-          hash = "sha256-2+Wf0AL9C5xOQCjA9maMt/W/kviNuiyMfaOFDU82KxM=";
+          version = "12.9.0";
+          hash = "sha256-ULjZlbGcVbPiokfnx7d4z7cmVVEfy2d+SUch80rZRA4=";
        };
        meta = {
          description = "Bring real icons to your Visual Studio Code";
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@ -7,7 +7,7 @@
 , libsForQt5

 # unwrapped package parameters
-, withGrass ? true
+, withGrass ? false
 , withWebKit ? false
 }:
 let
--- a/pkgs/applications/gis/qgis/ltr.nix
+++ b/pkgs/applications/gis/qgis/ltr.nix
@ -7,7 +7,7 @@
 , libsForQt5

 # unwrapped package parameters
-, withGrass ? true
+, withGrass ? false
 , withWebKit ? false
 }:
 let
--- a/pkgs/applications/misc/keepassxc/default.nix
+++ b/pkgs/applications/misc/keepassxc/default.nix
@ -146,6 +146,7 @@ stdenv.mkDerivation rec {
    '';
    homepage = "https://keepassxc.org/";
    license = licenses.gpl2Plus;
+    mainProgram = "keepassxc";
    maintainers = with maintainers; [ blankparticle ];
    platforms = platforms.linux ++ platforms.darwin;
  };
--- a/pkgs/applications/misc/oxker/default.nix
+++ b/pkgs/applications/misc/oxker/default.nix
@ -2,14 +2,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "oxker";
-  version = "0.7.2";
+  version = "0.8.0";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-Qh/mUEfCvrOrUHJ1kEWb3BLBmMyP/MzUyfFoB+eYj9w=";
+    hash = "sha256-5FZDHKYv3/ZEzb0tsI7wxydDU0p7zwfhSG2i4UScf6s=";
  };

-  cargoHash = "sha256-VYA5Y6CjhKx3MgQ0pyOO7vw44cKykRjlgUZopgR9pYo=";
+  cargoHash = "sha256-7SMIN6Nu9W6t27+YoCbJt0HCkNhw/ZU6pn6qRYvrgT8=";

  meta = with lib; {
    description = "Simple tui to view & control docker containers";
--- a/pkgs/applications/networking/cluster/fn-cli/default.nix
+++ b/pkgs/applications/networking/cluster/fn-cli/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "fn";
-  version = "0.6.34";
+  version = "0.6.35";

  src = fetchFromGitHub {
    owner = "fnproject";
    repo = "cli";
    rev = version;
-    hash = "sha256-rbZySF7DrBN37YIetFXZE/aPSRex5cQnV8FZ0KDQ71k=";
+    hash = "sha256-ohT4h9w6gaOk6C3O8eUBcmXHRSzL2mcRO8RnNY8htso=";
  };

  vendorHash = null;
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -162,11 +162,11 @@
    "vendorHash": null
  },
  "bigip": {
-    "hash": "sha256-ny/FjAStb4qUzVeAkkqgKDb5lzmR6e0J1RaG6CWBrYg=",
+    "hash": "sha256-7Km+FqUyCCFzVmSpg4m7FuWs3MF+mKqPxEQApQqe35M=",
    "homepage": "https://registry.terraform.io/providers/F5Networks/bigip",
    "owner": "F5Networks",
    "repo": "terraform-provider-bigip",
-    "rev": "v1.22.4",
+    "rev": "v1.22.5",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
@ -994,13 +994,13 @@
    "vendorHash": "sha256-pbJk35O8EowCa2dgLCrPDgakR0EJVaAnEvePGnrl/YQ="
  },
  "postgresql": {
-    "hash": "sha256-v/88uUvILQT0uHRgfwMuLQWw0ma2ELT691kQ9GVjr/A=",
+    "hash": "sha256-ldiMHcA0uJa7z5qx8ATuu7wn6W7HTLXEw3CG9rGnU/4=",
    "homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql",
    "owner": "cyrilgdn",
    "repo": "terraform-provider-postgresql",
-    "rev": "v1.23.0",
+    "rev": "v1.24.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-fHNXJGyOWGF7Dwfk14GWmLXSIENsshIHbxkF7iQJNuI="
+    "vendorHash": "sha256-2DWYW/NoNqchnfxEPBCFstzGuFKwXAXVmS9RqRWViWo="
  },
  "powerdns": {
    "hash": "sha256-NtJs2oNJbjUYNFsbrfo2RYhqOlKA15GJt9gi1HuTIw0=",
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@ -47,6 +47,14 @@ python3.pkgs.buildPythonApplication rec {

  dontWrapGApps = true;

+  preBuild = ''
+    python make.py build --dist unix
+  '';
+
+  postInstall = ''
+    python make.py install --dist unix --prefix=$out
+  '';
+
  preFixup = ''
    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
  '';
--- a/pkgs/applications/networking/instant-messengers/rambox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix
@ -2,11 +2,11 @@

 let
  pname = "rambox";
-  version = "2.4.0";
+  version = "2.4.1";

  src = fetchurl {
    url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage";
-    hash = "sha256-x9GDiSkkO0zYx/veB6xSr6/9/SW6JRTGAASlvWd/P0c=";
+    hash = "sha256-ndFv5rNTWyqrGGC8t1JNR+bQC0Jsit4I9p4ng7h/gcU=";
  };

  desktopItem = (makeDesktopItem {
--- a/pkgs/applications/terminal-emulators/alacritty/default.nix
+++ b/pkgs/applications/terminal-emulators/alacritty/default.nix
@ -49,16 +49,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "alacritty";
-  version = "0.13.2";
+  version = "0.14.0";

  src = fetchFromGitHub {
    owner = "alacritty";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-MrlzAZWLgfwIoTdxY+fjWbrv7tygAjnxXebiEgwOM9A=";
+    hash = "sha256-ZhkuuxTx2y8vOfxfpDpJAyNyDdRWab0pqyDdbOCQ2XE=";
  };

-  cargoHash = "sha256-7HPTELRlmyjj7CXNbgqrzxW548BgbxybWi+tT3rOCX0=";
+  cargoHash = "sha256-T+/G2z7H/egJ/IlP3KA31jydg1CmFdLW8bLYSf/yWck=";

  nativeBuildInputs = [
    cmake
--- a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix
+++ b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix
@ -7,14 +7,14 @@
 }:
 buildLua (finalAttrs: {
  pname = "modernx-zydezu";
-  version = "0.3.7";
+  version = "0.3.8";

  scriptPath = "modernx.lua";
  src = fetchFromGitHub {
    owner = "zydezu";
    repo = "ModernX";
    rev = finalAttrs.version;
-    hash = "sha256-slJYbhjNrzwq5rl83HV0Uy7BUK/bbltWSyH0198kSqw=";
+    hash = "sha256-dHjEmE/m5lAF3XyyebO/23BLmoS5sfSoNZuTtJv/JEA=";
  };

  postInstall = ''
--- a/pkgs/by-name/ap/api-linter/package.nix
+++ b/pkgs/by-name/ap/api-linter/package.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "api-linter";
-  version = "1.67.3";
+  version = "1.67.4";

  src = fetchFromGitHub {
    owner = "googleapis";
    repo = "api-linter";
    rev = "v${version}";
-    hash = "sha256-uyupDoLLF1lqYaufBsSNDjKVGF0JsRnephkq4Hk3aMU=";
+    hash = "sha256-zHJE3sau2KAbPNafUw2+OPFI5RRomqzr1QMEB1vfq3I=";
  };

-  vendorHash = "sha256-+dyoWK5iXH480c+akg26BCF/J8lKQoATVqZUfqMa080=";
+  vendorHash = "sha256-rZn3SYcuFay2pjGad+NhEf8dmzonsvO7M4OQovT8otg=";

  subPackages = [ "cmd/api-linter" ];

--- a/pkgs/by-name/at/athens/package.nix
+++ b/pkgs/by-name/at/athens/package.nix
@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "athens";
-  version = "0.15.2";
+  version = "0.15.3";

  src = fetchFromGitHub {
    owner = "gomods";
    repo = "athens";
    rev = "v${version}";
-    hash = "sha256-Ikm9nznJhd5ZrkJyh3ny1SZeuWVs5xgT4fpWKhVbuDA=";
+    hash = "sha256-iRuy3z5GCsuTnIQuPkzyTvMSMlYTqf3Do7uqgERTXn0=";
  };

  vendorHash = "sha256-cK23BIGh/BK1OHHrI++PD1h7lCN7NZfV1Yfirs8vC5A=";
--- a/pkgs/by-name/bu/bundletool/package.nix
+++ b/pkgs/by-name/bu/bundletool/package.nix
@ -8,11 +8,11 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "bundletool";
-  version = "1.17.1";
+  version = "1.17.2";

  src = fetchurl {
    url = "https://github.com/google/bundletool/releases/download/${finalAttrs.version}/bundletool-all-${finalAttrs.version}.jar";
-    sha256 = "sha256-RYgerRM4iHLYLEJVsZVIi3/DPyysWpqXewr8XpI2dZI=";
+    sha256 = "sha256-LUrZCPrqZAR8HMnLdH5qpmfGqxkuCWB70WtnJGqM1q4=";
  };

  dontUnpack = true;
--- a/pkgs/by-name/ed/edopro/deps.nix
+++ b/pkgs/by-name/ed/edopro/deps.nix
@ -0,0 +1,14 @@
+# This is automatically generated by the update script.
+# DO NOT MANUALLY EDIT.
+{
+  assets-hash = "sha256-vZhkWJ1ZoNEwdc5kM1S0hyXnWmupiTOanCi9DCuqw/k=";
+  edopro-version = "40.1.4";
+  edopro-rev = "c713e23491a1e55c9d8e91257e5f2b5873696b9b";
+  edopro-hash = "sha256-2E1cjG0FONu/fbr67/3qRCKQ1W/wPznClEWsMa1FAzo=";
+  irrlicht-version = "1.9.0-unstable-2023-02-18";
+  irrlicht-rev = "7edde28d4f8c0c3589934c398a3a441286bb7c22";
+  irrlicht-hash = "sha256-Q2tNiYE/enZPqA5YhUe+Tkvmqtmmz2E0OqTRUDnt+UA=";
+  ocgcore-version = "0-unstable-2022-09-15";
+  ocgcore-rev = "4a872ad7686e0d00ee4c1c051e90fc07c40613d4";
+  ocgcore-hash = "sha256-s3DOHrZilRUy6fbXObNiLRinxpdHY99vDOmS/ZfOI78=";
+}
--- a/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch
+++ b/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch
@ -0,0 +1,29 @@
+From 41e750142b44465f3af197b7e2f0d6f54fc48c2d Mon Sep 17 00:00:00 2001
+From: OPNA2608 <opna2608@protonmail.com>
+Date: Mon, 21 Oct 2024 17:42:24 +0200
+Subject: [PATCH] Mark Lua symbols as C symbols
+
+Otherwise linking against our Lua built by a C-compiler fails due to the symbols being resolved as C++ symbols.
+---
+ interpreter.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/interpreter.h b/interpreter.h
+index 6c405a1..c471ecb 100644
+--- a/interpreter.h
+++ b/interpreter.h
+@@ -9,9 +9,11 @@
+ #define INTERPRETER_H_
+ 
+ // Due to longjmp behaviour, we must build Lua as C++ to avoid UB
+extern "C" {
+ #include <lua.h>
+ #include <lualib.h>
+ #include <lauxlib.h>
+}
+ 
+ #include "common.h"
+ #include <unordered_map>
+-- 
+2.44.1
+
--- a/pkgs/by-name/ed/edopro/package.nix
+++ b/pkgs/by-name/ed/edopro/package.nix
@ -0,0 +1,318 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchzip,
+  makeWrapper,
+  premake5,
+  writeShellScriptBin,
+  runCommandLocal,
+  symlinkJoin,
+  imagemagick,
+  bzip2,
+  curl,
+  flac,
+  # Use fmt 10+ after release 40.1.4+
+  fmt_9,
+  freetype,
+  libevent,
+  libgit2,
+  libGL,
+  libGLU,
+  libjpeg,
+  libpng,
+  libvorbis,
+  libX11,
+  libxkbcommon,
+  libXxf86vm,
+  lua5_3,
+  mono,
+  nlohmann_json,
+  openal,
+  SDL2,
+  sqlite,
+  wayland,
+  egl-wayland,
+  covers_url ? "https://pics.projectignis.org:2096/pics/cover/{}.jpg",
+  fields_url ? "https://pics.projectignis.org:2096/pics/field/{}.png",
+  # While ygoprodeck has higher quality images, "spamming" of their api results in a ban.
+  # Thats why this link can change since it's compiled into the program, However it will
+  # download assets when needed so it is unlikely to get banned. Unless you search the
+  # card list with no filters of any kind. When testing use ProjectIgnis' website instead.
+  pics_url ? "https://images.ygoprodeck.com/images/cards/{}.jpg",
+}:
+let
+  archLabel =
+    {
+      "x86_64-linux" = "x64";
+      "aarch64-linux" = "arm64";
+    }
+    .${stdenv.hostPlatform.system}
+      or (throw "${stdenv.hostPlatform.system} is an unsupported arch label for edopro");
+
+  deps = import ./deps.nix;
+in
+let
+  assets = fetchzip {
+    url = "https://github.com/ProjectIgnis/edopro-assets/releases/download/${deps.edopro-version}/ProjectIgnis-EDOPro-${deps.edopro-version}-linux.tar.gz";
+    hash = deps.assets-hash;
+  };
+
+  irrlicht-edopro = stdenv.mkDerivation {
+    pname = "irrlicht-edopro";
+    version = deps.irrlicht-version;
+
+    src = fetchFromGitHub {
+      owner = "edo9300";
+      repo = "irrlicht1-8-4";
+      rev = deps.irrlicht-rev;
+      hash = deps.irrlicht-hash;
+    };
+
+    buildInputs = [
+      libGLU
+      libX11
+      libxkbcommon
+      libXxf86vm
+      wayland
+    ];
+
+    enableParallelBuilding = true;
+    buildFlags = [
+      "NDEBUG=1"
+    ];
+    makeFlags = [
+      "-C"
+      "source/Irrlicht"
+    ];
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/{bin,include}
+      cp lib/Linux/libIrrlicht.a $out/bin
+      cp -r include/* $out/include
+
+      runHook postInstall
+    '';
+  };
+
+  ocgcore = stdenv.mkDerivation {
+    pname = "ygopro-core";
+    version = deps.ocgcore-version;
+
+    src = fetchFromGitHub {
+      owner = "edo9300";
+      repo = "ygopro-core";
+      rev = deps.ocgcore-rev;
+      hash = deps.ocgcore-hash;
+      fetchSubmodules = true;
+    };
+
+    patches = [
+      ./ocgcore-lua-symbols.patch
+    ];
+
+    nativeBuildInputs = [ premake5 ];
+
+    buildInputs = [ lua5_3 ];
+
+    preBuild = ''
+      premake5 gmake2 \
+        --lua-path="${lua5_3}"
+    '';
+
+    enableParallelBuilding = true;
+    buildFlags = [
+      "verbose=true"
+      "config=release"
+      "ocgcoreshared"
+    ];
+    makeFlags = [
+      "-C"
+      "build"
+    ];
+
+    installPhase = ''
+      runHook preInstall
+
+      install -Dm644 -t $out/lib bin/release/libocgcore${stdenv.hostPlatform.extensions.sharedLibrary}
+
+      runHook postInstall
+    '';
+  };
+
+  edopro = stdenv.mkDerivation {
+    pname = "edopro";
+    version = deps.edopro-version;
+
+    src = fetchFromGitHub {
+      owner = "edo9300";
+      repo = "edopro";
+      rev = deps.edopro-rev;
+      hash = deps.edopro-hash;
+      fetchSubmodules = true;
+    };
+
+    nativeBuildInputs = [
+      makeWrapper
+      premake5
+    ];
+
+    buildInputs = [
+      bzip2
+      curl
+      flac
+      fmt_9
+      freetype
+      irrlicht-edopro
+      libevent
+      libgit2
+      libjpeg
+      libpng
+      libvorbis
+      lua5_3
+      nlohmann_json
+      ocgcore
+      openal
+      SDL2
+      sqlite
+    ];
+
+    # nixpkgs' gcc stack currently appears to not support LTO
+    postPatch = ''
+      substituteInPlace premake5.lua \
+        --replace-fail 'flags "LinkTimeOptimization"' 'removeflags "LinkTimeOptimization"'
+    '';
+
+    preBuild = ''
+      premake5 gmake2 \
+        --architecture=${archLabel} \
+        --covers=\"${covers_url}\" \
+        --fields=\"${fields_url}\" \
+        --pics=\"${pics_url}\" \
+        --prebuilt-core="${lib.getLib ocgcore}/lib" \
+        --sound=sfml
+    '';
+
+    enableParallelBuilding = true;
+    env = {
+      # remove after release 40.1.4+
+      # https://discord.com/channels/170601678658076672/792223685112889344/1286043823293599785
+      CXXFLAGS = "-include cstdint";
+      LDFLAGS = "-I ${irrlicht-edopro}/include -L ${irrlicht-edopro}/bin";
+    };
+    buildFlags = [
+      "verbose=true"
+      "config=release_${archLabel}"
+      "ygopro"
+    ];
+    makeFlags = [
+      "-C"
+      "build"
+    ];
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/bin
+      cp bin/${archLabel}/release/ygopro $out/bin
+      wrapProgram $out/bin/ygopro \
+        --prefix PATH : ${lib.makeBinPath [ mono ]} \
+        --prefix LD_LIBRARY_PATH : ${
+          lib.makeLibraryPath [
+            libGL
+            libX11
+            libxkbcommon
+            libXxf86vm
+            sqlite
+            wayland
+            egl-wayland
+          ]
+        }
+
+      runHook postInstall
+    '';
+  };
+
+  edopro-script =
+    let
+      assetsToCopy = lib.concatStringsSep "," [
+        # Needed if we download files from ProjectIgnis' website or any https only website.
+        "cacert.pem"
+        "config"
+        "deck"
+        "COPYING.txt"
+        "expansions"
+        "lflists"
+        "notices"
+        "puzzles"
+        "fonts"
+        "script"
+        "skin"
+        "sound"
+        "textures"
+        "WindBot"
+      ];
+    in
+    writeShellScriptBin "edopro" ''
+      set -eu
+      EDOPRO_DIR="''${XDG_DATA_HOME:-$HOME/.local/share}/edopro"
+
+      if [ ! -d $EDOPRO_DIR ]; then
+          mkdir -p $EDOPRO_DIR
+          cp -r --no-preserve=all ${assets}/{${assetsToCopy}} $EDOPRO_DIR
+          chmod -R go-rwx $EDOPRO_DIR
+
+          rm $EDOPRO_DIR/config/io.github.edo9300.EDOPro.desktop.in
+      fi
+
+      exec ${edopro}/bin/ygopro -C $EDOPRO_DIR $@
+    '';
+
+  edopro-desktop = runCommandLocal "io.github.edo9300.EDOPro.desktop" { } ''
+    cp ${assets}/config/io.github.edo9300.EDOPro.desktop.in desktop-template
+
+    sed '/Path=/d' -i desktop-template
+    sed 's/Exec=.*/Exec=EDOPro/' -i desktop-template
+    sed 's/Icon=.*/Icon=EDOPro/' -i desktop-template
+
+    install -D desktop-template $out/share/applications/io.github.edo9300.EDOPro.desktop
+  '';
+in
+symlinkJoin {
+  name = "edopro-application-${deps.edopro-version}";
+  version = deps.edopro-version;
+  paths = [
+    edopro-script
+    edopro-desktop
+  ];
+
+  postBuild = ''
+    mkdir -p $out/share/icons/hicolor/256x256/apps/
+    ${imagemagick}/bin/magick \
+        ${assets}/textures/AppIcon.png \
+        -resize 256x256 \
+        $out/share/icons/hicolor/256x256/apps/EDOPro.png
+  '';
+
+  passthru.updateScript = ./update.py;
+
+  meta = {
+    description = "Bleeding-edge automatic duel simulator, a fork of the YGOPro client";
+    homepage = "https://projectignis.github.io";
+    changelog = "https://github.com/edo9300/edopro/releases";
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [
+      OPNA2608
+      redhawk
+    ];
+    mainProgram = "edopro";
+    # This is likely a very easy app to port if you're interested.
+    # We just have no way to test on other platforms.
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+  };
+}
--- a/pkgs/by-name/ed/edopro/update.py
+++ b/pkgs/by-name/ed/edopro/update.py
@ -0,0 +1,119 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i python -p nix-prefetch-github python3Packages.githubkit
+import json
+import subprocess
+
+from githubkit import GitHub, UnauthAuthStrategy
+from githubkit.versions.latest.models import (
+    Commit,
+    ContentSubmodule,
+    Tag,
+)
+
+DEPS_PATH: str = "./pkgs/by-name/ed/edopro/deps.nix"
+
+with GitHub(UnauthAuthStrategy()) as github:
+    edopro: Tag = github.rest.repos.list_tags("edo9300", "edopro").parsed_data[0]
+
+    ocgcore_submodule: ContentSubmodule = github.rest.repos.get_content(
+        "edo9300", "edopro", "ocgcore"
+    ).parsed_data
+
+    ocgcore: Commit = github.rest.repos.get_commit(
+        "edo9300", "ygopro-core", ocgcore_submodule.sha
+    ).parsed_data
+
+    # This dep is not versioned in anyway and is why we check below to see if this is a new version.
+    irrlicht: Commit = github.rest.repos.list_commits(
+        "edo9300", "irrlicht1-8-4"
+    ).parsed_data[0]
+
+    irrlicht: Commit = github.rest.repos.get_commit(
+        "edo9300", "irrlicht1-8-4", "7edde28d4f8c0c3589934c398a3a441286bb7c22"
+    ).parsed_data
+
+
+edopro_working_version: str = ""
+try:
+    with open(DEPS_PATH, "r") as file:
+        for line in file.readlines():
+            if "edopro-version" in line:
+                edopro_working_version = line.split('"')[1]
+except FileNotFoundError:
+    print("Error: Dep file not found.")
+    exit(2)
+
+if edopro_working_version == "":
+    print("Working version is unbound")
+    exit(5)
+
+if edopro_working_version == edopro.name:
+    print("Version is updated")
+    exit(0)
+
+
+def get_hash(owner: str, repo: str, rev: str, submodule: bool = False) -> str:
+    args: list[str] = ["nix-prefetch-github", owner, repo, "--rev", rev]
+
+    if submodule:
+        args.append("--fetch-submodules")
+
+    out: subprocess.CompletedProcess = subprocess.run(args, capture_output=True)
+    out_json = json.loads(out.stdout.decode())
+
+    return out_json["hash"]
+
+
+edopro_hash = get_hash("edo9300", "edopro", edopro.commit.sha, submodule=True)
+ocgcore_hash = get_hash("edo9300", "ygopro-core", ocgcore.sha)
+irrlicht_hash = get_hash("edo9300", "irrlicht1-8-4", irrlicht.sha)
+
+asset_legacy_hash: str = (
+    subprocess.run(
+        [
+            "nix-prefetch-url",
+            f"https://github.com/ProjectIgnis/edopro-assets/releases/download/{edopro.name}/ProjectIgnis-EDOPro-{edopro.name}-linux.tar.gz",
+            "--unpack",
+        ],
+        capture_output=True,
+    )
+    .stdout.decode()
+    .strip()
+)
+asset_hash: str = (
+    subprocess.run(
+        [
+            "nix",
+            "--extra-experimental-features",
+            "nix-command",
+            "hash",
+            "to-sri",
+            "--type",
+            "sha256",
+            asset_legacy_hash,
+        ],
+        capture_output=True,
+    )
+    .stdout.decode()
+    .strip()
+)
+
+
+with open(DEPS_PATH, "w") as file:
+    contents = f"""# This is automatically generated by the update script.
+# DO NOT MANUALLY EDIT.
+{{
+  assets-hash = "{asset_hash}";
+  edopro-version = "{edopro.name}";
+  edopro-rev = "{edopro.commit.sha}";
+  edopro-hash = "{edopro_hash}";
+  irrlicht-version = "{"1.9.0-unstable-" + irrlicht.commit.committer.date.split("T")[0]}";
+  irrlicht-rev = "{irrlicht.sha}";
+  irrlicht-hash = "{irrlicht_hash}";
+  ocgcore-version = "{"0-unstable-" + ocgcore.commit.committer.date.split("T")[0]}";
+  ocgcore-rev = "{ocgcore.sha}";
+  ocgcore-hash = "{ocgcore_hash}";
+}}
+"""
+
+    file.write(contents)
--- a/pkgs/by-name/fa/factorio/versions.json
+++ b/pkgs/by-name/fa/factorio/versions.json
@ -14,14 +14,14 @@
      },
      "stable": {
        "candidateHashFilenames": [
-          "factorio_linux_2.0.8.tar.xz"
+          "factorio_linux_2.0.9.tar.xz"
        ],
-        "name": "factorio_alpha_x64-2.0.8.tar.xz",
+        "name": "factorio_alpha_x64-2.0.9.tar.xz",
        "needsAuth": true,
-        "sha256": "94ea36a5b9103369df7158a8281039dd2f1d7fa7bb3a2d854c715250dd73e185",
+        "sha256": "34c21cd3cbe91b65483786ccb4467b5d4766c748cbbddd2ce3b30d319d163e3b",
        "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.8/alpha/linux64",
-        "version": "2.0.8"
+        "url": "https://factorio.com/get-download/2.0.9/alpha/linux64",
+        "version": "2.0.9"
      }
    },
    "demo": {
@ -62,14 +62,14 @@
      },
      "stable": {
        "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.8.tar.xz"
+          "factorio-space-age_linux_2.0.9.tar.xz"
        ],
-        "name": "factorio_expansion_x64-2.0.8.tar.xz",
+        "name": "factorio_expansion_x64-2.0.9.tar.xz",
        "needsAuth": true,
-        "sha256": "408eae824daa761564b1ea7b81925efe05298cbaffd120eea235341ac05a6a60",
+        "sha256": "6369d23550a7a721d3de1d34253e8321ee601fa759d1fb5efac9abc28aa7509d",
        "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.8/expansion/linux64",
-        "version": "2.0.8"
+        "url": "https://factorio.com/get-download/2.0.9/expansion/linux64",
+        "version": "2.0.9"
      }
    },
    "headless": {
@ -87,15 +87,15 @@
      },
      "stable": {
        "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.8.tar.xz",
-          "factorio_headless_x64_2.0.8.tar.xz"
+          "factorio-headless_linux_2.0.9.tar.xz",
+          "factorio_headless_x64_2.0.9.tar.xz"
        ],
-        "name": "factorio_headless_x64-2.0.8.tar.xz",
+        "name": "factorio_headless_x64-2.0.9.tar.xz",
        "needsAuth": false,
-        "sha256": "d9594c4d552a3e4f965b188a4774da8c8b010fc23ddb0efc63b1d94818dde1ca",
+        "sha256": "f499077b3e2c1313452c350f1faf17db31cae2a0fa738f69166e97c3caa3c86d",
        "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.8/headless/linux64",
-        "version": "2.0.8"
+        "url": "https://factorio.com/get-download/2.0.9/headless/linux64",
+        "version": "2.0.9"
      }
    }
  }
--- a/pkgs/by-name/fa/fanbox-dl/package.nix
+++ b/pkgs/by-name/fa/fanbox-dl/package.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "fanbox-dl";
-  version = "0.23.1";
+  version = "0.23.2";

  src = fetchFromGitHub {
    owner = "hareku";
    repo = "fanbox-dl";
    rev = "v${version}";
-    hash = "sha256-EO1J90uH2J8EI51qGzIQyl4BbSwijkEi5ZQENgSMEm8=";
+    hash = "sha256-JARIY6z912XDvZ6JviLMP8OZLOIzUPLuJtWGpKcqwvY=";
  };

-  vendorHash = "sha256-GD5uxa5XWhlHHBztTpDKCTSym2pdkr/or6aGl9qF29U=";
+  vendorHash = "sha256-l/mgjCqRzidJ1QxH8bKGa7ZnRZVOqkuNifgEyFVU7fA=";

  # pings websites during testing
  doCheck = false;
--- a/pkgs/by-name/gl/glasskube/package.nix
+++ b/pkgs/by-name/gl/glasskube/package.nix
@ -8,12 +8,12 @@
 }:

 let
-  version = "0.23.0";
+  version = "0.25.0";
  gitSrc = fetchFromGitHub {
    owner = "glasskube";
    repo = "glasskube";
    rev = "refs/tags/v${version}";
-    hash = "sha256-X9XXQ/Ke3toXLIkSCzGrypd1lKDfslpJ96zmDHBDbl8=";
+    hash = "sha256-456kMO7KappYI2FuHA8g+uhkJNCGCxb/9zmleZqu6SQ=";
  };
  web-bundle = buildNpmPackage rec {
    inherit version;
@ -21,7 +21,7 @@ let

    src = gitSrc;

-    npmDepsHash = "sha256-9BicZfnrJEFrtaJ0uGmLnnY99KplnL8qdmG5FMo70uI=";
+    npmDepsHash = "sha256-XKPFT8eyZmDhNbuCpTzGYeg5QdhgpVhHkj8AGSlh6WU=";

    dontNpmInstall = true;

@ -41,7 +41,7 @@ in buildGo123Module rec {

  src = gitSrc;

-  vendorHash = "sha256-xpN/5VmRPFQegP+ORpb875N/+AKgxiqyZWk4Px+SCZ4=";
+  vendorHash = "sha256-oly6SLgXVyvKQQuPrb76LYngoDPNLjTAs4gWCT3/kew=";

  CGO_ENABLED = 0;

--- a/pkgs/by-name/go/got/package.nix
+++ b/pkgs/by-name/go/got/package.nix
@ -27,11 +27,11 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
  pname = "got";
-  version = "0.103";
+  version = "0.104";

  src = fetchurl {
    url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz";
-    hash = "sha256-MkBek/NTpU+rylSS5abFQl8Vm3phRFCQkpnI3INJKHg=";
+    hash = "sha256-sy14eSC8SXUhOVoGvrB9f0+StpN5WGMiS2BJ09ZpyMk=";
  };

  nativeBuildInputs = [ pkg-config bison ]
--- a/pkgs/by-name/gu/gummy/package.nix
+++ b/pkgs/by-name/gu/gummy/package.nix
@ -14,18 +14,19 @@
 , fmt
 , nlohmann_json
 , spdlog
+, nix-update-script
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "gummy";
-  version = "0.6.0";
+  version = "0.6.1";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "fusco";
    repo = "gummy";
    rev = finalAttrs.version;
-    hash = "sha256-kATieFf+dEpcYgSEPoETacP7R+u2dOrg7rOhIkNQ1uE=";
+    hash = "sha256-ic+kTBoirMX6g79NdNoeFbNNo1LYg/z+nlt/GAB6UyQ=";
  };

  nativeBuildInputs = [
@ -46,8 +47,10 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  cmakeFlags = [
-    "-DUDEV_DIR=${placeholder "out"}/lib/udev"
-    "-DUDEV_RULES_DIR=${placeholder "out"}/lib/udev/rules.d"
+    (lib.mapAttrsToList lib.cmakeFeature {
+      "UDEV_DIR" = "${placeholder "out"}/lib/udev";
+      "UDEV_RULES_DIR" = "${placeholder "out"}/lib/udev/rules.d";
+    })
  ];

  # Fixes the "gummy start" command, without this it cannot find the binary.
@ -65,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
  '';

  passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
+  passthru.updateScript = nix-update-script { };

  meta = with lib; {
    homepage = "https://codeberg.org/fusco/gummy";
--- a/pkgs/by-name/im/imhex/package.nix
+++ b/pkgs/by-name/im/imhex/package.nix
@ -19,7 +19,7 @@
  python3,
  jansson,
  curl,
-  fmt_8,
+  fmt,
  nlohmann_json,
  yara,
  rsync,
@ -97,7 +97,7 @@ stdenv'.mkDerivation (finalAttrs: {
    curl
    dbus
    file
-    fmt_8
+    fmt
    glfw3
    gtk3
    jansson
--- a/pkgs/by-name/ja/jalv/package.nix
+++ b/pkgs/by-name/ja/jalv/package.nix
@ -0,0 +1,69 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  libsForQt5,
+  libjack2,
+  lilv,
+  lv2,
+  meson,
+  ninja,
+  pkg-config,
+  portaudio,
+  serd,
+  sord,
+  sratom,
+  suil,
+  wrapGAppsHook3,
+  useJack ? true,
+  useQt ? false,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "jalv";
+  version = "1.6.8";
+
+  src = fetchFromGitHub {
+    owner = "drobilla";
+    repo = "jalv";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-MAQoc+WcuoG6Psa44VRaZ2TWB2LBpvf6EmqbUZPUf38=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ] ++ lib.optionals (!useQt) [ wrapGAppsHook3 ] ++ lib.optionals useQt [ libsForQt5.wrapQtAppsHook ];
+
+  buildInputs =
+    [
+      lilv
+      lv2
+      portaudio
+      serd
+      sord
+      sratom
+      suil
+    ]
+    ++ lib.optionals (!useJack) [ portaudio ]
+    ++ lib.optionals useJack [ libjack2 ]
+    ++ lib.optionals useQt [ libsForQt5.qtbase ];
+
+  mesonFlags = [
+    (lib.mesonEnable "portaudio" (!useJack))
+    (lib.mesonEnable "jack" useJack)
+    (lib.mesonEnable "gtk2" false)
+    (lib.mesonEnable "gtk3" (!useQt))
+    (lib.mesonEnable "qt5" useQt)
+  ];
+
+  meta = {
+    description = "Simple but fully featured LV2 host for Jack";
+    homepage = "http://drobilla.net/software/jalv";
+    license = lib.licenses.isc;
+    mainProgram = if useQt then "jalv.qt5" else "jalv.gtk3";
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.linux;
+  };
+})
--- a/pkgs/by-name/ja/janus-gateway/package.nix
+++ b/pkgs/by-name/ja/janus-gateway/package.nix
@ -1,7 +1,26 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gengetopt
-, glib, libconfig, libnice, jansson, boringssl, zlib, srtp, libuv
-, libmicrohttpd, curl, libwebsockets, sofia_sip, libogg, libopus
-, usrsctp, ffmpeg
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  pkg-config,
+  gengetopt,
+  glib,
+  libconfig,
+  libnice,
+  jansson,
+  boringssl,
+  zlib,
+  srtp,
+  libuv,
+  libmicrohttpd,
+  curl,
+  libwebsockets,
+  sofia_sip,
+  libogg,
+  libopus,
+  usrsctp,
+  ffmpeg,
 }:

 let
@ -15,20 +34,38 @@ in

 stdenv.mkDerivation rec {
  pname = "janus-gateway";
-  version = "1.2.3";
+  version = "1.2.4";

  src = fetchFromGitHub {
    owner = "meetecho";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-3o9XxxTlWppq1mFgIUjstUFz6bT44mvBJa4FBgcc4Pc=";
+    sha256 = "sha256-oUX9PxiNdmrC03p+DAGkxD+mbi2jzuCgwlgd2JZ4Gwo=";
  };

-  nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    gengetopt
+  ];

  buildInputs = [
-    glib libconfig libnice jansson boringssl zlib srtp libuv libmicrohttpd
-    curl libwebsockets_janus sofia_sip libogg libopus usrsctp ffmpeg
+    glib
+    libconfig
+    libnice
+    jansson
+    boringssl
+    zlib
+    srtp
+    libuv
+    libmicrohttpd
+    curl
+    libwebsockets_janus
+    sofia_sip
+    libogg
+    libopus
+    usrsctp
+    ffmpeg
  ];

  enableParallelBuilding = true;
@ -44,9 +81,17 @@ stdenv.mkDerivation rec {

  makeFlags = [
    "BORINGSSL_LIBS=-L${lib.getLib boringssl}/lib"
+    # Linking with CXX because boringssl static libraries depend on C++ stdlib.
+    # Upstream issue: https://www.github.com/meetecho/janus-gateway/issues/3456
+    "CCLD=${stdenv.cc.targetPrefix}c++"
  ];

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

  postInstall = ''
    moveToOutput share/janus "$doc"
--- a/pkgs/by-name/ke/keyguard/deps.json
+++ b/pkgs/by-name/ke/keyguard/deps.json
@ -1045,8 +1045,8 @@
   "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
   "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
  },
-  "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.7.0-rc01": {
-   "pom": "sha256-DhiM4cMSP5VblKXKW1jG4GXihQT0aApwC+ZdUQfrFGc="
+  "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.7.0": {
+   "pom": "sha256-+aUsGbpqYxZ/gnuysLo8caiIRbUNYy7CFO8j09D+NAE="
  },
  "org/jetbrains/intellij/deps#trove4j/1.0.20200330": {
   "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=",
@ -1707,13 +1707,13 @@
   "module": "sha256-X8dNSe1IImBLtiMbgqZoSnycSi5TAsB5SFbcnqL/4PA=",
   "pom": "sha256-WjUR8QbYW0UjQSY4346LURnS6EQCbRG1hzpqlenq8xA="
  },
-  "com/microsoft/signalr#signalr/8.0.8": {
-   "jar": "sha256-5pQWQ7AtKPuEGNQfsa9FftAZq9NpM2EIjZ/h1hzWXjs=",
-   "pom": "sha256-9G8bpHX16l3sHtG4mkV8yYGskuVleum0pUx5bwaQNQI="
+  "com/microsoft/signalr#signalr/8.0.10": {
+   "jar": "sha256-mI7x2yzYbu4935tvt6Tj2PH0e6K+lKOYIzteCTpjuF8=",
+   "pom": "sha256-C+qG0/ymoU3odX9NWp6CVTOj4J+pxATItLJ866v8aKA="
  },
-  "com/microsoft/signalr/messagepack#signalr-messagepack/8.0.8": {
-   "jar": "sha256-zlrZy8K6EcgkkfXs3k2BNa4i2qTB3o507ThUakTGKN8=",
-   "pom": "sha256-BCJCMKiI6uFFcmsd5dHeHmxx0H6Ew2Ol5eKFQuDXPzE="
+  "com/microsoft/signalr/messagepack#signalr-messagepack/8.0.10": {
+   "jar": "sha256-n+Snsmlp783g7D9Pr6WsNzNrYUl8e/zMqebbnhUHV50=",
+   "pom": "sha256-dRkpAi42IS1Ys6CcI7MND69ltlElqUxOz9Sgw0R8q4E="
  },
  "com/nulab-inc#zxcvbn/1.9.0": {
   "jar": "sha256-OO+uurCRROsfTUyf9lDnnfh1qNbEU5wQWweaYGu32zQ=",
@ -2610,267 +2610,267 @@
   "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=",
   "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw="
  },
-  "org/jetbrains/androidx/lifecycle#lifecycle-common/2.8.3-rc01": {
+  "org/jetbrains/androidx/lifecycle#lifecycle-common/2.8.3": {
   "jar": "sha256-lzcRGdyeJgTqeMVDMwf/DxRy6IYt19/vXK3ob0IW7co=",
-   "module": "sha256-s1NkHzy88bsIMGsECZzVXdjLCEbeph/VfHZKPcHPagY=",
-   "pom": "sha256-aw2RW/tuu1gsmq33twU+W68zvMcwxFr6cCaaz6sv5AA="
+   "module": "sha256-5JuLch7lfaXG+S0aivzDvCcuJblDHcJWwSrrawMhurE=",
+   "pom": "sha256-52FqxzlaU7v36UnOhS7Rr0Bzk5+NwhxY9O/1meAWkMY="
  },
-  "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose-desktop/2.8.3-rc01": {
+  "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose-desktop/2.8.3": {
   "jar": "sha256-weUaJG5p4jfofSib4Ivr2NQG/+n/YKEl6PIHLbYRmWY=",
-   "module": "sha256-jB8h9qz1Duyh0bJEubt8E0XpoL/iZ8lTj9xnRr6DaME=",
-   "pom": "sha256-oi/mutH7OYytvY5RoJPUu4mvICT4KBo32xWGdpnuS3s="
+   "module": "sha256-ftq2glUQ+28CDc0pDS5Z5EZpYM55g9j+0arRwcwlOgU=",
+   "pom": "sha256-3oQAyt0q08lXhEGdyH+sNu8E2tFIGCQmKtuTB0ksmGk="
  },
-  "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose/2.8.3-rc01": {
+  "org/jetbrains/androidx/lifecycle#lifecycle-runtime-compose/2.8.3": {
   "jar": "sha256-vKChLI38r39zQPaueEeHVboKrLX9Amzaqu0ETR6i0dM=",
-   "module": "sha256-4g+/7uNPpLogIgjFh1r+BZsFEWPgPJtC6A/mWSxJzhM=",
-   "pom": "sha256-AZ0y7f4f6NMsxLBZFWJc+IUdP0CahY08FX9/KsP4Ae0="
+   "module": "sha256-G5XG+23rwAEIPjOJRd5yxUe2ZSDxEY5G3XsuarqZhqE=",
+   "pom": "sha256-6rBzZerUBu/WAlH50jaJfSkFOjnQZ3OvkdjAdMGTBJY="
  },
-  "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.8.3-rc01": {
+  "org/jetbrains/androidx/lifecycle#lifecycle-runtime/2.8.3": {
   "jar": "sha256-oFTwYuKeqeEbC/wOcjyMMmHxM61wv9e2SYvLVqakFxE=",
-   "module": "sha256-O45TsaRsz2Ugsf+jF9xRaLgmgFoNCi+wUfmNmlfC+iE=",
-   "pom": "sha256-RhCbjUL5LbukHLxCbP6XPPFmZ89ljPE8P/8xn/nBAtY="
+   "module": "sha256-0GDrglEvHdCEbcJabjvoR5y7uI7XbuW4KOldzTXH6R8=",
+   "pom": "sha256-afzhSdyS2GswVk4ZAdZDNQWi/9ATIDxEj7FNQUBQJlE="
  },
-  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.8.3-rc01": {
+  "org/jetbrains/androidx/lifecycle#lifecycle-viewmodel/2.8.3": {
   "jar": "sha256-aFRIUvdm0yJNbF4MfGG4Pg1xUGOvM6JtVu5iaIco37w=",
-   "module": "sha256-IlPYvswJR77h3Bk5IA7qN9/Vb1rKy1lgUH9MQgzXOG8=",
-   "pom": "sha256-pMbbdwNPwAzb1D00BkOAlluIFbLR2uuGgHo/Om9B6n8="
+   "module": "sha256-C97hP9XDeEeYwpHraD2vz6sWQEA0nn6t2SOLo9XTKIE=",
+   "pom": "sha256-+LCPTAjUufxBcNjR+aIDEpGk0K9yzodSLPwsl5LMANo="
  },
-  "org/jetbrains/compose#compose-gradle-plugin/1.7.0-rc01": {
-   "jar": "sha256-bvxr0H9YF4MAEnxcv0COfkn//9WrDwSjRvIP7bfiNJs=",
-   "module": "sha256-ED6ebSTwIXal5ECkHea+Yst5Sa8ZRMJZMxnNLWW3PoM=",
-   "pom": "sha256-DNBQFbYoWKmAMKbcvoE29PNr9SiJKt1Qj5lg9yIg+DQ="
+  "org/jetbrains/compose#compose-gradle-plugin/1.7.0": {
+   "jar": "sha256-F7ch4W8bXBAaduFvbz0rw//+rit5zD759BhW7Y7B85I=",
+   "module": "sha256-BgNU2R7hwMVPCgs8GjzutD7Uv8qjm7O9JgbbhYaragg=",
+   "pom": "sha256-o+Zmvd7k+urvSEO7TZET2yxjKpeX3TjuHUYa8lk1H2g="
  },
-  "org/jetbrains/compose#gradle-plugin-internal-jdk-version-probe/1.7.0-rc01": {
-   "jar": "sha256-hwY7ymKmu3QYPx6lTUquicbq85uNmRXWhbP13KQ9w8M=",
-   "module": "sha256-UIF0Jv7rrPUqYtOiABDiBgNcHxtWnv6dyddm7JuLcxI=",
-   "pom": "sha256-mVJyA8/us/F3Ducx+Mt/7Lghu3vvTuGQJHNokw6QPI4="
+  "org/jetbrains/compose#gradle-plugin-internal-jdk-version-probe/1.7.0": {
+   "jar": "sha256-IV3fOk357eYF4cgjSA6zkOZK47RCh9MGyYvUD/iaYuQ=",
+   "module": "sha256-j86qapHAzzYaZkd/j1+SVfEMbglErzABHeJYSuoohz4=",
+   "pom": "sha256-JuhmPnnXa/BIj8w/JeFK/poQlJlAPu4vKrlvu+z0WnM="
  },
-  "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.7.0-rc01": {
-   "pom": "sha256-yH0dLbJbKFf7k8/J3UlEjiinHuVcBQF66r7e/l4Sz0Q="
+  "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.7.0": {
+   "pom": "sha256-9vpXaz9lXUXmgnqrC0sOaMOXr4hr/axkcd9jacqecu8="
  },
-  "org/jetbrains/compose/animation#animation-core-desktop/1.7.0-rc01": {
+  "org/jetbrains/compose/animation#animation-core-desktop/1.7.0": {
   "jar": "sha256-SbWk6POl6EcCRQMlwBdWiNVcShKXPPwaGjbmTxj9+NU=",
-   "module": "sha256-RYbeapNWeBBUb4zo4ffgAwPyc3CFBYPWoI6izwiTAoo=",
-   "pom": "sha256-XJi0WxWJ4gYJiTJwXexx4NqqN4SqrrAvKPTEN6lt8+k="
+   "module": "sha256-dUjThL4ILmK3T835lfj78lJcrMtGEU17H/zkIAO5Glw=",
+   "pom": "sha256-up2FWwjkrEa8OaiVih2ummFqQwTiyoVwiVsileelCAU="
  },
-  "org/jetbrains/compose/animation#animation-core/1.7.0-rc01": {
+  "org/jetbrains/compose/animation#animation-core/1.7.0": {
   "jar": "sha256-ln8031R8dRUQ4aeez1B/KpkP4soFTJ7IVhEI1rzvS58=",
-   "module": "sha256-vp3LogRf1hTHeaQiYiIMTJWHxTD/HRHlsX2DIUch9xk=",
-   "pom": "sha256-Q6JVlvPmaASXAHUBsXTNL26sXi3Hd5Dn5fZvUXD/8D0="
+   "module": "sha256-NP5zUz8vp9by6JeWNiLDdvWYLrpGkvW+1zNK1K+HcQc=",
+   "pom": "sha256-0PJC/klRLsOP3UEzWbLdy9PIQ/+LMKhV8zO9Op+wPLQ="
  },
-  "org/jetbrains/compose/animation#animation-desktop/1.7.0-rc01": {
+  "org/jetbrains/compose/animation#animation-desktop/1.7.0": {
   "jar": "sha256-XkDy/HvIy0IkPPp9c8YxoXs9mHSvaIQa0+93j3BmO+M=",
-   "module": "sha256-PJNWJ1GJcHceBH3Th2cb85ARdiv14BUDBiaveSXUPkA=",
-   "pom": "sha256-o3tmzL73XZYymilLLN8iulU8tDWh31wPnUnai9+x/mg="
+   "module": "sha256-vkvwxfvDqIynp6tHVOhCk07URUlh8m3S+0mqF7ZhnrI=",
+   "pom": "sha256-FSFz0u3LvcFx4sZkYuXqlT7IkwpykPyQF5cUHoXFiTA="
  },
-  "org/jetbrains/compose/animation#animation/1.7.0-rc01": {
+  "org/jetbrains/compose/animation#animation/1.7.0": {
   "jar": "sha256-uyegrYK2UqtzRMhFUDi2HKwUwx6CFovdgfz59apL3tI=",
-   "module": "sha256-nnUikVPJFi7KhzbL/sOhEJWG+7NcSppCTnly9KwmlBo=",
-   "pom": "sha256-F5uPmPkeUR0E8F/7KdNn/rYHEELgkXjKEw5gls0SoSA="
+   "module": "sha256-kTPWeIulfh1cAk09qH+euuIvoatcwIsDD5HS4uFZdmE=",
+   "pom": "sha256-L//BVM1KS/txnyNExZYS7x+gCdi1DKcTfJqLGFyiru4="
  },
-  "org/jetbrains/compose/annotation-internal#annotation/1.7.0-rc01": {
+  "org/jetbrains/compose/annotation-internal#annotation/1.7.0": {
   "jar": "sha256-sqg9fABDcJ5TdcAeILKOvuRG87gq7EiLa6zvMFOW02E=",
-   "module": "sha256-IiVtV1K8/YyU8Qelizb6u6jhvjhzzstaZaPCI2Tvims=",
-   "pom": "sha256-Ta9/eHj/I3dZMq4sZbjFBiIcjR4p6dczxDKDczQl/r0="
+   "module": "sha256-qUleTa2IlUVTYZnS6T7DUvZZkwUKVPdPRiMv2f3ymKs=",
+   "pom": "sha256-0oFVMe34ol4GEsYsuwZ5PTHekRdAyi8R3Lzgl6n1WYQ="
  },
-  "org/jetbrains/compose/collection-internal#collection/1.7.0-rc01": {
+  "org/jetbrains/compose/collection-internal#collection/1.7.0": {
   "jar": "sha256-4+BM9dHyfZujbGhkg11TUcY3ONPQL2FXmd28XB0L/AM=",
-   "module": "sha256-jpPZCcGPNIZ9n9L65s9IQIuDI8MVtD6gsMXANjTk5ac=",
-   "pom": "sha256-5u7v4NewO9uDYDhkP2QwoBuTZBkoAA1RcuIGr1kU6bA="
+   "module": "sha256-PS/V3z5VZdnA4cA8XdIjYizyiRVXIIYjJKME1SL3gEc=",
+   "pom": "sha256-YSpPsvay2ouT3ew6D21esxF2NhE+/aOt3/tV1iUJnv8="
  },
-  "org/jetbrains/compose/components#components-resources-android/1.7.0-rc01": {
-   "module": "sha256-EQ2buHW+eOfn0WBDwEdcttYDOdMml0c3vl6sx38y4/o=",
-   "pom": "sha256-c4OoehM2u1yLejJIP9zVELqS5jq8u9SW3yh/GDkyJH8="
+  "org/jetbrains/compose/components#components-resources-android/1.7.0": {
+   "module": "sha256-1w7u1mCwPnCWFQwj6EPdZXWby7w2EwD0/ooyhT6CcSQ=",
+   "pom": "sha256-pIG3PAFB7EJjfzbXyesFyrJSUR6mhEFafpm7Oo7QTbM="
  },
-  "org/jetbrains/compose/components#components-resources-desktop/1.7.0-rc01": {
+  "org/jetbrains/compose/components#components-resources-desktop/1.7.0": {
   "jar": "sha256-FYS3Oejxhp5PNAUZ3JhNSkRYKoDvMj5lWZndsY3ZVMI=",
-   "module": "sha256-vqnjWi83+RW2BNJUanZwcNbq7Uf3ttIyhsQWKuz0jXw=",
-   "pom": "sha256-3jPhAW6Rn/sihFLkYVCrBjHU9EuUlrLEFALhYGrp5m8="
+   "module": "sha256-EzcdzRsTOPruGm88RmUXgHfMpKQV4tI0dkmDqKzJkxg=",
+   "pom": "sha256-vUT3nsuxa8W9OQmbXGsMZ80C0aa+UJFDhBeUxWIxXRM="
  },
-  "org/jetbrains/compose/components#components-resources/1.7.0-rc01": {
+  "org/jetbrains/compose/components#components-resources/1.7.0": {
   "jar": "sha256-ArSt70Ju6JvXt9YaMmO09jW/eDbEjMuvJo25Ay+OAdI=",
-   "module": "sha256-cbuIM07Qg6ipU5WkFIuhe7qsNpMEWuYnpuEYRJzpoBA=",
-   "pom": "sha256-ThIGyeMgztgz2PeJoWcddYuD0kcj04UfUC4C+b/N/tc="
+   "module": "sha256-SwnDQyZRdrenG7ChlMQpwhfOxF+Ncy9oZLtVuiJlJ8Q=",
+   "pom": "sha256-k40+o5fKQkmfjPSMySntJf2Zwp4E3tgWiT6ct8yN46w="
  },
-  "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.7.0-rc01": {
-   "pom": "sha256-oeRfB7rF+Y34Cm6WYQpYZQOEJHRLg/ke13S2hCOZkIk="
+  "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.7.0": {
+   "pom": "sha256-2/9VPqXxybksnQwdoeEr983HeciyDY+m/CotdzXJpnY="
  },
-  "org/jetbrains/compose/desktop#desktop-jvm/1.7.0-rc01": {
+  "org/jetbrains/compose/desktop#desktop-jvm/1.7.0": {
   "jar": "sha256-YsgWBzGVzAEZ3B1msXhUS9t3Lvi+5IeZVFKMZ5ixfr4=",
-   "module": "sha256-CqUZiGcmcUdTPbrHXg68EZXDG3ERbEWeSo7yqVqgb1Q=",
-   "pom": "sha256-kYpR7OweckYnsGA2rHE6bnGpSLaUrY/jnIZkZUefn/w="
+   "module": "sha256-Fl1IccnE3fepQGDfGDhdfsuzzefe543VqcfoC50GzZY=",
+   "pom": "sha256-Yh0NwEq1O74WPK6jTcSTGtMLjdSGLaJiqcacwBwnRPI="
  },
-  "org/jetbrains/compose/desktop#desktop/1.7.0-rc01": {
-   "module": "sha256-T+nDnbGj/OtkSyr78WPdVrfNHSGk4tY8ZjPPZI71Db4=",
-   "pom": "sha256-lqgkWE0NhMRi4FzAe5LJkuwNmAAkMonblgm+wBnlemI="
+  "org/jetbrains/compose/desktop#desktop/1.7.0": {
+   "module": "sha256-MoK+qppv1rF8cjwisP+buHTi+Pvyu6B05D06P0FA8zc=",
+   "pom": "sha256-DidG/5FAzfY6or6Fzp40ciEZpGqfjaxzmrfmd++PRB8="
  },
-  "org/jetbrains/compose/foundation#foundation-desktop/1.7.0-rc01": {
+  "org/jetbrains/compose/foundation#foundation-desktop/1.7.0": {
   "jar": "sha256-nHUjEw15XuzenL87rqBNMOVnzRG3nnPT2ozgMdiyVug=",
-   "module": "sha256-LSNstwbX4aMzmBiC86z5YU6lqzxRXS4Ue+rViF4AGNk=",
-   "pom": "sha256-kbOPkdy5tLAroxFOja4HkmJLqovlvmj7C+sP4FN6ab0="
+   "module": "sha256-KAvYX2tc6qK0ZjsNCQW+BBBuene86+Levy9YUOyhXaM=",
+   "pom": "sha256-eIJ76xavjp63Q9mdsGwvNFdPchxM5wiZZk+1gqFJfgI="
  },
-  "org/jetbrains/compose/foundation#foundation-layout-desktop/1.7.0-rc01": {
+  "org/jetbrains/compose/foundation#foundation-layout-desktop/1.7.0": {
   "jar": "sha256-0shnwT/2Yy+YgOZ9q6sukwAHsAi5silQ/CzAdQCOzrY=",
-   "module": "sha256-ArK7GVO7OP7fULNoQZv7o1gYaBed7qRZ9ElQ2QuDYv0=",
-   "pom": "sha256-soxkTIbRU5XYGXNdRLXJ9R4UOetqHtVua0mw7OPYcC4="
+   "module": "sha256-+L/EbEm87ysEcgDQVrb1+ypMxnK75yq6xEdgxw+ITHc=",
+   "pom": "sha256-5LnUN0tJ2iugyII9LxZT52zNwrNgMvgBlIO2GDwGQFo="
  },
-  "org/jetbrains/compose/foundation#foundation-layout/1.7.0-rc01": {
+  "org/jetbrains/compose/foundation#foundation-layout/1.7.0": {
   "jar": "sha256-QrUOJHLNXuGTKbS+FTDOc3/YT5S23mOKiXJypeK9Quk=",
-   "module": "sha256-4W/xyoXEZLss3kaRRGxJptukpkUWhqDXiY8fOdN0tD0=",
-   "pom": "sha256-n/KPOk6um1kIjeLiagUSWt8FSjUOpN2I5wD87DOT7Ws="
+   "module": "sha256-v5mKtVotRpq9vDtM/FsjC6cXO6XX683caFiIHTlv9X4=",
+   "pom": "sha256-01z1/2PMSisctkVO8XxyOqvUdmZbiiNU4eK8vHuqCYI="
  },
-  "org/jetbrains/compose/foundation#foundation/1.7.0-rc01": {
+  "org/jetbrains/compose/foundation#foundation/1.7.0": {
   "jar": "sha256-ELOhv9YPC28MgEeiN9M1YMvx/AIeCU1z8GxPPyhldCQ=",
-   "module": "sha256-On4CXwkWuAsUzqUQ9KGT1/AuH1qCsVL9nAYeXjZfHXk=",
-   "pom": "sha256-eebzRpd/b9orQCZ3A2VwvERZGzAMrpC9Yd3W1tDdyOY="
+   "module": "sha256-dBAoLbTrKC401OCdYUGEXmnYMzyZz53EK7Zdcy6oK+g=",
+   "pom": "sha256-TZE4B6HjVXgvg7UKR8pfJRMSJh9sTmXO2dXlLuXPEKg="
  },
-  "org/jetbrains/compose/material#material-desktop/1.7.0-rc01": {
+  "org/jetbrains/compose/material#material-desktop/1.7.0": {
   "jar": "sha256-JCX2UAVWD2XtcyGy+CCQeeTFMIWv/INj6G6CNilE9EI=",
-   "module": "sha256-jU2kUQbZwzchFz/eWkDBAKGohgLUmEOldYIIkgyODEI=",
-   "pom": "sha256-iWncacdjxR76YmYWwdldLFR4ZK8ULcR6X8SG3A8HUcM="
+   "module": "sha256-z0mlF+Gh3u9XPp2oDp8pAfqGAPFCaUcWgt8UCL3QeM4=",
+   "pom": "sha256-CzPMG/qial+9yYnPjOqH9FyYEg2GxQzd2sylEy6tl98="
  },
-  "org/jetbrains/compose/material#material-icons-core-desktop/1.7.0-rc01": {
+  "org/jetbrains/compose/material#material-icons-core-desktop/1.7.0": {
   "jar": "sha256-vPbIU7bbL/FI0tOq07en6lTZP8e0Lgr9hA622vGhxoE=",
-   "module": "sha256-yAV+ZSYDvUMajK4Lva6v/pi3mYWezeTrz6rWmD9TKMY=",
-   "pom": "sha256-A6sRbuVGTxfrOp9Ccxb1h0H+QuHOMZQ3/zCpZQIq6d0="
+   "module": "sha256-JnGO9Uo/fB6pwaxLXsH/oGqsnhpv8/F7L5pbNmdtg14=",
+   "pom": "sha256-ngyYssNFfv3xRGpgILVsROKKdX7gXMFszf0P0d8kG6w="
  },
-  "org/jetbrains/compose/material#material-icons-core/1.7.0-rc01": {
+  "org/jetbrains/compose/material#material-icons-core/1.7.0": {
   "jar": "sha256-3loMJ34VmMEh0sRgbMA73/69BZ4ys0lN37hMCNUdpwE=",
-   "module": "sha256-oGYnQ0OpNDaCC4vsc0DC7cBMtek21Th/3cmg0cxMv+I=",
-   "pom": "sha256-u0eiA3nxX+jrStlHCyD03RykYQ23Kq8jaZdoIqA6cpI="
+   "module": "sha256-rMLAqyILaqDk4sIEqZBy6xDmMQBHKP4iOHJmDBSmEmQ=",
+   "pom": "sha256-C+Mv5zjA4Zh1w3VbFwTR/MtVGEda0EjvwhgE4Or3J/M="
  },
-  "org/jetbrains/compose/material#material-icons-extended-desktop/1.7.0-rc01": {
+  "org/jetbrains/compose/material#material-icons-extended-desktop/1.7.0": {
   "jar": "sha256-3FXTg9yoJ541ORflxak9GSqV58pPkm7lXuC0Yn+Z2GA=",
-   "module": "sha256-fJUkFx1HLSEYZqpx1J4CDEJiFQO2qp+O8IDUyoorsHA=",
-   "pom": "sha256-vQWIz5QZmd2pxW99KdhWMRVZfFKcyFdWi/sWaH8XqmE="
+   "module": "sha256-PCQq3pH6pwW5STITE/wOR1zWPDnfwQpSM4icS/IbIco=",
+   "pom": "sha256-Cb230io3hD8ya1SVbY9yV4rNG76qgcODLXZ7V0Y7R7Y="
  },
-  "org/jetbrains/compose/material#material-icons-extended/1.7.0-rc01": {
+  "org/jetbrains/compose/material#material-icons-extended/1.7.0": {
   "jar": "sha256-nnUXmWRicyD/GxtzAmklR01GX+t6idYpX40vZNxNQ6Y=",
-   "module": "sha256-kyKTZ4AVNk+C9/eMii+GFdkrFRqKdUG/6yCtaggKkhM=",
-   "pom": "sha256-NsT2Q6Ixc0xUuzCwvUj16lUZpq/KyRheLr0hj2160yU="
+   "module": "sha256-t/96BSTuY06QLWhcDik95fvfT/cpwa+zAebWcdcV3V4=",
+   "pom": "sha256-pp8HAfEwGjtwKeIuvWsIeyrsai53MCVuy6DC6KeAy9E="
  },
-  "org/jetbrains/compose/material#material-ripple-desktop/1.7.0-rc01": {
+  "org/jetbrains/compose/material#material-ripple-desktop/1.7.0": {
   "jar": "sha256-xfa9+yKaF5SoOO0fMfcpmjtRYAS+/+GovMp1OqJovgk=",
-   "module": "sha256-CvZsjtNuO5pQNguAu8UwMXB2CcAJcmCWExA+Gjom7vs=",
-   "pom": "sha256-Vvnsc/psxp8lXdrjdBEu/pbdmrgGuQaxMxrtxGDaxbo="
+   "module": "sha256-B7kC5jjctznI+4cth4H32ggofar8YFtqQzjeCb9x2fI=",
+   "pom": "sha256-vSRBYXCH26PSjg6Q7r6hxafI/Ihzq4HfgC7fA1/blag="
  },
-  "org/jetbrains/compose/material#material-ripple/1.7.0-rc01": {
+  "org/jetbrains/compose/material#material-ripple/1.7.0": {
   "jar": "sha256-k4lak+wU/hmING03mgx3S3qk0usrFPIKfTp2vVDkgbg=",
-   "module": "sha256-nc5BoF//ShcXCzLrFDUq4R7gEukvlIBcs4fwdgIMSf8=",
-   "pom": "sha256-Ep+lXHsomu7XWTbS5Z9OXfga+ojGTo/BUzeiSZJc2Rk="
+   "module": "sha256-3+f+laqzsdT/a4UqAVYeW7cAHnYI2A82bBGKLwf4VcA=",
+   "pom": "sha256-2fXtFA8I/nzleLHGPpsbDmiQY96bsiXzd3lqSRivPVg="
  },
-  "org/jetbrains/compose/material#material/1.7.0-rc01": {
+  "org/jetbrains/compose/material#material/1.7.0": {
   "jar": "sha256-lp++L0SKCBxkQOiNKP8Kn8aTEYd8+FhTxfntc7jTUhs=",
-   "module": "sha256-u7DqOnaUTH9VWOWyLlHcBYth//4OH8Cs9cd+xFRfhuo=",
-   "pom": "sha256-okxn6wenYZfuCpNG7WhNzkKznsZg2TkMSpVCYfEw+5U="
+   "module": "sha256-YPeQ2HDp+mhWiW756079/xM3wg0A+eyxGMKO2I3bQA8=",
+   "pom": "sha256-/PuHxleHr+0Z+kRiPX49FTKDsHPLpRXojeVR96G7wIs="
  },
-  "org/jetbrains/compose/material3#material3-desktop/1.7.0-rc01": {
+  "org/jetbrains/compose/material3#material3-desktop/1.7.0": {
   "jar": "sha256-k+/2Ln8fmEHoqoGS6JJwO+th/QtiUBG7xbtBcIKkUSU=",
-   "module": "sha256-Sg/XXF1WOlaanyEMe4Q8AXPqq+Z5GSbKFlfJOtGwrlM=",
-   "pom": "sha256-RGUG3Xfa7woLZm1YLErWxp+OwFsHcMOq9RRruiDOtoo="
+   "module": "sha256-HAWjsEfXmxXlL2sLPaxRjdx48PZh3Aay8BHoLGXN9q0=",
+   "pom": "sha256-PPKkVpDzATxXojGcHZ5cpRIQmPOSDABr7J9Ths6389s="
  },
-  "org/jetbrains/compose/material3#material3/1.7.0-rc01": {
+  "org/jetbrains/compose/material3#material3/1.7.0": {
   "jar": "sha256-Mk531GpPg+IzZBT0AfjwWss9wXAItC36HqwAmSyFI5M=",
-   "module": "sha256-PrvGvAuFAoFuOD/xI8FxBZeNd9oPhOU6qo+OKkKCc7Q=",
-   "pom": "sha256-Gk2DiWXlGt3ahDiOvDcHMXKJaDxj+XQuc4sPz4MUxUs="
+   "module": "sha256-lRdR4h5adj2J3tqHe2uwVH2xCn2d/CI8fxJI5x67y0Y=",
+   "pom": "sha256-U5TAiRfK3SgZ5LjvSVM9JXZgATW8PLtRF4qHxJ0s8Io="
  },
-  "org/jetbrains/compose/runtime#runtime-desktop/1.7.0-rc01": {
+  "org/jetbrains/compose/runtime#runtime-desktop/1.7.0": {
   "jar": "sha256-duMlBUe5yjyxpJwnKTOyXLO8y8m6Endd1hYaY9mqfPE=",
-   "module": "sha256-1+RmZ/vY8kGpYVcYN+EPkhOWTa/b7sjykyJQbMzehtc=",
-   "pom": "sha256-y9CfKxQp8BKN5ANhqD9UVLFi9IDGxfyebCfY99XCthQ="
+   "module": "sha256-ZiqUSgPejSp9CbfiWeWtnsuwtXVLlTT96Bmu8JMtyqE=",
+   "pom": "sha256-7Uf+L55XEcEsa80nuhngjnRo4YwEtsKzJvvu39O/5/c="
  },
-  "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.7.0-rc01": {
+  "org/jetbrains/compose/runtime#runtime-saveable-desktop/1.7.0": {
   "jar": "sha256-QwY2O+kOqr50uQDbTDLtHxXHVI5bMKcJPE7kDENrm4w=",
-   "module": "sha256-cr/7j+sIlkzTVjFqx50Dd6z9VAcJqyzl8OCbi2rsm9o=",
-   "pom": "sha256-vWVnP8T2lDeM80XTHPxKbBwntpJH+kWaF253Cg5lMAo="
+   "module": "sha256-i+IsKSWAu1xT1OvKUmSgp1wyhuHnHjfiu9K7BjOFMyc=",
+   "pom": "sha256-kUeE0ejiOF053MYSE2t28DGUVJCt8RH74f3A63JPO8o="
  },
-  "org/jetbrains/compose/runtime#runtime-saveable/1.7.0-rc01": {
+  "org/jetbrains/compose/runtime#runtime-saveable/1.7.0": {
   "jar": "sha256-mDxRgBZ4q5xRf0n5h1ld/VLveJaN5tqE5veXYqVWtn4=",
-   "module": "sha256-WDzBZ1wzQNiNP6MSkvFevhLhuIrzrSgV7t1id4saMc8=",
-   "pom": "sha256-Wx/s4MuYYCuQfbpJc3CVxXUTLC8UsEtRb/3BW3yFyT0="
+   "module": "sha256-830dEuwBLS/VOcZ+iu+6NxIfRnYoUGS30ZEcbLRGdbI=",
+   "pom": "sha256-MPe7+pWMvZEZSt9vYnx1K5tssUAzRJIk+KLKnryZXF4="
  },
-  "org/jetbrains/compose/runtime#runtime/1.7.0-rc01": {
+  "org/jetbrains/compose/runtime#runtime/1.7.0": {
   "jar": "sha256-XITDuxwbY2rjYDCg+Y1GKa+inhkqnHj1fyLOLI/2vJY=",
-   "module": "sha256-dyFNkMwOWKAxAgouIj2pGxtkKdOeM4uE64DAtg9tSVs=",
-   "pom": "sha256-V2Zsw9hnmsfZ8uQFye8XEc9VzzzBg7zaiCTfg/H0//Y="
+   "module": "sha256-zUi/uatY5vDly8/o5Axn4ntnd2zbmWjN4IWnlhPFWe4=",
+   "pom": "sha256-tX39Qom2JiHOJHc4nx+BVWewBJxOmIGD9MgkO2XUTjo="
  },
-  "org/jetbrains/compose/ui#ui-desktop/1.7.0-rc01": {
+  "org/jetbrains/compose/ui#ui-desktop/1.7.0": {
   "jar": "sha256-suyv6mByBEYkxLZt4B1Ikf2cgLJohbA87QNszOrMDic=",
-   "module": "sha256-v/ZSTdddb6iuLLz8XH/GInpsNwGW6DKf7JkerXQGATI=",
-   "pom": "sha256-snL9R2+VvGpehXDX7e4bE8Dz9D2BTY/LvQrb06IQaX0="
+   "module": "sha256-TV6orRcBQeQUghzsZ0xUR+gBIkSnj+OF61Aa36KxTHA=",
+   "pom": "sha256-gNOSOqqiGJwOKWqL0auC+sazT3ZusrFp7zT7VRVzVTE="
  },
-  "org/jetbrains/compose/ui#ui-geometry-desktop/1.7.0-rc01": {
+  "org/jetbrains/compose/ui#ui-geometry-desktop/1.7.0": {
   "jar": "sha256-S4bJYcC0vOeZUyn9V9Qznt4Ry3XX7JC8G5kTOWrdsw8=",
-   "module": "sha256-1pRVpNXjdJVGFbF1XYr8EhmErhndiUgMlp3M42y2Ghg=",
-   "pom": "sha256-qk/nLiiYYqNX1MilAyc01SoZWDR6ggI5EE5JiJvJ+2M="
+   "module": "sha256-bNyw2SFZYEUO3WyuUWFI7MwiRqO2CFNiomCBbSJJWzk=",
+   "pom": "sha256-fsSL7vLrhj/TFEfA5slWtNmnq3vGdOA3Mw9oBQtZRz8="
  },
-  "org/jetbrains/compose/ui#ui-geometry/1.7.0-rc01": {
+  "org/jetbrains/compose/ui#ui-geometry/1.7.0": {
   "jar": "sha256-UPK8AERD9Pnvdfc4MOel6O8PB+VM9cR4p6q5xUAiVbM=",
-   "module": "sha256-274k9tBmxfeK+Z3+06wmnZuEbo2q56srCAU35q9h+j0=",
-   "pom": "sha256-hY6EBF7fboMxaEuUWXMt/nhgTwgdebwfATMoeoiykXc="
+   "module": "sha256-FMOoC5/cUWvQMDAASGT7twMe/WVHYqtkF20LBj+cqUw=",
+   "pom": "sha256-QZsfystvNZCc+3voBwlNVjSQVri3Y9fN7W53EFGJ2NE="
  },
-  "org/jetbrains/compose/ui#ui-graphics-desktop/1.7.0-rc01": {
+  "org/jetbrains/compose/ui#ui-graphics-desktop/1.7.0": {
   "jar": "sha256-T7cOhyevDG4NRNj0v/ZduTQqlceZahgImP7XFxZ4fbg=",
-   "module": "sha256-FhhaeZVW5gWEEQdiLHs6vhLrk9GYv95/fCyQMxD+j5M=",
-   "pom": "sha256-/vboXilQor+eGL+TYv2FrePxDn3CB1/1z6bWph5GMZA="
+   "module": "sha256-iWWfOKlCpyNVehbNgtn4ctWFAiAblV8x3pWfTQeiau0=",
+   "pom": "sha256-f6b2IRLSDeHL3q7VDpCR78eb+BmB6RAWuZmIVs6VtKw="
  },
-  "org/jetbrains/compose/ui#ui-graphics/1.7.0-rc01": {
+  "org/jetbrains/compose/ui#ui-graphics/1.7.0": {
   "jar": "sha256-2KtnsO/p8bbsBSup42sNgqKKA7CYedT8C+g7ntNdenw=",
-   "module": "sha256-vzleESVEpZLbbxYC06+q/Zt776Tv83vsq1G6RwfCu40=",
-   "pom": "sha256-a9pT7eJznGrFZu+S1lFFjGyQpP560CliKPhjW40l2w4="
+   "module": "sha256-NSg3gfVnVU8VJmAJFFYA09nVwW762HNFjwNV9MAmnAs=",
+   "pom": "sha256-4cNg3cpYhZFuZ/VvCvA/s++/ZQDxVXq+h3+5C78QHKk="
  },
-  "org/jetbrains/compose/ui#ui-text-desktop/1.7.0-rc01": {
+  "org/jetbrains/compose/ui#ui-text-desktop/1.7.0": {
   "jar": "sha256-gOB+TKc597YSL2PpoX5oU7lHIg7LEYD43K9BnQ5GiZY=",
-   "module": "sha256-YlJfMGOUP0GZ8CsD2DXBSMQaU7u6KdjmSnfkM307Byc=",
-   "pom": "sha256-VkQNuzYlcgr3He0kYg1xAjp306sFr0nKCHuaGctCrzc="
+   "module": "sha256-9PZVvGr1y4ru+J2OiL61CRJzlbVkuRgVp80Z0/2zfQk=",
+   "pom": "sha256-rb2Ei969/SWsriJ297EtIza/QGdarCnDzTZIHqIA7eQ="
  },
-  "org/jetbrains/compose/ui#ui-text/1.7.0-rc01": {
+  "org/jetbrains/compose/ui#ui-text/1.7.0": {
   "jar": "sha256-j/miuMk7AofY+oN9WwkXkjFoy5feoa2hqNSqe7F8nxU=",
-   "module": "sha256-J8hk90eS75BmAVO+HSpnY3opns5AyCqFl1WZb3LyUYE=",
-   "pom": "sha256-+OK7AD0uDDfEVLsyLoIUyfXOskBcRWcwFVQPDlhy6Xo="
+   "module": "sha256-ImJh7g6SCP5Igat+pR2e5vbz1RnBWx1rFUJb98FtWTo=",
+   "pom": "sha256-JNbJDk5Hb1IDxkD2sxZl7BiwIPAfLxZNz3dnVa1wYhM="
  },
-  "org/jetbrains/compose/ui#ui-tooling-preview-desktop/1.7.0-rc01": {
+  "org/jetbrains/compose/ui#ui-tooling-preview-desktop/1.7.0": {
   "jar": "sha256-xc+tCxJel42RX4tMOGMLxdVI5Z/ooOg4wMyEKDxgWUM=",
-   "module": "sha256-3stx7FZXMW21YmrSgZwqUUmu68t6B3pCax1Ea2ZrWd4=",
-   "pom": "sha256-ZZg7EuCBIJOqpn0V4apd15UxagBIpBXLQu9d37w4Yb4="
+   "module": "sha256-v5EB4n48dWgCKkjaGOF7LdiIe4LN6dHQMjFummDH948=",
+   "pom": "sha256-lKYRZropAXUomq3Xtu5RSZ3l/gO/xuSCCeD9tagfHm0="
  },
-  "org/jetbrains/compose/ui#ui-tooling-preview/1.7.0-rc01": {
-   "module": "sha256-rU2dfmzOklGPa+78Q00OV72CbkP82cTr9esy0dFLRR0=",
-   "pom": "sha256-jlVF/i8dHW7MiMqmZGwTfcWb0Ug7Xl80SIEmU8Kxblg="
+  "org/jetbrains/compose/ui#ui-tooling-preview/1.7.0": {
+   "module": "sha256-vxGYhRsMn71B1NrnhLB9W8GJ10mpeeeTPZlJ7pRDca8=",
+   "pom": "sha256-InPHq9mcpAqDjqEBFrZh3ETnMHv97VkeJj0UMWnvUi4="
  },
-  "org/jetbrains/compose/ui#ui-uikit/1.7.0-rc01": {
+  "org/jetbrains/compose/ui#ui-uikit/1.7.0": {
   "jar": "sha256-GhOzmt860nZ/ln92S6Cg0u0qLQnu8xDyLSwDBNe9pss=",
-   "module": "sha256-CoF+c2gCKMmt4blbqqwuFb5PtHHldun/Sh5U4OK4D2Q=",
-   "pom": "sha256-n3fVs6X93gCO0Y4LrJHxtWoXa1d0oWdSY9VvnW85uSE="
+   "module": "sha256-VxLoIbC5bdlwAcQY7Kn//A6kabpF7ng7uJfRgBiPPyA=",
+   "pom": "sha256-Nreuwus6pSUI+00PJFLFTWhQUzCBQt4/VuQxeC/eXAM="
  },
-  "org/jetbrains/compose/ui#ui-unit-desktop/1.7.0-rc01": {
+  "org/jetbrains/compose/ui#ui-unit-desktop/1.7.0": {
   "jar": "sha256-WYtS4lftZ0FFaUuXkKc4OpD+0uxxVLoJrOSqmDxlsaI=",
-   "module": "sha256-SMkO45UYCnBQUkPZXBF00RBd7aMu0LdvAYH6JSpP46s=",
-   "pom": "sha256-ZnvHUoW6szo4GP1SdDxEOlSRYaUzKp6FCHX1MGoLcqI="
+   "module": "sha256-OcvNe7cG50of60dPMyN3Yp2++MXhOXEu4UmbaPigL0Y=",
+   "pom": "sha256-H2Xl5/BcnA16opnEaxRn6hCZfWGjzxlpSisxMv9xQKo="
  },
-  "org/jetbrains/compose/ui#ui-unit/1.7.0-rc01": {
+  "org/jetbrains/compose/ui#ui-unit/1.7.0": {
   "jar": "sha256-QdpdYcVod7W10B4qK8uWfL+vTUXBoaoSTAYBx6PedOc=",
-   "module": "sha256-r21Xb5itOKii83kpdZVfcMp7TDwUIxL8CYGFI/qwyqM=",
-   "pom": "sha256-ufLkqP7L2gzGW3zT87uoOuiRFSLFZxRjEz+R54GDskc="
+   "module": "sha256-gHp2IZXLdkSswLTc4hNI7S/d1BY/Sj0BqcTtHPyPdpo=",
+   "pom": "sha256-kHISejq/Lk2t0bxv/2fur35nvk1i7MqZmxF71+ciOaM="
  },
-  "org/jetbrains/compose/ui#ui-util-desktop/1.7.0-rc01": {
+  "org/jetbrains/compose/ui#ui-util-desktop/1.7.0": {
   "jar": "sha256-Fh3Mc7kp2mHO5QBF6W+wLxYzw28You84tcLETDhga1I=",
-   "module": "sha256-ISnvDx+9M55KCFLZZoXtIRPT6svC7N2O8cSa6IMTeUU=",
-   "pom": "sha256-FQFMK1TjTPCEqOHTFQHkXaDV6IsYuPTRi7XHkHub49s="
+   "module": "sha256-cbDYKrQiAZ/AbpsSDyTqmSTFm8D1tc6W/iDUye8Zdmg=",
+   "pom": "sha256-DlkctYsmNXdtlnpyrb6aOvb8Q8db2SCodxVlE3kE+uQ="
  },
-  "org/jetbrains/compose/ui#ui-util/1.7.0-rc01": {
+  "org/jetbrains/compose/ui#ui-util/1.7.0": {
   "jar": "sha256-cMKLKyQxS0t3mMq2qy+v53tHyS3qIvD8Il/lx5rHn3Y=",
-   "module": "sha256-3MuHSqbfBu18tQh9AvXkRTZzrVIvQWPcduCg0MgkIyU=",
-   "pom": "sha256-+qWMzWnZ3+lY8DNRqjOFNt2VSbo8rCgF4cRyv9T0VOw="
+   "module": "sha256-dnIxUWYxsugkOSHP2cFIhifjjLIEidOXNFHyagkGLtY=",
+   "pom": "sha256-Y4m+v3a9SXezAteFEOukGIGipqplqyP0eYJCSUDtS2M="
  },
  "org/jetbrains/compose/ui#ui/1.6.11": {
   "module": "sha256-Z5lkk+C/fOHwl4SUz9hM8kKEUQfktYcxHpO72XMLJFI=",
   "pom": "sha256-TfLxK8+p2L2aVwxn6OT7UlIcDmhFHAVGHFc6SUXuST0="
  },
-  "org/jetbrains/compose/ui#ui/1.7.0-rc01": {
+  "org/jetbrains/compose/ui#ui/1.7.0": {
   "jar": "sha256-nyVs9/d8fUtm+Muexe4JWSAKuQvQwJ1vXtEsmQKlhPg=",
-   "module": "sha256-yT2jcwfka12NtpMPqB1qj7pF3qUt8DxG/OcHk0DvkOo=",
-   "pom": "sha256-j5PTiO+cIkJ+SJKXulobQjhc9NU9bsz92LUrbX4Dfdg="
+   "module": "sha256-xb2CXBAf7xnylq2gc7yfRJidpOgoMM/03NPBfEGtfJc=",
+   "pom": "sha256-zXIIZEtdLIv8p5ThqA+n6Kwp3/WLidKeoDDYPxB1EOA="
  },
  "org/jetbrains/intellij/deps#trove4j/1.0.20200330": {
   "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=",
--- a/pkgs/by-name/ke/keyguard/package.nix
+++ b/pkgs/by-name/ke/keyguard/package.nix
@ -34,13 +34,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "keyguard";
-  version = "1.6.2";
+  version = "1.6.3";

  src = fetchFromGitHub {
    owner = "AChep";
    repo = "keyguard-app";
-    rev = "eb36b853a7ac67a0f72d5684e6751d41969b07dd";
-    hash = "sha256-tMNc8OlYsiYmVtac2jngvrFZjgI7eNFVIxXUfIJUdK4=";
+    rev = "8f6d527a42f13c6bdcee2ca3f133dd19751fc37a";
+    hash = "sha256-llr+792hzifV5vP0e7AKWhW3OtYcyAhzXPR45Do62ug=";
  };

  inherit gradleBuildTask gradleUpdateTask desktopItems;
--- a/pkgs/by-name/mi/miracle-wm/package.nix
+++ b/pkgs/by-name/mi/miracle-wm/package.nix
@ -27,13 +27,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "miracle-wm";
-  version = "0.3.6";
+  version = "0.3.7";

  src = fetchFromGitHub {
    owner = "mattkae";
    repo = "miracle-wm";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-fK/g6DhcxJMvxujZDZXs1yXRu2FGZQKmhxw7/czAQiY=";
+    hash = "sha256-31S7Mfz3LIOAmDUl6jbr3kSP2BdLaM0M4xMZ8FHhLH0=";
  };

  patches = [
--- a/pkgs/by-name/ne/nezha-agent/package.nix
+++ b/pkgs/by-name/ne/nezha-agent/package.nix
@ -1,45 +1,66 @@
 {
  lib,
  buildGoModule,
+  stdenv,
  fetchFromGitHub,
  nezha-agent,
+  versionCheckHook,
  testers,
 }:
 buildGoModule rec {
  pname = "nezha-agent";
-  version = "0.18.5";
+  version = "0.20.2";

  src = fetchFromGitHub {
    owner = "nezhahq";
    repo = "agent";
    rev = "refs/tags/v${version}";
-    hash = "sha256-LmWfs3aL+1lsX4ix2FjDP5g+A0wgcfziXdw5SaKlAdk=";
+    hash = "sha256-BM3FhCf9zfccC2xC/Fhz2/andZmPYsJojMRUA3M9NOQ=";
  };

-  vendorHash = "sha256-frPAhiexFSt+KobMbf32h8xv7HMcPl5koEgSs8Nz3cs=";
+  vendorHash = "sha256-q6/265vVg6jCnDvs825nni8QFHkJpQz4xxC9MlJH2do=";

  ldflags = [
    "-s"
    "-w"
    "-X main.version=${version}"
+    "-X main.arch=${stdenv.hostPlatform.system}"
  ];

-  # The test failed due to a geoip request in the sandbox. Remove it to avoid network requirement
-  preCheck = ''
-    rm ./pkg/monitor/myip_test.go
+  checkFlags =
+    let
+      # Skip tests that require network access
+      skippedTests = [
+        "TestLookupIP"
+        "TestGeoIPApi"
+        "TestFetchGeoIP"
+        "TestCloudflareDetection"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
+  postInstall = ''
+    pushd $out/bin
+    mv agent nezha-agent
+
+    # for compatibility
+    ln -sr nezha-agent agent
+    popd
  '';

-  passthru.tests = {
-    version = testers.testVersion {
-      package = nezha-agent;
-      command = "${nezha-agent}/bin/agent -v";
-    };
-  };
+  doInstallCheck = true;
+
+  versionCheckProgramArg = "-v";
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];

  meta = {
    description = "Agent of Nezha Monitoring";
    homepage = "https://github.com/nezhahq/agent";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ moraxyc ];
+    mainProgram = "nezha-agent";
  };
 }
--- a/pkgs/by-name/oi/oil/package.nix
+++ b/pkgs/by-name/oi/oil/package.nix
@ -1,58 +0,0 @@
-{ stdenv, lib, fetchurl, symlinkJoin, withReadline ? true, readline }:
-
-let
-  readline-all = symlinkJoin {
-    name = "readline-all"; paths = [ readline readline.dev ];
-  };
-in
-stdenv.mkDerivation rec {
-  pname = "oil";
-  version = "0.22.0";
-
-  src = fetchurl {
-    url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
-    hash = "sha256-RS5/1Ci2hqp1LP65viuU+fz3upqyLgrlcKh83PeCJC4=";
-  };
-
-  postPatch = ''
-    patchShebangs build
-  '';
-
-  preInstall = ''
-    mkdir -p $out/bin
-  '';
-
-  strictDeps = true;
-  buildInputs = lib.optional withReadline readline;
-  # As of 0.20.0 the build generates an error on MacOS (using clang version 16.0.6 in the builder),
-  # whereas running it outside of Nix with clang version 15.0.0 generates just a warning. The shell seems to
-  # work just fine though, so we disable the error here.
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types";
-  configureFlags = [
-    "--datarootdir=${placeholder "out"}"
-  ] ++ lib.optionals withReadline [
-    "--with-readline"
-    "--readline=${readline-all}"
-  ];
-
-  # Stripping breaks the bundles by removing the zip file from the end.
-  dontStrip = true;
-
-  meta = {
-    description = "New unix shell - Python version";
-    homepage = "https://www.oilshell.org/";
-
-    license = with lib.licenses; [
-      psfl # Includes a portion of the python interpreter and standard library
-      asl20 # Licence for Oil itself
-    ];
-
-    platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ melkor333 ];
-    changelog = "https://www.oilshell.org/release/${version}/changelog.html";
-  };
-
-  passthru = {
-    shellPath = "/bin/osh";
-  };
-}
--- a/pkgs/by-name/oi/oils-for-unix/package.nix
+++ b/pkgs/by-name/oi/oils-for-unix/package.nix
@ -8,11 +8,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "oils-for-unix";
-  version = "0.22.0";
+  version = "0.23.0";

  src = fetchurl {
    url = "https://www.oilshell.org/download/oils-for-unix-${version}.tar.gz";
-    hash = "sha256-etZK2VH6qbj9MQ/BffCpMpHgQat1MRrKG8hcu/p61F8=";
+    hash = "sha256-ydNcp4tKCO6vrIvGQ54rtAvM0zcNsiJkh/rtY0ihdSE=";
  };

  postPatch = ''
--- a/pkgs/by-name/pi/pipeline/Cargo.lock
+++ b/pkgs/by-name/pi/pipeline/Cargo.lock
--- a/pkgs/by-name/pi/pipeline/package.nix
+++ b/pkgs/by-name/pi/pipeline/package.nix
@ -0,0 +1,103 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  cargo,
+  rustc,
+  fetchFromGitLab,
+  gtk4,
+  libadwaita,
+  openssl,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook4,
+  glib,
+  appstream-glib,
+  desktop-file-utils,
+  blueprint-compiler,
+  sqlite,
+  clapper,
+  gst_all_1,
+  gtuber,
+  glib-networking,
+  gnome,
+  webp-pixbuf-loader,
+  librsvg,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "pipeline";
+  version = "2.0.2";
+
+  src = fetchFromGitLab {
+    owner = "schmiddi-on-mobile";
+    repo = "pipeline";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-8LKd7zZuwo/HtxFo8x8UpO1Y8/DnTZmaOYrc9NmnIrc=";
+  };
+
+  cargoDeps = rustPlatform.importCargoLock {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "clapper-0.1.0" = "sha256-IFFqfSq2OpzfopQXSYfnJ68HGLY+rvcLqk7NTdDd+28=";
+      "piped-openapi-sdk-1.0.0" = "sha256-UFzMYYqCzO6KyJvjvK/hBJtz3FOuSC2gWjKp72WFEGk=";
+      "pipeline-api-0.1.0" = "sha256-h094ZAJOqX9QC1EUAtzIVztudhndXglkYLcFbH/mpqQ=";
+    };
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    cargo
+    rustPlatform.cargoSetupHook
+    rustc
+    pkg-config
+    wrapGAppsHook4
+    glib
+    appstream-glib
+    desktop-file-utils
+    blueprint-compiler
+  ];
+
+  buildInputs = [
+    gtk4
+    libadwaita
+    openssl
+    sqlite
+    clapper
+
+    gst_all_1.gstreamer
+    gst_all_1.gst-libav
+    gst_all_1.gst-plugins-base
+    (gst_all_1.gst-plugins-good.override { gtkSupport = true; })
+    gst_all_1.gst-plugins-bad
+    gtuber
+    glib-networking # For GIO_EXTRA_MODULES. Fixes "TLS support is not available"
+  ];
+
+  # Pull in WebP support for YouTube avatars.
+  # In postInstall to run before gappsWrapperArgsHook.
+  postInstall = ''
+    export GDK_PIXBUF_MODULE_FILE="${
+      gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
+        extraLoaders = [
+          webp-pixbuf-loader
+          librsvg
+        ];
+      }
+    }"
+  '';
+
+  passthru.updateScript = nix-update-script { attrPath = finalAttrs.pname; };
+
+  meta = {
+    description = "Watch YouTube and PeerTube videos in one place";
+    homepage = "https://mobile.schmidhuberj.de/pipeline";
+    mainProgram = "tubefeeder";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ chuangzhu ];
+    platforms = lib.platforms.linux;
+  };
+})
--- a/pkgs/by-name/ru/rustdesk/Cargo.lock
+++ b/pkgs/by-name/ru/rustdesk/Cargo.lock
--- a/pkgs/by-name/ru/rustdesk/package.nix
+++ b/pkgs/by-name/ru/rustdesk/package.nix
@ -37,26 +37,26 @@

 rustPlatform.buildRustPackage rec {
  pname = "rustdesk";
-  version = "1.3.0";
+  version = "1.3.1";

  src = fetchFromGitHub {
    owner = "rustdesk";
    repo = "rustdesk";
    rev = version;
-    hash = "sha256-pDGURsF0eft2BkuXOzaMtNCHp9VFgZZh4bbNRa5NDII=";
+    hash = "sha256-PioaSdvgJ9oXC5DAbl+em7rxcGx1om9+sjCMdrvox90=";
  };

  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
      "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4=";
-      "arboard-3.4.0" = "sha256-lZIG5z115ExR6DcUut1rk9MrYFzSyCYH9kNGIikOPJM=";
+      "arboard-3.4.0" = "sha256-xuMfMakHVj/zjiUr6PVFy+aNQxwsXtAAFlTYxUt12fU=";
      "cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM=";
      "clipboard-master-4.0.0-beta.6" = "sha256-GZyzGMQOZ0iwGNZa/ZzFp8gU2tQVWZBpAbim8yb6yZA=";
      "confy-0.4.0-2" = "sha256-V7BCKISrkJIxWC3WT5+B5Vav86YTQvdO9TO6A++47FU=";
      "core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g=";
      "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0=";
-      "hwcodec-0.7.0" = "sha256-pfzcaD7h/U5ou+P7qRLR56iXOkm043rF74y+Q0FsVLo=";
+      "hwcodec-0.7.0" = "sha256-SswZI2BJ4pRXT379cziJlisPsc5sOiOiDqJ5WaPETnA=";
      "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI=";
      "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4=";
      "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE=";
@ -64,15 +64,15 @@ rustPlatform.buildRustPackage rec {
      "pam-0.7.0" = "sha256-o47tVoFlW9RiL7O8Lvuwz7rMYQHO+5TG27XxkAdHEOE=";
      "pam-sys-1.0.0-alpha4" = "sha256-5HIErVWnanLo5054NgU+DEKC2wwyiJ8AHvbx0BGbyWo=";
      "parity-tokio-ipc-0.7.3-4" = "sha256-PKw2Twd2ap+tRrQxqg8T1FvpoeKn0hvBqn1Z44F1LcY=";
-      "rdev-0.5.0-2" = "sha256-KrzNa4sKyuVw3EV/Ec9VBNRyJy7QFR2Gu4c2WkltwUw=";
+      "rdev-0.5.0-2" = "sha256-G+PvnA5mZyN080uoI5CGj/dQ9B1J4h5iYd7214MKBR8=";
      "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc=";
      "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM=";
      "sciter-rs-0.5.57" = "sha256-5Nd9npdx8yQJEczHv7WmSmrE1lBfvp5z7BubTbYBg3E=";
      "sysinfo-0.29.10" = "sha256-/UsFAvlWs/F7X1xT+97Fx+pnpCguoPHU3hTynqYMEs4=";
      "tao-0.25.0" = "sha256-kLmx1z9Ybn/hDt2OcszEjtZytQIE+NKTIn9zNr9oEQk=";
-      "tfc-0.7.0" = "sha256-VAoOadgGajWjW7q1RCwmQ5gMmaA1oeZBSiL1tYSuIEI=";
+      "tfc-0.7.0" = "sha256-4plK8ttbHsBPat3/rS+4RhGzirq2Ked2wrU8cQEU1zo=";
      "tokio-socks-0.5.2-1" = "sha256-i1dfNatqN4dinMcyAdLhj9hJWVsT10OWpCXsxl7pifI=";
-      "tray-icon-0.15.1" = "sha256-DvTVAsE3dB+o89SFk3RPRt5JzaWjPl4nlvC77zsVN/s=";
+      "tray-icon-0.14.3" = "sha256-dSX7LucZaLplRrh6zLwmFzyZN4ZtwIXzAEdZzlu3gQg=";
      "wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q=";
      "webm-1.1.0" = "sha256-p4BMej7yvb8c/dJynRWZmwo2hxAAY96Qx6Qx2DbT8hE=";
      "x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc=";
@ -83,7 +83,7 @@ rustPlatform.buildRustPackage rec {
  postPatch = ''
    # Overwrite cargo.lock because the one in the upstream repo has duplicates entries.
    # It should probably be removed in the next rustdesk update (if they fix their cargoLock)
-    ln -fs ${./Cargo.lock} Cargo.lock
+    cp ${./Cargo.lock} Cargo.lock
  '';

  desktopItems = [
@ -189,5 +189,6 @@ rustPlatform.buildRustPackage rec {
      leixb
    ];
    mainProgram = "rustdesk";
+    badPlatforms = lib.platforms.darwin;
  };
 }
--- a/pkgs/by-name/sc/scite/package.nix
+++ b/pkgs/by-name/sc/scite/package.nix
@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  wrapGAppsHook3,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "scite";
+  version = "5.5.3";
+
+  src = fetchurl {
+    url = "https://www.scintilla.org/scite${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.tgz";
+    hash = "sha256-MtXy8a4MzdJP8Rf6otc+Zu+KfYSJnmmXfBS8RVBBbOY=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    wrapGAppsHook3
+  ];
+
+  sourceRoot = "scite/gtk";
+
+  makeFlags = [
+    "GTK3=1"
+    "prefix=${placeholder "out"}"
+  ];
+
+  CXXFLAGS = [
+    # GCC 13: error: 'intptr_t' does not name a type
+    "-include cstdint"
+    "-include system_error"
+  ];
+
+  preBuild = ''
+    pushd ../../scintilla/gtk
+    make ''${makeFlags[@]}
+    popd
+
+    pushd ../../lexilla/src
+    make ''${makeFlags[@]}
+    popd
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = "https://www.scintilla.org/SciTE.html";
+    description = "SCIntilla based Text Editor";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      rszibele
+      aleksana
+    ];
+    mainProgram = "SciTE";
+  };
+})
--- a/pkgs/by-name/sc/screentest/package.nix
+++ b/pkgs/by-name/sc/screentest/package.nix
@ -1,43 +1,40 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoreconfHook
-, intltool
-, pkg-config
-, gtk2
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook3,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "screentest";
-  version = "unstable-2021-05-10";
+  version = "3.0";

  src = fetchFromGitHub {
    owner = "TobiX";
    repo = "screentest";
-    rev = "780e6cbbbbd6ba93e246e7747fe593b40c4e2747";
-    hash = "sha256-TJ47c77vQ/aRBJ2uEiFLuAR4dd4CMEo+iAAx0HCFbmA=";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-dbag1EAD+6+srfu/eqSl3CWlZtSopioQjyBQRJcUggA=";
  };

  strictDeps = true;

  nativeBuildInputs = [
-    autoreconfHook
-    intltool
+    meson
+    ninja
    pkg-config
-    gtk2 # for autoconf macros
+    wrapGAppsHook3
  ];

-  buildInputs = [
-    gtk2
-  ];
-
-  meta = with lib; {
+  meta = {
    description = "Simple screen testing tool";
    mainProgram = "screentest";
    homepage = "https://github.com/TobiX/screentest";
-    changelog = "https://github.com/TobiX/screentest/blob/${finalAttrs.src.rev}/NEWS";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ evils ];
-    platforms = platforms.unix;
+    changelog = "https://github.com/TobiX/screentest/blob/${finalAttrs.version}/NEWS";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ evils ];
+    platforms = lib.platforms.unix;
  };
 })
--- a/pkgs/by-name/se/sendme/package.nix
+++ b/pkgs/by-name/se/sendme/package.nix
@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "sendme";
-  version = "0.17.0";
+  version = "0.18.0";

  src = fetchFromGitHub {
    owner = "n0-computer";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-YnabQ8YHDsFYu5RX3E2NvPARsl+qn4688q9KxZ5Fegc=";
+    hash = "sha256-gPuzwJtQdQDFVuWYoH/TGSf+Fp++UvK9D7mL41p9eOk=";
  };

-  cargoHash = "sha256-yD40QKceLjtq80K6I98bT27sCAkCnkRkfE3m4eGjueU=";
+  cargoHash = "sha256-ML+USTwdMLyLcc3Fzu/eD7J7s7Sa1lEOZm/txjZv31E=";

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
    with darwin.apple_sdk.frameworks; [
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@ -5,7 +5,7 @@
  fetchFromGitHub,
  alsa-utils,
  copyDesktopItems,
-  electron_30,
+  electron_32,
  makeDesktopItem,
  makeWrapper,
  nix-update-script,
@ -15,16 +15,16 @@

 buildNpmPackage rec {
  pname = "teams-for-linux";
-  version = "1.11.0";
+  version = "1.11.2";

  src = fetchFromGitHub {
    owner = "IsmaelMartinez";
    repo = "teams-for-linux";
    rev = "refs/tags/v${version}";
-    hash = "sha256-UNe4stYEOTcQc+ap1/v9EXjHTwKvLYd4t8EPuojDyqw=";
+    hash = "sha256-fSZ94Px0NuxUZqc9cHE6czG/VzNsWp+UXllq7kEQvtI=";
  };

-  npmDepsHash = "sha256-OpoPXcSiHnK4UYFimY+yOM6M3dAOcvZ82DdGc++oNLM=";
+  npmDepsHash = "sha256-MfPdOqxiMDsvxsS3yWukRokDitqWQpTpK407xVX461o=";

  nativeBuildInputs = [
    makeWrapper
@ -42,7 +42,7 @@ buildNpmPackage rec {
  buildPhase = ''
    runHook preBuild

-    cp -r ${electron_30.dist} electron-dist
+    cp -r ${electron_32.dist} electron-dist
    chmod -R u+w electron-dist

    npm exec electron-builder -- \
@ -50,7 +50,7 @@ buildNpmPackage rec {
        -c.npmRebuild=true \
        -c.asarUnpack="**/*.node" \
        -c.electronDist=electron-dist \
-        -c.electronVersion=${electron_30.version}
+        -c.electronVersion=${electron_32.version}

    runHook postBuild
  '';
@ -72,7 +72,7 @@ buildNpmPackage rec {
      popd

      # Linux needs 'aplay' for notification sounds
-      makeWrapper '${lib.getExe electron_30}' "$out/bin/teams-for-linux" \
+      makeWrapper '${lib.getExe electron_32}' "$out/bin/teams-for-linux" \
        --prefix PATH : ${
          lib.makeBinPath [
            alsa-utils
@ -109,6 +109,8 @@ buildNpmPackage rec {

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

+  versionCheckProgramArg = [ "--version" ];
+
  meta = {
    description = "Unofficial Microsoft Teams client for Linux";
    mainProgram = "teams-for-linux";
--- a/pkgs/by-name/up/uplosi/package.nix
+++ b/pkgs/by-name/up/uplosi/package.nix
@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "uplosi";
-  version = "0.3.0";
+  version = "0.3.1";

  src = fetchFromGitHub {
    owner = "edgelesssys";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-AtsFZ92WkVkH8fd0Xa0D6/PR84/dtOH6gpM4mtn32Hk=";
+    hash = "sha256-MsZ4Bl8sW1dZUB9cYPsaLtc8P8RRx4hafSbNB4vXqi4=";
  };

  vendorHash = "sha256-o7PPgW3JL47G6Na5n9h3RasRMfU25FD1U/wCMaydRmc=";
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "${name}-bin";
-  version = "31.7.1";
+  version = "31.9.1";

  src = fetchurl {
    url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
--- a/pkgs/data/fonts/iosevka/variants.nix
+++ b/pkgs/data/fonts/iosevka/variants.nix
@ -1,93 +1,93 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  Iosevka = "0xpzsmvcvcf6c57bllg1yxylrvlm31gjpn9ilr7qz8bl7jz3z9rm";
-  IosevkaAile = "0ar4wmsjdqh9a52k4vn9krpz7ii3bddnprqjyvpi9f1ybpxj74q1";
-  IosevkaCurly = "1q9wqrhyk3636gy2yrkdc9l8wqiza3n5d6slx9h7529x8c6r64gb";
-  IosevkaCurlySlab = "03an8nyg1xkv9l1fndk7agwkbg3s1kvwj342h3zj1klwi9bjz28b";
-  IosevkaEtoile = "0qi8v8vzqifyxzzwqdx5kyvx11f1x8vgrk9104cb75xmslfa1wrg";
-  IosevkaSlab = "0kmz8qywds7jr3wiy02p2c3r2y1bs0ibj7w6wa0kkkm82kk5v4b1";
-  IosevkaSS01 = "091i0x9l589iq4f4mnkw26417vck6vhwnf2d68slv7xsss4jqpyw";
-  IosevkaSS02 = "0dlsnglcbqpnpycqxq2aqgn80q6lrj50vrmgr71n051ix5mx5czl";
-  IosevkaSS03 = "1y1l0rhbn55dd2scaffvk2fa6gap8rh4wb2lvi5a93z278ajcc7q";
-  IosevkaSS04 = "01wgjwk77nb7f55zkdb6k897cv5rkx2q3va4r9rhj3z6aragp59c";
-  IosevkaSS05 = "1w9wbwwzqf9812kd4q0g3z93f4qy6jn418m79d8s9bh132nm9jl4";
-  IosevkaSS06 = "0s1cl8i7nv7yxynspix5mkl0db1vrlik5yiqs47ih8a82rm6zgmj";
-  IosevkaSS07 = "0rssrgkfzr2pnycnjx2ny88sgcw4haqh5mmbyjnqm412602v57l1";
-  IosevkaSS08 = "11yhnwymkr8m4si9ph2knk44rk7r87sjab0g2w8lhiamlcrps49a";
-  IosevkaSS09 = "1mfv68s88zxvjcg90ha7cdhwhhlqv77b4iz7z991gmd34dd2n22l";
-  IosevkaSS10 = "14j5mn7ry45f6vyzrq6v1qcssdz7s99d2hmpn3hh4gyn18hzadix";
-  IosevkaSS11 = "0q3ksgh8y9mldr85k6l9q3p86yr13mcdvbwrrr2jy17kqjfms6yz";
-  IosevkaSS12 = "1lh1vfv4q1ghdnxnk45hdqpp3pp7wr6pcv2b8k2rpjpv0w8wkz7b";
-  IosevkaSS13 = "1vpkv053skbib9jgp75002gsisc2fpakwilh97sxnfyz47vqf6vk";
-  IosevkaSS14 = "1q73a2wkdzd51s2bpjysh6k5scsqj089vphj68i1r3xzig5zg73d";
-  IosevkaSS15 = "08qj500y20l4jzjd8qbdsifavi7hw1l136d2iqal2m18hy7kbvf3";
-  IosevkaSS16 = "1ifmk9j4az7g3rlxdswxc2cz1hbn2nxmrh3ysi9gsjzppfayi4wn";
-  IosevkaSS17 = "02abk8imd7kz1m4mq7c1sv13pm6d98l53qrh0291f3z5gpq6mdmw";
-  IosevkaSS18 = "0ia83ijbq9bishj6gwij7sszp75bqwz1h30bxkavlxk5gfb770q1";
-  SGr-Iosevka = "1n6v930a42wbx6bb1cyh6wvy2m885w60hlan9kgps682f8108h57";
-  SGr-IosevkaCurly = "19r0swn7wz0h5m2f4vf2sk1lrdvrnv4nlr0hikb3mh6fylglwffv";
-  SGr-IosevkaCurlySlab = "1xygrs9x8j9lm2n400i8m0i5vgwiq75vq4hm3712hkx2dx1kjycf";
-  SGr-IosevkaFixed = "0nl380k30l4gn327kp51vwzlqh9j39w6frhmrxbmdcblnz1sc5md";
-  SGr-IosevkaFixedCurly = "05aagifx30xzb9rmylx8k4jvpr8wgzi2dmc2ili40yk06jw97py1";
-  SGr-IosevkaFixedCurlySlab = "1blad2s6kzz64c5fri50fqwivy8qxzkfxjg73wqyjzhmwbf5am1d";
-  SGr-IosevkaFixedSlab = "1f0zqrd193w0lpzbl24ldr7wbbag3v6ahkch5jzad2f931fi62vl";
-  SGr-IosevkaFixedSS01 = "1nyvwab562a0c5f1gjqw4wwq3lkizz1zi0bpg3dbfk72kzwlx31n";
-  SGr-IosevkaFixedSS02 = "1k2lkf5cxxbp2rimv97c6bqq2fqkz4iwhvqh2bp3jw4jsxrqragc";
-  SGr-IosevkaFixedSS03 = "0c679d897k6jdwwsrmj57v6q08ns6brrn6pp53m1fs4v8vsy7gq8";
-  SGr-IosevkaFixedSS04 = "1zcv64yivzflr106vi9a0nzxl93d68d2pp07dlfc7acd86ps90j1";
-  SGr-IosevkaFixedSS05 = "1g45312ly0zr1hsgdv1nhj2slrign6lddnxxalnbpi065qcgxzdb";
-  SGr-IosevkaFixedSS06 = "0ahpvw9z573xd437m0vdyh7bh68z7frisjrm4r02a2nd0bc8rfva";
-  SGr-IosevkaFixedSS07 = "06a5gfzf2a8ci8qvxfr8m0pj4avg5fggfdfs51lwn5n1rjqv3jms";
-  SGr-IosevkaFixedSS08 = "00x0rz0j6l5lnb1bnly3dswazgxpdx5gd3ggihxcwvkjfarbs12y";
-  SGr-IosevkaFixedSS09 = "089qlqa9hrfq1dwdnj29kr3r60n95gsnqqcgx1y87nw8xxaj1l8c";
-  SGr-IosevkaFixedSS10 = "1g1xic30x6sb5jkg9ws1ymk1530402m60v6bsl9l164hj5wbfsjh";
-  SGr-IosevkaFixedSS11 = "0rpbr95k2xzg7gilljhrx2jhwxaqg6v7hfxj3mrjid5jjphrw43v";
-  SGr-IosevkaFixedSS12 = "1iz5apwf4700r63gicqcbic77f0dp1fhnqaxigrmhsyxwff8b31m";
-  SGr-IosevkaFixedSS13 = "1igwj2ikfamrdd6nbmdy72sdrk7k2v1j32yny9bl5wx13dw7575b";
-  SGr-IosevkaFixedSS14 = "00032jy2vls5f0frpnpbiiw8i2v1qj84hy1wcksgy4j357vw4lpf";
-  SGr-IosevkaFixedSS15 = "1kpgkvq022gb3j33kr9b97ays0wvc5wl23n9cvq9ij8j3wbs4z3k";
-  SGr-IosevkaFixedSS16 = "0bnc7y6ma9mi5xwy7csn9h75ahv3g8ggkfhr02qn34qm2dbmif1n";
-  SGr-IosevkaFixedSS17 = "1d62jfwrpvh735jlvk812ymmly2qhkpn38s0gh48m28whgwvrhcw";
-  SGr-IosevkaFixedSS18 = "18954hkad2b8pbp9f33f7ml4rzgkxl2hnjdc69zhav76lxd6369x";
-  SGr-IosevkaSlab = "0lvx0ghvy17b6jzpc88kj0p1symf4vqahlc6wa2w4jsb2csc9d2l";
-  SGr-IosevkaSS01 = "1b54d5g50k8hl3hnhmng4amayh5wmbvvkzq48mld6zwlfr1fadkd";
-  SGr-IosevkaSS02 = "0bg9y4fr812ax34kmdz727ib67dghpbsim7a57isc897x0igcbnj";
-  SGr-IosevkaSS03 = "01rsg0f8nxzl7i0w0sfp0sdrd1ab7p4qdadan486jaarxbjd6kx7";
-  SGr-IosevkaSS04 = "1l36xjs0pm83i1azx0s2y541x6b83b1dw9ghf5ajgll29sz0gnlx";
-  SGr-IosevkaSS05 = "0fj2jd65yhbxs9f2sadzpdm05d5api9ffqjx8a9hdc291ykl3sw6";
-  SGr-IosevkaSS06 = "105g5p9rvr8cfiqf4wbjsly8616jm49bx088ddgj4jyli1msjh8k";
-  SGr-IosevkaSS07 = "0lci5wa9q8bk57d0c99r86nhxh17qw4s0mh8yismnb0hqcknhfly";
-  SGr-IosevkaSS08 = "1v56yda5w45mi9hmbdswqa4dmscf728a2bj0lf3ai9zcprfnc8d3";
-  SGr-IosevkaSS09 = "0bgn9q6r1a3799nawhgzws9rm7mzibiz4ya2x4qkmawzzi1rdgjs";
-  SGr-IosevkaSS10 = "19nqp295cdq7k1zlh8nd42wa3m11ql7112v746vvwq5bpr79dn8c";
-  SGr-IosevkaSS11 = "0jr9j8c51fh3dp8mqiimr4lhnvznpn2q3swz2zyc8jlmbyga02ad";
-  SGr-IosevkaSS12 = "176mby5agqa7fll9wq16dws98nn7igfx72fni1f509hq5k7xygsp";
-  SGr-IosevkaSS13 = "0a53868nnwgql2sf909ybpdibjii8w89bp0kc8xymx7v9i2m4iyf";
-  SGr-IosevkaSS14 = "11m4v27sf6qif6069nm71dfnksp7bldkvlx9bbvyn0y6lg9n1pfl";
-  SGr-IosevkaSS15 = "00wr61nlf091gkwh5kdx8wp75y0vi2dlra91m89b4w6592vwffk4";
-  SGr-IosevkaSS16 = "0b1fqrcx65ajanc433gyscw15ra230z8gs5kh0ahhkwqwz1al0lq";
-  SGr-IosevkaSS17 = "1xsvga76x8p87ws386gmz28nghw3ybr1rck722a5wzzlz5z51p3m";
-  SGr-IosevkaSS18 = "0w97ayi3jsb3313bw9dr9xb1l5lx6d26rc5yw0y9c9ph180f9afy";
-  SGr-IosevkaTerm = "0b5y4gg149271gmf255hr8lp1n2qxafp5k1gi7h7rpnnndaimj1g";
-  SGr-IosevkaTermCurly = "1izpf2sb0zv2kfqm1zb1ambicydqbis202n36rxn3b3sfa41hnwy";
-  SGr-IosevkaTermCurlySlab = "03dbzgp0g0767aym5rshbjvzbhff8gpg90zl9sqrrfgmwav9yqd6";
-  SGr-IosevkaTermSlab = "1amaimpr84q36gf2ma31d5ss57g84d8rw4bzg7058kd801yc1y53";
-  SGr-IosevkaTermSS01 = "1pj4bb7q9bjwnss2353ldw599f8sns28vc8h8n33sq9xqrna9fbd";
-  SGr-IosevkaTermSS02 = "1rgwyhzzpllprs2rmkrsc8xknsc4gzi3h0cv96qnx9jvd9ixyq67";
-  SGr-IosevkaTermSS03 = "1c682qaj6bzyrwq4yc9bxn8y6yza9hn0c3hpj5g62akwk50dvkg9";
-  SGr-IosevkaTermSS04 = "02rgpbb2wn3aibkkpfi2sxy751bwmf7azkv44xdalhyb6hz7vfgv";
-  SGr-IosevkaTermSS05 = "187kwn9g81rpq71w58hdi27ngl1zby550xx85a2dz00w7j1l1qy3";
-  SGr-IosevkaTermSS06 = "13k91ha10yymh5wcnf45sh1d51rgnlrzdg9bdh4r86122mq2pvl9";
-  SGr-IosevkaTermSS07 = "16mq7mbcrqvpmwl6zgbs8r4w5b1r0m01i6iiwv20x74ay9pkglmv";
-  SGr-IosevkaTermSS08 = "0npiqvw4ai9mq9ix0hfrq86h3y828g284nw2q4dgqpcpvhm8kxq5";
-  SGr-IosevkaTermSS09 = "105p6x8chm9lsapb6ccpvhbrhaackdscjqi5j04hadkf4kxp7cn4";
-  SGr-IosevkaTermSS10 = "023bgny097p8n58npf7f3y7shxgyfgqh5yy67lc64gwi3bw8lwb6";
-  SGr-IosevkaTermSS11 = "1lkkkcqpgcfs3j3vdr3nryaxhycgz67d58zd54mpkxj3hicag1i9";
-  SGr-IosevkaTermSS12 = "18d53273x83sq7nm6mi810y74i57nlz46vxxybdjbfp3i74rl14q";
-  SGr-IosevkaTermSS13 = "1vi5i12l7pp2ishk8wdn2rpbxhmmvjqla6zcn5grq9i3ki92hbaf";
-  SGr-IosevkaTermSS14 = "0p5pzcmhg4wbmr8kp2ydhrprnw7ll9wvvsni05347s3vg7scd7al";
-  SGr-IosevkaTermSS15 = "11grinpbmd0qpkqs31qg20bdd1y35570ja8ifx8pfh0j91x97q1f";
-  SGr-IosevkaTermSS16 = "1mbqzfaxqi1l406wjjnz34nhlsgxj4jsayybdwv12nv7v8fbyalj";
-  SGr-IosevkaTermSS17 = "138jbkicfrqgqg04am8fwvjr5zmjxx22ik1ss4iivgl0grr07ysf";
-  SGr-IosevkaTermSS18 = "0glfd94lv7pl52apfxks0ic6w66347c4hxm57phylfmmvd163zd0";
+  Iosevka = "1nma01k7v4dhq0w84l5qdxakl6ajhf76g54lm5xb0yggarl9fn3y";
+  IosevkaAile = "0lqcwmal97ddfzvi6zdrcxygmi0rszmrmlqpc49fn01yl0gkb4p1";
+  IosevkaCurly = "0xncws9cgjjhz120nvkxikc7kqj1vqqwghb1sx7kcfjqh5rkngna";
+  IosevkaCurlySlab = "1srfhrr44wp208xw0z4z16jsmh4saaszglgpsxyyhgkdmdzpn0w4";
+  IosevkaEtoile = "1aw89ig62wfm80655ib07xwpn17skvqwd4rpwq7xk6ryz6jnlgrr";
+  IosevkaSlab = "1dj2blr87jn3cxb2y2mybk359bvgj7kni34adha722mp039z8di8";
+  IosevkaSS01 = "18y79gghmkhi26kzv9r28z0wgcc9ybca7jdqwlc5wb0vky5w9wq4";
+  IosevkaSS02 = "1lxggf53dmxcsj333ibp3lm6cpzlwldf4irkm5kimxw0z8gph8xq";
+  IosevkaSS03 = "0ywfxjdhssdlddgpr48crff3pkpp5rm0kshmkib2gmy5xgyhf7dr";
+  IosevkaSS04 = "13970rb1kasn65rjw318zga6q677wj9bx0p7bp6cy31dmg0v6mp7";
+  IosevkaSS05 = "0ckfw0kajrmw6nxyjivdkizxbf9fxjdlwczs2lxn2vjbapy4c7kf";
+  IosevkaSS06 = "1rx065pwwaf99riz4b8104y1kgsn69bqf03832wicr5809knvsnj";
+  IosevkaSS07 = "074nyqi46rls2nxfczq4m48xkx777dnw96zrhy6m01lly07xhpny";
+  IosevkaSS08 = "04vapfj8jx6c9799z4fqcabm7y7xbcbnm8x1bamimchbk23xwy1d";
+  IosevkaSS09 = "1n56r4c1glwssv4jwgls88x6wnxv9j6k8myzf2fwy4cci5s2d5as";
+  IosevkaSS10 = "0ndambz7fz38s7x99lxqjjgkykwrml7wpf2svb9vw2wnyiiwzn69";
+  IosevkaSS11 = "1fm5aihz9dvvp5viir1b9wb80zhaxfl3w9w5siniprq46y31cmys";
+  IosevkaSS12 = "1fjd73xxdch5rfw2k2330np994pcv2xrzf1l12b585maj3l926p2";
+  IosevkaSS13 = "03kyf09gpn5rp0l71gh1680nlh0cc7jlak0kzplv2bfg1wwkh5x8";
+  IosevkaSS14 = "0jhyjcq1x28fdbnqij71z8cd3ww7pj0bih4wbs7jmj87xvxn94zm";
+  IosevkaSS15 = "16im03mgs6c8nmaxs1p986mzsk78fhxyqcla75hajbj6i5j6j5iz";
+  IosevkaSS16 = "1jfcyb0dkwb9dxby4kap1vc5kfzap2fxgjgan5437pxrjlkmmnkd";
+  IosevkaSS17 = "11hdwspxlh9wa3jcph9zgcgm8r5w7jrazv1bny3n7d9ikw7i7jh6";
+  IosevkaSS18 = "0g6qq8q5hnsv55kkdv3hsdvs6n5plpkyawlhdrm76qlrg7iw1ii3";
+  SGr-Iosevka = "1f628x5pchva8c10b5w8x5cl89p28p3ir6c0m5l524kq6b4qxspf";
+  SGr-IosevkaCurly = "09hv8pbikmmx17gmb32mbjpak9818qqvknln88ssdra2b7sh88a9";
+  SGr-IosevkaCurlySlab = "11kxz7lzm38lg725ws7yh87zh5jnwqw4938l8bxw1pjxj4jyhbi7";
+  SGr-IosevkaFixed = "08kd556v0wbsdcz1i83bzv29wsklw0h1jiridh1kjdwn73xdnaj2";
+  SGr-IosevkaFixedCurly = "1r6iyxmnr84p44f1jbj8x2w8ki9fxflmv15zvhv3ikbfar9ypp86";
+  SGr-IosevkaFixedCurlySlab = "016qfwdv5173c7b11h9df8dz9xywfzcds2sd869bsp5i5g6im76j";
+  SGr-IosevkaFixedSlab = "1zwg86v81wwvrgvc4hy96s6rj5i4p67i4waj5c120in7hghlc6rm";
+  SGr-IosevkaFixedSS01 = "0ihn36hfrsqbv3r365wy5z5wf5j464683vhdi5nk8vyq5b7x1hps";
+  SGr-IosevkaFixedSS02 = "14z624mshjdgxm77h5c1xg44qnwjn9m6bx9ymzia7hxwpl3xsbf9";
+  SGr-IosevkaFixedSS03 = "0nbvfqsfcsj26scd5ia2rvnj6qh8pg9wv8q9avidc5f6dsq4sy5z";
+  SGr-IosevkaFixedSS04 = "073x2v0cghn3fp6ycfk16wn4vbqrgqwc4h2ky9gx3ndpf6fy5znh";
+  SGr-IosevkaFixedSS05 = "0jnzf55jjx04zb33zasxyjshk4zbabnfcdb0pr5q400wj9qnnv6s";
+  SGr-IosevkaFixedSS06 = "19gdzg4phs5cc0gj3zrhh9113infq8amwcizfq1mhsb7z1fqg48f";
+  SGr-IosevkaFixedSS07 = "1rv2w9h5fwwdk6zq6ra9pmh4f7pdq87ydcwp11hhcjlk0iln1602";
+  SGr-IosevkaFixedSS08 = "0lqm6c5b9y2crq694g00ryrq5j197yhlqvqk7ss494xv3vscrmsa";
+  SGr-IosevkaFixedSS09 = "0v0w5vwgl3x84sqmw6wjam6inygchx1z9ax6km8hxlwjx4by9m32";
+  SGr-IosevkaFixedSS10 = "0mfh0wr9ixgjp32i9hbhp0x8v3afwgplprivwl7qbgn18arr1ff8";
+  SGr-IosevkaFixedSS11 = "03d4vwr9d4dw9dk9s0x3jsb9bahy69rz3lqq8zwyny1ipkdbynx6";
+  SGr-IosevkaFixedSS12 = "0pvr9m1jdn2m0w1gx9rvyhphg1bd7s3jjibj3nbb8qmsx32rw347";
+  SGr-IosevkaFixedSS13 = "1jvy36qqghjnv3grry6cpwhqsj0x0cdi2izqqin0pfa304r56pc6";
+  SGr-IosevkaFixedSS14 = "1l0cb9my5xg5f13kyp3v9fs65wj66rx5asirqv339qbhw0hg5sp3";
+  SGr-IosevkaFixedSS15 = "0b590zg0mrcv4rf51rcnah654rsicvw0j6v2dqgjvm7x62pkiks5";
+  SGr-IosevkaFixedSS16 = "0ij7xv0d1d1s8g7qcchrhbv088zcvr2ircm8dqg7pkwwla31342y";
+  SGr-IosevkaFixedSS17 = "1rnvxq37lvwf0y3fd7cq9qk78gh3vbw380a7a82r0qqypynid47m";
+  SGr-IosevkaFixedSS18 = "0g24q74z7vrbl21ljmibf9ay4mz5m568fs6nagli4fd5q6nag6p3";
+  SGr-IosevkaSlab = "0fzcs3xg36fd6kbq3gzrirc6qw9jakq4gkc480kxa8hvmcyqn30a";
+  SGr-IosevkaSS01 = "1w9nmgqcwa8zhmwprbw9wsd9y0q0g8v1nrg54b8hcnhfqj0hqqxg";
+  SGr-IosevkaSS02 = "1g30im488cql8nzkqmirpz0sa0w67s2qfjyiz5fcpsdim6dg90vx";
+  SGr-IosevkaSS03 = "00yfkypnvgkpvsghwvn19nyjcirk8rpjhly9y1bkmvlz0x6ljhyq";
+  SGr-IosevkaSS04 = "0wx2zcq2wrar4bxvv0asqhmh1yvaf0nknpk78bvdrawprylcwmam";
+  SGr-IosevkaSS05 = "0p1xibl1aklyyxdfkhp8rb6c49b7832h8k89yqw17y1yw0n8pfl4";
+  SGr-IosevkaSS06 = "05zry2qy3q7jkhpj233j2wpc66rr4dm02xly7wsn9vhalx178jgk";
+  SGr-IosevkaSS07 = "0an7sp8dh4x8vnnvgvp49iskryh5z4npmn47vi3jxl6vpl70flx0";
+  SGr-IosevkaSS08 = "198pywx83ciwfvhcgy7r7zw0hmm1xh4ccjq6h7spg8ca7x87sc0c";
+  SGr-IosevkaSS09 = "1vpqzmkyjn1k0rlpq7q2yky3a3l0yczlsvvi8pvfhgpcxsrmvgsr";
+  SGr-IosevkaSS10 = "0p75b9w9ljjcz16p4dv5phyhwdhxgb6kkpdpn1xpibbxifrcp400";
+  SGr-IosevkaSS11 = "0hdwkn69g4h93l64b5dn6kmqlnrm8pnl5721k25vjac631yzjpig";
+  SGr-IosevkaSS12 = "0rlr2wh9h650ax4ngf37ch3l90f641fxq81h31qbcxi1798sd5ds";
+  SGr-IosevkaSS13 = "1qf69czsqd52580xwqpr4wvx88wi8csf1cxyjwv6h44gzfx5ka89";
+  SGr-IosevkaSS14 = "1jyml7xkbsdi22q3c0l6527q1ii97qyfj3h2dwxcly2v0jx22l0n";
+  SGr-IosevkaSS15 = "0yssy3vrmgfqachms20b6gl52lkk0drxrvwnyizc9lc96fx1x4a3";
+  SGr-IosevkaSS16 = "1hll0l63d300047jwh7m81djqf7mgg0gdv1gw7dynl8rpp8iqwxw";
+  SGr-IosevkaSS17 = "1rf3m48h396ql9m6i8c3gnxy0q7a9l8xk3xrwcnf2pidghgnwj5f";
+  SGr-IosevkaSS18 = "15cp4y4221vggd3q6202z1r46fkdrn81j33bskwaq3vqn4ykrpvx";
+  SGr-IosevkaTerm = "18kscgr1398zdzqdy7m693lw8gh9r3wrzw9gg62ksdbcbwn16im4";
+  SGr-IosevkaTermCurly = "1v8y7km35hmkm8fx08szjwkxpykyd88nfvwi15jiajc4gbsl3hvy";
+  SGr-IosevkaTermCurlySlab = "026bg6q5v8n4wfaw0mbrscylxqwfs5m727dvv734km110p5dvx1j";
+  SGr-IosevkaTermSlab = "034chas42avxrkw2s5x08bwydarazk9h50blv3vraj66qzw2vngx";
+  SGr-IosevkaTermSS01 = "17va6zc2wjn2nm7ixdv11mjmxcnkr5yca8af6prnfdkdmdaxp1zd";
+  SGr-IosevkaTermSS02 = "1mvisnjn3gj2zs6g5n856mkixyhc6bspv9zcknb51am2s9n8mv5b";
+  SGr-IosevkaTermSS03 = "00pigslzg8fwdg51qs8096w14b8dgycgsm3j4ab6xpp5hshvna5a";
+  SGr-IosevkaTermSS04 = "01jjg7hjz0y8nc8cijlfc8zp1b49hby0ihwv1yk7skhs9gvr99rp";
+  SGr-IosevkaTermSS05 = "07ykxm73445a7i8693zdsp5d1rjmccq7bysj90y73lky5f1w1bc4";
+  SGr-IosevkaTermSS06 = "17rdmamd4p469kw7nwxcdaih8ps7n0jrlwkni4n4vfib28pcym9r";
+  SGr-IosevkaTermSS07 = "0vgh7g9xyl52gb63hw09mszmkya7afvizhddni6mff7f5xdzy1mh";
+  SGr-IosevkaTermSS08 = "0s524hhg64jfwbgifariasv4cd425alscspkc2d02d0gf4d4czbb";
+  SGr-IosevkaTermSS09 = "15w06z0mkph0cpkw5xyzn53dpmc11p7c2nya35m72harwdvpawsv";
+  SGr-IosevkaTermSS10 = "0b4z99b2mqa11avkiyamy9kzchp1x09lyhglc9d10qm94phi75iw";
+  SGr-IosevkaTermSS11 = "1xnnmpx01i2diz9qvmfb0gc0injdqk9n41c0ci93lpvk3rxjvcs7";
+  SGr-IosevkaTermSS12 = "1kbfbdjcnaxh3s6q5b3pwy8bknvz0av5s0h4hvq6qnrvvrdrdr4f";
+  SGr-IosevkaTermSS13 = "1rnxy0zbl8pc4ph2zpjcc101vbb2ss2pvxx4h32gvkx5j0sk1cfl";
+  SGr-IosevkaTermSS14 = "0k1v9jl52j37fq86p3gwpf31qa1a6alj18hi2bbv5ybzya7m8pp8";
+  SGr-IosevkaTermSS15 = "1c6mw04h1zgjdnzlim553za899gc07gnhianw499dv3yi87p012q";
+  SGr-IosevkaTermSS16 = "0aggw8hn5g3cvlxcdsyjcxq1ygrmrjq2xjsvwkmvdsfpfhsp1zsa";
+  SGr-IosevkaTermSS17 = "191jy9j3bm7xnp7w9mq5kllf96vwhzvyq1nfcdd0ly773a3bjg4a";
+  SGr-IosevkaTermSS18 = "10dbr3r4jxb9jq82hxhwqsxd8hrhjw626hv6i6g368g73x68sxk2";
 }
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix
@ -20,13 +20,13 @@

 stdenv.mkDerivation rec {
  pname = "wingpanel-indicator-power";
-  version = "8.0.0";
+  version = "8.0.1";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = pname;
    rev = version;
-    sha256 = "sha256-RelK4HIyTQ6kXi7/K8U33sKIrDrhA3IFVnnvX4x88UQ=";
+    sha256 = "sha256-zMvw96uRr9hrgXck+OhMiPku9qu8/zUtusiaJLUcuys=";
  };

  patches = [
--- a/pkgs/development/compilers/open-watcom/v2.nix
+++ b/pkgs/development/compilers/open-watcom/v2.nix
@ -13,13 +13,13 @@
 stdenv.mkDerivation rec {
  pname = "${passthru.prettyName}-unwrapped";
  # nixpkgs-update: no auto update
-  version = "0-unstable-2024-05-14";
+  version = "0-unstable-2024-10-13";

  src = fetchFromGitHub {
    owner = "open-watcom";
    repo = "open-watcom-v2";
-    rev = "d3733a7fca1d02ad91b58b377ecb38e1293889db";
-    hash = "sha256-gDrmm7hd07lv0KhkP7Bys5qCuCCH+t/XvlftCYlCyI8=";
+    rev = "f0a6465832643ba08b7f94fb814c552804fb395b";
+    hash = "sha256-rT3z0KrkCZ78SbsK2CEHfvJa1TEnRH2kwhzZhi8fZDo=";
  };

  postPatch = ''
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@ -98,6 +98,11 @@ stdenv.mkDerivation (finalAttrs: {
      url = "https://github.com/OSGeo/gdal/commit/40c3212fe4ba93e5176df4cd8ae5e29e06bb6027.patch";
      sha256 = "sha256-D55iT6E/YdpSyfN7KUDTh1gdmIDLHXW4VC5d6D9B7ls=";
    })
+    # disable test failing with proj 9.5
+    (fetchpatch {
+      url = "https://github.com/OSGeo/gdal/commit/bb9e5c0ec3e45b0f3e60c4d284e4082550448480.patch";
+      hash = "sha256-TpjlxTH/51aRZkogpJuiNlfz3RLCe80wQVD4i+5m+Pw=";
+    })
  ];

  nativeBuildInputs = [
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@ -16,13 +16,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "proj";
-  version = "9.4.1";
+  version = "9.5.0";

  src = fetchFromGitHub {
    owner = "OSGeo";
    repo = "PROJ";
    rev = finalAttrs.version;
-    hash = "sha256-sLlG9NNHST9d0G5hV1tOGpTSv4rbUxERW3kwGC+t1iU=";
+    hash = "sha256-j7Bvv8F9wxrcQlquRa7Pdj5HTUJhwo8Wc1/JbULkUhM=";
  };

  patches = [
--- a/pkgs/development/libraries/qxmpp/default.nix
+++ b/pkgs/development/libraries/qxmpp/default.nix
@ -12,13 +12,13 @@

 mkDerivation rec {
  pname = "qxmpp";
-  version = "1.8.1";
+  version = "1.8.2";

  src = fetchFromGitHub {
    owner = "qxmpp-project";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-Tp3SDOoUAnAvwkID6U63TkeLy6Is+sWn7Oy0nT1f/LQ=";
+    sha256 = "sha256-fxTlxlnqttZZWRkt+vo4MJJz7DR/FMXcOqUv+/nlV18=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/wxsqlite3/default.nix
+++ b/pkgs/development/libraries/wxsqlite3/default.nix
@ -12,13 +12,13 @@

 stdenv.mkDerivation rec {
  pname = "wxsqlite3";
-  version = "4.9.11";
+  version = "4.9.12";

  src = fetchFromGitHub {
    owner = "utelle";
    repo = "wxsqlite3";
    rev = "v${version}";
-    hash = "sha256-aX1YU35ATL+f18tGIba6cgNYZvYm3TshHsN7RFD+vI4=";
+    hash = "sha256-WiOAF1yg18W4Vyyy+rzRe87GQTemvn32bexit4M/HjE=";
  };

  nativeBuildInputs = [ autoreconfHook ];
--- a/pkgs/development/python-modules/cf-xarray/default.nix
+++ b/pkgs/development/python-modules/cf-xarray/default.nix
@ -16,7 +16,7 @@
  rich,
  shapely,

-  # checks
+  # tests
  dask,
  pytestCheckHook,
  scipy,
@ -24,14 +24,14 @@

 buildPythonPackage rec {
  pname = "cf-xarray";
-  version = "0.9.5";
+  version = "0.10.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "xarray-contrib";
    repo = "cf-xarray";
    rev = "refs/tags/v${version}";
-    hash = "sha256-Rz0E7GBaN/7zb0dqAxo0SJ4Bd+eQuOOv6x1WubIUh6A=";
+    hash = "sha256-lAVH2QGdMyU5A6QTLKujeAh8n1AkCsAtdyKQEqLahTk=";
  };

  build-system = [
--- a/pkgs/development/python-modules/diffsync/default.nix
+++ b/pkgs/development/python-modules/diffsync/default.nix
@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "diffsync";
-  version = "2.0.0";
+  version = "2.0.1";
  format = "pyproject";

  src = fetchFromGitHub {
    owner = "networktocode";
    repo = "diffsync";
    rev = "refs/tags/v${version}";
-    hash = "sha256-4LS18FPrnGE1tM0pFzAw0+ajDaw9g7MCgIwS2ptrX9c=";
+    hash = "sha256-T3kcZcRm28WeXZTXBBCpaMxjgB0KmqvWO4gdILH5hCA=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/libarchive-c/default.nix
+++ b/pkgs/development/python-modules/libarchive-c/default.nix
@ -3,6 +3,7 @@
  stdenv,
  buildPythonPackage,
  fetchFromGitHub,
+  fetchpatch,
  libarchive,
  glibcLocales,
  mock,
@ -21,6 +22,14 @@ buildPythonPackage rec {
    sha256 = "sha256-CO9llPIbVTuE74AeohrMAu5ICkuT/MorRlYEEFne6Uk=";
  };

+  patches = [
+    (fetchpatch {
+      name = "fix-tests-with-recent-libarchive.patch";
+      url = "https://github.com/Changaco/python-libarchive-c/commit/a56e9402c76c2fb9631651de7bae07b5fbb0b624.patch";
+      hash = "sha256-OLwJQurEFAmwZJbQfhkibrR7Rcnc9vpWwBuhKxgmT7g=";
+    })
+  ];
+
  LC_ALL = "en_US.UTF-8";

  postPatch = ''
--- a/pkgs/development/python-modules/openai/default.nix
+++ b/pkgs/development/python-modules/openai/default.nix
@ -35,7 +35,7 @@

 buildPythonPackage rec {
  pname = "openai";
-  version = "1.51.0";
+  version = "1.52.1";
  pyproject = true;

  disabled = pythonOlder "3.7.1";
@ -44,7 +44,7 @@ buildPythonPackage rec {
    owner = "openai";
    repo = "openai-python";
    rev = "refs/tags/v${version}";
-    hash = "sha256-VwsW7wVNSVlZg+RJoQ3C9AuqHL5dFO+f9pyfUbRbrSM=";
+    hash = "sha256-TTbwhs7rXWIJWOU5bC0wGjXZkBpfBAXb4ycOR9xjTpw=";
  };

  build-system = [
--- a/pkgs/development/python-modules/pyproj/default.nix
+++ b/pkgs/development/python-modules/pyproj/default.nix
@ -19,7 +19,7 @@

 buildPythonPackage rec {
  pname = "pyproj";
-  version = "3.6.1";
+  version = "3.7.0";
  format = "setuptools";
  disabled = pythonOlder "3.9";

@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "pyproj4";
    repo = "pyproj";
    rev = "refs/tags/${version}";
-    hash = "sha256-ynAhu89VpvtQJRkIeVyffQHhd+OvWSiZzaI/7nd6fXA=";
+    hash = "sha256-uCoWmJ0xtbJ/DHts5+9KR6d6p8vmZqDrI4RFjXQn2fM=";
  };

  # force pyproj to use ${proj}
@ -37,12 +37,6 @@ buildPythonPackage rec {
      proj = proj;
      projdev = proj.dev;
    })
-
-    # fix test failure caused by update of EPSG DB
-    (fetchpatch {
-      url = "https://github.com/pyproj4/pyproj/commit/3f7c7e5bcec33d9b2f37ceb03c484ea318dff3ce.patch";
-      hash = "sha256-0J8AlInuhFDAYIBJAJ00XbqIanJY/D8xPVwlOapmLDE=";
-    })
  ];

  nativeBuildInputs = [ cython ];
--- 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.1253";
+  version = "3.0.1255";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
    owner = "TencentCloud";
    repo = "tencentcloud-sdk-python";
    rev = "refs/tags/${version}";
-    hash = "sha256-UQeh2VTIIuTvvJ3+GfY0pfSFLyc2KCg0i5qlglhBAJY=";
+    hash = "sha256-l0k8fyQ4ba+9uyQiIAsPKTKjmZ0p/QIlC0seqP6LBZY=";
  };

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

 buildPythonPackage rec {
  pname = "truststore";
-  version = "0.9.1";
+  version = "0.9.2";
  pyproject = true;

  disabled = pythonOlder "3.10";
@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "sethmlarson";
    repo = "truststore";
    rev = "refs/tags/v${version}";
-    hash = "sha256-BP88oQ363XFuRMKZqW8wSm1wl5upU+yEgmwktv65JOU=";
+    hash = "sha256-BSJneLxwgnD8IJ8IJM43WhmlII5N3qic96SBquMdMnc=";
  };

  build-system = [ flit-core ];
--- a/pkgs/development/tools/analysis/hotspot/default.nix
+++ b/pkgs/development/tools/analysis/hotspot/default.nix
@ -7,7 +7,6 @@
 , wrapQtAppsHook
 , elfutils
 , fetchFromGitHub
-, fetchpatch
 , kconfigwidgets
 , kddockwidgets
 , ki18n
@ -28,25 +27,16 @@

 stdenv.mkDerivation rec {
  pname = "hotspot";
-  version = "1.5.0";
+  version = "1.5.1";

  src = fetchFromGitHub {
    owner = "KDAB";
    repo = "hotspot";
    rev = "refs/tags/v${version}";
-    hash = "sha256-FJkDPWqNwoWg/15tvMnwke7PVtWVuqT0gtJBFQE0qZ4=";
+    hash = "sha256-O2wp19scyHIwIY2AzKmPmorGXDH249/OhSg+KtzOYhI=";
    fetchSubmodules = true;
  };

-  patches = [
-    # Backport stuck UI bug fix
-    # FIXME: remove in next update
-    (fetchpatch {
-      url = "https://github.com/KDAB/hotspot/commit/7639dee8617dba9b88182c7ff4887e8d3714ac98.patch";
-      hash = "sha256-aAo9uEy+MBztMhnC5jB08moZBeRCENU22R39pqSBXOY=";
-    })
-  ];
-
  nativeBuildInputs = [
    cmake
    extra-cmake-modules
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@ -8,11 +8,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "coursier";
-  version = "2.1.13";
+  version = "2.1.14";

  src = fetchurl {
    url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier";
-    hash = "sha256-AGHpJaKhu9/rzWPfNWzJPdp/jpQOm28BGAcXuwyNNxE=";
+    hash = "sha256-yAWU0ruaNAlYTPujPOjmoXgH0iVmYnZeIqn3+fN2P60=";
  };

  dontUnpack = true;
--- a/pkgs/development/tools/subxt/default.nix
+++ b/pkgs/development/tools/subxt/default.nix
@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "subxt";
-  version = "0.37.0";
+  version = "0.37.1";

  src = fetchFromGitHub {
    owner = "paritytech";
    repo = "subxt";
    rev = "v${version}";
-    hash = "sha256-GD4P+SXl9hyv0CxOximOMz+Gzi85kPahsiz0wHRqSWk=";
+    hash = "sha256-lCDjqvdjiQktyFAp3KuFHehwapd3BiLxMSLsNK+wDDo=";
  };

-  cargoHash = "sha256-luKtu9g+NtlwRhC1icpIxkBvP3GtggpKoj7Sx4anLAM=";
+  cargoHash = "sha256-RmeV2EYHGbMMAeerQkHcYav+RIVY68Tj66zjcFgjUfQ=";

  # Only build the command line client
  cargoBuildFlags = [ "--bin" "subxt" ];
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@ -5,16 +5,16 @@ let
  variants = {
    # ./update-zen.py zen
    zen = {
-      version = "6.11.2"; #zen
+      version = "6.11.5"; #zen
      suffix = "zen1"; #zen
-      sha256 = "1pwhdx8dcih0q3xj2hndd9vmz1xclrp4dw9yk0p1hi03mb634s40"; #zen
+      sha256 = "1w342k54ns6rwkk13l9f7h0qzikn6hbnb2ydxyqalrmll8n2g237"; #zen
      isLqx = false;
    };
    # ./update-zen.py lqx
    lqx = {
-      version = "6.11.2"; #lqx
+      version = "6.11.5"; #lqx
      suffix = "lqx1"; #lqx
-      sha256 = "0q5zdzb26azshn1n8fc5zy5n2sa7sz3q4khkjivafz6pyli1wfl8"; #lqx
+      sha256 = "0ql7nw6sph4ai44n66c7l06aj4ibhdy45415yzgibin1jg9rqa6d"; #lqx
      isLqx = true;
    };
  };
@ -83,8 +83,6 @@ let
      HZ = freeform "1000";
      HZ_1000 = yes;

-      # Alternative zpool for zswap
-      Z3FOLD = yes;
    } // lib.optionalAttrs (isLqx) {
      # Google's BBRv3 TCP congestion Control
      TCP_CONG_BBR = yes;
@ -101,7 +99,6 @@ let
      # Swap storage is compressed with LZ4 using zswap
      ZSWAP_COMPRESSOR_DEFAULT_LZ4  = lib.mkOptionDefault yes;
      ZSWAP_COMPRESSOR_DEFAULT_ZSTD = lib.mkDefault no;
-      ZSWAP_ZPOOL_DEFAULT_Z3FOLD = yes;

      # Fix error: unused option: XXX.
      CFS_BANDWIDTH = lib.mkForce (option no);
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@ -39,12 +39,12 @@ rec {
  stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest;

  production = generic {
-    version = "550.120";
-    sha256_64bit = "sha256-gBkoJ0dTzM52JwmOoHjMNwcN2uBN46oIRZHAX8cDVpc=";
-    sha256_aarch64 = "sha256-dzTEUuSIWKEuAMhsL9QkR7CCHpm6m9ZwtGSpSKqwJdc=";
-    openSha256 = "sha256-O3OrGGDR+xrpfyPVQ04aM3eGI6aWuZfRzmaPjMfnGIg=";
-    settingsSha256 = "sha256-fPfIPwpIijoUpNlAUt9C8EeXR5In633qnlelL+btGbU=";
-    persistencedSha256 = "sha256-ztEemWt0VR+cQbxDmMnAbEVfThdvASHni4SJ0dTZ2T4=";
+    version = "550.127.05";
+    sha256_64bit = "sha256-04TzT10qiWvXU20962ptlz2AlKOtSFocLuO/UZIIauk=";
+    sha256_aarch64 = "sha256-3wsGqJvDf8io4qFSqbpafeHHBjbasK5i/W+U6TeEeBY=";
+    openSha256 = "sha256-r0zlWPIuc6suaAk39pzu/tp0M++kY2qF8jklKePhZQQ=";
+    settingsSha256 = "sha256-cUSOTsueqkqYq3Z4/KEnLpTJAryML4Tk7jco/ONsvyg=";
+    persistencedSha256 = "sha256-8nowXrL6CRB3/YcoG1iWeD4OCYbsYKOOPE374qaa4sY=";
  };

  latest = selectHighestVersion production (generic {
--- a/pkgs/servers/webdav/default.nix
+++ b/pkgs/servers/webdav/default.nix
@ -2,22 +2,27 @@

 buildGo123Module rec {
  pname = "webdav";
-  version = "5.3.0";
+  version = "5.4.2";

  src = fetchFromGitHub {
    owner = "hacdias";
    repo = "webdav";
    rev = "v${version}";
-    sha256 = "sha256-F7ehl7Q/66ah6/N06U8Ld3bUjuF5tpJlNS/aWEorQaI=";
+    sha256 = "sha256-a1XAlmEW8gNTgVZiJ200CP/wvbwvyv4Lc3L6KP/4Mik=";
  };

-  vendorHash = "sha256-FvTDqGr3B05osuJvLj7J04JMeamZc/X6YeLY24ej7Ak=";
+  vendorHash = "sha256-d8WauJ1i429dr79iHgrbFRZCmx+W6OobSINy8aNGG6w=";
+
+  __darwinAllowLocalNetworking = true;

  meta = with lib; {
    description = "Simple WebDAV server";
    homepage = "https://github.com/hacdias/webdav";
    license = licenses.mit;
-    maintainers = with maintainers; [ pmy ];
+    maintainers = with maintainers; [
+      pmy
+      pbsds
+    ];
    mainProgram = "webdav";
  };
 }
--- a/pkgs/tools/filesystems/tar2ext4/default.nix
+++ b/pkgs/tools/filesystems/tar2ext4/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "tar2ext4";
-  version = "0.12.7";
+  version = "0.12.8";

  src = fetchFromGitHub {
    owner = "microsoft";
    repo = "hcsshim";
    rev = "v${version}";
-    sha256 = "sha256-ObNBeHmQ4VqnZdUbKxLxuXeRw2jVPQxroO2HK4Wp8tg=";
+    sha256 = "sha256-20+y7wFV3HxkrS1qHNq2neIc826HU5AXzuqqS7Ll2gg=";
  };

  sourceRoot = "${src.name}/cmd/tar2ext4";
--- a/pkgs/tools/package-management/morph/default.nix
+++ b/pkgs/tools/package-management/morph/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "morph";
-  version = "1.7.0";
+  version = "1.8.0";

  src = fetchFromGitHub {
    owner = "dbcdk";
    repo = "morph";
    rev = "v${version}";
-    hash = "sha256-0CHmjqPxBgALGZYjfJFLoLBnoI0U7oZ8WyCtu1bkzZg=";
+    hash = "sha256-IqWtVklzSq334cGgLx/13l329g391oDW50MZWyO6l08=";
  };

-  vendorHash = "sha256-KV+djwUYNfD7NqmYkanRVeKj2lAGfMjJhCUSRiC4/yM=";
+  vendorHash = "sha256-zQlMtbXgrH83zrcIoOuFhb2tYCeQ1pz4UQUvRIsLMCE=";

  nativeBuildInputs = [ makeWrapper ];

--- a/pkgs/tools/security/kubernetes-polaris/default.nix
+++ b/pkgs/tools/security/kubernetes-polaris/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "kubernetes-polaris";
-  version = "9.4.1";
+  version = "9.5.0";

  src = fetchFromGitHub {
    owner = "FairwindsOps";
    repo = "polaris";
    rev = version;
-    sha256 = "sha256-CVc/ZMF/3HBDPjny81Pj26eSnBuTRjXgkso34kZSex4=";
+    sha256 = "sha256-6dbp9gdobgL6afu+mzsqVBFQKT8lgxhKiEhQXN4Z5UY=";
  };

  vendorHash = "sha256-X0GPKR6l1v5312hOmelrcqp4KT3LwsGkvKoqUfEM0uU=";
--- a/pkgs/tools/security/nuclei/default.nix
+++ b/pkgs/tools/security/nuclei/default.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "nuclei";
-  version = "3.3.4";
+  version = "3.3.5";

  src = fetchFromGitHub {
    owner = "projectdiscovery";
    repo = "nuclei";
    rev = "refs/tags/v${version}";
-    hash = "sha256-wY7OninwYrFuP681Xffsv25XnOw8xWp3QAvrpTibnvk=";
+    hash = "sha256-L8HOuPENnyM56ac1dqJRCYzqN9wRnGt4RoF8BZji0Z0=";
  };

-  vendorHash = "sha256-V/L6trRaCfV1qLKw1MsRWIh+RwAcoafvSW8zgA41maQ=";
+  vendorHash = "sha256-ZGFzZ/WpiVChtvMJQH3lR4k2it1KF0QwrMQchQz5XYw=";
  proxyVendor = true; # hash mismatch between Linux and Darwin

  subPackages = [ "cmd/nuclei/" ];
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -828,6 +828,7 @@ mapAliases {
  o = orbiton; # Added 2023-04-09
  oathToolkit = oath-toolkit; # Added 2022-04-04
  oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17
+  oil = lib.warn "Oil has been replaced with the faster native C++ version and renamed to 'oils-for-unix'. See also https://github.com/oils-for-unix/oils/wiki/Oils-Deployments" oils-for-unix; # Added 2024-10-22
  onevpl-intel-gpu = lib.warn "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04
  opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20
  opencv3 = throw "opencv3 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20
@ -1090,7 +1091,10 @@ mapAliases {
    steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable";
    steam = lib.warn "`steamPackages.steam` has been moved to top level as `steam-unwrapped`" steam-unwrapped;
    steam-fhsenv = lib.warn "`steamPackages.steam-fhsenv` has been moved to top level as `steam`" steam;
+    steam-fhsenv-small = lib.warn "`steamPackages.steam-fhsenv-small` has been moved to top level as `steam`; there is no longer a -small variant" steam;
    steam-fhsenv-without-steam = lib.warn "`steamPackages.steam-fhsenv-without-steam` has been moved to top level as `steam-fhsenv-without-steam`" steam-fhsenv-without-steam;
+    steam-runtime = throw "`steamPackages.steam-runtime` has been removed, as it's no longer supported or necessary";
+    steam-runtime-wrapped = throw "`steamPackages.steam-runtime-wrapped` has been removed, as it's no longer supported or necessary";
    steamcmd = lib.warn "`steamPackages.steamcmd` has been moved to top level as `steamcmd`" steamcmd;
  };
  steam-small = steam; # Added 2024-09-12
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -24429,8 +24429,6 @@ with pkgs;

  ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };

-  janus-gateway = callPackage ../servers/janus-gateway { };
-
  janusgraph = callPackage ../servers/nosql/janusgraph { };

  jboss = callPackage ../servers/http/jboss { };
@ -30289,7 +30287,7 @@ with pkgs;

  jaeles = callPackage ../tools/security/jaeles { };

-  jalv = callPackage ../applications/audio/jalv { };
+  jalv-qt = jalv.override { useQt = true; };

  jameica = callPackage ../applications/office/jameica {
    inherit (darwin.apple_sdk.frameworks) Cocoa;
@ -32299,8 +32297,6 @@ with pkgs;

  sc-im = callPackage ../applications/misc/sc-im { };

-  scite = callPackage ../applications/editors/scite { };
-
  scli = callPackage ../applications/misc/scli { };

  scribus_1_5 = libsForQt5.callPackage ../applications/office/scribus/default.nix { };
@ -37135,8 +37131,6 @@ with pkgs;

  gummi = callPackage ../applications/misc/gummi { };

-  gummy = callPackage ../tools/misc/gummy { };
-
  hashpump = callPackage ../tools/misc/hashpump { };

  hck = callPackage ../tools/text/hck { };