Merge staging-next into staging

2023-09-06 00:02:28 +00:00 · 2023-09-06 00:02:28 +00:00 · bcf3e3f1c8
commit bcf3e3f1c8
parent 161bf63234 72eff9fe5d
152 changed files with 5373 additions and 3603 deletions
--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@ -177,6 +177,8 @@

 - The `html-proofer` package has been updated from major version 3 to major version 5, which includes [breaking changes](https://github.com/gjtorikian/html-proofer/blob/v5.0.8/UPGRADING.md).

+- `kratos` has been updated from 0.10.1 to the first stable version 1.0.0, please read the [0.10.1 to 0.11.0](https://github.com/ory/kratos/releases/tag/v0.11.0), [0.11.0 to 0.11.1](https://github.com/ory/kratos/releases/tag/v0.11.1), [0.11.1 to 0.13.0](https://github.com/ory/kratos/releases/tag/v0.13.0) and [0.13.0 to 1.0.0](https://github.com/ory/kratos/releases/tag/v1.0.0) upgrade guides. The most notable breaking change is the introduction of one-time passwords (`code`) and update of the default recovery strategy from `link` to `code`.
+
 ## Other Notable Changes {#sec-release-23.11-notable-changes}

 - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.
@ -245,6 +247,8 @@ The module update takes care of the new config syntax and the data itself (user
 - `networking.nftables` is no longer flushing all rulesets on every reload.
  Use `networking.nftables.flushRuleset = true;` to get back the old behaviour.

+- The `cawbird` package is dropped from nixpkgs, as it got broken by the Twitter API closing down and has been abandoned upstream.
+
 ## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals}

 - The use of `sourceRoot = "source";`, `sourceRoot = "source/subdir";`, and similar lines in package derivations using the default `unpackPhase` is deprecated as it requires `unpackPhase` to always produce a directory named "source". Use `sourceRoot = src.name`, `sourceRoot = "${src.name}/subdir";`, or `setSourceRoot = "sourceRoot=$(echo */subdir)";` or similar instead.
--- a/nixos/lib/testing/driver.nix
+++ b/nixos/lib/testing/driver.nix
@ -175,7 +175,12 @@ in
  };

  config = {
-    _module.args.hostPkgs = config.hostPkgs;
+    _module.args = {
+      hostPkgs =
+        # Comment is in nixos/modules/misc/nixpkgs.nix
+        lib.mkOverride lib.modules.defaultOverridePriority
+          config.hostPkgs.__splicedPackages;
+    };

    driver = withChecks driver;

--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -163,6 +163,7 @@
  ./programs/direnv.nix
  ./programs/dmrconfig.nix
  ./programs/droidcam.nix
+  ./programs/ecryptfs.nix
  ./programs/environment.nix
  ./programs/evince.nix
  ./programs/extra-container.nix
--- a/nixos/modules/programs/ecryptfs.nix
+++ b/nixos/modules/programs/ecryptfs.nix
@ -0,0 +1,31 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.ecryptfs;
+
+in {
+  options.programs.ecryptfs = {
+    enable = mkEnableOption (lib.mdDoc "ecryptfs setuid mount wrappers");
+  };
+
+  config = mkIf cfg.enable {
+    security.wrappers = {
+
+      "mount.ecryptfs_private" = {
+        setuid = true;
+        owner = "root";
+        group = "root";
+        source = "${lib.getBin pkgs.ecryptfs}/bin/mount.ecryptfs_private";
+      };
+      "umount.ecryptfs_private" = {
+        setuid = true;
+        owner = "root";
+        group = "root";
+        source = "${lib.getBin pkgs.ecryptfs}/bin/umount.ecryptfs_private";
+      };
+
+    };
+  };
+}
--- a/nixos/modules/services/networking/dae.nix
+++ b/nixos/modules/services/networking/dae.nix
@ -1,41 +1,161 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:
+
 let
  cfg = config.services.dae;
+  assets = cfg.assets;
+  genAssetsDrv = paths: pkgs.symlinkJoin {
+    name = "dae-assets";
+    inherit paths;
+  };
 in
 {
-  meta.maintainers = with lib.maintainers; [ pokon548 ];
+  meta.maintainers = with lib.maintainers; [ pokon548 oluceps ];

  options = {
-    services.dae = {
-      enable = lib.options.mkEnableOption (lib.mdDoc "the dae service");
-      package = lib.mkPackageOptionMD pkgs "dae" { };
+    services.dae = with lib;{
+      enable = mkEnableOption
+        (mdDoc "A Linux high-performance transparent proxy solution based on eBPF");
+
+      package = mkPackageOptionMD pkgs "dae" { };
+
+      assets = mkOption {
+        type = with types;(listOf path);
+        default = with pkgs; [ v2ray-geoip v2ray-domain-list-community ];
+        defaultText = literalExpression "with pkgs; [ v2ray-geoip v2ray-domain-list-community ]";
+        description = mdDoc ''
+          Assets required to run dae.
+        '';
+      };
+
+      assetsPath = mkOption {
+        type = types.str;
+        default = "${genAssetsDrv assets}/share/v2ray";
+        defaultText = literalExpression ''
+          (symlinkJoin {
+              name = "dae-assets";
+              paths = assets;
+          })/share/v2ray
+        '';
+        description = mdDoc ''
+          The path which contains geolocation database.
+          This option will override `assets`.
+        '';
+      };
+
+      openFirewall = mkOption {
+        type = with types; submodule {
+          options = {
+            enable = mkEnableOption "enable";
+            port = mkOption {
+              type = types.int;
+              description = ''
+                Port to be opened. Consist with field `tproxy_port` in config file.
+              '';
+            };
+          };
+        };
+        default = {
+          enable = true;
+          port = 12345;
+        };
+        defaultText = literalExpression ''
+          {
+            enable = true;
+            port = 12345;
+          }
+        '';
+        description = mdDoc ''
+          Open the firewall port.
+        '';
+      };
+
+      configFile = mkOption {
+        type = types.path;
+        default = "/etc/dae/config.dae";
+        example = "/path/to/your/config.dae";
+        description = mdDoc ''
+          The path of dae config file, end with `.dae`.
+        '';
+      };
+
+      config = mkOption {
+        type = types.str;
+        default = ''
+          global{}
+          routing{}
+        '';
+        description = mdDoc ''
+          Config text for dae.
+
+          See <https://github.com/daeuniverse/dae/blob/main/example.dae>.
+        '';
+      };
+
+      disableTxChecksumIpGeneric =
+        mkEnableOption (mdDoc "See <https://github.com/daeuniverse/dae/issues/43>");
+
    };
  };

-  config = lib.mkIf config.services.dae.enable {
-    networking.firewall.allowedTCPPorts = [ 12345 ];
-    networking.firewall.allowedUDPPorts = [ 12345 ];
+  config = lib.mkIf cfg.enable

-    systemd.services.dae = {
-      unitConfig = {
-        Description = "dae Service";
-        Documentation = "https://github.com/daeuniverse/dae";
-        After = [ "network-online.target" "systemd-sysctl.service" ];
-        Wants = [ "network-online.target" ];
+    {
+      environment.systemPackages = [ cfg.package ];
+      systemd.packages = [ cfg.package ];
+
+      environment.etc."dae/config.dae" = {
+        mode = "0400";
+        source = pkgs.writeText "config.dae" cfg.config;
      };

-      serviceConfig = {
-        User = "root";
-        ExecStartPre = "${lib.getExe cfg.package} validate -c /etc/dae/config.dae";
-        ExecStart = "${lib.getExe cfg.package} run --disable-timestamp -c /etc/dae/config.dae";
-        ExecReload = "${lib.getExe cfg.package} reload $MAINPID";
-        LimitNPROC = 512;
-        LimitNOFILE = 1048576;
-        Restart = "on-abnormal";
-        Type = "notify";
+      networking = lib.mkIf cfg.openFirewall.enable {
+        firewall =
+          let portToOpen = cfg.openFirewall.port;
+          in
+          {
+            allowedTCPPorts = [ portToOpen ];
+            allowedUDPPorts = [ portToOpen ];
+          };
      };

-      wantedBy = [ "multi-user.target" ];
+      systemd.services.dae =
+        let
+          daeBin = lib.getExe cfg.package;
+          TxChecksumIpGenericWorkaround = with lib;(getExe pkgs.writeShellApplication {
+            name = "disable-tx-checksum-ip-generic";
+            text = with pkgs; ''
+              iface=$(${iproute2}/bin/ip route | ${lib.getExe gawk} '/default/ {print $5}')
+              ${lib.getExe ethtool} -K "$iface" tx-checksum-ip-generic off
+            '';
+          });
+        in
+        {
+          wantedBy = [ "multi-user.target" ];
+          serviceConfig = {
+            ExecStartPre = [ "" "${daeBin} validate -c ${cfg.configFile}" ]
+              ++ (with lib; optional cfg.disableTxChecksumIpGeneric TxChecksumIpGenericWorkaround);
+            ExecStart = [ "" "${daeBin} run --disable-timestamp -c ${cfg.configFile}" ];
+            Environment = "DAE_LOCATION_ASSET=${cfg.assetsPath}";
+          };
+        };
+
+      assertions = [
+        {
+          assertion = lib.pathExists (toString (genAssetsDrv cfg.assets) + "/share/v2ray");
+          message = ''
+            Packages in `assets` has no preset paths included.
+            Please set `assetsPath` instead.
+          '';
+        }
+
+        {
+          assertion = !((config.services.dae.config != "global{}\nrouting{}\n")
+            && (config.services.dae.configFile != "/etc/dae/config.dae"));
+          message = ''
+            Option `config` and `configFile` could not be set
+            at the same time.
+          '';
+        }
+      ];
    };
-  };
 }
--- a/nixos/modules/virtualisation/anbox.nix
+++ b/nixos/modules/virtualisation/anbox.nix
@ -5,7 +5,7 @@ with lib;
 let

  cfg = config.virtualisation.anbox;
-  kernelPackages = config.boot.kernelPackages;
+
  addrOpts = v: addr: pref: name: {
    address = mkOption {
      default = addr;
@ -25,6 +25,28 @@ let
    };
  };

+  finalImage = if cfg.imageModifications == "" then cfg.image else ( pkgs.callPackage (
+    { runCommandNoCC, squashfsTools }:
+
+    runCommandNoCC "${cfg.image.name}-modified.img" {
+      nativeBuildInputs = [
+        squashfsTools
+      ];
+    } ''
+      echo "-> Extracting Anbox root image..."
+      unsquashfs -dest rootfs ${cfg.image}
+
+      echo "-> Modifying Anbox root image..."
+      (
+      cd rootfs
+      ${cfg.imageModifications}
+      )
+
+      echo "-> Packing modified Anbox root image..."
+      mksquashfs rootfs $out -comp xz -no-xattrs -all-root
+    ''
+  ) { });
+
 in

 {
@ -42,6 +64,18 @@ in
      '';
    };

+    imageModifications = mkOption {
+      default = "";
+      type = types.lines;
+      description = lib.mdDoc ''
+        Commands to edit the image filesystem.
+
+        This can be used to e.g. bundle a privileged F-Droid.
+
+        Commands are ran with PWD being at the root of the filesystem.
+      '';
+    };
+
    extraInit = mkOption {
      type = types.lines;
      default = "";
@ -67,16 +101,19 @@ in
  config = mkIf cfg.enable {

    assertions = singleton {
-      assertion = versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.18";
-      message = "Anbox needs user namespace support to work properly";
+      assertion = with config.boot.kernelPackages; kernelAtLeast "5.5" && kernelOlder "5.18";
+      message = "Anbox needs a kernel with binder and ashmem support";
    };

    environment.systemPackages = with pkgs; [ anbox ];

-    services.udev.extraRules = ''
-      KERNEL=="ashmem", NAME="%k", MODE="0666"
-      KERNEL=="binder*", NAME="%k", MODE="0666"
-    '';
+    systemd.mounts = singleton {
+      requiredBy = [ "anbox-container-manager.service" ];
+      description = "Anbox Binder File System";
+      what = "binder";
+      where = "/dev/binderfs";
+      type = "binder";
+    };

    virtualisation.lxc.enable = true;
    networking.bridges.anbox0.interfaces = [];
@ -87,6 +124,9 @@ in
      internalInterfaces = [ "anbox0" ];
    };

+    # Ensures NetworkManager doesn't touch anbox0
+    networking.networkmanager.unmanaged = [ "anbox0" ];
+
    systemd.services.anbox-container-manager = let
      anboxloc = "/var/lib/anbox";
    in {
@ -121,12 +161,13 @@ in
        ExecStart = ''
          ${pkgs.anbox}/bin/anbox container-manager \
            --data-path=${anboxloc} \
-            --android-image=${cfg.image} \
+            --android-image=${finalImage} \
            --container-network-address=${cfg.ipv4.container.address} \
            --container-network-gateway=${cfg.ipv4.gateway.address} \
            --container-network-dns-servers=${cfg.ipv4.dns} \
            --use-rootfs-overlay \
-            --privileged
+            --privileged \
+            --daemon
        '';
      };
    };
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@ -109,6 +109,7 @@ in {
  allTerminfo = handleTest ./all-terminfo.nix {};
  alps = handleTest ./alps.nix {};
  amazon-init-shell = handleTest ./amazon-init-shell.nix {};
+  anbox = runTest ./anbox.nix;
  anuko-time-tracker = handleTest ./anuko-time-tracker.nix {};
  apcupsd = handleTest ./apcupsd.nix {};
  apfs = runTest ./apfs.nix;
@ -210,6 +211,7 @@ in {
  custom-ca = handleTest ./custom-ca.nix {};
  croc = handleTest ./croc.nix {};
  darling = handleTest ./darling.nix {};
+  dae = handleTest ./dae.nix {};
  dconf = handleTest ./dconf.nix {};
  deepin = handleTest ./deepin.nix {};
  deluge = handleTest ./deluge.nix {};
--- a/nixos/tests/anbox.nix
+++ b/nixos/tests/anbox.nix
@ -0,0 +1,40 @@
+{ lib, pkgs, ... }:
+
+{
+  name = "anbox";
+  meta.maintainers = with lib.maintainers; [ mvnetbiz ];
+
+  nodes.machine = { pkgs, config, ... }: {
+    imports = [
+      ./common/user-account.nix
+      ./common/x11.nix
+    ];
+
+    environment.systemPackages = with pkgs; [ android-tools ];
+
+    test-support.displayManager.auto.user = "alice";
+
+    virtualisation.anbox.enable = true;
+    boot.kernelPackages = pkgs.linuxPackages_5_15;
+
+    # The AArch64 anbox image will not start.
+    # Meanwhile the postmarketOS images work just fine.
+    virtualisation.anbox.image = pkgs.anbox.postmarketos-image;
+    virtualisation.memorySize = 2500;
+  };
+
+  testScript = { nodes, ... }: let
+    user = nodes.machine.users.users.alice;
+    bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${toString user.uid}/bus";
+  in ''
+    machine.wait_for_x()
+
+    machine.wait_until_succeeds(
+        "sudo -iu alice ${bus} anbox wait-ready"
+    )
+
+    machine.wait_until_succeeds("adb shell true")
+
+    print(machine.succeed("adb devices"))
+  '';
+}
--- a/nixos/tests/dae.nix
+++ b/nixos/tests/dae.nix
@ -0,0 +1,29 @@
+import ./make-test-python.nix ({ lib, pkgs, ... }: {
+
+  name = "dae";
+
+  meta = {
+    maintainers = with lib.maintainers; [ oluceps ];
+  };
+
+  nodes.machine = { pkgs, ... }: {
+    environment.systemPackages = [ pkgs.curl ];
+    services.nginx = {
+      enable = true;
+      statusPage = true;
+    };
+    services.dae = {
+      enable = true;
+    };
+  };
+
+  testScript = ''
+    machine.wait_for_unit("nginx.service")
+    machine.wait_for_unit("dae.service")
+
+    machine.wait_for_open_port(80)
+
+    machine.succeed("curl --fail --max-time 10 http://localhost")
+  '';
+
+})
--- a/pkgs/applications/audio/bambootracker/default.nix
+++ b/pkgs/applications/audio/bambootracker/default.nix
@ -17,14 +17,14 @@ assert lib.versionAtLeast qtbase.version "6.0" -> qt5compat != null;

 stdenv.mkDerivation (finalAttrs: {
  pname = "bambootracker";
-  version = "0.6.2";
+  version = "0.6.3";

  src = fetchFromGitHub {
    owner = "BambooTracker";
    repo = "BambooTracker";
    rev = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-rn6PNxVsLEXz8q3nvMMhKV1/Woq2CxROf0qsQJykyUs=";
+    hash = "sha256-rMYs2jixzoMGem9lxAjDMbFOMrnK8BLFjZIagdZk/Ok=";
  };

  postPatch = lib.optionalString (lib.versionAtLeast qtbase.version "6.0") ''
--- a/pkgs/applications/blockchains/btcpayserver/default.nix
+++ b/pkgs/applications/blockchains/btcpayserver/default.nix
@ -6,13 +6,13 @@

 buildDotnetModule rec {
  pname = "btcpayserver";
-  version = "1.11.2";
+  version = "1.11.3";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-22JQ8GqMRNfBT2ynyGhJBeGgnyAVYVBa5tUGZsleDP0=";
+    sha256 = "sha256-fs8GAE/beiFLUNBI+r8h08a2TYSY9fYQYGvxBOtClgg=";
  };

  projectFile = "BTCPayServer/BTCPayServer.csproj";
--- a/pkgs/applications/blockchains/btcpayserver/deps.nix
+++ b/pkgs/applications/blockchains/btcpayserver/deps.nix
@ -8,7 +8,7 @@
  (fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; })
  (fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; })
  (fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; })
-  (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.29"; sha256 = "1kd07n0l0h6cmfxb5mdkawjsbmjynz2dknnj8c22wvk1jchif956"; })
+  (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.31"; sha256 = "1yxg2651m649ha99rzjv7pnphx42bxzf5sc86czj6ng4rpp8rnkb"; })
  (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.20"; sha256 = "0nk82hkgs67mxfxkgbav8yxxd79m0xyqaan7vay00gg33pjqdjvj"; })
  (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.28"; sha256 = "05jkdds1g0xfvf8spakwbyndz8an2kadwybg6dwz6q5rlk0aj7m8"; })
  (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; })
@ -16,7 +16,7 @@
  (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.20"; sha256 = "093w82mcxxxbvx66j0sp3lsfm2bkbi3igm80iz9zdghy85845kc9"; })
  (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.26"; sha256 = "1kfl88psjbsh88l98kc6dyxqjghnzyffi070v2ifkdjcdgdbawfs"; })
  (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.17"; sha256 = "1n6zbb7rfwp7lbmrzdnw338nwyb8m552fdnar2jp4fd5ffibyrd6"; })
-  (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.20"; sha256 = "1rq8cd7hg8mmvci7fxx0hj1jw7afz6li7y73s3c07xjgiy68jgfl"; })
+  (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.21"; sha256 = "0dgca4d21f08ik4h9hv8cqgkmyqq0mqai6m9wids0dx0zzl7cbyx"; })
  (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; })
  (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; })
  (fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; })
@ -38,7 +38,7 @@
  (fetchNuGet { pname = "HtmlSanitizer"; version = "5.0.372"; sha256 = "1gllp58vdbql2ybwf05i2178x7p4g8zyyk64317d1pyss5217g7r"; })
  (fetchNuGet { pname = "Humanizer.Core"; version = "2.8.26"; sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; })
  (fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; })
-  (fetchNuGet { pname = "LNURL"; version = "0.0.29"; sha256 = "00d9n2lgn3paqm12c563rv8slxrbbxq6m58m098l30wsm96llj0r"; })
+  (fetchNuGet { pname = "LNURL"; version = "0.0.30"; sha256 = "1sph5vkl0794aky21inp8b9dz2v2clxxx6whfg2g71c0cxrxa3r5"; })
  (fetchNuGet { pname = "MailKit"; version = "3.3.0"; sha256 = "18l0jkrc4d553kiw4vdjzzpafpvsgjs1n19kjbi8isnhzidmsl4j"; })
  (fetchNuGet { pname = "Microsoft.AspNet.SignalR.Client"; version = "2.4.3"; sha256 = "1whxcmxydcxjkw84sqk5idd406v3ia0xj2m4ia4b6wqbvkdqn7rf"; })
  (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; sha256 = "1sy1q36bm9fz3gi780w4jgysw3dwaz2f3a5gcn6jxw1gkmdasb08"; })
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@ -4,13 +4,19 @@ lib.makeScope pkgs.newScope (self:
  let
    gconf = pkgs.gnome2.GConf;
    inherit (self) callPackage;
+    stdenv = if pkgs.stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv;
    inheritedArgs = {
      inherit gconf;
+      inherit stdenv;

      inherit (pkgs.darwin) sigtool;
      inherit (pkgs.darwin.apple_sdk_11_0.frameworks)
        Accelerate AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit
        Quartz QuartzCore UniformTypeIdentifiers WebKit;
+      gnutls =
+        if pkgs.stdenv.isDarwin
+        then pkgs.gnutls.override { inherit stdenv; inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; }
+        else pkgs.gnutls;
    };
  in {
    sources = import ./sources.nix {
--- a/pkgs/applications/editors/pixelorama/default.nix
+++ b/pkgs/applications/editors/pixelorama/default.nix
@ -26,13 +26,13 @@ let
    else throw "unsupported platform";
 in stdenv.mkDerivation (finalAttrs: {
  pname = "pixelorama";
-  version = "0.11.1";
+  version = "0.11.2";

  src = fetchFromGitHub {
    owner = "Orama-Interactive";
    repo = "Pixelorama";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-+gPkuVzQ86MzHQ0AjnPDdyk2p7eIxtggq+KJ43KVbk8=";
+    sha256 = "sha256-jSgSKxW7cxSoSwBytoaQtLwbkYm2udjmaZTHbN1jJwQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -29,12 +29,12 @@ final: prev:

  ChatGPT-nvim = buildVimPluginFrom2Nix {
    pname = "ChatGPT.nvim";
-    version = "2023-08-16";
+    version = "2023-09-01";
    src = fetchFromGitHub {
      owner = "jackMort";
      repo = "ChatGPT.nvim";
-      rev = "fba5423b3ddf0b67ada2bbb4d5f66d9cf76c996a";
-      sha256 = "14vd07w73b6s8wnpzh8lpf75j752z2pmmslq5mjxzx23cdcp8fik";
+      rev = "8191b4a1faea28483aa3a495d01ade3eb86409fe";
+      sha256 = "0w283187mk1nm8vg5yfnipnq5j53ycyl3qv8vsl75b9mnrldhm1v";
    };
    meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/";
  };
@ -305,12 +305,12 @@ final: prev:

  SchemaStore-nvim = buildVimPluginFrom2Nix {
    pname = "SchemaStore.nvim";
-    version = "2023-08-23";
+    version = "2023-08-31";
    src = fetchFromGitHub {
      owner = "b0o";
      repo = "SchemaStore.nvim";
-      rev = "c7c6353db3208608786503cbade1e9f8d3531f15";
-      sha256 = "1nji29s3gjdrfdj21x1vpsfs7ai7q1a8k76mk90nppf2dx15ixpw";
+      rev = "762773532c385231904a39bfafd8562ff31156d7";
+      sha256 = "139qqm343fx2k27d0s9nci0x4643gggmsiq44sjnx32cq5y689xl";
    };
    meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
  };
@ -377,12 +377,12 @@ final: prev:

  SpaceVim = buildVimPluginFrom2Nix {
    pname = "SpaceVim";
-    version = "2023-08-25";
+    version = "2023-08-31";
    src = fetchFromGitHub {
      owner = "SpaceVim";
      repo = "SpaceVim";
-      rev = "7e81ce1019626977f7dbab44fb2abb5517993359";
-      sha256 = "11pz313swwv065nkvk2z7hgakijjg696dq7g1a056abk33hs9rh9";
+      rev = "6f0728c625bf5861b44b8bd1048fba5f095f2327";
+      sha256 = "0k0x726hvgfr4m912ly3q4f7bjxqiapy6hcl2wylrvc9ahaig7px";
    };
    meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
  };
@ -595,12 +595,12 @@ final: prev:

  alpha-nvim = buildVimPluginFrom2Nix {
    pname = "alpha-nvim";
-    version = "2023-08-24";
+    version = "2023-08-31";
    src = fetchFromGitHub {
      owner = "goolord";
      repo = "alpha-nvim";
-      rev = "63a860e7ed3ae41ee92481ea65a48fb35431ae21";
-      sha256 = "0mns3cymfisnd603mwxc30psbsm9m41gwqaai1r3w9iijy5axfkz";
+      rev = "26d95031e2c624c5317dbdce386eb89f9356d4c0";
+      sha256 = "00g9z4blfal6dx4m488yasvja1pmmwfs7k2dazm1lahlygi3rl7k";
    };
    meta.homepage = "https://github.com/goolord/alpha-nvim/";
  };
@ -979,12 +979,12 @@ final: prev:

  base46 = buildVimPluginFrom2Nix {
    pname = "base46";
-    version = "2023-08-28";
+    version = "2023-09-01";
    src = fetchFromGitHub {
      owner = "nvchad";
      repo = "base46";
-      rev = "87a3054bd5cf4f50d42038f3060e5d41bb2d5d8d";
-      sha256 = "0iisisfn805mydq2nlx82lwlwj1f4sjc92py1m48ag50vmf62ip5";
+      rev = "919af1c40278d91c3f38cba08cb0f49f7e6a12e6";
+      sha256 = "15pkgglic6wdgw7pfqaphg9h911p0zra99nx4cxylssfp62f0bpv";
    };
    meta.homepage = "https://github.com/nvchad/base46/";
  };
@ -1783,12 +1783,12 @@ final: prev:

  cmp-rg = buildVimPluginFrom2Nix {
    pname = "cmp-rg";
-    version = "2022-09-05";
+    version = "2023-09-01";
    src = fetchFromGitHub {
      owner = "lukas-reineke";
      repo = "cmp-rg";
-      rev = "1cad8eb315643d0df13c37401c03d7986f891011";
-      sha256 = "02ij7isp6hzcfkd5zw9inymmpgcmhiz0asjra45w8jkzqlxd322j";
+      rev = "677a7874ee8f1afc648c2e7d63a97bc21a7663c5";
+      sha256 = "0cahyz5i6iyjqb4cklrkimw5pjajfnlazpmky617ysl3m1b6pwk3";
    };
    meta.homepage = "https://github.com/lukas-reineke/cmp-rg/";
  };
@ -2011,12 +2011,12 @@ final: prev:

  coc-nvim = buildVimPluginFrom2Nix {
    pname = "coc.nvim";
-    version = "2023-07-26";
+    version = "2023-08-31";
    src = fetchFromGitHub {
      owner = "neoclide";
      repo = "coc.nvim";
-      rev = "9332d2ab1154dedc9dbcd3e1c873886abaf061a6";
-      sha256 = "1aq1bz2pl6wfhxawkdwkrcvc18dgs0x3p5fwivfmnhaqislkx4lf";
+      rev = "05fcd1acb2e3b70bba6e73b9e470bf765a98170b";
+      sha256 = "1c635ckwpj8r6i6bm01s896inbxaqys64gjkr6jbgwc604h4bsvi";
    };
    meta.homepage = "https://github.com/neoclide/coc.nvim/";
  };
@ -2311,12 +2311,12 @@ final: prev:

  copilot-cmp = buildVimPluginFrom2Nix {
    pname = "copilot-cmp";
-    version = "2023-08-10";
+    version = "2023-08-30";
    src = fetchFromGitHub {
      owner = "zbirenbaum";
      repo = "copilot-cmp";
-      rev = "d631b3afbf26bb17d6cf2b3cd8f3d79e7d5eeca1";
-      sha256 = "192s9fi9p4d21c361f0yp44axbkpyf78knrdw7vql0wakb09qi9r";
+      rev = "11eb015fbf9f07ad1c72dbdc9d830ebac610b5cd";
+      sha256 = "16i9ign32sp1smi34rpg0dqs7a35p691801w6in8zv0ayk6r8bjr";
    };
    meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/";
  };
@ -2539,12 +2539,12 @@ final: prev:

  dashboard-nvim = buildVimPluginFrom2Nix {
    pname = "dashboard-nvim";
-    version = "2023-08-24";
+    version = "2023-09-01";
    src = fetchFromGitHub {
      owner = "nvimdev";
      repo = "dashboard-nvim";
-      rev = "9134d7befd50ff920ede5b0f7d6c3dbb9f7c0ecb";
-      sha256 = "09mys6n9hwlbwy48nxndjrr6y0bg67nai36fpjxydqq2i3ijq897";
+      rev = "2caf39ffe2b51bdcf28528473b51042760e888f3";
+      sha256 = "1d12jaqij8j08q8x50hcbjk26yz3pnrgg5acb0x6qixrhgxm5qfh";
    };
    meta.homepage = "https://github.com/nvimdev/dashboard-nvim/";
  };
@ -3081,12 +3081,12 @@ final: prev:

  editorconfig-vim = buildVimPluginFrom2Nix {
    pname = "editorconfig-vim";
-    version = "2023-08-29";
+    version = "2023-08-30";
    src = fetchFromGitHub {
      owner = "editorconfig";
      repo = "editorconfig-vim";
-      rev = "14856573a09f1ddb570bfd8734e34e8018e8aa97";
-      sha256 = "0pvxvm56m8q6vl5509r0c045c3hhqnwfm82c6z99x2iwnrw0s39w";
+      rev = "aefcf3d735122f349b172302d164d5eb61cd7e5f";
+      sha256 = "1aj3bx2gf348mka27bw7k85kgm8j9gpiih5p79zrsry515vy0smx";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
@ -3106,12 +3106,12 @@ final: prev:

  efmls-configs-nvim = buildVimPluginFrom2Nix {
    pname = "efmls-configs-nvim";
-    version = "2023-08-29";
+    version = "2023-08-31";
    src = fetchFromGitHub {
      owner = "creativenull";
      repo = "efmls-configs-nvim";
-      rev = "e244c307f520dc70627523759386d387c73803b8";
-      sha256 = "1w0ralyyz2m11hp7ij44cchibbx0z8p81z4fjvizvcpcjs5xriir";
+      rev = "3c299d8c243469476857986fb2404ce3ba7bf0dc";
+      sha256 = "05rfhc312y1f9ck6ab83bmmchxszl39cj1q6154zla21nkx8jsp9";
    };
    meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/";
  };
@ -3203,12 +3203,12 @@ final: prev:

  executor-nvim = buildVimPluginFrom2Nix {
    pname = "executor.nvim";
-    version = "2023-08-19";
+    version = "2023-08-30";
    src = fetchFromGitHub {
      owner = "google";
      repo = "executor.nvim";
-      rev = "60348d7644a5729d0bb0de7ee0a3641ae0c1b545";
-      sha256 = "188gn67syidq8anajm5dgm1dqzjqmak954vvwp0n2gihr741pwk4";
+      rev = "ce7c48e6b60925f9514a8a7ad7bc8c4d8498a85d";
+      sha256 = "07vmglghgl3qbmqmrh895i87rc4bzxckky8na5inw704ibz3766c";
    };
    meta.homepage = "https://github.com/google/executor.nvim/";
  };
@ -3612,12 +3612,12 @@ final: prev:

  fzf-lua = buildVimPluginFrom2Nix {
    pname = "fzf-lua";
-    version = "2023-08-23";
+    version = "2023-09-01";
    src = fetchFromGitHub {
      owner = "ibhagwan";
      repo = "fzf-lua";
-      rev = "b7bda51ba7d0c07aaa30e8428a6531e939f6c3a3";
-      sha256 = "073mgny8xfv1ndhqh241092g6xv1mw4r16ybjjkifv89kdzz53rj";
+      rev = "2632033492cadfbda3a8678d3c3e65d9397e521d";
+      sha256 = "1kn4g74vaz23i9g5m4p39cfifsayvmhfxajvbgfk5x30q3mqfpfw";
    };
    meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
  };
@ -3720,12 +3720,12 @@ final: prev:

  git-conflict-nvim = buildVimPluginFrom2Nix {
    pname = "git-conflict.nvim";
-    version = "2023-08-29";
+    version = "2023-08-31";
    src = fetchFromGitHub {
      owner = "akinsho";
      repo = "git-conflict.nvim";
-      rev = "d084646ef4c40e24eb9cac3eed1f1c8bd140431c";
-      sha256 = "0sf5flwraiby8dknfphyq1k8xyzz2h18illr7m7snx28dhll2cja";
+      rev = "f20f197df50a0779ba55e933ef0995698ad32039";
+      sha256 = "1wmj5hc1g8b8qbfwrckwjz98lrx74fj5skvmp6y2llv2dridk89d";
    };
    meta.homepage = "https://github.com/akinsho/git-conflict.nvim/";
  };
@ -3780,12 +3780,12 @@ final: prev:

  gitsigns-nvim = buildNeovimPlugin {
    pname = "gitsigns.nvim";
-    version = "2023-08-26";
+    version = "2023-08-31";
    src = fetchFromGitHub {
      owner = "lewis6991";
      repo = "gitsigns.nvim";
-      rev = "d8590288417fef2430f85bc8b312fae8b1cf2c40";
-      sha256 = "1ly0hij1ccbvmcx4axdq0bi9iay5ms1597ng84vmx6bnsd0hlfx3";
+      rev = "44adf808ace6cb65a3353bd61fa585a2d8fe0db3";
+      sha256 = "0wp1rdvf1s2z1z39n6wrh3nm2v5bpazh1qw91qv5sg3yyzv5fdg0";
    };
    meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
  };
@ -4020,23 +4020,23 @@ final: prev:

  hardtime-nvim = buildVimPluginFrom2Nix {
    pname = "hardtime.nvim";
-    version = "2023-08-30";
+    version = "2023-09-01";
    src = fetchFromGitHub {
      owner = "m4xshen";
      repo = "hardtime.nvim";
-      rev = "ab488faf43d477f544e6880cd9c1ba51f0fd7995";
-      sha256 = "1li49j0dpah5bjxqa8abjxhmlgl5xr6b7gv9md5430zsf9gvikyb";
+      rev = "cd8212efb4db858251d2d7d15ca1ee76d5f17823";
+      sha256 = "1dahkblxv18b3wbin1cyc5jhx65mcwxdw9jylfg5na5qin5nipr3";
    };
    meta.homepage = "https://github.com/m4xshen/hardtime.nvim/";
  };

  hare-vim = buildVimPluginFrom2Nix {
    pname = "hare.vim";
-    version = "2023-08-21";
+    version = "2023-08-31";
    src = fetchgit {
      url = "https://git.sr.ht/~sircmpwn/hare.vim";
-      rev = "fed1a198b4abdfd7c0f68ab7c6b369460e08fd8d";
-      sha256 = "1md59105irdzlzwiqfl53hlvqj1a4zn21wqvxcbfc937wvk1xsw7";
+      rev = "ce32a0c6a622770bd1454069aef9abe95efcbd16";
+      sha256 = "1rlarv26amx99dhvgqphrjbwl92vci1v56r565fryqrhbgrwr3a0";
    };
    meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim";
  };
@ -4318,12 +4318,12 @@ final: prev:

  image-nvim = buildVimPluginFrom2Nix {
    pname = "image.nvim";
-    version = "2023-08-28";
+    version = "2023-08-31";
    src = fetchFromGitHub {
      owner = "3rd";
      repo = "image.nvim";
-      rev = "6fcf4a9aa2bae1e8319e5c87b0d180c27af3026e";
-      sha256 = "1a8k8pvd9l9zrw8pmfykbn2zva13hf1a8zqyd6pb4b56wyf2vbr7";
+      rev = "1abfecb67aeb103b0d597f1e8098995f2a72934d";
+      sha256 = "06vpa75nnxpjgxxxllif1h9dgzfvkg2080fgcxsrw09myi8xkcbz";
    };
    meta.homepage = "https://github.com/3rd/image.nvim/";
  };
@ -5230,12 +5230,12 @@ final: prev:

  lspsaga-nvim = buildVimPluginFrom2Nix {
    pname = "lspsaga.nvim";
-    version = "2023-08-29";
+    version = "2023-09-01";
    src = fetchFromGitHub {
      owner = "nvimdev";
      repo = "lspsaga.nvim";
-      rev = "34fd54bd4fff12ce748c9f3644ebb5052fdbe17d";
-      sha256 = "0cpghg6kzzq7ygj518n2izavckhkhmxzfdhr4q6i434hd7g6ih0a";
+      rev = "5073eda4082f8b46d0c1573a067cdd56fcd8d066";
+      sha256 = "1w879rf1qv9v7p27dgmf720nab493vf9m70wvi57pl0hqd7zxw4d";
    };
    meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
  };
@ -5278,12 +5278,12 @@ final: prev:

  luasnip = buildVimPluginFrom2Nix {
    pname = "luasnip";
-    version = "2023-08-18";
+    version = "2023-08-31";
    src = fetchFromGitHub {
      owner = "l3mon4d3";
      repo = "luasnip";
-      rev = "c4d6298347f7707e9757351b2ee03d0c00da5c20";
-      sha256 = "0i6llbq26wpnx1za2mh37ja01zqjv8nv3npk6spadvv57yb0m38f";
+      rev = "ea7d7ea510c641c4f15042becd27f35b3e5b3c2b";
+      sha256 = "0r0k265m5nf0rl8hma13yjw8fyd08629h1awa94lk0s6dvk7mkh0";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@ -5507,12 +5507,12 @@ final: prev:

  mini-nvim = buildVimPluginFrom2Nix {
    pname = "mini.nvim";
-    version = "2023-08-29";
+    version = "2023-09-01";
    src = fetchFromGitHub {
      owner = "echasnovski";
      repo = "mini.nvim";
-      rev = "a1b96721dea1e9c7aeeb4bd402b9debebf38ed23";
-      sha256 = "0m52p2k4ghc9mcqv9cpnw2p657vdw1svn69hjfh0dgb6s1nd6vll";
+      rev = "3a3e19d7b7850e711485b8adde73ba44789f2cf6";
+      sha256 = "1zlbjdigfpp5p97156bpg5n8y90gwh17qw8gy3mws9xss73zxy1g";
    };
    meta.homepage = "https://github.com/echasnovski/mini.nvim/";
  };
@ -5879,12 +5879,12 @@ final: prev:

  neo-tree-nvim = buildVimPluginFrom2Nix {
    pname = "neo-tree.nvim";
-    version = "2023-08-27";
+    version = "2023-08-30";
    src = fetchFromGitHub {
      owner = "nvim-neo-tree";
      repo = "neo-tree.nvim";
-      rev = "2c992760f154285dff9f798647954b363cf35963";
-      sha256 = "03gads1fim5lv90sgxvv16gn3hm32qq9hlm31qjs2hs2qiminsj0";
+      rev = "71d5559f7fa8e28a51570134e300b62f141a2f34";
+      sha256 = "0qgyi4zp4mdn8a7rqpb62rxkx016w18vyyvy0zgbk71xlh985da5";
    };
    meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
  };
@ -5903,12 +5903,12 @@ final: prev:

  neoconf-nvim = buildVimPluginFrom2Nix {
    pname = "neoconf.nvim";
-    version = "2023-08-29";
+    version = "2023-09-01";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "neoconf.nvim";
-      rev = "1075bd7f23d244f14d691c261b14c38209abf02d";
-      sha256 = "114m39r7zy62z3ri6lr0gcj9c1p6mq131234c0im24z0wkb93czy";
+      rev = "92c981fea858ce1f7440b45af9e649be8fe75c5f";
+      sha256 = "1d62yw6qxas3fk91v883yzcl8j3i84qh1jakw0abzqzlb8jhj56r";
    };
    meta.homepage = "https://github.com/folke/neoconf.nvim/";
  };
@ -5963,12 +5963,12 @@ final: prev:

  neogit = buildVimPluginFrom2Nix {
    pname = "neogit";
-    version = "2023-08-30";
+    version = "2023-09-01";
    src = fetchFromGitHub {
      owner = "NeogitOrg";
      repo = "neogit";
-      rev = "dc7e5d005287ee410b0a791897fd98131f9105c3";
-      sha256 = "0iqq1a9fdrn904a94ggbhyjb0n1mkndxvmkqm0d7yla5h2wm46rp";
+      rev = "08d23c7ae1e7c3c66802990d5aa16269bdd996a7";
+      sha256 = "1paazirc1alhmk85y0p2hsry62g6a0ly2r4pn5fp9vnix2gdjmb9";
    };
    meta.homepage = "https://github.com/NeogitOrg/neogit/";
  };
@ -6035,12 +6035,12 @@ final: prev:

  neorg = buildVimPluginFrom2Nix {
    pname = "neorg";
-    version = "2023-08-14";
+    version = "2023-08-30";
    src = fetchFromGitHub {
      owner = "nvim-neorg";
      repo = "neorg";
-      rev = "f296a22864bbac0d94ad00fa18cc8231dbeaa1e3";
-      sha256 = "1xd4h2vrm7b87y2islyz3iigzd6xy9ramq5ayxbd89xaywjj3lid";
+      rev = "064f8f65dd32f4fe728e76acfa3e4e153b121147";
+      sha256 = "0whwlny5q02yi011wl4clhvq6347w7sn4j2cj7ck7wp8mqrbwpwz";
    };
    meta.homepage = "https://github.com/nvim-neorg/neorg/";
  };
@ -6540,12 +6540,12 @@ final: prev:

  nord-nvim = buildVimPluginFrom2Nix {
    pname = "nord.nvim";
-    version = "2023-03-26";
+    version = "2023-08-30";
    src = fetchFromGitHub {
      owner = "shaunsingh";
      repo = "nord.nvim";
-      rev = "fab04b2dd4b64f4b1763b9250a8824d0b5194b8f";
-      sha256 = "01zbahh1q332lcksd7dmkw109i7x5xan9w9z3n13bwwpn01knf6h";
+      rev = "15fbfc38a83980b93e169b32a1bf64757f1e2bf4";
+      sha256 = "077mr9gz4bsk0fz7vmzc9b68kysdax5vrlwfh7rhdam8qqlpncm7";
    };
    meta.homepage = "https://github.com/shaunsingh/nord.nvim/";
  };
@ -6624,12 +6624,12 @@ final: prev:

  nvchad = buildVimPluginFrom2Nix {
    pname = "nvchad";
-    version = "2023-08-27";
+    version = "2023-08-31";
    src = fetchFromGitHub {
      owner = "nvchad";
      repo = "nvchad";
-      rev = "3f1e6d71d4c6c98380d5383d5e1bf1f6eaa3399f";
-      sha256 = "18g985bq6r5n36m0043xrdclqrm6dg6p9pz94lrabmqvl2kgda3f";
+      rev = "a9bc954d0203ae9bded11f1e7167bf9020f181aa";
+      sha256 = "0dq46jigkpa886svpjlp7267nbk6v5cyfyh26yml3kvsh7sdzdi9";
    };
    meta.homepage = "https://github.com/nvchad/nvchad/";
  };
@ -6864,12 +6864,12 @@ final: prev:

  nvim-dap = buildVimPluginFrom2Nix {
    pname = "nvim-dap";
-    version = "2023-08-24";
+    version = "2023-08-31";
    src = fetchFromGitHub {
      owner = "mfussenegger";
      repo = "nvim-dap";
-      rev = "4377a05b9476587b7b485d6a9d9745768c4e4b37";
-      sha256 = "0mvlh0wdycdk07384i68gyxsafy437pbyryaqf3zbnw95r0z1va9";
+      rev = "31e1ece773e10448dcb616d5144290946a6264b7";
+      sha256 = "1sm6pbsh6hkvd6qvbls5hlbbvmk9n60dp228zk18s8kml24x3bcb";
    };
    meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
  };
@ -7103,12 +7103,12 @@ final: prev:

  nvim-lilypond-suite = buildVimPluginFrom2Nix {
    pname = "nvim-lilypond-suite";
-    version = "2023-08-29";
+    version = "2023-09-01";
    src = fetchFromGitHub {
      owner = "martineausimon";
      repo = "nvim-lilypond-suite";
-      rev = "ef1f81f25ac319d87de22fe45100441ad6b24abc";
-      sha256 = "1anrqzwjm53mlr5zikawzxsarylc5n6vpa9nna13r88ni349ilda";
+      rev = "ba3acec99c479492b1f843937cc423557cb8c5ad";
+      sha256 = "0n88n1b0yki7v3dpbbch3rrrhcj8ga3k3j1gzjv93c9igzsyx97d";
    };
    meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/";
  };
@ -7235,12 +7235,12 @@ final: prev:

  nvim-navbuddy = buildVimPluginFrom2Nix {
    pname = "nvim-navbuddy";
-    version = "2023-08-26";
+    version = "2023-09-01";
    src = fetchFromGitHub {
      owner = "SmiteshP";
      repo = "nvim-navbuddy";
-      rev = "46670b27a21ae26d25d3ee2b71f31729162f9de7";
-      sha256 = "1adh5dybdgh24mc6in3rabydm1ap0k0dsjrjy626007j57m6agwc";
+      rev = "b56a704323d07aac296a20bbf8274cf24e73ab32";
+      sha256 = "0ncd6wr7csi13j9ysisbgbygzxhnrgwzlaxhfz6s51h71qycfcd4";
    };
    meta.homepage = "https://github.com/SmiteshP/nvim-navbuddy/";
  };
@ -7391,12 +7391,12 @@ final: prev:

  nvim-snippy = buildVimPluginFrom2Nix {
    pname = "nvim-snippy";
-    version = "2023-08-20";
+    version = "2023-08-31";
    src = fetchFromGitHub {
      owner = "dcampos";
      repo = "nvim-snippy";
-      rev = "ee3b830787538f259b84867c8971c4284abc4a8d";
-      sha256 = "1la88yl3k8nbjskqxhy494d0a4mdhnvxglxsqc225jsyx6h6pj42";
+      rev = "83a6ee5feac7cd08269159380c51e1de416800a5";
+      sha256 = "17xswhp4whvraz7nl2sqpjwy4i0aiy1mb5ns1v8gay5p9ksa3xpi";
    };
    meta.homepage = "https://github.com/dcampos/nvim-snippy/";
  };
@ -7499,12 +7499,12 @@ final: prev:

  nvim-treesitter = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter";
-    version = "2023-08-30";
+    version = "2023-09-01";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter";
-      rev = "7f6ff292e3f53e7b12554ee92264c23762dc7906";
-      sha256 = "0y0z43cnwh5ssrvqrxqmzvhq0nymczxbivjzc3n0dcpk60609j14";
+      rev = "691d73287a94e8ed82a383df82aabfe77ab4bcaa";
+      sha256 = "0633r617g3a1c405yyhma5n9qzb6hnh5j2ryxwkzbl78ld1fs8ip";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
  };
@ -7630,12 +7630,12 @@ final: prev:

  nvim-ufo = buildVimPluginFrom2Nix {
    pname = "nvim-ufo";
-    version = "2023-08-26";
+    version = "2023-08-31";
    src = fetchFromGitHub {
      owner = "kevinhwang91";
      repo = "nvim-ufo";
-      rev = "8b01594c29bd01e7b49b647a663c819ed909714f";
-      sha256 = "1vw1nprs4kgz9y3r294ws3axbsgnfbjnvin7ja6xsg4fsaxqy8fw";
+      rev = "890b94870f052773d77175d07a51f2e083210632";
+      sha256 = "0c823ya1501qi6kbp889sw5jrgx2249x8q27drmpjv29lr5lkb06";
    };
    meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/";
  };
@ -7823,12 +7823,12 @@ final: prev:

  onedarkpro-nvim = buildVimPluginFrom2Nix {
    pname = "onedarkpro.nvim";
-    version = "2023-08-21";
+    version = "2023-08-31";
    src = fetchFromGitHub {
      owner = "olimorris";
      repo = "onedarkpro.nvim";
-      rev = "c81dff789f7623c431d1f43cf334237e52bbfd61";
-      sha256 = "193yw6bk7psa979cpp1ram0ipw49kj0xsr25mk5m78xh8pivgg1g";
+      rev = "fa861b992471d55f653751f1fea8769ca536a554";
+      sha256 = "0llkyk2q127lp932mwnqx90zbn23l7s7v3fa8p6sdx25bvjcbjfz";
    };
    meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
  };
@ -7956,12 +7956,12 @@ final: prev:

  oxocarbon-nvim = buildVimPluginFrom2Nix {
    pname = "oxocarbon.nvim";
-    version = "2023-06-06";
+    version = "2023-08-30";
    src = fetchFromGitHub {
      owner = "nyoom-engineering";
      repo = "oxocarbon.nvim";
-      rev = "12a7507f1cd5ac6edb890d12268e4444a35956f2";
-      sha256 = "0l6akk6yx06yfz83y041qnxghgrhbgmvlvsfqqahknxsc2bakh1r";
+      rev = "162a92e2bcca588a01c2f9fd857bdb4dabd8d72c";
+      sha256 = "06q6ykda4pbkqblkqvk7l1gjw9hwn06l13v1sann39dzgwi1yrw7";
    };
    meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/";
  };
@ -8497,12 +8497,12 @@ final: prev:

  refactoring-nvim = buildVimPluginFrom2Nix {
    pname = "refactoring.nvim";
-    version = "2023-08-23";
+    version = "2023-08-31";
    src = fetchFromGitHub {
      owner = "theprimeagen";
      repo = "refactoring.nvim";
-      rev = "2cfd6ddb0acece95d9658560ae9740b98ef70dbb";
-      sha256 = "1pcfxl5350qwrlrr5j784pzy4w5b1v9w1yjjcpk0fghv2wi99isk";
+      rev = "2ec9bc0fb5f3c8c6a0f776f0159dd2a3b1663554";
+      sha256 = "038cczxj9ba3axb3aw5r2dsp5anzacnwnnp61i1pk7kk8l3wg2ck";
    };
    meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
  };
@ -8821,12 +8821,12 @@ final: prev:

  sg-nvim = buildVimPluginFrom2Nix {
    pname = "sg.nvim";
-    version = "2023-08-29";
+    version = "2023-08-30";
    src = fetchFromGitHub {
      owner = "sourcegraph";
      repo = "sg.nvim";
-      rev = "bd4efc10ab92b83443df06dda7b8ac95d462c2c0";
-      sha256 = "0x2xlv49j7g7xhrhkj20qz63xw28mg6zm4wkd26j1j7gb0kgjm97";
+      rev = "ef9deec58ac515f2a743f6e251eb8e464a654e41";
+      sha256 = "10as3cc2bdl3w6cxhz8ijq94q54g9lhrcl70m2xild47i08h18nh";
    };
    meta.homepage = "https://github.com/sourcegraph/sg.nvim/";
  };
@ -9423,6 +9423,18 @@ final: prev:
    meta.homepage = "https://github.com/gcmt/taboo.vim/";
  };

+  tabout-nvim = buildVimPluginFrom2Nix {
+    pname = "tabout.nvim";
+    version = "2023-03-29";
+    src = fetchFromGitHub {
+      owner = "abecodes";
+      repo = "tabout.nvim";
+      rev = "0d275c8d25f32457e67b5c66d6ae43f26a61bce5";
+      sha256 = "11zly7bfdz110a7ififylzgizin06ia0i3jipzp12n2n2paarp1f";
+    };
+    meta.homepage = "https://github.com/abecodes/tabout.nvim/";
+  };
+
  tabpagebuffer-vim = buildVimPluginFrom2Nix {
    pname = "tabpagebuffer.vim";
    version = "2014-09-30";
@ -9811,12 +9823,12 @@ final: prev:

  telescope-nvim = buildNeovimPlugin {
    pname = "telescope.nvim";
-    version = "2023-08-29";
+    version = "2023-08-30";
    src = fetchFromGitHub {
      owner = "nvim-telescope";
      repo = "telescope.nvim";
-      rev = "32e6792f865221dfaf2a3751fd3cfeac96557433";
-      sha256 = "1rbm8sb8cvmvgbcqkiy9j507hh47xvbd5s91j6kiqwng04c5mf63";
+      rev = "2c1ed33a6f6f2db3b69f5421f6b405eda1b07748";
+      sha256 = "1adam01isj51qbihxxkz20l00x1lfvdsbvzs6wamzpycjh4i9bj4";
    };
    meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
  };
@ -10268,12 +10280,12 @@ final: prev:

  unison = buildVimPluginFrom2Nix {
    pname = "unison";
-    version = "2023-08-29";
+    version = "2023-08-31";
    src = fetchFromGitHub {
      owner = "unisonweb";
      repo = "unison";
-      rev = "a8cc552bad9f6bf5de1d5c62c4aa2d4c270a7541";
-      sha256 = "1l4zdj36dsi5vhx7m21wb5kjdn5yljjw526hgc86ws5l1xq1vngb";
+      rev = "e7b891914b10df0c5075a617e55be93d3f4b7537";
+      sha256 = "1637y40gpfc63ba4rhn1mri29v1g7393k1hmni96f8wr25agh0q8";
    };
    meta.homepage = "https://github.com/unisonweb/unison/";
  };
@ -12080,12 +12092,12 @@ final: prev:

  vim-gitgutter = buildVimPluginFrom2Nix {
    pname = "vim-gitgutter";
-    version = "2023-08-17";
+    version = "2023-09-01";
    src = fetchFromGitHub {
      owner = "airblade";
      repo = "vim-gitgutter";
-      rev = "5f525476f3ade40e60aa295a8a2a01c0935b0d61";
-      sha256 = "15mh6j4727fcy8rq6yzhdngg39wqqjlx6w042xk76hyzdnamcc10";
+      rev = "744a0fcd9e723ec66b7e3302f20dcd8c7227f010";
+      sha256 = "11f1s9946hpwz2762ckr271gf3i8nq8g3k94lqdmv6fi1cacmwkc";
    };
    meta.homepage = "https://github.com/airblade/vim-gitgutter/";
  };
@ -13187,12 +13199,12 @@ final: prev:

  vim-monokai-tasty = buildVimPluginFrom2Nix {
    pname = "vim-monokai-tasty";
-    version = "2023-02-15";
+    version = "2023-08-31";
    src = fetchFromGitHub {
      owner = "patstockwell";
      repo = "vim-monokai-tasty";
-      rev = "8c1052347dd204a83ef72f7af36bdf2fa6861e0b";
-      sha256 = "12wri9qj8klvksn9n7g2jvnnsa41vn4ij44wsyc3g44630p2d7x9";
+      rev = "c6c25baf03e9a4ce039f20b72a0d9af1b03776e2";
+      sha256 = "11i22k4sm5ckq612bs9a5jjcd3zsjv7hgy60ba5fg1jl82b7xm2j";
    };
    meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/";
  };
@ -15409,12 +15421,12 @@ final: prev:

  vimtex = buildVimPluginFrom2Nix {
    pname = "vimtex";
-    version = "2023-08-19";
+    version = "2023-08-31";
    src = fetchFromGitHub {
      owner = "lervag";
      repo = "vimtex";
-      rev = "534fd725f2475a9083b032e402c7e73b8a3fc6bb";
-      sha256 = "0i1fnvj10m01jxp5kxjya8xsmk8xgnm9jn5bm5zrq4l7m1i85gk4";
+      rev = "ad17583ce399b6830b4c2888ef2a12d52c5eb607";
+      sha256 = "1x1y118y8czz5r5qn3pr8lh1jx79pr0bsr3lghh58zvgzawg2swk";
    };
    meta.homepage = "https://github.com/lervag/vimtex/";
  };
@ -15782,12 +15794,12 @@ final: prev:

  zenbones-nvim = buildVimPluginFrom2Nix {
    pname = "zenbones.nvim";
-    version = "2023-07-02";
+    version = "2023-08-30";
    src = fetchFromGitHub {
      owner = "mcchrish";
      repo = "zenbones.nvim";
-      rev = "ba1c6ad48626526f65a2eb0149abbc2747cb961b";
-      sha256 = "04k0l2nqjnw1qgzl0xnsi9r48rp91z6201dpwpnviv3bhlzsvdbf";
+      rev = "491b8a79e0547e181c7c6fb054d778fd595f068c";
+      sha256 = "1p8fakdby43sk3l54dszib5sf6h58mcmvdd3zvwjxn16diqjd6jd";
    };
    meta.homepage = "https://github.com/mcchrish/zenbones.nvim/";
  };
@ -15890,12 +15902,12 @@ final: prev:

  dracula-vim = buildVimPluginFrom2Nix {
    pname = "dracula-vim";
-    version = "2023-08-23";
+    version = "2023-08-30";
    src = fetchFromGitHub {
      owner = "dracula";
      repo = "vim";
-      rev = "248e649f2fbd262292ee4196cadb5b7f38168f37";
-      sha256 = "0lmch8zyxcq22v4988sb1wasvfj9fgq869wlpzi2kg60fw9d8zpd";
+      rev = "b2cc39273abbb6b38a3d173d2a5d8c2d1c79fc19";
+      sha256 = "1fcggi03mh0rq1akr9a76mfycm6i34yihhkqmxzgbf63q4v90qrd";
    };
    meta.homepage = "https://github.com/dracula/vim/";
  };
@ -15938,12 +15950,12 @@ final: prev:

  nightfly = buildVimPluginFrom2Nix {
    pname = "nightfly";
-    version = "2023-08-20";
+    version = "2023-09-01";
    src = fetchFromGitHub {
      owner = "bluz71";
      repo = "vim-nightfly-colors";
-      rev = "06eaaaa8717538a7ce96b13c137da8c9eaa84ec8";
-      sha256 = "08g7dwa1qlg7gj10y2sggq4558fl3cywvq4zhqnzygxlnb66rjpd";
+      rev = "2737ba5b8d22ad6803bb0f51099f90c61bab566c";
+      sha256 = "07g6s0p9mqs3s65a027zvpwpfmx191ajg0h8v9qilgzw755barx7";
    };
    meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/";
  };
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@ -60,12 +60,12 @@
  };
  bash = buildGrammar {
    language = "bash";
-    version = "0.0.0+rev=4798bc6";
+    version = "0.0.0+rev=bdcd56c";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-bash";
-      rev = "4798bc61410fcb3ae725bab24f96f5c4684cea71";
-      hash = "sha256-VHzmBJc9Y3T0jRnOLDJEDVsC/ufGTryWzz/uxgHX2ck=";
+      rev = "bdcd56c5a3896f7bbb7684e223c43d9f24380351";
+      hash = "sha256-zkhCk19kd/KiqYTamFxui7KDE9d+P9pLjc1KVTvYPhI=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash";
  };
@ -291,12 +291,12 @@
  };
  csv = buildGrammar {
    language = "csv";
-    version = "0.0.0+rev=f1d35df";
+    version = "0.0.0+rev=6c19574";
    src = fetchFromGitHub {
      owner = "amaanq";
      repo = "tree-sitter-csv";
-      rev = "f1d35df780976721d3cd38f0b16538dd31f87a23";
-      hash = "sha256-t4uzc1VwJzS4qj0D1wolUvUNuc5OzC4L4RnLpYh+TXo=";
+      rev = "6c1957405bd6f7751b050f61367f1094fab91444";
+      hash = "sha256-ISG+FgauEfuH5+uCxQWA1h9/HTaWR3eJcn+k2c51dYs=";
    };
    location = "csv";
    meta.homepage = "https://github.com/amaanq/tree-sitter-csv";
@ -403,12 +403,12 @@
  };
  doxygen = buildGrammar {
    language = "doxygen";
-    version = "0.0.0+rev=7ac6203";
+    version = "0.0.0+rev=a750758";
    src = fetchFromGitHub {
      owner = "amaanq";
      repo = "tree-sitter-doxygen";
-      rev = "7ac6203cc018ff440b45b6d5aeba596f02eec4d5";
-      hash = "sha256-QgmbdB9byVxLpsKB+FaQyyqUO8YuTfnYSTP9hDj5OOU=";
+      rev = "a750758da90955c86fcc22fcbb6fa44a7d009865";
+      hash = "sha256-/4yBu5S9bQhxGO9JcNZukn+xpfzfaQQRLqVuDHgMYd0=";
    };
    meta.homepage = "https://github.com/amaanq/tree-sitter-doxygen";
  };
@ -570,12 +570,12 @@
  };
  fortran = buildGrammar {
    language = "fortran";
-    version = "0.0.0+rev=6828cf3";
+    version = "0.0.0+rev=f73d473";
    src = fetchFromGitHub {
      owner = "stadelmanma";
      repo = "tree-sitter-fortran";
-      rev = "6828cf3629addb1706bdbbd33491e95f12b7042c";
-      hash = "sha256-/DoXmcNmHvgWvYt4IkHJoDp46xgoHMp+cw1jYEcQCHI=";
+      rev = "f73d473e3530862dee7cbb38520f28824e7804f6";
+      hash = "sha256-K9CnLhDKiWTxVM5OBZ80psV2oFDnlTgd+DDoP39ufds=";
    };
    meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
  };
@ -1085,6 +1085,17 @@
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia";
  };
+  kconfig = buildGrammar {
+    language = "kconfig";
+    version = "0.0.0+rev=aaba009";
+    src = fetchFromGitHub {
+      owner = "amaanq";
+      repo = "tree-sitter-kconfig";
+      rev = "aaba009ba9d7881f0f81742da588ae70b572316d";
+      hash = "sha256-yjw1fr4utQHIrP/CA4df2adhpm+xrkvobZ5ZF5tjjEI=";
+    };
+    meta.homepage = "https://github.com/amaanq/tree-sitter-kconfig";
+  };
  kdl = buildGrammar {
    language = "kdl";
    version = "0.0.0+rev=e180e05";
@ -1341,6 +1352,17 @@
    };
    meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg";
  };
+  nqc = buildGrammar {
+    language = "nqc";
+    version = "0.0.0+rev=14e6da1";
+    src = fetchFromGitHub {
+      owner = "amaanq";
+      repo = "tree-sitter-nqc";
+      rev = "14e6da1627aaef21d2b2aa0c37d04269766dcc1d";
+      hash = "sha256-Gf6410cWLENCgI1uIBVBl4RnRuVCHkWkn6sxusmI6j4=";
+    };
+    meta.homepage = "https://github.com/amaanq/tree-sitter-nqc";
+  };
  objc = buildGrammar {
    language = "objc";
    version = "0.0.0+rev=62e61b6";
@ -1566,12 +1588,12 @@
  };
  psv = buildGrammar {
    language = "psv";
-    version = "0.0.0+rev=f1d35df";
+    version = "0.0.0+rev=6c19574";
    src = fetchFromGitHub {
      owner = "amaanq";
      repo = "tree-sitter-csv";
-      rev = "f1d35df780976721d3cd38f0b16538dd31f87a23";
-      hash = "sha256-t4uzc1VwJzS4qj0D1wolUvUNuc5OzC4L4RnLpYh+TXo=";
+      rev = "6c1957405bd6f7751b050f61367f1094fab91444";
+      hash = "sha256-ISG+FgauEfuH5+uCxQWA1h9/HTaWR3eJcn+k2c51dYs=";
    };
    location = "psv";
    meta.homepage = "https://github.com/amaanq/tree-sitter-csv";
@ -1677,12 +1699,12 @@
  };
  racket = buildGrammar {
    language = "racket";
-    version = "0.0.0+rev=7dc4fb6";
+    version = "0.0.0+rev=e4ba1a9";
    src = fetchFromGitHub {
      owner = "6cdh";
      repo = "tree-sitter-racket";
-      rev = "7dc4fb60390218b09bc351062eeede7dcdbb4d9f";
-      hash = "sha256-80BJ12gstc2+SuPqwziOClOzeH9BJflQ39JSqUmutkQ=";
+      rev = "e4ba1a9674a3b4dd7905d04f194ae6f8331be342";
+      hash = "sha256-4+TRol2i6ibuXqBr6O8jI/4MZq8hnf09eVBtPqaKp8s=";
    };
    meta.homepage = "https://github.com/6cdh/tree-sitter-racket";
  };
@ -1809,12 +1831,12 @@
  };
  scala = buildGrammar {
    language = "scala";
-    version = "0.0.0+rev=d50b6ca";
+    version = "0.0.0+rev=70afdd5";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-scala";
-      rev = "d50b6ca5cc3d925e3d1f497199cb8d8383ddae8a";
-      hash = "sha256-fzruLddcKTqC47CKCZhznDoyGIA1fPdqxqmzgmd9RkM=";
+      rev = "70afdd5632d57dd63a960972ab25945e353a52f6";
+      hash = "sha256-bi0Lqo/Zs2Uaz1efuKAARpEDg5Hm59oUe7eSXgL1Wow=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
  };
@ -1832,12 +1854,12 @@
  };
  scheme = buildGrammar {
    language = "scheme";
-    version = "0.0.0+rev=af3af6c";
+    version = "0.0.0+rev=85b6188";
    src = fetchFromGitHub {
      owner = "6cdh";
      repo = "tree-sitter-scheme";
-      rev = "af3af6c9356b936f8a515a1e449c32e804c2b1a8";
-      hash = "sha256-s9AoMNYnKvzr969aujgwUaVn4WoRaZ5snfFEF73KUGA=";
+      rev = "85b6188fb77c03dfb01d13e58e2844450506860c";
+      hash = "sha256-v+iQpeAeySKPgMu5IQ8vNnUSc2duX1vYvO3qqK1/Pmc=";
    };
    meta.homepage = "https://github.com/6cdh/tree-sitter-scheme";
  };
@ -2121,12 +2143,12 @@
  };
  tsv = buildGrammar {
    language = "tsv";
-    version = "0.0.0+rev=f1d35df";
+    version = "0.0.0+rev=6c19574";
    src = fetchFromGitHub {
      owner = "amaanq";
      repo = "tree-sitter-csv";
-      rev = "f1d35df780976721d3cd38f0b16538dd31f87a23";
-      hash = "sha256-t4uzc1VwJzS4qj0D1wolUvUNuc5OzC4L4RnLpYh+TXo=";
+      rev = "6c1957405bd6f7751b050f61367f1094fab91444";
+      hash = "sha256-ISG+FgauEfuH5+uCxQWA1h9/HTaWR3eJcn+k2c51dYs=";
    };
    location = "tsv";
    meta.homepage = "https://github.com/amaanq/tree-sitter-csv";
@ -2312,12 +2334,12 @@
  };
  wing = buildGrammar {
    language = "wing";
-    version = "0.0.0+rev=915f263";
+    version = "0.0.0+rev=ca6d5be";
    src = fetchFromGitHub {
      owner = "winglang";
      repo = "wing";
-      rev = "915f263722a6a74e5a30be82310d3843ed203058";
-      hash = "sha256-wUYw3RS0brNbdFcb3ojs6gkrxBuOdRquTEmHTwAzc8w=";
+      rev = "ca6d5bea6c7cf5d16ca65f9ee223d2d3457ab2ec";
+      hash = "sha256-RKDIfU82b58DEDXLte4TTuzTtN44MClyBJQwSuQ8YFo=";
    };
    location = "libs/tree-sitter-wing";
    generate = true;
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -966,7 +966,7 @@ self: super: {
        pname = "sg-nvim-rust";
        inherit (old) version src;

-        cargoHash = "sha256-BXmf/eUxfsqq49K31k1+KjMHTV7KBTh0Sse/hCcFjqw=";
+        cargoHash = "sha256-1mb99WtELS64kfA2exUlVLzOj82xkFhWx0JHayosZL0=";

        nativeBuildInputs = [ pkg-config ];

--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -790,6 +790,7 @@ https://github.com/kdheepak/tabline.nvim/,,
 https://github.com/vim-scripts/tabmerge/,,
 https://github.com/codota/tabnine-vim/,,
 https://github.com/gcmt/taboo.vim/,,
+https://github.com/abecodes/tabout.nvim/,HEAD,
 https://github.com/Shougo/tabpagebuffer.vim/,,
 https://github.com/godlygeek/tabular/,,
 https://github.com/AndrewRadev/tagalong.vim/,,
--- a/pkgs/applications/emulators/yuzu/update.sh
+++ b/pkgs/applications/emulators/yuzu/update.sh
@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p nix nix-prefetch-git gnutar curl jq
+#! nix-shell -i bash -p nix nix-prefetch-git gnutar curl jq unzip

 set -euo pipefail

--- a/pkgs/applications/file-managers/portfolio-filemanager/default.nix
+++ b/pkgs/applications/file-managers/portfolio-filemanager/default.nix
@ -7,18 +7,18 @@
 , glib
 , gobject-introspection
 , gtk3
-, libhandy
-, librsvg
+, gtk4
+, libadwaita
 , meson
 , ninja
 , pkg-config
-, wrapGAppsHook
+, wrapGAppsHook4
 , nix-update-script
 }:

 python3.pkgs.buildPythonApplication rec {
  pname = "portfolio";
-  version = "0.9.15";
+  version = "1.0.0";

  format = "other";

@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
    owner = "tchx84";
    repo = "Portfolio";
    rev = "v${version}";
-    hash = "sha256-/OwHeeUjpjm35O7mySoAfKt7Rsp1EK2WE+tfiV3oiQg=";
+    hash = "sha256-ahVrOyyF/7X19ZJcHQ4YbC+4b96CPEnns7TUAFCvKao=";
  };

  postPatch = ''
@ -37,20 +37,17 @@ python3.pkgs.buildPythonApplication rec {
    appstream-glib
    desktop-file-utils
    gettext
-    glib
    gobject-introspection
-    gtk3
+    gtk3 # For gtk-update-icon-cache
    meson
    ninja
    pkg-config
-    wrapGAppsHook
+    wrapGAppsHook4
  ];

  buildInputs = [
-    glib
-    gtk3
-    libhandy
-    librsvg
+    gtk4
+    libadwaita
  ];

  propagatedBuildInputs = with python3.pkgs; [
@ -65,6 +62,12 @@ python3.pkgs.buildPythonApplication rec {
    ln -s dev.tchx84.Portfolio "$out/bin/portfolio"
  '';

+  # Prevent double wrapping
+  dontWrapGApps = true;
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
  passthru = {
    updateScript = nix-update-script { };
  };
--- a/pkgs/applications/graphics/upscayl/default.nix
+++ b/pkgs/applications/graphics/upscayl/default.nix
@ -4,11 +4,11 @@
  lib,
 }: let
  pname = "upscayl";
-  version = "2.5.5";
+  version = "2.7.5";

  src = fetchurl {
    url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage";
-    hash = "sha256-qpLxOGphR9iHvtb8AZZaMict/g8wLkL7Dhr4mt3LZdk=";
+    hash = "sha256-vJDpwf/N3rk5Bd9hBNpoNtlIAgn+Y77MF231ZOhLNeI=";
  };

  appimageContents = appimageTools.extractType2 {
--- a/pkgs/applications/misc/kratos/default.nix
+++ b/pkgs/applications/misc/kratos/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "kratos";
-  version = "0.10.1";
+  version = "1.0.0";

  src = fetchFromGitHub {
    owner = "ory";
    repo = "kratos";
    rev = "v${version}";
-    hash = "sha256-Ld2N7w9jQLkzCww1Sex5nEBZf6e9XIUnbfPOjcFAYQA=";
+    hash = "sha256-KDpc0zc65rvvpPojghFEujoS0aewyjv7B/bmpC2i1dA=";
  };

-  vendorSha256 = "sha256-9zXoJ+c1aPWDqasechC4ModWE0+sfMqZzp/Pph/mYcs=";
+  vendorSha256 = "sha256-Y/Sd2hu1bPUb0TQRD1pANz+rtqKcHBXvjKpYwKgxHMQ=";

  subPackages = [ "." ];

--- 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.3.1";
+  version = "0.3.2";

  src = fetchCrate {
    inherit pname version;
-    sha256 = "sha256-35MHq2G2L7yfz+W9uUaRb8fpEp/h0bt2HtK615XwZG8=";
+    sha256 = "sha256-HFZSIzP3G6f78gTOpzZFG5ZAo5Lo6VuxQe6xMvCVfss=";
  };

-  cargoHash = "sha256-goIb8BoHSF0g/OWmeZtha+qKlcvLTqwMmYcD2uYUI7E=";
+  cargoHash = "sha256-ZsqxlwgXqw9eUEjw1DLBMz05V/y/ZbcrCL6I8TcnnDs=";

  meta = with lib; {
    description = "A simple tui to view & control docker containers";
--- a/pkgs/applications/misc/pot/Cargo.lock
+++ b/pkgs/applications/misc/pot/Cargo.lock
--- a/pkgs/applications/misc/pot/default.nix
+++ b/pkgs/applications/misc/pot/default.nix
@ -23,13 +23,13 @@

 stdenv.mkDerivation rec {
  pname = "pot";
-  version = "1.10.0";
+  version = "2.0.0";

  src = fetchFromGitHub {
    owner = "pot-app";
    repo = "pot-desktop";
    rev = version;
-    hash = "sha256-v5yx8pE8+m+5CDy7X3CwitYhFQMX8Ynt8Y2k1lEZKpg=";
+    hash = "sha256-VgEDV7bD5EfT5ZG7wuj5Ch3mfZ6x8a8473AvX96C64Q=";
  };

  sourceRoot = "${src.name}/src-tauri";
@ -37,10 +37,6 @@ stdenv.mkDerivation rec {
  postPatch = ''
    substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
      --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
-
-    chmod -R +w ..
-    # Disable auto update check by default
-    sed -i -e '/auto_check/s/true/false/' src/main.rs ../src/windows/Config/index.jsx
  '';

  pnpm-deps = stdenvNoCC.mkDerivation {
@ -70,17 +66,17 @@ stdenv.mkDerivation rec {

    dontFixup = true;
    outputHashMode = "recursive";
-    outputHash = "sha256-HJdVAjvHmhvztJMR9rVniWl12sGQYTyZojEYaoKnn5M=";
+    outputHash = "sha256-+/GDP3IFCidIs2/ZqQX7pZmZNQrCHNT6uy+x1CKkCmI=";
  };

  cargoDeps = rustPlatform.importCargoLock {
    lockFile = ./Cargo.lock;
    outputHashes = {
-      "tauri-plugin-single-instance-0.0.0" = "sha256-Wb08d5Cpi8YhtngbnQ3ziy+zAwg5ZY+2xKejgE2oCNE=";
-      "tauri-plugin-autostart-0.0.0" = "sha256-Wb08d5Cpi8YhtngbnQ3ziy+zAwg5ZY+2xKejgE2oCNE=";
+      # All other crates in the same workspace reuse this hash.
+      "tauri-plugin-autostart-0.0.0" = "sha256-7Qi07yRb+ww569+sEXFIwAtS8jbUNQx6LsrUnMl5YOo=";
      "enigo-0.1.2" = "sha256-99VJ0WYD8jV6CYUZ1bpYJBwIE2iwOZ9SjOvyA2On12Q=";
      "selection-0.1.0" = "sha256-V4vixiyKqhpZeTXiFw0HKz5xr0zHd4DkC/hovJ8Y2a8=";
-      "screenshots-0.6.0" = "sha256-NHs7gqplg/eSUWYojayxeJtX7T4f8mt+akahi9LeukU=";
+      "reqwest_dav-0.1.3" = "sha256-nWOH1SOoNA2o2lmGAIEJj3OLOlP39FjlXqK8LPZ95hI=";
    };
  };

@ -105,12 +101,12 @@ stdenv.mkDerivation rec {

  ESBUILD_BINARY_PATH = "${lib.getExe (esbuild.override {
    buildGoModule = args: buildGoModule (args // rec {
-      version = "0.17.19";
+      version = "0.18.20";
      src = fetchFromGitHub {
        owner = "evanw";
        repo = "esbuild";
        rev = "v${version}";
-        hash = "sha256-PLC7OJLSOiDq4OjvrdfCawZPfbfuZix4Waopzrj8qsU=";
+        hash = "sha256-mED3h+mY+4H465m02ewFK/BgA1i/PQ+ksUNxBlgpUoI=";
      };
      vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
    });
@ -119,6 +115,7 @@ stdenv.mkDerivation rec {
  preBuild = ''
    export HOME=$(mktemp -d)
    pnpm config set store-dir ${pnpm-deps}
+    chmod +w ..
    pnpm install --offline --frozen-lockfile --no-optional --ignore-script
    chmod -R +w ../node_modules
    pnpm rebuild
--- a/pkgs/applications/misc/smb3-foundry/default.nix
+++ b/pkgs/applications/misc/smb3-foundry/default.nix
@ -14,17 +14,15 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "smb3-foundry";
-  version = "1.2";
+  version = "1.3.1";

  src = fetchFromGitHub {
    owner = "mchlnix";
    repo = "SMB3-Foundry";
    rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-iqqIyGp/sqWgShxk52omVcn7Q3WL2hK8sTLH4dashLE=";
+    hash = "sha256-8cf7VhvC372Cqi94n2FSHcoCGblpZoZvBXcXq5jU6CY=";
  };

-  patches = [ ./fix-relative-dirs.patch ];
-
  nativeBuildInputs = [ makeWrapper ];

  installPhase = ''
@ -42,11 +40,12 @@ stdenv.mkDerivation (finalAttrs: {
  '';

  meta = {
-    homepage = "https://github.com/mchlnix/SMB3-Foundry";
-    description = "A modern Super Mario Bros. 3 Level Editor";
    changelog = "https://github.com/mchlnix/SMB3-Foundry/releases/tag/${finalAttrs.version}";
+    description = "A modern Super Mario Bros. 3 Level Editor";
+    homepage = "https://github.com/mchlnix/SMB3-Foundry";
    license = lib.licenses.gpl3Only;
-    platforms = lib.platforms.unix;
+    mainProgram = "smb3-foundry";
    maintainers = with lib.maintainers; [ tomasajt ];
+    platforms = lib.platforms.unix;
  };
 })
--- a/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch
+++ b/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch
@ -1,34 +0,0 @@
-diff --git a/foundry/gui/WarningList.py b/foundry/gui/WarningList.py
-index ace83d7..46012df 100644
--- a/foundry/gui/WarningList.py
-+++ b/foundry/gui/WarningList.py
-@@ -5,6 +5,7 @@ from PySide6.QtCore import QEvent, QRect, Qt, Signal, SignalInstance
- from PySide6.QtGui import QCursor, QFocusEvent
- from PySide6.QtWidgets import QLabel, QVBoxLayout, QWidget
- 
-+from foundry import root_dir
- from foundry.game import GROUND
- from foundry.game.ObjectDefinitions import GeneratorType
- from foundry.game.gfx.objects import EnemyItem
-@@ -216,7 +217,7 @@ class WarningList(QWidget):
-         return [enemy for enemy in self.level_ref.level.enemies if enemy.type == enemy_id]
- 
-     def _build_enemy_clan_dict(self):
-        with open("data/enemy_data.json", "r") as enemy_data_file:
-+        with open(root_dir.joinpath("data", "enemy_data.json"), "r") as enemy_data_file:
-             enemy_data = json.loads(enemy_data_file.read())
- 
-             self._enemy_dict.clear()
-diff --git a/smb3parse/util/parser/__init__.py b/smb3parse/util/parser/__init__.py
-index ecef169..8bba57e 100644
--- a/smb3parse/util/parser/__init__.py
-+++ b/smb3parse/util/parser/__init__.py
-@@ -302,7 +302,7 @@ def gen_levels_in_rom(
- 
-     print("---------------------", level_count, "------------------------")
- 
-    level_data = pathlib.Path("data/levels.dat")
-+    level_data = pathlib.Path(__file__).parent.parent.parent.joinpath("data", "levels.dat")
- 
-     missing = 0
-     levels: dict[int, set[int]] = defaultdict(set)
--- a/pkgs/applications/misc/wofi-emoji/default.nix
+++ b/pkgs/applications/misc/wofi-emoji/default.nix
@ -1,19 +1,18 @@
 { stdenv, lib, fetchurl, fetchFromGitHub, jq, wofi, wtype, wl-clipboard }:

 let emojiJSON = fetchurl {
-  url = "https://raw.githubusercontent.com/muan/emojilib/v3.0.6/dist/emoji-en-US.json";
-  sha256 = "sha256-wf7zsIEbX/diLwmVvnN2Goxh2V5D3Z6nbEMSb5pSGt0=";
-};
+  url = "https://raw.githubusercontent.com/muan/emojilib/v3.0.10/dist/emoji-en-US.json";
+  hash = "sha256-UhAB5hVp5vV2d1FjIb2TBd2FJ6OPBbiP31HGAEDQFnA=";};
 in
 stdenv.mkDerivation rec {
  pname = "wofi-emoji";
-  version = "unstable-2022-08-19";
+  version = "unstable-2023-06-19";

  src = fetchFromGitHub {
-    owner = "dln";
+    owner = "Zeioth";
    repo = pname;
-    rev = "c5ecb4f0f164aedb046f52b5eacac889609c8522";
-    sha256 = "1wq276bhf9x24ds13b2dwa69cjnr207p6977hr4bsnczryg609rh";
+    rev = "796d688b71ac9fa1e5b2c1b9a3fa11dba801b02b";
+    hash = "sha256-HBsqekNuKqxaKaSeLboukLm4Lkg9JakPO7uN3Z8QBC8=";
  };

  nativeBuildInputs = [ jq ];
--- a/pkgs/applications/networking/cawbird/default.nix
+++ b/pkgs/applications/networking/cawbird/default.nix
@ -1,88 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, glib
-, gtk3
-, json-glib
-, sqlite
-, libsoup
-, liboauth
-, gettext
-, gspell
-, vala
-, meson
-, ninja
-, pkg-config
-, dconf
-, gst_all_1
-, wrapGAppsHook
-, gobject-introspection
-, glib-networking
-, librest
-, python3
-}:
-
-stdenv.mkDerivation rec {
-  version = "1.5";
-  pname = "cawbird";
-
-  src = fetchFromGitHub {
-    owner = "IBBoard";
-    repo = "cawbird";
-    rev = "v${version}";
-    sha256 = "sha256-XFN9gfCoQDmYYysg1yrUoPPE0Ow40LttvV5Ltu0DTfI=";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    vala
-    pkg-config
-    wrapGAppsHook
-    python3
-    gobject-introspection # for setup hook
-  ];
-
-  buildInputs = [
-    glib
-    gtk3
-    json-glib
-    sqlite
-    libsoup
-    liboauth
-    gettext
-    dconf
-    gspell
-    glib-networking
-    librest
-  ] ++ (with gst_all_1; [
-    gstreamer
-    gst-plugins-base
-    gst-plugins-bad
-    (gst-plugins-good.override {
-      gtkSupport = true;
-    })
-    gst-libav
-  ]);
-
-  postPatch = ''
-    chmod +x data/meson_post_install.py # patchShebangs requires executable file
-    patchShebangs data/meson_post_install.py
-  '';
-
-  # supply Twitter API keys
-  # use keys supplied by @SuperSandro2000, see https://github.com/IBBoard/cawbird/blob/master/README.md#preparation
-  mesonFlags = [
-    "-Dconsumer_key_base64=YnJJNm01SE9PbEkzM3pWenZObVhVSHdlTg=="
-    "-Dconsumer_secret_base64=YUc1SkcyYzhsenlKT2VOWWhVSXlJMERDaFh0WEswUG9oTEp4TzhZNEdJb1hXN0hhYlY="
-  ];
-
-  meta = with lib; {
-    description = "Native GTK Twitter client for the Linux desktop";
-    longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird.";
-    homepage = "https://ibboard.co.uk/cawbird/";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with lib.maintainers; [ jonafato schmittlauch ];
-  };
-}
--- a/pkgs/applications/networking/cluster/kn/default.nix
+++ b/pkgs/applications/networking/cluster/kn/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "kn";
-  version = "1.10.0";
+  version = "1.11.0";

  src = fetchFromGitHub {
    owner = "knative";
    repo = "client";
    rev = "knative-v${version}";
-    sha256 = "sha256-LkjE3GMHoD+PmB4J09xf71nBrY1KPvh13l2O3QN9EH0=";
+    sha256 = "sha256-Aiu8SedWCP2yIw51+aVEFcskJKee8RvUcW6yGtagSnI=";
  };

  vendorHash = null;
--- a/pkgs/applications/networking/cluster/luigi/default.nix
+++ b/pkgs/applications/networking/cluster/luigi/default.nix
@ -2,14 +2,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "luigi";
-  version = "3.0.2";
+  version = "3.3.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "b4b1ccf086586d041d7e91e68515d495c550f30e4d179d63863fea9ccdbb78eb";
+    sha256 = "sha256-zIZC3rbiLwYB7o34rT3mOagVIbfmY6elBEkZGFrSs1c=";
  };

-  propagatedBuildInputs = with python3.pkgs; [ python-dateutil tornado python-daemon boto3 ];
+  propagatedBuildInputs = with python3.pkgs; [ python-dateutil tornado python-daemon boto3 tenacity ];

  # Requires tox, hadoop, and google cloud
  doCheck = false;
--- a/pkgs/applications/networking/cluster/node-problem-detector/default.nix
+++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "node-problem-detector";
-  version = "0.8.13";
+  version = "0.8.14";

  src = fetchFromGitHub {
    owner = "kubernetes";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-nNi4YahrO4zwqwR90tIpQCAydGdQbfy5PXCifpP/T7Q=";
+    sha256 = "sha256-kh9rYg6UszBMCWYfVU+tP4ZRoigEm6+Z+7pnZWdbcwU=";
  };

  vendorHash = null;
--- a/pkgs/applications/networking/cluster/temporal-cli/default.nix
+++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix
@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoModule, installShellFiles, symlinkJoin }:
+{ lib, fetchFromGitHub, buildGoModule, installShellFiles, symlinkJoin, stdenv }:

 let
  metaCommon = with lib; {
@ -40,6 +40,9 @@ let
      "-X github.com/temporalio/cli/headers.Version=${version}"
    ];

+    # Tests fail with x86 on macOS Rosetta 2
+    doCheck = !(stdenv.isDarwin && stdenv.hostPlatform.isx86_64);
+
    preCheck = ''
      export HOME=$(mktemp -d)
    '';
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@ -8,13 +8,13 @@ buildGoModule rec {
  /* Do not use "dev" as a version. If you do, Tilt will consider itself
    running in development environment and try to serve assets from the
    source tree, which is not there once build completes.  */
-  version = "0.33.4";
+  version = "0.33.5";

  src = fetchFromGitHub {
    owner = "tilt-dev";
    repo = "tilt";
    rev = "v${version}";
-    hash = "sha256-rQ5g5QyGyuJAHmE8zGFzqtpqW2xEju5JV386y9Cn+cs=";
+    hash = "sha256-o78PoIKj+0FvZRpm0AqtUq3N9a9/LDYc7DIPZgSZe4s=";
  };

  vendorHash = null;
--- a/pkgs/applications/networking/cluster/timoni/default.nix
+++ b/pkgs/applications/networking/cluster/timoni/default.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "timoni";
-  version = "0.11.1";
+  version = "0.12.1";

  src = fetchFromGitHub {
    owner = "stefanprodan";
    repo = "timoni";
    rev = "v${version}";
-    hash = "sha256-o5s/3c6fi6aYzKIBKq23U6FtzueDN0WVsG/wdCMEjDU=";
+    hash = "sha256-GILJAaid1kSO9281HQx7NI+mjmyJbTYTkwhvX4V/Idc=";
  };

-  vendorHash = "sha256-rMLswgEWWaDupBHDXs/JATaaw4n5D+LjlM72eq8hPAM=";
+  vendorHash = "sha256-nGYAk9dwQ/+3SmNqGzbpptqBDAO/vNT9jhlcJf4y8jg=";

  subPackages = [ "cmd/timoni" ];
  nativeBuildInputs = [ installShellFiles ];
--- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
@ -2,13 +2,13 @@

 (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
  pname = "signalbackup-tools";
-  version = "20230730";
+  version = "20230905-3";

  src = fetchFromGitHub {
    owner = "bepaald";
    repo = pname;
    rev = version;
-    hash = "sha256-5gXeAX3eV70p5wdQEMXv5QAv3vXH2OH46XL2rY0AUvE=";
+    hash = "sha256-xbQcrDtTZh0UeNIRODeA1OBgMdqEso2gAFuSpTSvrXo=";
  };

  postPatch = ''
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@ -48,23 +48,23 @@ let
  # and often with different versions.  We write them on three lines
  # like this (rather than using {}) so that the updater script can
  # find where to edit them.
-  versions.aarch64-darwin = "5.15.11.22019";
-  versions.x86_64-darwin = "5.15.11.22019";
-  versions.x86_64-linux = "5.15.11.7239";
+  versions.aarch64-darwin = "5.15.12.22445";
+  versions.x86_64-darwin = "5.15.12.22445";
+  versions.x86_64-linux = "5.15.12.7665";

  srcs = {
    aarch64-darwin = fetchurl {
      url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
      name = "zoomusInstallerFull.pkg";
-      hash = "sha256-R3QD2jo0+kwgOZ0PwHbFxAlbutSpxyDr+CzEwdKxioY=";
+      hash = "sha256-pTpNbKmJGTxRIrfD/zWIrkouhCbErxu9Gjy9mDdTtHc=";
    };
    x86_64-darwin = fetchurl {
      url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
-      hash = "sha256-nSiG2n8oN1k0xyBw4jWbrZT6AiP5VVJXkeBXppvNcAk=";
+      hash = "sha256-EItKg22id/e7OfJaWxxJdl9B+3nDHNl6ENvfGR4QJ6Y=";
    };
    x86_64-linux = fetchurl {
      url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
-      hash = "sha256-pnVy+rS3NxMPwm86+ERLf1oSrsniP3i+FhSg16BuO38=";
+      hash = "sha256-DMFMLwxPt1LV4Qhhrw6gdToe0z9743hGcxVWeR4O1YU=";
    };
  };

--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/pkgs/applications/networking/ostinato/default.nix
@ -6,13 +6,13 @@

 mkDerivation rec {
  pname = "ostinato";
-  version = "1.1";
+  version = "1.2.0";

  src = fetchFromGitHub  {
    owner  = "pstavirs";
    repo   = "ostinato";
    rev    = "v${version}";
-    sha256 = "0B3jOj5rA3/rD2gXS2praZImeP34zN06fOPy/IswXOg=";
+    sha256 = "sha256-yhfhNfkiZulF0FxNT+3CeGqUTXLmwPQntl2TLdCcMTQ=";
  };

  ostinatoIcon = fetchurl {
--- a/pkgs/applications/office/jabref/default.nix
+++ b/pkgs/applications/office/jabref/default.nix
@ -1,5 +1,6 @@
 { lib
 , stdenv
+, fetchurl
 , fetchFromGitHub
 , wrapGAppsHook
 , makeDesktopItem
@ -10,6 +11,7 @@
 , jdk
 , gradle
 , perl
+, python3
 }:

 let
@ -19,20 +21,20 @@ let
      pin = "2.2.1-20230117.075740-16";
    };
    afterburner = {
-      snapshot = "testmoduleinfo-SNAPSHOT";
-      pin = "0e337d8773";
+      snapshot = "1.1.0-SNAPSHOT";
+      pin = "1.1.0-20221226.155809-7";
    };
  };
 in
 stdenv.mkDerivation rec {
-  version = "5.9";
+  version = "5.10";
  pname = "jabref";

  src = fetchFromGitHub {
    owner = "JabRef";
    repo = "jabref";
    rev = "v${version}";
-    hash = "sha256-uACmXas5L1NcxLwllkcbgCCt9bRicpQkiJkhkkVWDDY=";
+    hash = "sha256-Yj4mjXOZVM0dKcMfTjmnZs/kIs8AR0KJ9HKlyPM96j8=";
  };

  desktopItems = [
@ -49,35 +51,46 @@ stdenv.mkDerivation rec {
    })
  ];

-  deps = stdenv.mkDerivation {
-    pname = "${pname}-deps";
-    inherit src version postPatch;
+  deps =
+    let
+      javafx-web = fetchurl {
+        url = "https://repo1.maven.org/maven2/org/openjfx/javafx-web/20/javafx-web-20.jar";
+        hash = "sha256-qRtVN34KURlVM5Ie/x25IfKsKsUcux7V2m3LML74G/s=";
+      };
+    in
+    stdenv.mkDerivation {
+      pname = "${pname}-deps";
+      inherit src version postPatch;

-    nativeBuildInputs = [ gradle perl ];
-    buildPhase = ''
-      export GRADLE_USER_HOME=$(mktemp -d)
-      gradle --no-daemon downloadDependencies -Dos.arch=amd64
-      gradle --no-daemon downloadDependencies -Dos.arch=aarch64
-    '';
-    # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
-    installPhase = ''
-      find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
-        | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \
-        | sh
-      mv $out/com/tobiasdiez/easybind/${versionReplace.easybind.pin} \
-        $out/com/tobiasdiez/easybind/${versionReplace.easybind.snapshot}
-    '';
-    # Don't move info to share/
-    forceShare = [ "dummy" ];
-    outputHashMode = "recursive";
-    outputHash = "sha256-s6GA8iT3UEVuELBgpBvzPJlVX+9DpfOQrEd3KIth8eA=";
-  };
+      nativeBuildInputs = [ gradle perl ];
+      buildPhase = ''
+        export GRADLE_USER_HOME=$(mktemp -d)
+        gradle --no-daemon downloadDependencies -Dos.arch=amd64
+        gradle --no-daemon downloadDependencies -Dos.arch=aarch64
+      '';
+      # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
+      installPhase = ''
+        find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
+          | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \
+          | sh
+        mv $out/org/jabref/afterburner.fx/${versionReplace.afterburner.pin} \
+          $out/org/jabref/afterburner.fx/${versionReplace.afterburner.snapshot}
+        mv $out/com/tobiasdiez/easybind/${versionReplace.easybind.pin} \
+          $out/com/tobiasdiez/easybind/${versionReplace.easybind.snapshot}
+        # This jar is required but not used or cached for unknown reason.
+        cp ${javafx-web} $out/org/openjfx/javafx-web/20/javafx-web-20.jar
+      '';
+      # Don't move info to share/
+      forceShare = [ "dummy" ];
+      outputHashMode = "recursive";
+      outputHash = "sha256-XswHEKjzErL+znau/F6mTORVJlFSgVuT0svK29v5dEU=";
+    };

  postPatch = ''
    # Pin the version
    substituteInPlace build.gradle \
-      --replace 'com.github.JabRef:afterburner.fx:${versionReplace.afterburner.snapshot}' \
-        'com.github.JabRef:afterburner.fx:${versionReplace.afterburner.pin}' \
+      --replace 'org.jabref:afterburner.fx:${versionReplace.afterburner.snapshot}' \
+        'org.jabref:afterburner.fx:${versionReplace.afterburner.pin}' \
      --replace 'com.tobiasdiez:easybind:${versionReplace.easybind.snapshot}' \
        'com.tobiasdiez:easybind:${versionReplace.easybind.pin}'
  '';
@ -91,6 +104,18 @@ stdenv.mkDerivation rec {
      build.gradle \
      buildSrc/build.gradle \
      settings.gradle
+
+    # The `plugin {}` block can't resolve plugins from the deps repo
+    sed -e '/plugins {/,/^}/d' buildSrc/build.gradle > buildSrc/build.gradle.tmp
+    cat > buildSrc/build.gradle <<EOF
+    buildscript {
+      repositories { maven { url uri("${deps}") } }
+      dependencies { classpath 'org.openjfx:javafx-plugin:0.0.14' }
+    }
+    apply plugin: 'java'
+    apply plugin: 'org.openjfx.javafxplugin'
+    EOF
+    cat buildSrc/build.gradle.tmp >> buildSrc/build.gradle
  '';

  nativeBuildInputs = [
@ -101,7 +126,10 @@ stdenv.mkDerivation rec {
    unzip
  ];

-  buildInputs = [ gtk3 ];
+  buildInputs = [
+    gtk3
+    python3
+  ];

  buildPhase = ''
    runHook preBuild
@ -129,6 +157,7 @@ stdenv.mkDerivation rec {

    # script to support browser extensions
    install -Dm755 buildres/linux/jabrefHost.py $out/lib/jabrefHost.py
+    patchShebangs $out/lib/jabrefHost.py
    install -Dm644 buildres/linux/native-messaging-host/firefox/org.jabref.jabref.json $out/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json
    sed -i -e "s|/opt/jabref|$out|" $out/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json

@ -137,11 +166,8 @@ stdenv.mkDerivation rec {

    tar xf build/distributions/JabRef-${version}.tar -C $out --strip-components=1

-    # remove openjfx libs for other platforms
-    rm $out/lib/javafx-*-win.jar ${lib.optionalString stdenv.isAarch64 "$out/lib/javafx-*-linux.jar"}
-
    # workaround for https://github.com/NixOS/nixpkgs/issues/162064
-    unzip $out/lib/javafx-web-*.jar libjfxwebkit.so -d $out/lib/
+    unzip $out/lib/javafx-web-*-*.jar libjfxwebkit.so -d $out/lib/

    DEFAULT_JVM_OPTS=$(sed -n -E "s/^DEFAULT_JVM_OPTS='(.*)'$/\1/p" $out/bin/JabRef | sed -e "s|\$APP_HOME|$out|g" -e 's/"//g')

--- a/pkgs/applications/office/portfolio/default.nix
+++ b/pkgs/applications/office/portfolio/default.nix
@ -27,11 +27,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "PortfolioPerformance";
-  version = "0.65.1";
+  version = "0.65.3";

  src = fetchurl {
    url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
-    hash = "sha256-VfYuqrz9YDHwY0atKXYkzHJW/lXlVWGgo5QjMTMeB+g=";
+    hash = "sha256-xAbfyjQ0MPNDC6UJthCLtu8nfI/AdtludvejA32/dIQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/science/math/wolfram-engine/l10ns.nix
+++ b/pkgs/applications/science/math/wolfram-engine/l10ns.nix
@ -7,6 +7,13 @@
 let allVersions = with lib; flip map
  # N.B. Versions in this list should be ordered from newest to oldest.
  [
+    {
+      version = "13.3.0";
+      lang = "en";
+      language = "English";
+      sha256 = "96106ac8ed6d0e221a68d846117615c14025320f927e5e0ed95b1965eda68e31";
+      installer = "WolframEngine_13.3.0_LINUX.sh";
+    }
    {
      version = "13.2.0";
      lang = "en";
--- a/pkgs/applications/science/medicine/xmedcon/default.nix
+++ b/pkgs/applications/science/medicine/xmedcon/default.nix
@ -6,6 +6,7 @@
 , pkg-config
 , libpng
 , zlib
+, wrapGAppsHook
 }:

 stdenv.mkDerivation rec {
@ -24,11 +25,11 @@ stdenv.mkDerivation rec {
    zlib
  ];

-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ pkg-config wrapGAppsHook ];

  meta = with lib; {
    description = "An open source toolkit for medical image conversion ";
-    homepage = "https://xmedcon.sourceforge.io/Main/HomePage";
+    homepage = "https://xmedcon.sourceforge.net/";
    license = licenses.lgpl2Plus;
    maintainers = with maintainers; [ arianvp flokli ];
    platforms = platforms.darwin ++ platforms.linux;
--- a/pkgs/applications/version-management/git-credential-manager/default.nix
+++ b/pkgs/applications/version-management/git-credential-manager/default.nix
@ -20,13 +20,13 @@
 assert withLibsecretSupport -> withGuiSupport;
 buildDotnetModule rec {
  pname = "git-credential-manager";
-  version = "2.2.2";
+  version = "2.3.2";

  src = fetchFromGitHub {
    owner = "git-ecosystem";
    repo = "git-credential-manager";
    rev = "v${version}";
-    hash = "sha256-XXtir/sSjJ1rpv3UQHM3Kano/fMBch/sm8ZtYwGyFyQ=";
+    hash = "sha256-vfv6dCmTuDsh6MaD2HAKlxZtQGVE0B5HJZPnoAUwUnM=";
  };

  projectFile = "src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj";
--- a/pkgs/applications/version-management/git-credential-manager/update.sh
+++ b/pkgs/applications/version-management/git-credential-manager/update.sh
@ -16,8 +16,8 @@ fi
 echo "updating $currentVersion -> $latestVersion"

 sed -i -e "s/version = \"${currentVersion}\"/version = \"${latestVersion}\"/" default.nix
-hash="$(nix-prefetch ./.)"
-sed -i -Ee "s/hash = \"sha256-[A-Za-z0-9=]{44}\"/hash = \"${hash}\"/" default.nix
+hash="$(nix-prefetch -f "$(pwd)/../../../.." git-credential-manager)"
+sed -i -Ee "s/hash = \"sha256-[A-Za-z0-9/+=]{44}\"/hash = \"${hash}\"/" default.nix


 $(nix-build ../../../.. -A git-credential-manager.fetch-deps --no-out-link)
--- a/pkgs/applications/video/multiviewer-for-f1/default.nix
+++ b/pkgs/applications/video/multiviewer-for-f1/default.nix
@ -23,15 +23,15 @@
 , xorg
 }:
 let
-  id = "123365359";
+  id = "123219506";
 in
 stdenvNoCC.mkDerivation rec {
  pname = "multiviewer-for-f1";
-  version = "1.26.4";
+  version = "1.26.2";

  src = fetchurl {
    url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb";
-    sha256 = "sha256-VKpEE1o24Wc4IOagIC62kzPf7nCkgAWsXbeOQXNN4O4=";
+    sha256 = "sha256-nibPVqc4B3PHF/3wR5FsYZGVkkReQjy+4glfdnBysSU=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/as/asciiquarium-transparent/package.nix
+++ b/pkgs/by-name/as/asciiquarium-transparent/package.nix
@ -0,0 +1,34 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  makeWrapper,
+  perlPackages,
+}:
+stdenv.mkDerivation {
+  pname = "asciiquarium-transparent";
+  version = "unstable-2023-02-19";
+  src = fetchFromGitHub {
+    owner = "nothub";
+    repo = "asciiquarium";
+    rev = "653cd99a611080c776d18fc7991ae5dd924c72ce";
+    hash = "sha256-72LRFydbObFDXJllmlRjr5O8qjDqtlp3JunE3kwb5aU=";
+  };
+  nativeBuildInputs = [makeWrapper];
+  buildInputs = [perlPackages.perl];
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    cp asciiquarium $out/bin/asciiquarium
+    wrapProgram $out/bin/asciiquarium --set PERL5LIB ${perlPackages.makeFullPerlPath [perlPackages.TermAnimation]}
+    runHook postInstall
+  '';
+  meta = with lib; {
+    description = "An aquarium/sea animation in ASCII art (with option of transparent background)";
+    mainProgram = "asciiquarium";
+    homepage = "https://github.com/nothub/asciiquarium";
+    license = with licenses; [gpl2Only];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [quantenzitrone];
+  };
+}
--- a/pkgs/by-name/ga/gash-utils/package.nix
+++ b/pkgs/by-name/ga/gash-utils/package.nix
@ -0,0 +1,46 @@
+{ lib
+, stdenv
+, fetchurl
+, guile
+, makeWrapper
+, pkg-config
+, gash
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gash-utils";
+  version = "0.2.0";
+
+  src = fetchurl {
+    url = "mirror://savannah/gash/gash-utils-${finalAttrs.version}.tar.gz";
+    hash = "sha256-5qrlpvQP34xfhzD2bD+MMEe94A+M2XWV9arSRElZ1KM=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    guile # buildPlatform's guile is needed at build time
+    makeWrapper
+    pkg-config
+  ];
+
+  buildInputs = [
+    gash
+    guile
+  ];
+
+  postInstall = ''
+    for f in $out/bin/*; do
+      wrapProgram $f \
+        --prefix GUILE_LOAD_PATH : "${gash}/${guile.siteDir}"
+    done
+  '';
+
+  meta = with lib; {
+    description = "Core POSIX utilities written in Guile Scheme";
+    homepage = "https://savannah.nongnu.org/projects/gash/";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ wegank ];
+    platforms = platforms.all;
+  };
+})
--- a/pkgs/by-name/ga/gash/package.nix
+++ b/pkgs/by-name/ga/gash/package.nix
@ -0,0 +1,35 @@
+{ lib
+, stdenv
+, fetchurl
+, guile
+, pkg-config
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gash";
+  version = "0.3.0";
+
+  src = fetchurl {
+    url = "mirror://savannah/gash/gash-${finalAttrs.version}.tar.gz";
+    hash = "sha256-VGrsaRBo1nfFjd/BVpXbn4CGFuGfpzMi1Ppno8iXwqk=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    guile # buildPlatform's guile is needed at build time
+    pkg-config
+  ];
+
+  buildInputs = [
+    guile
+  ];
+
+  meta = with lib; {
+    description = "POSIX-compatible shell written in Guile Scheme";
+    homepage = "https://savannah.nongnu.org/projects/gash/";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ wegank ];
+    platforms = platforms.all;
+  };
+})
--- a/pkgs/by-name/ss/sssnake/package.nix
+++ b/pkgs/by-name/ss/sssnake/package.nix
@ -0,0 +1,27 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  ncurses,
+}:
+stdenv.mkDerivation rec {
+  pname = "sssnake";
+  version = "0.3.2";
+  src = fetchFromGitHub {
+    owner = "angeljumbo";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-zkErOV6Az0kJdwyXzMCnVW1997zpAB79TBvf/41Igic=";
+  };
+  buildInputs = [ncurses];
+  makeFlags = [
+    "PREFIX=$(out)"
+  ];
+  meta = with lib; {
+    description = "Cli snake game that plays itself";
+    homepage = "https://github.com/angeljumbo/sssnake";
+    license = with licenses; [mit];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [quantenzitrone];
+  };
+}
--- a/pkgs/by-name/wa/wayland-logout/package.nix
+++ b/pkgs/by-name/wa/wayland-logout/package.nix
@ -0,0 +1,27 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  lib,
+  meson,
+  ninja,
+}:
+stdenv.mkDerivation rec {
+  pname = "wayland-logout";
+  version = "1.4";
+  src = fetchFromGitHub {
+    owner = "soreau";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-VSAw6go4v937HWazXfMz8OdHgOnUtrlDXkslsV4eDIg=";
+  };
+  nativeBuildInputs = [meson ninja];
+  meta = with lib; {
+    description = ''
+      A utility designed to kill a single instance of a wayland compositor
+    '';
+    homepage = "https://github.com/soreau/wayland-logout";
+    maintainers = with maintainers; [quantenzitrone];
+    license = with licenses; [mit];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/desktops/lomiri/development/geonames/default.nix
+++ b/pkgs/desktops/lomiri/development/geonames/default.nix
@ -36,16 +36,16 @@ stdenv.mkDerivation (finalAttrs: {
  ] ++ lib.optionals withExamples [
    "bin"
  ] ++ lib.optionals withDocumentation [
-    "doc"
+    "devdoc"
  ];

  patches = [
    # Improves install locations of demo & docs
    # Remove when https://gitlab.com/ubports/development/core/geonames/-/merge_requests/3 merged & in release
    (fetchpatch {
-      name = "0001-geonames-Use-GNUInstallDirs-more.patch";
-      url = "https://gitlab.com/OPNA2608/geonames/-/commit/e64a391fc213b2629da1c8bbf975fd62a2973c51.patch";
-      hash = "sha256-HPYDtIy1WUrZLPzvKh4aezrT/LniZkNX+PeQ9YB85RY=";
+      name = "0001-geonames-Use-CMAKE_INSTALL_BINDIR-for-install.patch";
+      url = "https://gitlab.com/OPNA2608/geonames/-/commit/3bca6d4d02843aed851a0a7480d5cd5ac02b4cda.patch";
+      hash = "sha256-vwffuMKpIqymYaiGEvnNeVXLmnz5e4aBpg55fnNbjKs=";
    })
  ];

--- a/pkgs/development/beam-modules/build-mix.nix
+++ b/pkgs/development/beam-modules/build-mix.nix
@ -28,6 +28,7 @@ let
    MIX_ENV = mixEnv;
    MIX_DEBUG = if enableDebugInfo then 1 else 0;
    HEX_OFFLINE = 1;
+    LC_ALL = "C.UTF-8";

    # add to ERL_LIBS so other modules can find at runtime.
    # http://erlang.org/doc/man/code.html#code-path
--- a/pkgs/development/beam-modules/mix-release.nix
+++ b/pkgs/development/beam-modules/mix-release.nix
@ -50,6 +50,7 @@ stdenv.mkDerivation (overridable // {
  # some older dependencies still use rebar
  MIX_REBAR = "${rebar}/bin/rebar";
  MIX_REBAR3 = "${rebar3}/bin/rebar3";
+  LC_ALL = "C.UTF-8";

  postUnpack = ''
    export HEX_HOME="$TEMPDIR/hex"
--- a/pkgs/development/compilers/chez/default.nix
+++ b/pkgs/development/compilers/chez/default.nix
@ -1,18 +1,15 @@
-{ lib, stdenv, fetchFromGitHub
+{ lib, stdenv, fetchurl
 , coreutils, cctools
 , ncurses, libiconv, libX11, libuuid
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "chez-scheme";
-  version = "9.5.8a";
+  version = "9.6.2";

-  src = fetchFromGitHub {
-    owner  = "cisco";
-    repo   = "ChezScheme";
-    rev    = "refs/tags/v${version}";
-    sha256 = "sha256-d8DgHATZzZbOYODHFKTqg4oWg/wja8jQgcCVpj8j6yQ=";
-    fetchSubmodules = true;
+  src = fetchurl {
+    url = "https://github.com/cisco/ChezScheme/releases/download/v${finalAttrs.version}/csv${finalAttrs.version}.tar.gz";
+    hash = "sha256-cUaVeJ4brTUY5s1fvIroIE92ED1a0roFo/HAY+stXQI=";
  };

  nativeBuildInputs = lib.optional stdenv.isDarwin cctools;
@ -62,7 +59,7 @@ stdenv.mkDerivation rec {
  ** Clean up some of the examples from the build output.
  */
  postInstall = ''
-    rm -rf $out/lib/csv${version}/examples
+    rm -rf $out/lib/csv${finalAttrs.version}/examples
  '';

  setupHook = ./setup-hook.sh;
@ -75,4 +72,4 @@ stdenv.mkDerivation rec {
    platforms    = lib.platforms.unix;
    badPlatforms = [ "aarch64-linux" "aarch64-darwin" ];
  };
-}
+})
--- a/pkgs/development/interpreters/femtolisp/default.nix
+++ b/pkgs/development/interpreters/femtolisp/default.nix
@ -36,5 +36,6 @@ stdenv.mkDerivation {
    maintainers = with lib.maintainers; [ moody ];
    broken = stdenv.isDarwin;
    platforms = lib.platforms.unix;
+    mainProgram = "flisp";
  };
 }
--- a/pkgs/development/libraries/bctoolbox/default.nix
+++ b/pkgs/development/libraries/bctoolbox/default.nix
@ -9,7 +9,7 @@

 stdenv.mkDerivation rec {
  pname = "bctoolbox";
-  version = "5.2.16";
+  version = "5.2.98";

  nativeBuildInputs = [
    cmake
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
    group = "BC";
    repo = pname;
    rev = version;
-    hash = "sha256-M2apFibqSKp8ojXl82W+vQb7CUxdbWsmw8PLL/ByYuM=";
+    hash = "sha256-j1vVd9UcwmP3tGGN6NApiMyOql8vYljTqj3CKor1Ckk=";
  };

  # Do not build static libraries
--- a/pkgs/development/libraries/belle-sip/default.nix
+++ b/pkgs/development/libraries/belle-sip/default.nix
@ -11,7 +11,7 @@

 stdenv.mkDerivation rec {
  pname = "belle-sip";
-  version = "5.2.64";
+  version = "5.2.98";

  src = fetchFromGitLab {
    domain = "gitlab.linphone.org";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
    group = "BC";
    repo = pname;
    rev = version;
-    sha256 = "sha256-5GTKunm6q5nTlfsA5vZZ0MCaSiit+JIdWHcb2t+MLEA=";
+    hash = "sha256-PZnAB+LOlwkiJO0ICqYqn0TgqQY2KdUbgGJRFSzGxdE=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/libraries/belr/default.nix
+++ b/pkgs/development/libraries/belr/default.nix
@ -7,7 +7,7 @@

 stdenv.mkDerivation rec {
  pname = "belr";
-  version = "5.1.55";
+  version = "5.2.98";

  src = fetchFromGitLab {
    domain = "gitlab.linphone.org";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
    group = "BC";
    repo = pname;
    rev = version;
-    sha256 = "sha256-0JDwNKqPkzbXqDhgMV+okPMHPFJwmLwLsDrdD55Jcs4=";
+    hash = "sha256-4keVUAsTs1DAhOfV71VD28I0PEHnyvW95blplY690LY=";
  };

  buildInputs = [ bctoolbox ];
--- a/pkgs/development/libraries/bzrtp/default.nix
+++ b/pkgs/development/libraries/bzrtp/default.nix
@ -8,7 +8,7 @@

 stdenv.mkDerivation rec {
  pname = "bzrtp";
-  version = "5.2.16";
+  version = "5.2.98";

  src = fetchFromGitLab {
    domain = "gitlab.linphone.org";
@ -16,18 +16,19 @@ stdenv.mkDerivation rec {
    group = "BC";
    repo = pname;
    rev = version;
-    hash = "sha256-nrnGmJxAeobejS6zdn5Z/kOFOxyepZcxW/G4nXAt2DY=";
+    hash = "sha256-p3r8GVhxShTanEI/tS8Dq59I7VKMDX1blz6S236XFqQ=";
  };

  buildInputs = [ bctoolbox sqlite ];
  nativeBuildInputs = [ cmake ];

  # Do not build static libraries
-  cmakeFlags = [ "-DENABLE_STATIC=NO" "-DCMAKE_C_FLAGS=-Wno-error=cast-function-type" ];
+  cmakeFlags = [ "-DENABLE_STATIC=NO" ];

  env.NIX_CFLAGS_COMPILE = toString [
    # Needed with GCC 12
    "-Wno-error=stringop-overflow"
+    "-Wno-error=unused-parameter"
  ];

  meta = with lib; {
--- a/pkgs/development/libraries/libfprint/default.nix
+++ b/pkgs/development/libraries/libfprint/default.nix
@ -19,7 +19,7 @@

 stdenv.mkDerivation rec {
  pname = "libfprint";
-  version = "1.94.5";
+  version = "1.94.6";
  outputs = [ "out" "devdoc" ];

  src = fetchFromGitLab {
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
    owner = "libfprint";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-+eSvzbXxjemVKMeD8tp/0/tGBjw2EOlmyxb8KfyZKtA=";
+    hash = "sha256-lDnAXWukBZSo8X6UEVR2nOMeVUi/ahnJgx2cP+vykZ8=";
  };

  postPatch = ''
--- a/pkgs/development/libraries/liblinphone/default.nix
+++ b/pkgs/development/libraries/liblinphone/default.nix
@ -20,7 +20,7 @@

 stdenv.mkDerivation rec {
  pname = "liblinphone";
-  version = "5.2.17";
+  version = "5.2.98";

  src = fetchFromGitLab {
    domain = "gitlab.linphone.org";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
    group = "BC";
    repo = pname;
    rev = version;
-    hash = "sha256-zxp+jcClfKm+VsylRtydF2rlDCkO+sa9vw8GpwAfKHM=";
+    hash = "sha256-kQZePMa7MTaSJLEObM8khfSFYLqhlgTcVyKfTPLwKYU=";
  };

  postPatch = ''
--- a/pkgs/development/libraries/libquotient/default.nix
+++ b/pkgs/development/libraries/libquotient/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "libquotient";
-  version = "0.8.0";
+  version = "0.8.1.1";

  src = fetchFromGitHub {
    owner = "quotient-im";
    repo = "libQuotient";
    rev = version;
-    hash = "sha256-ecTHiWbsNDIUz+Sadh2pVbDRZFzdMkZXBYSjy1JqZrk=";
+    hash = "sha256-WNLwO2w8FYy12BeqPuiS0wg3fUMwTxfrIF1QwcjE9yQ=";
  };

  buildInputs = [ olm openssl qtbase qtmultimedia qtkeychain ];
--- a/pkgs/development/libraries/lime/default.nix
+++ b/pkgs/development/libraries/lime/default.nix
@ -10,7 +10,7 @@

 stdenv.mkDerivation rec {
  pname = "lime";
-  version = "5.2.6";
+  version = "5.2.98";

  src = fetchFromGitLab {
    domain = "gitlab.linphone.org";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
    group = "BC";
    repo = pname;
    rev = version;
-    sha256 = "sha256-WQ6AcJpQSvWR5m2edVNji5u6ZiS4QOH45vQN2q+39NU=";
+    hash = "sha256-LdwXBJpwSA/PoCXL+c1pcX1V2Fq/eR6nNmwBKDM1Vr8=";
  };

  buildInputs = [
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@ -23,7 +23,7 @@

 stdenv.mkDerivation rec {
  pname = "mediastreamer2";
-  version = "5.2.16";
+  version = "5.2.98";

  dontWrapQtApps = true;

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
    group = "BC";
    repo = pname;
    rev = version;
-    hash = "sha256-K4EBZC3zuLKF9Qw4i24f0hYKlOgRM7MR4Ck2ZoTYi6I=";
+    hash = "sha256-02e1nGSwlhEHwQH6WqBSKBlWQWAYa7lKdZaZ8/0SAxs=";
  };

  patches = [
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@ -113,6 +113,7 @@ mapAliases {
  vue-language-server = self.vls; # added 2023-08-20
  inherit (pkgs) web-ext; # added 2023-08-20
  inherit (pkgs) write-good; # added 2023-08-20
+  inherit (pkgs) yaml-language-server; # added 2023-09-05
  inherit (pkgs) yo; # added 2023-08-20
  zx = pkgs.zx; # added 2023-08-01
 }
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@ -332,7 +332,6 @@
 , "wrangler"
 , "wring"
 , "@yaegassy/coc-nginx"
-, "yaml-language-server"
 , "yalc"
 , "yarn"
 , "@zwave-js/server"
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@ -116773,47 +116773,6 @@ in
    bypassCache = true;
    reconstructLock = true;
  };
-  yaml-language-server = nodeEnv.buildNodePackage {
-    name = "yaml-language-server";
-    packageName = "yaml-language-server";
-    version = "1.14.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.14.0.tgz";
-      sha512 = "HnNiHM5AOTXuM8ZpubzqgTy+7V5kFiMXVedOT2yjhvnxCw6pbMXcD/ymHaaT5v2ue0H8GGH4NFkvCEzcIcTJDg==";
-    };
-    dependencies = [
-      sources."ajv-8.12.0"
-      sources."fast-deep-equal-3.1.3"
-      sources."json-schema-traverse-1.0.0"
-      sources."jsonc-parser-3.2.0"
-      sources."lodash-4.17.21"
-      sources."punycode-2.3.0"
-      sources."request-light-0.5.8"
-      sources."require-from-string-2.0.2"
-      sources."uri-js-4.4.1"
-      sources."vscode-json-languageservice-4.1.8"
-      sources."vscode-jsonrpc-6.0.0"
-      sources."vscode-languageserver-7.0.0"
-      (sources."vscode-languageserver-protocol-3.16.0" // {
-        dependencies = [
-          sources."vscode-languageserver-types-3.16.0"
-        ];
-      })
-      sources."vscode-languageserver-textdocument-1.0.10"
-      sources."vscode-languageserver-types-3.17.3"
-      sources."vscode-nls-5.2.0"
-      sources."vscode-uri-3.0.7"
-      sources."yaml-2.2.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "YAML language server";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
  yalc = nodeEnv.buildNodePackage {
    name = "yalc";
    packageName = "yalc";
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@ -486,12 +486,4 @@ final: prev: {
      rm -r $out/lib/node_modules/wrangler/node_modules/@esbuild/sunos-x64
    '';
  });
-
-  yaml-language-server = prev.yaml-language-server.override {
-    nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
-    postInstall = ''
-      wrapProgram "$out/bin/yaml-language-server" \
-      --prefix NODE_PATH : ${final.prettier}/lib/node_modules
-    '';
-  };
 }
--- a/pkgs/development/python-modules/awscrt/default.nix
+++ b/pkgs/development/python-modules/awscrt/default.nix
@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "awscrt";
-  version = "0.19.0";
+  version = "0.19.1";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-Q5DA+lraOebUYgjFDj11XUPZY1X8qD/1dwgeMoL2SZ0=";
+    hash = "sha256-kXf/TKw0YkWuSWNc1rQqbb3q4XWCRRkBAiDUisX/8UI=";
  };

  buildInputs = lib.optionals stdenv.isDarwin [
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@ -28,14 +28,14 @@

 buildPythonPackage rec {
  pname = "celery";
-  version = "5.3.3";
+  version = "5.3.4";
  format = "setuptools";

  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-uskO+ZtwubW11M/Ov28atRaLhsYSC8fFgUzYI039k4E=";
+    hash = "sha256-kCPfaoli2nnrMMDITV9IY9l5OkZjVMyTHX9yQjmW3ig=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/dataclass-factory/default.nix
+++ b/pkgs/development/python-modules/dataclass-factory/default.nix
@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, nose2
+, typing-extensions
+}:
+
+buildPythonPackage rec {
+  pname = "dataclass-factory";
+  version = "2.13";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "reagento";
+    repo = "dataclass-factory";
+    rev = version;
+    hash = "sha256-hNPuqs3TvDleIxflCW5rutbXjDotFRLCNJlcTBFxFAw=";
+  };
+
+  nativeCheckInputs = [
+    nose2
+  ];
+
+  checkInputs = [
+    typing-extensions
+  ];
+
+  pythonImportsCheck = [ "dataclass_factory" ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    nose2 -v tests
+
+    runHook postCheck
+  '';
+
+  meta = with lib; {
+    description = "Modern way to convert python dataclasses or other objects to and from more common types like dicts or json-like structures";
+    homepage = "https://github.com/reagento/dataclass-factory";
+    changelog = "https://github.com/reagento/dataclass-factory/releases/tag/${src.rev}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
--- a/pkgs/development/python-modules/dataclasses-json/default.nix
+++ b/pkgs/development/python-modules/dataclasses-json/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "dataclasses-json";
-  version = "0.5.15";
+  version = "0.6.0";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "lidatong";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-ADWNB2Eu4TwlAvchyzBwGiw9YT9McPr9lsNfo1lR1WI=";
+    hash = "sha256-jv00WqSC/KCM+6+LtsCAQcqZTBbV1pavEqsCP/F84VU=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/dunamai/default.nix
+++ b/pkgs/development/python-modules/dunamai/default.nix
@ -6,13 +6,12 @@
 , importlib-metadata
 , packaging
 , pytestCheckHook
-, setuptools
 , git
 }:

 buildPythonPackage rec {
  pname = "dunamai";
-  version = "1.16.0";
+  version = "1.18.0";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -21,7 +20,7 @@ buildPythonPackage rec {
    owner = "mtkennerly";
    repo = "dunamai";
    rev = "refs/tags/v${version}";
-    hash = "sha256-pPUn+1rv76N/7WVDyWJLPVMweJ1Qbx6/P4zIKU06hSs=";
+    hash = "sha256-QKXEFwOAa5nIQZA6DHNqnWyshnN+/6qovdqjCd9WF4k=";
  };

  nativeBuildInputs = [
@ -46,7 +45,11 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    git
    pytestCheckHook
-    setuptools
+  ];
+
+  disabledTests = [
+    # clones from github.com
+    "test__version__from_git__shallow"
  ];

  pythonImportsCheck = [
--- a/pkgs/development/python-modules/millheater/default.nix
+++ b/pkgs/development/python-modules/millheater/default.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "millheater";
-  version = "0.11.1";
+  version = "0.11.2";
  format = "setuptools";

  disabled = pythonOlder "3.10";
@ -17,7 +17,7 @@ buildPythonPackage rec {
    owner = "Danielhiversen";
    repo = "pymill";
    rev = "refs/tags/${version}";
-    hash = "sha256-RlnZUI7F1u1rjmuPc2guqVomR25Izf5jejN6LlMZYS8=";
+    hash = "sha256-PsNT/mZ4Dun4s9QpGRyEuVxYcM5AXaUS28UsSOowOb4=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix
+++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix
@ -3,7 +3,6 @@
 , dunamai
 , fetchFromGitHub
 , jinja2
-, markupsafe
 , poetry-core
 , poetry
 , pytestCheckHook
@ -13,7 +12,7 @@

 buildPythonPackage rec {
  pname = "poetry-dynamic-versioning";
-  version = "0.21.5";
+  version = "1.0.1";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -22,7 +21,7 @@ buildPythonPackage rec {
    owner = "mtkennerly";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-YFbIQLIbedErdKiPlZf0+6qtZexuJ6Q6pzhy54vSK5Y=";
+    hash = "sha256-BGAo3c0TzyhIiDtZjoEP+Eeu51WJB3Wg71poFMWJ+VM=";
  };

  nativeBuildInputs = [
@ -32,7 +31,6 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    dunamai
    jinja2
-    markupsafe
    tomlkit
  ];

--- a/pkgs/development/python-modules/pulumi-aws/default.nix
+++ b/pkgs/development/python-modules/pulumi-aws/default.nix
@ -12,7 +12,7 @@
 buildPythonPackage rec {
  pname = "pulumi-aws";
  # Version is independant of pulumi's.
-  version = "6.0.3";
+  version = "6.0.4";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "pulumi";
    repo = "pulumi-aws";
    rev = "refs/tags/v${version}";
-    hash = "sha256-AnyKDoD7hh3iYheUK8RXFfXEi5yChkZNAyWobC2ghmQ=";
+    hash = "sha256-YukXw7/KDfw6iYoN6UpF5XGb5D6oaaXTOpsduqZZz2Y=";
  };

  sourceRoot = "${src.name}/sdk/python";
--- a/pkgs/development/python-modules/pymilvus/default.nix
+++ b/pkgs/development/python-modules/pymilvus/default.nix
@ -19,7 +19,7 @@

 buildPythonPackage rec {
  pname = "pymilvus";
-  version = "2.2.15";
+  version = "2.3.0";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -28,7 +28,7 @@ buildPythonPackage rec {
    owner = "milvus-io";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-wwhgO2iCzPXobyZI0narHPn2WCAB9sS1+AoLrP1Ih6Q=";
+    hash = "sha256-hp00iUT1atyTQk532z7VAajpfvtnKE8W2la9MW7NxoE=";
  };

  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
--- a/pkgs/development/python-modules/pytest-quickcheck/default.nix
+++ b/pkgs/development/python-modules/pytest-quickcheck/default.nix
@ -2,30 +2,33 @@
 , buildPythonPackage
 , fetchPypi
 , pytest
+, pytestCheckHook
 , pytest-flakes
-, tox
 }:

 buildPythonPackage rec {
  pname = "pytest-quickcheck";
  version = "0.9.0";
+  format = "setuptools";

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-UFF8ldnaImXU6al4kGjf720mbwXE6Nut9VlvNVrMVoY=";
  };

-  buildInputs = [ pytest ];
+  propagatedBuildInputs = [
+    pytest
+  ];

-  propagatedBuildInputs = [ pytest-flakes tox ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-flakes
+  ];

  meta = with lib; {
    license = licenses.asl20;
    homepage = "https://pypi.python.org/pypi/pytest-quickcheck";
    description = "pytest plugin to generate random data inspired by QuickCheck";
    maintainers = with maintainers; [ onny ];
-    # Pytest support > 6.0 missing
-    # https://github.com/t2y/pytest-quickcheck/issues/17
-    broken = true;
  };
 }
--- a/pkgs/development/python-modules/python-jenkins/default.nix
+++ b/pkgs/development/python-modules/python-jenkins/default.nix
@ -12,15 +12,17 @@
 , requests
 , requests-mock
 , stestr
+, multiprocess
+, pythonRelaxDepsHook
 }:

 buildPythonPackage rec {
  pname = "python-jenkins";
-  version = "1.7.0";
+  version = "1.8.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "01jid5s09lr3kayr2h1z9n8h9nhyw3jxv9c4b5hrlxijknkqzvfy";
+    hash = "sha256-/18dklOdkD+GmwLq8rExREfm1tePdn7c/dkpZ9UyucY=";
  };

  # test uses timeout mechanism unsafe for use with the "spawn"
@ -30,18 +32,25 @@ buildPythonPackage rec {
      --replace test_jenkins_open_no_timeout dont_test_jenkins_open_no_timeout
  '';

+  nativeBuildInputs = [
+    pythonRelaxDepsHook
+  ];
+  pythonRelaxDeps = [
+    "setuptools"
+  ];
+
  buildInputs = [ mock ];
  propagatedBuildInputs = [ pbr pyyaml setuptools six multi_key_dict requests ];

  __darwinAllowLocalNetworking = true;

-   nativeCheckInputs = [ stestr testscenarios requests-mock ];
-   checkPhase = ''
-     # Skip tests that fail due to setuptools>=66.0.0 rejecting PEP 440
-     # non-conforming versions. See
-     # https://github.com/pypa/setuptools/issues/2497 for details.
-     stestr run -E "tests.test_plugins.(PluginsTestScenarios.test_plugin_version_comparison|PluginsTestScenarios.test_plugin_version_object_comparison|PluginsTest.test_plugin_equal|PluginsTest.test_plugin_not_equal)"
-   '';
+  nativeCheckInputs = [ stestr testscenarios requests-mock multiprocess ];
+  checkPhase = ''
+    # Skip tests that fail due to setuptools>=66.0.0 rejecting PEP 440
+    # non-conforming versions. See
+    # https://github.com/pypa/setuptools/issues/2497 for details.
+    stestr run -E "tests.test_plugins.(PluginsTestScenarios.test_plugin_version_comparison|PluginsTestScenarios.test_plugin_version_object_comparison|PluginsTest.test_plugin_equal|PluginsTest.test_plugin_not_equal)"
+  '';

  meta = with lib; {
    description = "Python bindings for the remote Jenkins API";
--- a/pkgs/development/python-modules/pythonnet/default.nix
+++ b/pkgs/development/python-modules/pythonnet/default.nix
@ -12,11 +12,11 @@

 let
  pname = "pythonnet";
-  version = "3.0.1";
+  version = "3.0.2";
  src = fetchPypi {
    pname = "pythonnet";
    inherit version;
-    sha256 = "sha256-7U9/f5VRVAQRLds9oWOOGhATy1bmTEjE+mAwPwKwo90=";
+    sha256 = "sha256-LN0cztxkp8m9cRvj0P0MSniTJHQTncVKppe+3edBx0Y=";
  };

  # This buildDotnetModule is used only to get nuget sources, the actual
--- a/pkgs/development/python-modules/pyvista/default.nix
+++ b/pkgs/development/python-modules/pyvista/default.nix
@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "pyvista";
-  version = "0.41.1";
+  version = "0.42.0";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-vFxEMKEkiFOBrkvmaJPwoo+lOe6V9AmPxl32Tocy9p8=";
+    hash = "sha256-ujuDH+GK9Q6V8r/PgU5Lu3P7cmau/n7Rk/8a+v7/JRo=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@ -16,14 +16,14 @@

 buildPythonPackage rec {
  pname = "qtconsole";
-  version = "5.4.0";
+  version = "5.4.4";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-V3SOov0mMgoLd626IBMc+7E4GMfJbYP6/LEQ/1X1izU=";
+    hash = "sha256-t/+1PXTyPO4p9M21Xdb6vI7DEtlPPEa6OOHd5FhpPfs=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/qtpy/default.nix
+++ b/pkgs/development/python-modules/qtpy/default.nix
@ -14,14 +14,14 @@

 buildPythonPackage rec {
  pname = "QtPy";
-  version = "2.3.0";
+  version = "2.4.0";
  format = "setuptools";

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

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-BgPJyDzMA1pHF6EpCL9rxssiUJgn6i7A6Uwtp8ntV8U=";
+    hash = "sha256-2y1QgWeqYQZ4FWXI2lxvFIfeusujNRnO3DX6iZfUJNQ=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/shazamio/default.nix
+++ b/pkgs/development/python-modules/shazamio/default.nix
@ -0,0 +1,76 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, poetry-core
+, wheel
+, aiofiles
+, aiohttp
+, dataclass-factory
+, numpy
+, pydantic
+, pydub
+, ffmpeg
+, pytest-asyncio
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "shazamio";
+  version = "0.4.0.1";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "dotX12";
+    repo = "ShazamIO";
+    rev = version;
+    hash = "sha256-dfrdfbGkLYNjlS6Qv9Rnywv6nqiKrNXCICLSuAXpQBU=";
+  };
+
+  patches = [
+    # remove poetry and virtualenv from build dependencies as they are not used
+    # https://github.com/dotX12/ShazamIO/pull/71
+    (fetchpatch {
+      name = "remove-unused-build-dependencies.patch";
+      url = "https://github.com/dotX12/ShazamIO/commit/5c61e1efe51c2826852da5b6aa6ad8ce3d4012a9.patch";
+      hash = "sha256-KiU5RVBPnSs5qrReFeTe9ePg1fR7y0NchIIHcQwlPaI=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    poetry-core
+    wheel
+  ];
+
+  propagatedBuildInputs = [
+    aiofiles
+    aiohttp
+    dataclass-factory
+    numpy
+    pydantic
+    pydub
+  ];
+
+  nativeCheckInputs = [
+    ffmpeg
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # requires internet access
+    "test_about_artist"
+    "test_recognize_song_file"
+    "test_recognize_song_bytes"
+  ];
+
+  pythonImportsCheck = [ "shazamio" ];
+
+  meta = with lib; {
+    description = "A free asynchronous library from reverse engineered Shazam API";
+    homepage = "https://github.com/dotX12/ShazamIO";
+    changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${src.rev}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
--- a/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/pkgs/development/python-modules/spyder-kernels/default.nix
@ -14,14 +14,14 @@

 buildPythonPackage rec {
  pname = "spyder-kernels";
-  version = "2.4.3";
+  version = "2.4.4";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-0aNkq4nacW2RZxup2J748ZZgaLug5HB5ekiWU4KcqvM=";
+    hash = "sha256-NjuwoOFZTLaRY3RkGS9PGZaQlUaSUiQrQ8CSvzBaJd0=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@ -7,19 +7,16 @@
 , cloudpickle
 , cookiecutter
 , diff-match-patch
-, flake8
 , intervaltree
 , jedi
 , jellyfish
 , keyring
 , matplotlib
-, mccabe
 , nbconvert
 , numpy
 , numpydoc
 , psutil
 , pygments
-, pylint
 , pylint-venv
 , pyls-spyder
 , pyopengl
@ -28,7 +25,6 @@
 , python-lsp-server
 , pyxdg
 , pyzmq
-, pycodestyle
 , qdarkstyle
 , qstylizer
 , qtawesome
@ -45,14 +41,14 @@

 buildPythonPackage rec {
  pname = "spyder";
-  version = "5.4.2";
+  version = "5.4.5";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-L8zgT7M7N+P5/9FQgf6ab7afUQXC1afzwUjAp6yKxC8=";
+    hash = "sha256-/9p/8avjy1c3Dwos9Byx03kfVrRofVQus+Ae5beFnmo=";
  };

  patches = [
--- a/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch
+++ b/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch
@ -1,24 +1,25 @@
-Don't remove sys.path entries that come from PYTHONPATH, or else the app cannot
-be used in Nixpkgs.
-
-Author: Bjørn Forsman <bjorn.forsman@gmail.com>
-diff -uNr spyder-5.4.0.orig/spyder/app/start.py spyder-5.4.0/spyder/app/start.py
--- spyder-5.4.0.orig/spyder/app/start.py	2022-08-30 02:02:28.000000000 +0200
-+++ spyder-5.4.0/spyder/app/start.py	2023-01-02 11:38:28.138744879 +0100
-@@ -6,16 +6,8 @@
+diff --git a/spyder/app/start.py b/spyder/app/start.py
+index 97b08a600..66486e510 100644
+--- a/spyder/app/start.py
+++ b/spyder/app/start.py
+@@ -6,20 +6,8 @@
 # (see spyder/__init__.py for details)
 # -----------------------------------------------------------------------------
- 
+
 -# Remove PYTHONPATH paths from sys.path before other imports to protect against
 -# shadowed standard libraries.
 import os
 import sys
 -if os.environ.get('PYTHONPATH'):
 -    for path in os.environ['PYTHONPATH'].split(os.pathsep):
-        try:
-            sys.path.remove(path.rstrip(os.sep))
-        except ValueError:
-            pass
- 
+-        if os.name == 'nt' and 'pkgs' in path:
+-            # Don't remove pynsist installer entry for 'pkgs' directory
+-            continue
+-        else:
+-            try:
+-                sys.path.remove(path.rstrip(os.sep))
+-            except ValueError:
+-                pass
+
 # Standard library imports
 import ctypes
--- a/pkgs/development/python-modules/vsure/default.nix
+++ b/pkgs/development/python-modules/vsure/default.nix
@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "vsure";
-  version = "2.6.6";
+  version = "2.6.7";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-ecrBvKOhW3znVoXHQeKKW4o/hbA4fLhxJrWZObwtki8=";
+    hash = "sha256-/eVFa1BTFbvFTAt48Bv+bjsV7f2eVSuKARJQVxDqU9s=";
  };

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

 buildPythonPackage rec {
  pname = "zamg";
-  version = "0.2.4";
+  version = "0.3.0";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "killer0071234";
    repo = "python-zamg";
    rev = "refs/tags/v${version}";
-    hash = "sha256-o1FMhwAHdkcfArT9QRgVi0ieRw4aVdBoqwdlV0sxpQ0=";
+    hash = "sha256-dt0y423Xw/IFi83DFvGdsN1uzJBMbm13pBYtMgMntuU=";
  };

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

 buildPythonPackage rec {
  pname = "zeroconf";
-  version = "0.93.1";
+  version = "0.97.0";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "jstasiak";
    repo = "python-zeroconf";
    rev = "refs/tags/${version}";
-    hash = "sha256-ixNh/pCt6e8x9n0wg7GBTwhm3PkmHQzd4CGmacWcAfY=";
+    hash = "sha256-qs0Ivkibxb6y9Bw2/Im9/2YabybqbJV0sORRg9RMV/M=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@ -22,14 +22,14 @@ with py.pkgs;

 buildPythonApplication rec {
  pname = "checkov";
-  version = "2.4.25";
+  version = "2.4.27";
  format = "setuptools";

  src = fetchFromGitHub {
    owner = "bridgecrewio";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-IVmC3/TbdVjbbWBY8Buw7CxiZs2D0X375D2dCT3UnM4=";
+    hash = "sha256-HTYxPHCMDYRg4UR2Nm7cHNP9mi0tOPjCTzv3z175YE4=";
  };

  patches = [
--- a/pkgs/development/tools/build-managers/moon/default.nix
+++ b/pkgs/development/tools/build-managers/moon/default.nix
@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "moon";
-  version = "1.10.1";
+  version = "1.13.0";

  src = fetchFromGitHub {
    owner = "moonrepo";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-JLCxG4iWm+yJ9WUqQxOeBnOLAugeTrM3bl79zKYBs6w=";
+    hash = "sha256-iCopvHLbOepgsMFn//kfIdNZtAN7kqzZ1lVXcIGAAso=";
  };

-  cargoHash = "sha256-4PHc0BkK/QXrafOoeUS0XicKb/JDdJkLhbDAziYgZh4=";
+  cargoHash = "sha256-pEx7dszYfFxCGokkEbpNjoE1KsXo2r6t6FGLBXMZGwo=";

  env = {
    RUSTFLAGS = "-C strip=symbols";
--- a/pkgs/development/tools/fsautocomplete/default.nix
+++ b/pkgs/development/tools/fsautocomplete/default.nix
@ -5,13 +5,13 @@ let
 in
 buildDotnetModule rec {
  pname = "fsautocomplete";
-  version = "0.61.1";
+  version = "0.62.0";

  src = fetchFromGitHub {
    owner = "fsharp";
    repo = "FsAutoComplete";
    rev = "v${version}";
-    sha256 = "sha256-e5td3mHTjlwcxZDDJmqKmn9Tfhtp4EVJ8C8Qn1xyeBo=";
+    sha256 = "sha256-pU/XGZZScbS2OiExLry4e9Oto9LrYr7j99y9+hRc+BU=";
  };

  nugetDeps = ./deps.nix;
--- a/pkgs/development/tools/fsautocomplete/deps.nix
+++ b/pkgs/development/tools/fsautocomplete/deps.nix
@ -8,6 +8,7 @@
  (fetchNuGet { pname = "BlackFox.VsWhere"; version = "1.1.0"; sha256 = "1brk2rv4yjdbyc4x1qhcmii6rjqsyk52galjxir5carzhr72jrs1"; })
  (fetchNuGet { pname = "CliWrap"; version = "3.4.4"; sha256 = "1g67sbhqxfl15ilazj64jc0z60ig1x03p2d4jwk6iw64smkp24x8"; })
  (fetchNuGet { pname = "CommandLineParser"; version = "2.4.3"; sha256 = "1aca3q25n3dg55v4j3kzlzfzd5k2jpy6zhp8x7g74pdfdqzrhg55"; })
+  (fetchNuGet { pname = "CommunityToolkit.HighPerformance"; version = "7.0.1"; sha256 = "18xw7fn0nm8aqcah1n2dkx4m45pz464s4p8bpbvnhdbbri62467r"; })
  (fetchNuGet { pname = "Destructurama.FSharp"; version = "1.2.0"; sha256 = "0zbk88akz2k49zi5f62klz4h193zb4dfasjdcz4k4wr87chi06nv"; })
  (fetchNuGet { pname = "DiffPlex"; version = "1.7.1"; sha256 = "1q78r70pirgb7j5wkh454ws237lihh0fig212cpbj02cz53c2h6j"; })
  (fetchNuGet { pname = "dotnet-reportgenerator-globaltool"; version = "5.0.2"; sha256 = "0grzjd6h82f3whx8iax23v9dvq5c5qvqraadnrpkxsfc8p1z0ynh"; })
@ -42,11 +43,11 @@
  (fetchNuGet { pname = "Fantomas.Client"; version = "0.9.0"; sha256 = "1zixwk61fyk7y9q6f8266kwxi6byr8fmyp1lf57qhbbvhq2waj9d"; })
  (fetchNuGet { pname = "FParsec"; version = "1.1.1"; sha256 = "01s3zrxl9kfx0264wy0m555pfx0s0z165n4fvpgx63jlqwbd8m04"; })
  (fetchNuGet { pname = "FSharp.Analyzers.SDK"; version = "0.11.0"; sha256 = "0djgbxnygmpdkrw923z2vgirs5kamrvf94ls7pvnk43c52xlb0pf"; })
-  (fetchNuGet { pname = "FSharp.Compiler.Service"; version = "43.7.300"; sha256 = "01aiczwsmv4ka6dkmw9vxfdy40wp5nzv7558pmywjixq3a780bqj"; })
+  (fetchNuGet { pname = "FSharp.Compiler.Service"; version = "43.7.400"; sha256 = "1sdc63vyplw02s5wzrly1kdsmhb144arj57q22yggigmsrhzqlag"; })
  (fetchNuGet { pname = "FSharp.Control.AsyncSeq"; version = "3.2.1"; sha256 = "02c8d8snd529rrcj6lsmab3wdq2sjh90j8sanx50ck9acfn9jd3v"; })
  (fetchNuGet { pname = "FSharp.Control.Reactive"; version = "5.0.5"; sha256 = "0ahvd3s5wfv610ks3b00ya5r71cqm34ap8ywx0pyrzhlsbk1ybqg"; })
  (fetchNuGet { pname = "FSharp.Core"; version = "6.0.5"; sha256 = "07929km96znf6xnqzmxdk3h48kz2rg9msf4c5xxmnjqr0ikfb8c6"; })
-  (fetchNuGet { pname = "FSharp.Core"; version = "7.0.300"; sha256 = "017mp4ndfi9ckps9jczw6d48xm0c2rakf3i5g5f6mimhd1cvlf54"; })
+  (fetchNuGet { pname = "FSharp.Core"; version = "7.0.400"; sha256 = "1pl6iqqcpm9djfn7f6ms5j1xbcyz00nb808qd6pmsjrnylflalgp"; })
  (fetchNuGet { pname = "FSharp.Data.Adaptive"; version = "1.2.13"; sha256 = "16l1h718h110yl2q83hzy1rpalyqlicdaxln7g0bf8kzq9b2v6rz"; })
  (fetchNuGet { pname = "FSharp.Formatting"; version = "14.0.1"; sha256 = "0sx4jlxzmrdcmc937arc9v0r90qkpf2gd1m9ngkpg88qvqcx4xsa"; })
  (fetchNuGet { pname = "FSharp.UMX"; version = "1.1.0"; sha256 = "1rzf5m38fcpphfhcv359plk2sval16kj00gdfwzpm9gi8wjw8j8k"; })
@ -64,21 +65,22 @@
  (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.51.0"; sha256 = "1b7iwf5qk4c449mi5lsnf6j99pwwrj79y8zkinzf5j2rslc97r0z"; })
  (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; })
  (fetchNuGet { pname = "Iced"; version = "1.17.0"; sha256 = "1999xavgpy2h83rh4indiq5mx5l509swqdi1raxj3ab6zvk49zpb"; })
-  (fetchNuGet { pname = "IcedTasks"; version = "0.5.3"; sha256 = "0yrdlhynxbdpg4lwqny7fah32lrsr3qwfszlb8n0bpgbx6pnkk6d"; })
+  (fetchNuGet { pname = "IcedTasks"; version = "0.5.4"; sha256 = "0584bbld25f6hzglzsah1n215658d4lwnzwxcazrwzyy25rmansl"; })
  (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "7.2.1.6856"; sha256 = "19z68rgzl93lh1h8anbgzw119mhvcgr9nh5q2nxk6qihl2mx97ba"; })
  (fetchNuGet { pname = "Ionide.KeepAChangelog.Tasks"; version = "0.1.8"; sha256 = "066zla2rp1sal6by3h3sg6ibpkk52kbhn30bzk58l6ym7q1kqa6b"; })
-  (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.4.14"; sha256 = "0jkwnvn2g2bbnfvc7a3l30c6kkzwcrzxryq31pq9sm2nnnvk1dxs"; })
-  (fetchNuGet { pname = "Ionide.ProjInfo"; version = "0.61.3"; sha256 = "0d6zzqzsd4gn2dnpkamzl0h2p94vfsnrkigjk3cyqp233xrbhqdf"; })
-  (fetchNuGet { pname = "Ionide.ProjInfo.FCS"; version = "0.61.3"; sha256 = "1hlxhlbvwgb997q7169a6q8v804w8bfxhin2yljd77alj2yzal9r"; })
-  (fetchNuGet { pname = "Ionide.ProjInfo.ProjectSystem"; version = "0.61.3"; sha256 = "1mhzvcfrnx5wd2nad321azsndr9yb47m3y7gim49a70fswngbl38"; })
-  (fetchNuGet { pname = "Ionide.ProjInfo.Sln"; version = "0.61.3"; sha256 = "1a01c7r3q3sjz81p8d0j8k0j9inwgj2xfy8mc8r2699xk55bih09"; })
+  (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.4.17"; sha256 = "14h8rkc9q6shh9fqa640bzfs1k1y5nfriwviwjynpjf79xbbcpvs"; })
+  (fetchNuGet { pname = "Ionide.ProjInfo"; version = "0.62.0"; sha256 = "1da6hhca9vd6hxbz9jmwxwx2pc7d5ayd41sp6mzzmbk4n3jk32q2"; })
+  (fetchNuGet { pname = "Ionide.ProjInfo.FCS"; version = "0.62.0"; sha256 = "1mkw4b1sawv1p0c4a1fidkw02bh9iik7fi80ffgqi0msc3ql8lmg"; })
+  (fetchNuGet { pname = "Ionide.ProjInfo.ProjectSystem"; version = "0.62.0"; sha256 = "0kj9h5gvvrl720kg5jylx8w1jjmcci7bdhabr57sbq31vbgav74d"; })
+  (fetchNuGet { pname = "Ionide.ProjInfo.Sln"; version = "0.62.0"; sha256 = "05yxz0hhpi1b0kdyzbjbb0klmpbaq8i5d0s4y59wr2qbz2318xpa"; })
+  (fetchNuGet { pname = "LinkDotNet.StringBuilder"; version = "1.18.0"; sha256 = "0lgh4yjnim9qbqkmkgpx5fi2lha1cgcdbddvbsiw9jzp18fndxly"; })
  (fetchNuGet { pname = "McMaster.NETCore.Plugins"; version = "1.4.0"; sha256 = "1k2qz0qnf2b1kfwbzcynivy93jm7dcwl866d0fl7qlgq5vql7niy"; })
  (fetchNuGet { pname = "MessagePack"; version = "2.4.35"; sha256 = "0y8pz073ync51cv39lxldc797nmcm39r4pdhy2il6r95rppjqg5h"; })
  (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.4.35"; sha256 = "1jny2r6rwq7xzwymm779w9x8a5rhyln97mxzplxwd53wwbb0wbzd"; })
  (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })
+  (fetchNuGet { pname = "Microsoft.Bcl.HashCode"; version = "1.1.0"; sha256 = "1ggsadahlp76zcn1plapszd5v5ja8rh479fwrahqd3knql4dfnr0"; })
  (fetchNuGet { pname = "Microsoft.Build"; version = "17.2.0"; sha256 = "09hs74nr0kv83wc1way9x7vq3nmxbr2s4vdy99hx78kj25pylcr7"; })
  (fetchNuGet { pname = "Microsoft.Build"; version = "17.4.0"; sha256 = "0j8rqwl8h2hh4yl4bvsijm0rl8356a8vfvdqj4jk5blmvfcfs7b4"; })
-  (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.4.0"; sha256 = "06yh8fxxfrqlhm5kd2mdlwz6zjfqb1haf7cp812q6apvh8akfnyd"; })
  (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.6.3"; sha256 = "0gj182wih2rr90c045a7x1cy04szv83zr21c725h70s7dcshdvn6"; })
  (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.5.3"; sha256 = "0km0zafgbm4qjg0azv40aanfn38fplkz057gqhyd76h4zgvwpxg4"; })
  (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.4.0"; sha256 = "12d3jg8qpf4k5gknxv728270faiwzb0qb6m8cfjwsqy990v54z2c"; })
@ -129,11 +131,10 @@
  (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.3.44"; sha256 = "0l1hh2xb183xr5nk8xvbd8zz45n7h15cxlicg5zii6q68q8z49wf"; })
  (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.0.64"; sha256 = "1qm2dc9v1glpgy2blbcmsljwrsx55k82rjw4hiqh031h8idwryrl"; })
  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
-  (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.1"; sha256 = "1map729br97ny6mqkaw5qsg55yjbfz2hskvy56qz8rf7p1bjhky2"; })
  (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; })
  (fetchNuGet { pname = "Mono.Cecil"; version = "0.11.4"; sha256 = "1yxa7mh432s7g7p9r7scqxvxjk5ypwc567qdbf0gmk8fbf0d3f8y"; })
  (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; })
-  (fetchNuGet { pname = "MSBuild.StructuredLogger"; version = "2.1.820"; sha256 = "04i27pcw06a7zb9p8yw255lczsap4aj8p2zncscm679380lxa7p1"; })
+  (fetchNuGet { pname = "MSBuild.StructuredLogger"; version = "2.1.844"; sha256 = "0fp2gng4gk63ac0wz231zwbnpy6a35mq04gy8fc81gra6px4sy5v"; })
  (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.8.61"; sha256 = "1wxhrqlhb8wq1x5kn3wacylicznl3fgmfdqvx6r3s97yv89zyzy4"; })
  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; })
@ -158,7 +159,6 @@
  (fetchNuGet { pname = "StreamJsonRpc"; version = "2.12.27"; sha256 = "15k0z6y3dsgipzfaa73irf5xjddr5mj9z26k27s8p6viay608cxc"; })
  (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; })
  (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; sha256 = "1i55cxp8ycc03dmxx4n22qi6jkwfl23cgffb95izq7bjar8avxxq"; })
-  (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; })
  (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; })
  (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; })
  (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; })
@ -170,9 +170,8 @@
  (fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; sha256 = "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72"; })
  (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; })
  (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "7.0.0"; sha256 = "149d9kmakzkbw69cip1ny0wjlgcvnhrr7vz5pavpsip36k2mw02a"; })
-  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; })
+  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.2"; sha256 = "1h97ikph775gya93qsjjaka87qcygbyh1064rh1hnfcnp5xv0ipi"; })
  (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "7.0.0"; sha256 = "16p8z975dnzmncfifa9gw9n3k9ycpr2qvz7lglpghsvx0fava8k9"; })
-  (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; })
  (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; })
  (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; })
  (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; })
@ -184,6 +183,7 @@
  (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.7.0"; sha256 = "0l8jpxhpgjlf1nkz5lvp61r4kfdbhr29qi8aapcxn3izd9wd0j8r"; })
  (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.7.0"; sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; })
  (fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.1"; sha256 = "0fjqifk4qz9lw5gcadpfalpplyr0z2b3p9x7h0ll481a9sqvppc9"; })
+  (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; sha256 = "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"; })
  (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; sha256 = "1ijfiqpi3flp5g9amridhjjmzz6md1c6pnxx5h7pdbiqqx9rwrpk"; })
  (fetchNuGet { pname = "System.Resources.Extensions"; version = "6.0.0"; sha256 = "1h73gps9ffw77vys4zwgm78fgackqw6a7rjrg75mmx79vdw1shgw"; })
  (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })
@ -193,7 +193,6 @@
  (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; })
  (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.1"; sha256 = "1nq9ngkqha70rv41692c79zq09cx6m85wkp3xj9yc31s62afyl5i"; })
  (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.1"; sha256 = "15d0np1njvy2ywf0qzdqyjk5sjs4zbfxg917jrvlbfwrqpqxb5dj"; })
-  (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; })
  (fetchNuGet { pname = "System.Security.Permissions"; version = "7.0.0"; sha256 = "0wkm6bj4abknzj41ygkziifx8mzhj4bix92wjvj6lihaw1gniq8c"; })
  (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; })
  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; })
@ -203,7 +202,6 @@
  (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; })
  (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "6.0.0"; sha256 = "1b4vyjdir9kdkiv2fqqm4f76h0df68k8gcd7jb2b38zgr2vpnk3c"; })
  (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; })
-  (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; })
  (fetchNuGet { pname = "System.Windows.Extensions"; version = "7.0.0"; sha256 = "11r9f0v7qp365bdpq5ax023yra4qvygljz18dlqs650d44iay669"; })
  (fetchNuGet { pname = "YoloDev.Expecto.TestSdk"; version = "0.13.3"; sha256 = "0y9bhgws3m2idj8cr53rn0155wwi6nhgbp6hmci0gc2w7fp3387c"; })
 ]
--- a/pkgs/development/tools/ktlint/default.nix
+++ b/pkgs/development/tools/ktlint/default.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "ktlint";
-  version = "0.50.0";
+  version = "1.0.0";

  src = fetchurl {
    url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint";
-    sha256 = "01qh85kclksgv484cwma7jyaxlz8rgk14l4mxcvzp2flprdnzgd2";
+    sha256 = "1pc1ck87l849xfy1lcdr1v3p84qyxn9725pvh09czvlqs58yy6ax";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/development/tools/language-servers/pylyzer/default.nix
+++ b/pkgs/development/tools/language-servers/pylyzer/default.nix
@ -12,16 +12,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "pylyzer";
-  version = "0.0.41";
+  version = "0.0.42";

  src = fetchFromGitHub {
    owner = "mtshiba";
    repo = "pylyzer";
    rev = "v${version}";
-    hash = "sha256-8pDHCu0cmBDkMc5epVTT1JSKd9dbLsRk3ZyqBM5QJwc=";
+    hash = "sha256-SZwMgxQUuGq74mca1mgZ41esW/mr+mvlOhHXFALjd8U=";
  };

-  cargoHash = "sha256-1eAxl9eO6SOTVT4e+kinsDPd2LFmF9+SflUJaFEJE6g=";
+  cargoHash = "sha256-iPNdkKLvLyJGwdd19tNNwuxVBctp1K+UuQjjLLzkgHg=";

  nativeBuildInputs = [
    git
--- a/pkgs/development/tools/language-servers/yaml-language-server/default.nix
+++ b/pkgs/development/tools/language-servers/yaml-language-server/default.nix
@ -0,0 +1,41 @@
+{ lib
+, mkYarnPackage
+, fetchYarnDeps
+, fetchFromGitHub
+}:
+
+mkYarnPackage rec {
+  pname = "yaml-language-server";
+  version = "1.14.0";
+
+  src = fetchFromGitHub {
+    owner = "redhat-developer";
+    repo = "yaml-language-server";
+    rev = version;
+    hash = "sha256-DS5kMw/x8hP2MzxHdHXnBqqBGLq21NiZBb5ApjEe/ts=";
+  };
+
+  packageJSON = ./package.json;
+  offlineCache = fetchYarnDeps {
+    yarnLock = "${src}/yarn.lock";
+    hash = "sha256-zHcxZ4VU6CGux72Nsy0foU4gFshK1wO/LTfnwOoirmg=";
+  };
+
+  buildPhase = ''
+    runHook preBuild
+
+    export HOME=$(mktemp -d)
+    yarn --offline build
+
+    runHook postBuild
+  '';
+
+  meta = {
+    changelog = "https://github.com/redhat-developer/yaml-language-server/blob/${src.rev}/CHANGELOG.md";
+    description = "Language Server for YAML Files";
+    homepage = "https://github.com/redhat-developer/yaml-language-server";
+    license = lib.licenses.mit;
+    mainProgram = "yaml-language-server";
+    maintainers = with lib.maintainers; [ wolfangaukang ];
+  };
+}
--- a/pkgs/development/tools/language-servers/yaml-language-server/package.json
+++ b/pkgs/development/tools/language-servers/yaml-language-server/package.json
@ -0,0 +1,108 @@
+{
+  "name": "yaml-language-server",
+  "description": "YAML language server",
+  "version": "1.14.0",
+  "author": "Gorkem Ercan (Red Hat)",
+  "license": "MIT",
+  "contributors": [
+    {
+      "name": "Joshua Pinkney",
+      "email": "joshpinkney@gmail.com"
+    },
+    {
+      "name": "Yevhen Vydolob",
+      "email": "yvydolob@redhat.com"
+    },
+    {
+      "name": "Google LLC"
+    }
+  ],
+  "bin": {
+    "yaml-language-server": "./bin/yaml-language-server"
+  },
+  "main": "./out/server/src/index.js",
+  "keywords": [
+    "yaml",
+    "LSP"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/redhat-developer/yaml-language-server.git"
+  },
+  "optionalDependencies": {
+    "prettier": "2.8.7"
+  },
+  "dependencies": {
+    "ajv": "^8.11.0",
+    "lodash": "4.17.21",
+    "request-light": "^0.5.7",
+    "vscode-json-languageservice": "4.1.8",
+    "vscode-languageserver": "^7.0.0",
+    "vscode-languageserver-textdocument": "^1.0.1",
+    "vscode-languageserver-types": "^3.16.0",
+    "vscode-nls": "^5.0.0",
+    "vscode-uri": "^3.0.2",
+    "yaml": "2.2.2"
+  },
+  "devDependencies": {
+    "@microsoft/eslint-formatter-sarif": "3.0.0",
+    "@types/chai": "^4.2.12",
+    "@types/mocha": "8.2.2",
+    "@types/node": "16.x",
+    "@types/prettier": "2.7.2",
+    "@types/sinon": "^9.0.5",
+    "@types/sinon-chai": "^3.2.5",
+    "@typescript-eslint/eslint-plugin": "^5.38.0",
+    "@typescript-eslint/parser": "^5.38.0",
+    "chai": "^4.2.0",
+    "coveralls": "3.1.1",
+    "eslint": "^8.24.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "http-proxy-agent": "^5.0.0",
+    "https-proxy-agent": "^5.0.0",
+    "mocha": "9.2.2",
+    "mocha-lcov-reporter": "^1.3.0",
+    "nyc": "^15.1.0",
+    "rimraf": "^3.0.2",
+    "sinon": "^9.0.3",
+    "sinon-chai": "^3.5.0",
+    "source-map-support": "^0.5.19",
+    "ts-node": "^10.0.0",
+    "typescript": "^4.8.3"
+  },
+  "scripts": {
+    "clean": "rimraf out/server && rimraf lib",
+    "compile": "tsc -p .",
+    "watch": "tsc --watch -p .",
+    "test": "mocha --require ts-node/register --timeout 5000 --ui bdd ./test/*.test.ts",
+    "coverage": "nyc mocha --require ts-node/register --timeout 5000 --require source-map-support/register --recursive --ui bdd ./test/*.test.ts",
+    "coveralls": "nyc --reporter=lcov --reporter=text mocha --timeout 5000 --require ts-node/register --require source-map-support/register --recursive --ui bdd ./test/*.test.ts",
+    "lint": "eslint --max-warnings 0 -c .eslintrc.js --ext .ts src test",
+    "lint-ci": "eslint --max-warnings 0 -c .eslintrc.js -f @microsoft/eslint-formatter-sarif -o eslint-result.sarif --ext .ts src test",
+    "prettier-fix": "yarn prettier --write .",
+    "build": "yarn clean && yarn lint && yarn compile && yarn build:libs",
+    "build:libs": "yarn compile:umd && yarn compile:esm",
+    "compile:umd": "tsc -p ./tsconfig.umd.json",
+    "compile:esm": "tsc -p ./tsconfig.esm.json",
+    "check-dependencies": "node ./scripts/check-dependencies.js",
+    "pull-remote": "git pull https://github.com/redhat-developer/yaml-language-server.git main"
+  },
+  "nyc": {
+    "extension": [
+      ".ts",
+      ".tsx"
+    ],
+    "exclude": [
+      "**/*.d.ts",
+      "test/",
+      "out",
+      "lib",
+      "coverage/",
+      ".eslintrc.js",
+      "scripts"
+    ],
+    "all": true
+  }
+}
--- a/pkgs/development/tools/misc/dart-sass/default.nix
+++ b/pkgs/development/tools/misc/dart-sass/default.nix
@ -29,7 +29,7 @@ buildDartApplication rec {
  };

  pubspecLockFile = ./pubspec.lock;
-  vendorHash = "sha256-YWxVpwuo97i00/F4WOn2AWiRFYSFIWbEbmxDF77gWsE=";
+  vendorHash = "sha256-oLHHKV5tTgEkCzqRscBXMNafKg4jdH2U9MhVY/Myfv4=";

  nativeBuildInputs = [
    buf
--- a/pkgs/development/tools/misc/dart-sass/pubspec.lock
+++ b/pkgs/development/tools/misc/dart-sass/pubspec.lock
@ -66,13 +66,13 @@ packages:
    source: hosted
    version: "2.0.3"
  cli_pkg:
-    dependency: "direct dev"
+    dependency: "direct main"
    description:
      name: cli_pkg
-      sha256: "0f76b0ea3f158e9c68e3ae132e90435cfd094c507ae6aaeccb05bbc2ef758517"
+      sha256: "009e19944bbfb07c3b97f2f8c9941aa01ca70a7d3d0018e813303b4c3905c9b9"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.4"
+    version: "2.5.0"
  cli_repl:
    dependency: "direct main"
    description:
@ -82,7 +82,7 @@ packages:
    source: hosted
    version: "0.2.3"
  cli_util:
-    dependency: transitive
+    dependency: "direct dev"
    description:
      name: cli_util
      sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7
@ -93,10 +93,10 @@ packages:
    dependency: "direct main"
    description:
      name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
      url: "https://pub.dev"
    source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
  convert:
    dependency: transitive
    description:
@ -125,18 +125,18 @@ packages:
    dependency: transitive
    description:
      name: csslib
-      sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f"
+      sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb"
      url: "https://pub.dev"
    source: hosted
-    version: "0.17.3"
+    version: "1.0.0"
  dart_style:
    dependency: "direct dev"
    description:
      name: dart_style
-      sha256: f4f1f73ab3fd2afcbcca165ee601fe980d966af6a21b5970c6c9376955c528ad
+      sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
  dartdoc:
    dependency: "direct dev"
    description:
@ -189,18 +189,18 @@ packages:
    dependency: transitive
    description:
      name: html
-      sha256: "58e3491f7bf0b6a4ea5110c0c688877460d1a6366731155c4a4580e7ded773e8"
+      sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
      url: "https://pub.dev"
    source: hosted
-    version: "0.15.3"
+    version: "0.15.4"
  http:
    dependency: "direct main"
    description:
      name: http
-      sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
+      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
      url: "https://pub.dev"
    source: hosted
-    version: "0.13.6"
+    version: "1.1.0"
  http_multi_server:
    dependency: transitive
    description:
@ -261,10 +261,10 @@ packages:
    dependency: transitive
    description:
      name: markdown
-      sha256: "8e332924094383133cee218b676871f42db2514f1f6ac617b6cf6152a7faab8e"
+      sha256: acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd
      url: "https://pub.dev"
    source: hosted
-    version: "7.1.0"
+    version: "7.1.1"
  matcher:
    dependency: transitive
    description:
@ -333,10 +333,10 @@ packages:
    dependency: transitive
    description:
      name: petitparser
-      sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
+      sha256: eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6
      url: "https://pub.dev"
    source: hosted
-    version: "5.4.0"
+    version: "6.0.1"
  pointycastle:
    dependency: transitive
    description:
@ -357,26 +357,26 @@ packages:
    dependency: "direct main"
    description:
      name: protobuf
-      sha256: "01dd9bd0fa02548bf2ceee13545d4a0ec6046459d847b6b061d8a27237108a08"
+      sha256: "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.0"
+    version: "3.1.0"
  protoc_plugin:
    dependency: "direct dev"
    description:
      name: protoc_plugin
-      sha256: e2be5014ba145dc0f8de20ac425afa2a513aff64fe350d338e481d40de0573df
+      sha256: a800528e47f6efd31a57213dd11b6036f36cbd6677785742a2121e96f7c7a2b9
      url: "https://pub.dev"
    source: hosted
-    version: "20.0.1"
+    version: "21.1.1"
  pub_api_client:
    dependency: "direct dev"
    description:
      name: pub_api_client
-      sha256: d4bc6c9ec778da1a79675eab41bde456b392973216acd783156afaee69230e22
+      sha256: d456816ef5142906a22dc56e37be6bef6cb0276f0a26c11d1f7d277868202e71
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.0"
+    version: "2.6.0"
  pub_semver:
    dependency: "direct main"
    description:
@ -477,18 +477,18 @@ packages:
    dependency: "direct main"
    description:
      name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
      url: "https://pub.dev"
    source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
  stream_channel:
    dependency: "direct main"
    description:
      name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
  stream_transform:
    dependency: "direct main"
    description:
@ -517,26 +517,26 @@ packages:
    dependency: "direct dev"
    description:
      name: test
-      sha256: "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46"
+      sha256: "9b0dd8e36af4a5b1569029949d50a52cb2a2a2fdaa20cebb96e6603b9ae241f9"
      url: "https://pub.dev"
    source: hosted
-    version: "1.24.3"
+    version: "1.24.6"
  test_api:
    dependency: transitive
    description:
      name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.0"
+    version: "0.6.1"
  test_core:
    dependency: transitive
    description:
      name: test_core
-      sha256: "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e"
+      sha256: "4bef837e56375537055fdbbbf6dd458b1859881f4c7e6da936158f77d61ab265"
      url: "https://pub.dev"
    source: hosted
-    version: "0.5.3"
+    version: "0.5.6"
  test_descriptor:
    dependency: "direct dev"
    description:
@ -553,14 +553,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.1.0"
-  tuple:
-    dependency: "direct main"
-    description:
-      name: tuple
-      sha256: "0ea99cd2f9352b2586583ab2ce6489d1f95a5f6de6fb9492faaf97ae2060f0aa"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.1"
  typed_data:
    dependency: "direct main"
    description:
@ -581,10 +573,10 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: f3743ca475e0c9ef71df4ba15eb2d7684eecd5c8ba20a462462e4e8b561b2e11
+      sha256: c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583
      url: "https://pub.dev"
    source: hosted
-    version: "11.6.0"
+    version: "11.10.0"
  watcher:
    dependency: "direct main"
    description:
@ -613,10 +605,10 @@ packages:
    dependency: transitive
    description:
      name: xml
-      sha256: "80d494c09849dc3f899d227a78c30c5b949b985ededf884cb3f3bcd39f4b447a"
+      sha256: af5e77e9b83f2f4adc5d3f0a4ece1c7f45a2467b695c2540381bac793e34e556
      url: "https://pub.dev"
    source: hosted
-    version: "5.4.1"
+    version: "6.4.2"
  yaml:
    dependency: "direct dev"
    description:
--- a/Show More
+++ b/Show More