Merge master into staging-next

2024-08-27 00:13:08 +00:00 · 2024-08-27 00:13:08 +00:00 · 0629545b27
commit 0629545b27
parent 75c9ed99be 0c7aafc7f5
168 changed files with 1808 additions and 928 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -19946,13 +19946,6 @@
    githubId = 36031171;
    name = "Supa";
  };
-  superherointj = {
-    email = "sergiomarcelo@yandex.com";
-    github = "superherointj";
-    githubId = 5861043;
-    matrix = "@superherointj:matrix.org";
-    name = "Sérgio Marcelo";
-  };
  SuperSandro2000 = {
    email = "sandro.jaeckel@gmail.com";
    matrix = "@sandro:supersandro.de";
@ -21936,6 +21929,14 @@
    githubId = 230381;
    name = "Daniel Nilsson";
  };
+  vrifox = {
+    email = "vrifox@vrifox.cc";
+    github = "vrifox";
+    githubId = 109021367;
+    keys = [ { fingerprint = "413C 73F0 C5BD 6318 826A  42D9 D400 98E5 B60B 2197"; } ];
+    matrix = "@vri:cozy.town";
+    name = "Vri";
+  };
  vrinek = {
    email = "vrinek@hey.com";
    github = "vrinek";
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@ -507,7 +507,6 @@ with lib.maintainers;
      marcusramberg
      mic92
      rorosen
-      superherointj
      wrmilling
      yajo
    ];
@ -780,7 +779,11 @@ with lib.maintainers;
  };

  perl = {
-    members = [ sgo ];
+    members = [
+      sgo
+      marcusramberg
+      zakame
+    ];
    scope = "Maintain the Perl interpreter and Perl packages.";
    shortName = "Perl";
    enableFeatureFreezePing = true;
@ -947,7 +950,6 @@ with lib.maintainers;
  stridtech = {
    # Verify additions by approval of an already existing member of the team
    members = [
-      superherointj
      ulrikstrid
    ];
    scope = "Group registration for Strid Tech AB team members who collectively maintain packages";
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@ -1,8 +1,4 @@
 { config, lib, pkgs, ... }:
-
-with pkgs;
-with lib;
-
 let

  cfg = config.hardware.pulseaudio;
@ -10,28 +6,28 @@ let
  hasZeroconf = let z = cfg.zeroconf; in z.publish.enable || z.discovery.enable;

  overriddenPackage = cfg.package.override
-    (optionalAttrs hasZeroconf { zeroconfSupport = true; });
-  binary = "${getBin overriddenPackage}/bin/pulseaudio";
+    (lib.optionalAttrs hasZeroconf { zeroconfSupport = true; });
+  binary = "${lib.getBin overriddenPackage}/bin/pulseaudio";
  binaryNoDaemon = "${binary} --daemonize=no";

  # Forces 32bit pulseaudio and alsa-plugins to be built/supported for apps
  # using 32bit alsa on 64bit linux.
-  enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsa-lib != null && pkgs.pkgsi686Linux.libpulseaudio != null);
+  enable32BitAlsaPlugins = cfg.support32Bit && pkgs.stdenv.isx86_64 && (pkgs.pkgsi686Linux.alsa-lib != null && pkgs.pkgsi686Linux.libpulseaudio != null);


  myConfigFile =
    let
-      addModuleIf = cond: mod: optionalString cond "load-module ${mod}";
-      allAnon = optional cfg.tcp.anonymousClients.allowAll "auth-anonymous=1";
+      addModuleIf = cond: mod: lib.optionalString cond "load-module ${mod}";
+      allAnon = lib.optional cfg.tcp.anonymousClients.allowAll "auth-anonymous=1";
      ipAnon =  let a = cfg.tcp.anonymousClients.allowedIpRanges;
-                in optional (a != []) ''auth-ip-acl=${concatStringsSep ";" a}'';
-    in writeTextFile {
+                in lib.optional (a != []) ''auth-ip-acl=${lib.concatStringsSep ";" a}'';
+    in pkgs.writeTextFile {
      name = "default.pa";
        text = ''
        .include ${cfg.configFile}
        ${addModuleIf cfg.zeroconf.publish.enable "module-zeroconf-publish"}
        ${addModuleIf cfg.zeroconf.discovery.enable "module-zeroconf-discover"}
-        ${addModuleIf cfg.tcp.enable (concatStringsSep " "
+        ${addModuleIf cfg.tcp.enable (lib.concatStringsSep " "
           ([ "module-native-protocol-tcp" ] ++ allAnon ++ ipAnon))}
        ${addModuleIf config.services.jack.jackd.enable "module-jack-sink"}
        ${addModuleIf config.services.jack.jackd.enable "module-jack-source"}
@ -49,7 +45,7 @@ let
  # Create pulse/client.conf even if PulseAudio is disabled so
  # that we can disable the autospawn feature in programs that
  # are built with PulseAudio support (like KDE).
-  clientConf = writeText "client.conf" ''
+  clientConf = pkgs.writeText "client.conf" ''
    autospawn=no
    ${cfg.extraClientConf}
  '';
@ -82,16 +78,16 @@ in {
  options = {

    hardware.pulseaudio = {
-      enable = mkOption {
-        type = types.bool;
+      enable = lib.mkOption {
+        type = lib.types.bool;
        default = false;
        description = ''
          Whether to enable the PulseAudio sound server.
        '';
      };

-      systemWide = mkOption {
-        type = types.bool;
+      systemWide = lib.mkOption {
+        type = lib.types.bool;
        default = false;
        description = ''
          If false, a PulseAudio server is launched automatically for
@ -105,8 +101,8 @@ in {
        '';
      };

-      support32Bit = mkOption {
-        type = types.bool;
+      support32Bit = lib.mkOption {
+        type = lib.types.bool;
        default = false;
        description = ''
          Whether to include the 32-bit pulseaudio libraries in the system or not.
@ -114,8 +110,8 @@ in {
        '';
      };

-      configFile = mkOption {
-        type = types.nullOr types.path;
+      configFile = lib.mkOption {
+        type = lib.types.nullOr lib.types.path;
        description = ''
          The path to the default configuration options the PulseAudio server
          should use. By default, the "default.pa" configuration
@ -123,8 +119,8 @@ in {
        '';
      };

-      extraConfig = mkOption {
-        type = types.lines;
+      extraConfig = lib.mkOption {
+        type = lib.types.lines;
        default = "";
        description = ''
          Literal string to append to `configFile`
@ -132,21 +128,21 @@ in {
        '';
      };

-      extraClientConf = mkOption {
-        type = types.lines;
+      extraClientConf = lib.mkOption {
+        type = lib.types.lines;
        default = "";
        description = ''
          Extra configuration appended to pulse/client.conf file.
        '';
      };

-      package = mkOption {
-        type = types.package;
+      package = lib.mkOption {
+        type = lib.types.package;
        default = if config.services.jack.jackd.enable
                  then pkgs.pulseaudioFull
                  else pkgs.pulseaudio;
-        defaultText = literalExpression "pkgs.pulseaudio";
-        example = literalExpression "pkgs.pulseaudioFull";
+        defaultText = lib.literalExpression "pkgs.pulseaudio";
+        example = lib.literalExpression "pkgs.pulseaudioFull";
        description = ''
          The PulseAudio derivation to use.  This can be used to enable
          features (such as JACK support, Bluetooth) via the
@ -154,10 +150,10 @@ in {
        '';
      };

-      extraModules = mkOption {
-        type = types.listOf types.package;
+      extraModules = lib.mkOption {
+        type = lib.types.listOf lib.types.package;
        default = [];
-        example = literalExpression "[ pkgs.pulseaudio-modules-bt ]";
+        example = lib.literalExpression "[ pkgs.pulseaudio-modules-bt ]";
        description = ''
          Extra pulseaudio modules to use. This is intended for out-of-tree
          pulseaudio modules like extra bluetooth codecs.
@ -167,8 +163,8 @@ in {
      };

      daemon = {
-        logLevel = mkOption {
-          type = types.str;
+        logLevel = lib.mkOption {
+          type = lib.types.str;
          default = "notice";
          description = ''
            The log level that the system-wide pulseaudio daemon should use,
@ -176,31 +172,31 @@ in {
          '';
        };

-        config = mkOption {
-          type = types.attrsOf types.unspecified;
+        config = lib.mkOption {
+          type = lib.types.attrsOf lib.types.unspecified;
          default = {};
          description = "Config of the pulse daemon. See `man pulse-daemon.conf`.";
-          example = literalExpression ''{ realtime-scheduling = "yes"; }'';
+          example = lib.literalExpression ''{ realtime-scheduling = "yes"; }'';
        };
      };

      zeroconf = {
        discovery.enable =
-          mkEnableOption "discovery of pulseaudio sinks in the local network";
+          lib.mkEnableOption "discovery of pulseaudio sinks in the local network";
        publish.enable =
-          mkEnableOption "publishing the pulseaudio sink in the local network";
+          lib.mkEnableOption "publishing the pulseaudio sink in the local network";
      };

      # TODO: enable by default?
      tcp = {
-        enable = mkEnableOption "tcp streaming support";
+        enable = lib.mkEnableOption "tcp streaming support";

        anonymousClients = {
-          allowAll = mkEnableOption "all anonymous clients to stream to the server";
-          allowedIpRanges = mkOption {
-            type = types.listOf types.str;
+          allowAll = lib.mkEnableOption "all anonymous clients to stream to the server";
+          allowedIpRanges = lib.mkOption {
+            type = lib.types.listOf lib.types.str;
            default = [];
-            example = literalExpression ''[ "127.0.0.1" "192.168.1.0/24" ]'';
+            example = lib.literalExpression ''[ "127.0.0.1" "192.168.1.0/24" ]'';
            description = ''
              A list of IP subnets that are allowed to stream to the server.
            '';
@ -213,7 +209,7 @@ in {
  };


-  config = lib.mkIf cfg.enable (mkMerge [
+  config = lib.mkIf cfg.enable (lib.mkMerge [
    {
      environment.etc."pulse/client.conf".source = clientConf;

@ -222,21 +218,21 @@ in {
      environment.etc = {
        "alsa/conf.d/99-pulseaudio.conf".text = alsaConf;

-        "pulse/daemon.conf".source = writeText "daemon.conf"
+        "pulse/daemon.conf".source = pkgs.writeText "daemon.conf"
          (lib.generators.toKeyValue {} cfg.daemon.config);

-        "openal/alsoft.conf".source = writeText "alsoft.conf" "drivers=pulse";
+        "openal/alsoft.conf".source = pkgs.writeText "alsoft.conf" "drivers=pulse";

-        "libao.conf".source = writeText "libao.conf" "default_driver=pulse";
+        "libao.conf".source = pkgs.writeText "libao.conf" "default_driver=pulse";
      };

-      hardware.pulseaudio.configFile = mkDefault "${getBin overriddenPackage}/etc/pulse/default.pa";
+      hardware.pulseaudio.configFile = lib.mkDefault "${lib.getBin overriddenPackage}/etc/pulse/default.pa";

      # Disable flat volumes to enable relative ones
-      hardware.pulseaudio.daemon.config.flat-volumes = mkDefault "no";
+      hardware.pulseaudio.daemon.config.flat-volumes = lib.mkDefault "no";

      # Upstream defaults to speex-float-1 which results in audible artifacts
-      hardware.pulseaudio.daemon.config.resample-method = mkDefault "speex-float-5";
+      hardware.pulseaudio.daemon.config.resample-method = lib.mkDefault "speex-float-5";

      # Allow PulseAudio to get realtime priority using rtkit.
      security.rtkit.enable = true;
@ -247,7 +243,7 @@ in {
      services.udev.packages = [ overriddenPackage ];
    }

-    (mkIf (cfg.extraModules != []) {
+    (lib.mkIf (cfg.extraModules != []) {
      hardware.pulseaudio.daemon.config.dl-search-path = let
        overriddenModules = builtins.map
          (drv: drv.override { pulseaudio = overriddenPackage; })
@ -259,15 +255,15 @@ in {
      in lib.concatStringsSep ":" modulePaths;
    })

-    (mkIf hasZeroconf {
+    (lib.mkIf hasZeroconf {
      services.avahi.enable = true;
    })
-    (mkIf cfg.zeroconf.publish.enable {
+    (lib.mkIf cfg.zeroconf.publish.enable {
      services.avahi.publish.enable = true;
      services.avahi.publish.userServices = true;
    })

-    (mkIf (!cfg.systemWide) {
+    (lib.mkIf (!cfg.systemWide) {
      environment.etc = {
        "pulse/default.pa".source = myConfigFile;
      };
@ -278,7 +274,7 @@ in {
            RestartSec = "500ms";
            PassEnvironment = "DISPLAY";
          };
-        } // optionalAttrs config.services.jack.jackd.enable {
+        } // lib.optionalAttrs config.services.jack.jackd.enable {
          environment.JACK_PROMISCUOUS_SERVER = "jackaudio";
        };
        sockets.pulseaudio = {
@ -287,7 +283,7 @@ in {
      };
    })

-    (mkIf cfg.systemWide {
+    (lib.mkIf cfg.systemWide {
      users.users.pulse = {
        # For some reason, PulseAudio wants UID == GID.
        uid = assert uid == gid; uid;
--- a/nixos/modules/services/home-automation/home-assistant.nix
+++ b/nixos/modules/services/home-automation/home-assistant.nix
@ -655,6 +655,7 @@ in {
        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
        User = "hass";
        Group = "hass";
+        WorkingDirectory = cfg.configDir;
        Restart = "on-failure";
        RestartForceExitStatus = "100";
        SuccessExitStatus = "100";
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
    homepage = "https://audacious-media-player.org";
    downloadPage = "https://github.com/audacious-media-player/audacious";
    mainProgram = "audacious";
-    maintainers = with lib.maintainers; [ eelco ramkromberg ttuegel thiagokokada ];
+    maintainers = with lib.maintainers; [ ramkromberg ttuegel thiagokokada ];
    platforms = lib.platforms.linux;
    license = with lib.licenses; [
      bsd2
--- a/pkgs/applications/audio/musly/default.nix
+++ b/pkgs/applications/audio/musly/default.nix
@ -1,34 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake, eigen, ffmpeg_4 }:
-stdenv.mkDerivation {
-  pname = "musly";
-  version = "unstable-2017-04-26";
-  src = fetchFromGitHub {
-    owner = "dominikschnitzer";
-    repo = "musly";
-    rev = "f911eacbbe0b39ebe87cb37d0caef09632fa40d6";
-    sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825";
-  };
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ eigen ffmpeg_4 ];
-  fixupPhase = lib.optionalString stdenv.isDarwin ''
-    install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly
-    install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly
-    install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/lib/libmusly.dylib
-  '';
-
-  meta = with lib; {
-    homepage = "https://www.musly.org";
-    description = "Fast and high-quality audio music similarity library written in C/C++";
-    longDescription = ''
-      Musly analyzes the the audio signal of music pieces to estimate their similarity.
-      No meta-data about the music piece is included in the similarity estimation.
-      To use Musly in your application, have a look at the library documentation
-      or try the command line application included in the package and start generating
-      some automatic music playlists right away.
-    '';
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ ggpeti ];
-    platforms = with platforms; darwin ++ linux;
-    mainProgram = "musly";
-  };
-}
--- a/pkgs/applications/audio/spotify/linux.nix
+++ b/pkgs/applications/audio/spotify/linux.nix
@ -184,6 +184,6 @@ stdenv.mkDerivation {
    '';

  meta = meta // {
-    maintainers = with lib.maintainers; [ eelco ftrvxmtrx sheenobu timokau ma27 ];
+    maintainers = with lib.maintainers; [ ftrvxmtrx sheenobu timokau ma27 ];
  };
 }
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@ -771,7 +771,7 @@ let
          downloadPage = "https://marketplace.visualstudio.com/items?itemName=bradgashler.htmltagwrap";
          homepage = "https://github.com/bgashler1/vscode-htmltagwrap";
          license = lib.licenses.mit;
-          maintainers = [ lib.maintainers.superherointj ];
+          maintainers = [ ];
        };
      };

@ -2600,7 +2600,7 @@ let
          downloadPage = "https://marketplace.visualstudio.com/items?itemName=jeff-hykin.better-nix-syntax";
          homepage = "https://github.com/jeff-hykin/better-nix-syntax";
          license = lib.licenses.mit;
-          maintainers = [ lib.maintainers.superherointj ];
+          maintainers = [ ];
        };
      };

@ -4301,7 +4301,7 @@ let
          downloadPage = "https://marketplace.visualstudio.com/items?itemName=signageos.signageos-vscode-sops";
          homepage = "https://github.com/signageos/vscode-sops";
          license = lib.licenses.unfree;
-          maintainers = [ lib.maintainers.superherointj ];
+          maintainers = [ ];
        };
      };

--- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
    name = "tinymist";
    publisher = "myriad-dreamin";
    inherit (tinymist) version;
-    hash = "sha256-8+CPlLJnMwlemMH36xOjGvL/NapPSpyFerpxER07hOU=";
+    hash = "sha256-m5wq1F2sjiBacdyTFtLoqrJ/B6nwoaUjiNbc+zfpJoU=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/emulators/gens-gs/default.nix
+++ b/pkgs/applications/emulators/gens-gs/default.nix
@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
    description = "Genesis/Mega Drive emulator";
    platforms = [ "i686-linux" ];
    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.eelco ];
+    maintainers = [ ];
  };
 }
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@ -57,7 +57,7 @@ in mkDerivation {
    homepage = "https://github.com/kmkolasinski/AwesomeBump";
    description = "Program to generate normal, height, specular or ambient occlusion textures from a single image";
    license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.eelco ];
+    maintainers = [ ];
    platforms = lib.platforms.linux;
    mainProgram = "AwesomeBump";
  };
--- a/pkgs/applications/kde/ktorrent.nix
+++ b/pkgs/applications/kde/ktorrent.nix
@ -11,7 +11,7 @@ mkDerivation {
    description = "KDE integrated BtTorrent client";
    homepage    = "https://apps.kde.org/ktorrent/";
    license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ eelco ];
+    maintainers = [ ];
  };

  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
--- a/pkgs/applications/kde/libktorrent.nix
+++ b/pkgs/applications/kde/libktorrent.nix
@ -1,5 +1,5 @@
 {
-  mkDerivation, lib,
+  mkDerivation,
  extra-cmake-modules,
  karchive, kcrash, ki18n, kio, libgcrypt, qca-qt5, solid,
  boost, gmp
@ -7,10 +7,10 @@

 mkDerivation {
  pname = "libktorrent";
-  meta = with lib; {
+  meta = {
    description = "BitTorrent library used by KTorrent";
    homepage    = "https://apps.kde.org/ktorrent/";
-    maintainers = with maintainers; [ eelco ];
+    maintainers = [ ];
  };

  nativeBuildInputs = [ extra-cmake-modules ];
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@ -21,13 +21,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "albert";
-  version = "0.26.0";
+  version = "0.26.2";

  src = fetchFromGitHub {
    owner = "albertlauncher";
    repo = "albert";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-OdRx8fev0weXgSMEUhSm7aESN2W3BVnJpgtrlEUo+L0=";
+    hash = "sha256-jgSa1IvpMlwtpNT/SEysG28qaszV7gH6ZSqGrHQ/EC0=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/misc/ttdl/default.nix
+++ b/pkgs/applications/misc/ttdl/default.nix
@ -5,16 +5,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "ttdl";
-  version = "4.4.0";
+  version = "4.4.1";

  src = fetchFromGitHub {
    owner = "VladimirMarkelov";
    repo = "ttdl";
    rev = "v${version}";
-    sha256 = "sha256-PZ1q360gkV+mB0pgkrUmViZqJRyrX8NkmFFZhqvFIPk=";
+    sha256 = "sha256-pcZ/8eM8JN+DKJKdVKJEl775QUXC4CFeMAaiBN0j+zo=";
  };

-  cargoHash = "sha256-9LoVtY9Okt2SUQLDMgM6V76OJBM4WU0sQioXHlNNzwU=";
+  cargoHash = "sha256-+caVo53gf7ZUMr0w/yoXfBaZ5MPe73s7vwoOdZVUcNY=";

  meta = with lib; {
    description = "CLI tool to manage todo lists in todo.txt format";
--- a/pkgs/applications/misc/wego/default.nix
+++ b/pkgs/applications/misc/wego/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "wego";
-  version = "2.2";
+  version = "2.3";

  src = fetchFromGitHub {
    owner = "schachmat";
    repo = pname;
    rev = version;
-    sha256 = "sha256-bkbH3RewlYYNamAhAZGWQmzNdGB06K3m/D8ScsQP9ic=";
+    sha256 = "sha256-YGUll0Wi/oulNMXSrSFeAVe+aGpyFeyXRZTW4ngC3Zk=";
  };

  vendorHash = "sha256-aXrXw/7ZtSZXIKDMZuWPV2zAf0e0lU0QCBhua7tHGEY=";
--- a/pkgs/applications/networking/cluster/cilium/default.nix
+++ b/pkgs/applications/networking/cluster/cilium/default.nix
@ -42,7 +42,7 @@ buildGoModule rec {
    description = "CLI to install, manage & troubleshoot Kubernetes clusters running Cilium";
    license = lib.licenses.asl20;
    homepage = "https://www.cilium.io/";
-    maintainers = with lib.maintainers; [ bryanasdev000 humancalico qjoly superherointj ];
+    maintainers = with lib.maintainers; [ bryanasdev000 humancalico qjoly ];
    mainProgram = "cilium";
  };
 }
--- a/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md
+++ b/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md
@ -26,7 +26,7 @@ If you cause a regression (we've all been there), you are responsible for fixing

 To merge code, you need to be a committer, or use the merge-bot, but currently the merge-bot only works for packages located at `pkgs/by-name/`, which means, K3s still need to be migrated there before you can use merge-bot for merging. As a non-committer, once you have approved a PR you need to forward the request to a committer. For deciding which committer, give preference initially to K3s committers, but any committer can commit. A committer usually has a green approval in PRs.

-K3s's committers currently are: superherointj, marcusramberg, Mic92.
+K3s's committers currently are: marcusramberg, Mic92.

@euank is often silent but still active and has always handled anything dreadful, internal parts of K3s/Kubernetes or architecture things, he initially packaged K3s for nixpkgs, think of him as a last resort, when we fail to accomplish a fix, he comes to rescue us from ourselves.

--- a/pkgs/applications/networking/cluster/pachyderm/default.nix
+++ b/pkgs/applications/networking/cluster/pachyderm/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "pachyderm";
-  version = "2.11.0";
+  version = "2.11.1";

  src = fetchFromGitHub {
    owner = "pachyderm";
    repo = "pachyderm";
    rev = "v${version}";
-    hash = "sha256-tr/1A3kOYvprybqE2Ma7AUr7gdDWZly1H38qKfPQVTk=";
+    hash = "sha256-dg93x73Lg0JGE/q67ae+ugLrVXDRftsZRLslaPryui8=";
  };

  vendorHash = "sha256-d2MSMucGMGGPLE0wh8Y27AUVPkeyOCkCa0JSPawYQmc=";
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
    homepage = "https://sylpheed.sraoss.jp/en/";
    description = "Lightweight and user-friendly e-mail client";
    mainProgram = "sylpheed";
-    maintainers = with maintainers; [ eelco ];
+    maintainers = [ ];
    platforms = platforms.linux ++ platforms.darwin;
    license = licenses.gpl2;
  };
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@ -21,7 +21,7 @@ let
      description = "Full-featured e-mail client";
      homepage = "https://thunderbird.net/";
      mainProgram = "thunderbird";
-      maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ];
+      maintainers = with maintainers; [ lovesegfault pierron vcunat ];
      platforms = platforms.unix;
      badPlatforms = platforms.darwin;
      broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
    description = "GTK-based Usenet newsreader good at both text and binaries";
    mainProgram = "pan";
    homepage = "http://pan.rebelbase.com/";
-    maintainers = [ maintainers.eelco ];
+    maintainers = [ ];
    platforms = platforms.linux;
    license = with licenses; [ gpl2Only fdl11Only ];
  };
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@ -26,18 +26,15 @@

 stdenv.mkDerivation rec {
  pname = "nextcloud-client";
-  # make sure an official release has been published on
-  # https://github.com/nextcloud-releases/desktop/releases and re-check the
-  # hash afterwards
-  version = "3.13.2";
+  version = "3.13.3";

  outputs = [ "out" "dev" ];

  src = fetchFromGitHub {
-    owner = "nextcloud";
+    owner = "nextcloud-releases";
    repo = "desktop";
    rev = "v${version}";
-    hash = "sha256-hZjmAdh9QQ2bAIYL3K7scl59kz9Wxnv9f6rKMeuKb7U=";
+    hash = "sha256-Z2/WllEiz/Yj/GyIczfA4L2+3Hr8Jmo7X2W/hP1PmwI=";
  };

  patches = [
--- a/pkgs/applications/science/math/cbc/default.nix
+++ b/pkgs/applications/science/math/cbc/default.nix
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = "https://projects.coin-or.org/Cbc";
    license = lib.licenses.epl10;
-    maintainers = [ lib.maintainers.eelco ];
+    maintainers = [ ];
    platforms = lib.platforms.linux ++ lib.platforms.darwin;
    description = "Mixed integer programming solver";
  };
--- a/pkgs/applications/science/math/eigenmath/default.nix
+++ b/pkgs/applications/science/math/eigenmath/default.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation rec {
  pname = "eigenmath";
-  version = "3.27-unstable-2024-06-20";
+  version = "3.27-unstable-2024-08-24";

  src = fetchFromGitHub {
    owner = "georgeweigt";
    repo = pname;
-    rev = "c3e3da104dbef888c3e52659134d5e9bdc12764d";
-    hash = "sha256-fqCphnRQw79v7ZTCZU9ucm/R7BKY7yCZYDSnxD7uRS8=";
+    rev = "92ae1a3f9c9f6808f3faefa10ae66c0ff480dab2";
+    hash = "sha256-AHZ9p7yyYENHywNppsSTfaM3KFqpX5ehxfjPwocHv5Q=";
  };

  checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in ''
--- a/pkgs/applications/version-management/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-machete/default.nix
@ -10,13 +10,13 @@

 buildPythonApplication rec {
  pname = "git-machete";
-  version = "3.28.0";
+  version = "3.29.0";

  src = fetchFromGitHub {
    owner = "virtuslab";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-INGJYUq5sW6er27kBjtz6BOWhnEtdnRuZgLnfEpO1uE=";
+    hash = "sha256-QEZF6bCNAXvGTC1KUMRyhIfgUBh4wjgfuoiBEG7jKFE=";
  };

  nativeBuildInputs = [ installShellFiles ];
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@ -92,7 +92,7 @@ let
      downloadPage = "https://www.mercurial-scm.org/release/";
      changelog = "https://wiki.mercurial-scm.org/Release${versions.majorMinor version}";
      license = licenses.gpl2Plus;
-      maintainers = with maintainers; [ eelco lukegb pacien techknowlogick ];
+      maintainers = with maintainers; [ lukegb pacien techknowlogick ];
      platforms = platforms.unix;
      mainProgram = "hg";
    };
--- a/pkgs/applications/version-management/rcs/default.nix
+++ b/pkgs/applications/version-management/rcs/default.nix
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
      '';

    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ eelco ];
+    maintainers = [ ];
    platforms = lib.platforms.unix;
  };
 }
--- a/pkgs/applications/version-management/stgit/default.nix
+++ b/pkgs/applications/version-management/stgit/default.nix
@ -18,15 +18,15 @@

 rustPlatform.buildRustPackage rec {
  pname = "stgit";
-  version = "2.4.10";
+  version = "2.4.11";

  src = fetchFromGitHub {
    owner = "stacked-git";
    repo = "stgit";
    rev = "v${version}";
-    hash = "sha256-3z0MwqE7+jEuWK1/OUGDolUWzi9soKWvVtlhyA9zJEA=";
+    hash = "sha256-wmBbcK6oImIlgbJ1gMkCVPBLaHUUeN2y9szx8age7mo=";
  };
-  cargoHash = "sha256-9cfgKOIxnh1YLeUVLFnRQz6PqeLrz/6Sc2QybCXo6/w=";
+  cargoHash = "sha256-hw5pXmwcoi76XwPFdfQoai8S6ApDit48nVuII4ksCRM=";

  nativeBuildInputs = [
    pkg-config installShellFiles makeWrapper asciidoc xmlto docbook_xsl
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@ -115,7 +115,7 @@ let
      license = licenses.asl20;
      homepage = "https://subversion.apache.org/";
      mainProgram = "svn";
-      maintainers = with maintainers; [ eelco lovek323 ];
+      maintainers = with maintainers; [ lovek323 ];
      platforms = platforms.linux ++ platforms.darwin;
    };

--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@ -200,7 +200,7 @@ stdenv.mkDerivation rec {
    description = "Movie player that supports many video formats";
    homepage = "http://mplayerhq.hu";
    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ eelco ];
+    maintainers = [ ];
    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ];
  };
 }
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@ -296,7 +296,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://www.qemu.org/";
    description = "Generic and open source machine emulator and virtualizer";
    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ eelco qyliss ];
+    maintainers = with maintainers; [ qyliss ];
    platforms = platforms.unix;
  }
  # toolsOnly: Does not have qemu-kvm and there's no main support tool
--- a/pkgs/applications/virtualization/vmware-workstation/default.nix
+++ b/pkgs/applications/virtualization/vmware-workstation/default.nix
@ -79,20 +79,6 @@ let
    sha256 = "sha256-JSEW1gqQuLGRkathlwZU/TnG6dL/xWKW4//SfE+kO0A=";
  };

-  gdbm3 = gdbm.overrideAttrs (old: rec {
-    version = "1.8.3";
-
-    src = fetchurl {
-      url = "mirror://gnu/gdbm/gdbm-${version}.tar.gz";
-      sha256 = "sha256-zDQDOKLii0AFirnrU1SiHVP4ihWC6iG6C7GFw3ooHck=";
-    };
-
-    installPhase = ''
-      mkdir -p $out/lib
-      cp .libs/libgdbm*.so* $out/lib/
-    '';
-  });
-
  vmware-unpack-env = buildFHSEnv rec {
    name = "vmware-unpack-env";
    targetPkgs = pkgs: [ zlib ];
@ -114,7 +100,7 @@ stdenv.mkDerivation rec {
    libxslt
    libxml2
    libuuid
-    gdbm3
+    gdbm
    readline
    xz
    cups
--- a/pkgs/by-name/al/alvr/package.nix
+++ b/pkgs/by-name/al/alvr/package.nix
@ -18,7 +18,7 @@ appimageTools.wrapType2 {
  extraInstallCommands = ''
    install -Dm444 ${appimageContents}/alvr.desktop -t $out/share/applications
    substituteInPlace $out/share/applications/alvr.desktop \
-      --replace 'Exec=alvr_dashboard' 'Exec=alvr'
+      --replace-fail 'Exec=alvr_dashboard' 'Exec=alvr'
    cp -r ${appimageContents}/usr/share/icons $out/share
  '';

--- a/pkgs/by-name/di/diesel-cli/package.nix
+++ b/pkgs/by-name/di/diesel-cli/package.nix
@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [

 rustPlatform.buildRustPackage rec {
  pname = "diesel-cli";
-  version = "2.2.1";
+  version = "2.2.3";

  src = fetchCrate {
    inherit version;
    crateName = "diesel_cli";
-    hash = "sha256-B+AHTJgOBUGVc4J2VcwuqVwAbm0wpsFHc9+gc5g2RAM=";
+    hash = "sha256-pv75bvswi+JfeL7B8GPaQgXyNdNvzNgXs9VYgzKRn2U=";
  };

-  cargoHash = "sha256-HFhkePq2fZ7MxZfH0jLlS5B10jqf15+RUcGZnDbML5Q=";
+  cargoHash = "sha256-BMMh4BEoB1UhavoiQWfFhsSZsvfFSfEJhEewjA1ukLQ=";

  nativeBuildInputs = [
    installShellFiles
--- a/pkgs/by-name/di/dippi/package.nix
+++ b/pkgs/by-name/di/dippi/package.nix
@ -0,0 +1,52 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  vala,
+  glib,
+  gtk4,
+  libadwaita,
+  wrapGAppsHook4,
+  appstream-glib,
+  desktop-file-utils,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "dippi";
+  version = "4.1.0";
+
+  src = fetchFromGitHub {
+    owner = "cassidyjames";
+    repo = "dippi";
+    rev = version;
+    hash = "sha256-BYI3WqMDxzERlqtq7ISQ+U1FTrpKh5OJBMo/AsdmdlQ=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    vala
+    pkg-config
+    wrapGAppsHook4
+    appstream-glib
+    desktop-file-utils
+  ];
+
+  buildInputs = [
+    glib
+    gtk4
+    libadwaita
+  ];
+
+  meta = {
+    description = "Calculate display info like DPI and aspect ratio";
+    homepage = "https://github.com/cassidyjames/dippi";
+    mainProgram = "com.github.cassidyjames.dippi";
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ zendo ];
+  };
+}
--- a/pkgs/by-name/fa/fail2ban/package.nix
+++ b/pkgs/by-name/fa/fail2ban/package.nix
@ -94,6 +94,6 @@ python3.pkgs.buildPythonApplication rec {
    homepage = "https://www.fail2ban.org/";
    description = "Program that scans log files for repeated failing login attempts and bans IP addresses";
    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ eelco lovek323 ];
+    maintainers = with maintainers; [ lovek323 ];
  };
 }
--- a/pkgs/by-name/fl/flashprog/package.nix
+++ b/pkgs/by-name/fl/flashprog/package.nix
@ -14,12 +14,12 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "flashprog";
-  version = "1.1";
+  version = "1.2";

  src = fetchgit {
    url = "https://review.sourcearcade.org/flashprog";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-CLwaGxVOo8FJaWfvrJ2hAm7XonP5nHT6YTsaw7scKCM=";
+    hash = "sha256-Z09hZ4a/G3DhWCmSkPyKs7ecSFBUfez7IWWxIhH3LyI=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/fl/fluxcd/package.nix
+++ b/pkgs/by-name/fl/fluxcd/package.nix
@ -81,7 +81,6 @@ buildGoModule rec {
    maintainers = with lib.maintainers; [
      bryanasdev000
      jlesquembre
-      superherointj
    ];
    mainProgram = "flux";
  };
--- a/pkgs/by-name/fy/fyne/package.nix
+++ b/pkgs/by-name/fy/fyne/package.nix
@ -17,16 +17,16 @@

 buildGoModule rec {
  pname = "fyne";
-  version = "2.5.0";
+  version = "2.5.1";

  src = fetchFromGitHub {
    owner = "fyne-io";
    repo = "fyne";
    rev = "refs/tags/v${version}";
-    hash = "sha256-DUXCaPFMb6f7ROI8DC2RVCX12xf5F9MEtBJyi8CuoE4=";
+    hash = "sha256-21/52Uub5+l0TcuWZ9QSyckgR1kKNfDvro1CF5QuZWA=";
  };

-  vendorHash = "sha256-Mz+p2kpPtqFb/wDkwOdIUQ2fCvzWqTH49YRjWmSlF4M=";
+  vendorHash = "sha256-+g11BRf9xRXjtF8InzdTHGOGOf8lJgLKEdBR5DcpEmo=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/by-name/go/godot_4/package.nix
+++ b/pkgs/by-name/go/godot_4/package.nix
@ -192,7 +192,6 @@ stdenv.mkDerivation rec {
    ];
    maintainers = with lib.maintainers; [
      shiryel
-      superherointj
    ];
    mainProgram = "godot4";
  };
--- a/pkgs/by-name/go/goflow2/package.nix
+++ b/pkgs/by-name/go/goflow2/package.nix
@ -4,7 +4,7 @@
  fetchFromGitHub,
 }:
 let
-  version = "2.2.0";
+  version = "2.2.1";
 in
 buildGoModule {
  pname = "goflow2";
@ -14,7 +14,7 @@ buildGoModule {
    owner = "netsampler";
    repo = "goflow2";
    rev = "v${version}";
-    hash = "sha256-kqoHYNuyzT1gsBR00KuMe/+D0YT3ZvXOvoceWGKg7G8=";
+    hash = "sha256-u2wdlmAwRqBPKD+aof34ud9O4aJ+4ccuMxyk8Cgpsp0=";
  };

  ldflags = [
--- a/pkgs/by-name/gr/graphite-cli/package-lock.json
+++ b/pkgs/by-name/gr/graphite-cli/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "@withgraphite/graphite-cli",
-  "version": "1.4.2",
+  "version": "1.4.3",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@withgraphite/graphite-cli",
-      "version": "1.4.2",
+      "version": "1.4.3",
      "hasInstallScript": true,
      "license": "None",
      "dependencies": {
--- a/pkgs/by-name/gr/graphite-cli/package.nix
+++ b/pkgs/by-name/gr/graphite-cli/package.nix
@ -7,14 +7,14 @@

 buildNpmPackage rec {
  pname = "graphite-cli";
-  version = "1.4.2";
+  version = "1.4.3";

  src = fetchurl {
    url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz";
-    hash = "sha256-bh5BSpzmxSMgr1wKOCrOTQSpsSdgaVtBcw9jiE4IzI8=";
+    hash = "sha256-ITROAsDlkNJx5z1DN41Y3kOQzlm2CmciPVn9IrtjCQc=";
  };

-  npmDepsHash = "sha256-gluPxs1NPVjv5K64FtED7b4zWmOXufVquuBHqz1JUzU=";
+  npmDepsHash = "sha256-G2J0yu/loihlrgGSMEJmVK496bVwJehLwYAPh0f8UbM=";

  postPatch = ''
    ln -s ${./package-lock.json} package-lock.json
--- a/pkgs/by-name/hc/hclfmt/package.nix
+++ b/pkgs/by-name/hc/hclfmt/package.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "hclfmt";
-  version = "2.21.0";
+  version = "2.22.0";

  src = fetchFromGitHub {
    owner = "hashicorp";
    repo = "hcl";
    rev = "v${version}";
-    hash = "sha256-izbctn5OqaDunQLovgCGTgqMzC9i227zXlXUNCEExvA=";
+    hash = "sha256-jIW2r8RWNbk4maWKeUSe1Kqll5jJYe72UCP2EEGfRYg=";
  };

  vendorHash = "sha256-F2i7ph9GL9Xo43da6jHPn9P9FdWC6eSgqCyHPBxdFJY=";
--- a/pkgs/by-name/he/hello/package.nix
+++ b/pkgs/by-name/he/hello/package.nix
@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
    homepage = "https://www.gnu.org/software/hello/manual/";
    changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${finalAttrs.version}";
    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.eelco ];
+    maintainers = [ ];
    mainProgram = "hello";
    platforms = platforms.all;
  };
--- a/pkgs/by-name/he/heptabase/package.nix
+++ b/pkgs/by-name/he/heptabase/package.nix
@ -5,10 +5,10 @@
 }:
 let
  pname = "heptabase";
-  version = "1.35.3";
+  version = "1.35.4";
  src = fetchurl {
    url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
-    hash = "sha256-2HEBQI+C/LKrIUb+6qNmm+xjvTOxS+vk5WTsOZKz3+s=";
+    hash = "sha256-JFIC5a0W8pmiPxgkymE8d+iULM80U85xGOF0M2vu/PI=";
  };

  appimageContents = appimageTools.extractType2 { inherit pname version src; };
--- a/pkgs/by-name/ki/kissfft/fix-fftw-dependency-check.patch
+++ b/pkgs/by-name/ki/kissfft/fix-fftw-dependency-check.patch
@ -0,0 +1,23 @@
+From a73134e594d85abc32e27a34a78ce75c5f006f92 Mon Sep 17 00:00:00 2001
+From: Emily <hello@emily.moe>
+Date: Sat, 3 Aug 2024 17:49:57 +0100
+Subject: [PATCH] Fix FFTW dependency check
+
+`KISFFT_FLOAT` is not defined anywhere.
+---
+ test/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 0a0e403..d7d8350 100644
+--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
+@@ -24,7 +24,7 @@ add_kissfft_test_executable(bm_kiss benchkiss.c pstats.c)
+ # set_tests_properties(${NAME} PROPERTIES TIMEOUT 3600)
+ 
+ include(FindPkgConfig)
+-if(KISSFFT_FLOAT)
+if(KISSFFT_DATATYPE MATCHES "^float$")
+     set(fftw3_pkg fftw3f)
+ else()
+     set(fftw3_pkg fftw3)
--- a/pkgs/by-name/ki/kissfft/package.nix
+++ b/pkgs/by-name/ki/kissfft/package.nix
@ -0,0 +1,86 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+  pkg-config,
+  fftw,
+  fftwFloat,
+  python3,
+  datatype ? "double",
+  libpng,
+  enableStatic ? stdenv.hostPlatform.isStatic,
+  enableOpenmp ? false,
+  llvmPackages,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "kissfft-${datatype}${lib.optionalString enableOpenmp "-openmp"}";
+  version = "131.1.0";
+
+  outputs = [
+    "bin"
+    "dev"
+    "out"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "mborgerding";
+    repo = "kissfft";
+    rev = finalAttrs.version;
+    hash = "sha256-ukikTVnmKomKXTo6zc+PhpZzEkzXN2imFwZOYlfR3Pk=";
+  };
+
+  patches = [
+    # Fix FFTW dependency check
+    # https://github.com/mborgerding/kissfft/pull/95
+    ./fix-fftw-dependency-check.patch
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+  ];
+
+  buildInputs =
+    lib.optionals (datatype != "simd") [ libpng ]
+    # TODO: This may mismatch the LLVM version in the stdenv, see #79818.
+    ++ lib.optional (enableOpenmp && stdenv.cc.isClang) llvmPackages.openmp;
+
+  nativeCheckInputs = [ (python3.withPackages (ps: [ ps.numpy ])) ];
+
+  checkInputs = [ (if datatype == "float" then fftwFloat else fftw) ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "KISSFFT_DATATYPE" datatype)
+    (lib.cmakeBool "KISSFFT_STATIC" enableStatic)
+    # `test/testkiss.py` expects this…
+    (lib.cmakeFeature "KISSFFT_OPENMP" (if enableOpenmp then "ON" else "OFF"))
+  ];
+
+  # Required for `test/testcpp.c`.
+  env = {
+    NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__MATH_LONG_DOUBLE_CONSTANTS=1";
+  };
+
+  doCheck = true;
+
+  # https://bugs.llvm.org/show_bug.cgi?id=45034
+  postPatch =
+    lib.optionalString
+      (stdenv.hostPlatform.isLinux && stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "10")
+      ''
+        substituteInPlace CMakeLists.txt \
+          --replace "-ffast-math" ""
+      '';
+
+  meta = {
+    description = "Mixed-radix Fast Fourier Transform based up on the KISS principle";
+    homepage = "https://github.com/mborgerding/kissfft";
+    license = lib.licenses.bsd3;
+    maintainers = [ ];
+    platforms = lib.platforms.all;
+  };
+})
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@ -53,13 +53,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
  pname = "koboldcpp";
-  version = "1.73";
+  version = "1.73.1";

  src = fetchFromGitHub {
    owner = "LostRuins";
    repo = "koboldcpp";
    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-S0MonY2rIAkbJnTaDVc2YiGPjOaevgp82mt6JwWdN1U=";
+    hash = "sha256-LRXtmQ5u+/vgcU6YC9IN2CazfDtg5+jZnJV2o9jEAaY=";
  };

  enableParallelBuilding = true;
--- a/pkgs/by-name/la/labwc-menu-generator/package.nix
+++ b/pkgs/by-name/la/labwc-menu-generator/package.nix
@ -1,24 +1,27 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, meson
+, ninja
 , glib
-, perl
 , pkg-config
 , unstableGitUpdater
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "labwc-menu-generator";
-  version = "0-unstable-2024-05-27";
+  version = "0.1.0-unstable-2024-07-09";

  src = fetchFromGitHub {
    owner = "labwc";
    repo = "labwc-menu-generator";
-    rev = "efed0194947c45123287ea057c5fdb13894854cd";
-    hash = "sha256-ZmuntI3NfIYkM2Fxt3J4pKOOilzgphF240mCer3cJ6c=";
+    rev = "a2b3e8e46068d82e97168772e7c194d6b6e03e3d";
+    hash = "sha256-Y5gBaTgVu3OzZQwGDNLsmQkfS0txBm/vD0MG5av2Gv0=";
  };

  nativeBuildInputs = [
+    meson
+    ninja
    pkg-config
  ];

@ -26,20 +29,10 @@ stdenv.mkDerivation (finalAttrs: {
    glib
  ];

-  nativeCheckInputs = [
-    perl
-  ];
-
  doCheck = true;

  strictDeps = true;

-  installPhase = ''
-    runHook preInstall
-    install -Dm755 labwc-menu-generator -t $out/bin
-    runHook postInstall
-  '';
-
  passthru.updateScript = unstableGitUpdater { };

  meta = {
--- a/pkgs/by-name/le/less/package.nix
+++ b/pkgs/by-name/le/less/package.nix
@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
    changelog = "https://www.greenwoodsoftware.com/less/news.${finalAttrs.version}.html";
    license = lib.licenses.gpl3Plus;
    mainProgram = "less";
-    maintainers = with lib.maintainers; [ eelco dtzWill ];
+    maintainers = with lib.maintainers; [ dtzWill ];
    platforms = lib.platforms.unix;
  };
 })
--- a/pkgs/by-name/li/libresample/fix-test.patch
+++ b/pkgs/by-name/li/libresample/fix-test.patch
@ -0,0 +1,108 @@
+From fb8e3c74d582038a358936d827f53c4c0c43d4e6 Mon Sep 17 00:00:00 2001
+From: Matt Harvey <mattharvey@google.com>
+Date: Mon, 27 Nov 2023 16:28:53 -0800
+Subject: [PATCH] Fix testresample.c output span; add exit code
+
+Prior to this chance, the "Resample with different factors" test only
+passed for 60 of the 63 factors, with the 3 failing ones being the
+largest.
+
+1. Since only 63 distinct factors were being considered, 100 random
+   samples was overkill.
+2. To support noticing failure in continuous build systems, it's nice if
+   the test exit()s with nonzero when there are failures.
+3. The root cause was a formula error when determining which indices in
+   the resampled output ought be compared. Details are explained in a
+   comment.
+---
+ tests/testresample.c | 32 ++++++++++++++++++++++++--------
+ 1 file changed, 24 insertions(+), 8 deletions(-)
+
+diff --git a/tests/testresample.c b/tests/testresample.c
+index aa83a46..640df5a 100644
+--- a/tests/testresample.c
+++ b/tests/testresample.c
+@@ -19,6 +19,8 @@
+ 
+ #define MIN(A, B) (A) < (B)? (A) : (B)
+ 
+int global_error;
+
+ void runtest(int srclen, double freq, double factor,
+              int srcblocksize, int dstblocksize)
+ {
+@@ -65,10 +67,12 @@ void runtest(int srclen, double freq, double factor,
+ 
+    if (o < 0) {
+       printf("Error: resample_process returned an error: %d\n", o);
+      global_error = 1;
+    }
+ 
+    if (out <= 0) {
+       printf("Error: resample_process returned %d samples\n", out);
+      global_error = 1;
+       free(src);
+       free(dst);
+       return;
+@@ -79,15 +83,16 @@ void runtest(int srclen, double freq, double factor,
+       printf("   Expected ~%d, got %d samples out\n",
+              expectedlen, out);
+    }
+-   
+
+    sum = 0.0;
+    sumsq = 0.0;
+    errcount = 0.0;
+ 
+-   /* Don't compute statistics on all output values; the last few
+-      are guaranteed to be off because it's based on far less
+-      interpolation. */
+-   statlen = out - fwidth;
+   /* Don't compute statistics on all output values; the last small fraction
+      are guaranteed to be off since they are interpolated based on far fewer
+      values. When upsampling, the length of the range where this concern
+      applies is in direct proportion to the upsampling factor. */
+   statlen = out - ((int)round(fwidth * factor));
+ 
+    for(i=0; i<statlen; i++) {
+       double diff = sin((i/freq)/factor) - dst[i];
+@@ -117,6 +122,7 @@ void runtest(int srclen, double freq, double factor,
+       printf("   i=%d:  expected %.3f, got %.3f\n",
+              i, sin((i/freq)/factor), dst[i]);
+       printf("   At least %d samples had significant error.\n", errcount);
+      global_error = 1;
+    }
+    err = sum / statlen;
+    rmserr = sqrt(sumsq / statlen);
+@@ -130,6 +136,8 @@ int main(int argc, char **argv)
+    int i, srclen, dstlen, ifreq;
+    double factor;
+ 
+   global_error = 0;
+
+    printf("\n*** Vary source block size*** \n\n");
+    srclen = 10000;
+    ifreq = 100;
+@@ -172,11 +180,19 @@ int main(int argc, char **argv)
+    printf("\n*** Resample with different factors ***\n\n");
+    srclen = 10000;
+    ifreq = 100;
+-   for(i=0; i<100; i++) {
+-      factor = ((rand() % 64) + 1) / 4.0;
+   for (i = 1; i < 64; i++) {
+      factor = i / 4.0;
+      dstlen = (int)(srclen * factor + 10);
+      runtest(srclen, (double)ifreq, factor, srclen, dstlen);
+   }
+
+   printf("\n*** Resample with large factors ***\n\n");
+   srclen = 200;
+   ifreq = 100;
+   for (factor = 25.0; factor < 1000.0; factor *= 1.7) {
+       dstlen = (int)(srclen * factor + 10);
+       runtest(srclen, (double)ifreq, factor, srclen, dstlen);
+    }
+ 
+-   return 0;
+   return global_error;
+ }
--- a/pkgs/by-name/li/libresample/package.nix
+++ b/pkgs/by-name/li/libresample/package.nix
@ -0,0 +1,68 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  meson,
+  ninja,
+  pkg-config,
+  libsndfile,
+  libsamplerate,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libresample";
+  version = "0.1.4-unstable-2024-08-23";
+
+  outputs = [
+    "bin"
+    "dev"
+    "out"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "minorninth";
+    repo = "libresample";
+    rev = "7cb7f9c3f72d4e6774d964dc324af827192df7c3";
+    hash = "sha256-8gyGZVblqeHYXKFM79AcfX455+l3Tsoq3xQse5nrKAo=";
+  };
+
+  patches = [
+    # Fix testresample.c output span; add exit code
+    # https://github.com/minorninth/libresample/pull/7
+    ./fix-test.patch
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
+
+  buildInputs =
+    [
+      # For `resample-sndfile`
+      libsndfile
+    ]
+    ++ lib.optionals (!libsamplerate.meta.broken) [
+      # For `compareresample`
+      libsamplerate
+    ];
+
+  mesonFlags = [ (lib.mesonEnable "compareresample" (!libsamplerate.meta.broken)) ];
+
+  doCheck = true;
+
+  meta = {
+    description = "Real-time library for sampling rate conversion library";
+    homepage = "https://github.com/minorninth/libresample";
+    license = lib.licenses.bsd2; # OR LGPL-2.1-or-later
+    sourceProvenance = [ lib.sourceTypes.fromSource ];
+    platforms = lib.platforms.all;
+    maintainers = [
+      lib.maintainers.sander
+      lib.maintainers.emily
+    ];
+    mainProgram = "resample-sndfile";
+  };
+})
--- a/pkgs/by-name/lm/lmstudio/darwin.nix
+++ b/pkgs/by-name/lm/lmstudio/darwin.nix
@ -9,8 +9,8 @@ stdenv.mkDerivation {
  inherit meta pname version;

  src = fetchurl {
-    url = "https://releases.lmstudio.ai/mac/arm64/${version}/1/LM-Studio-${version}-arm64.dmg";
-    hash = "sha256-ZitdLHuGIH22Ohk7UWVz32BPFTj796HoR+5zEs5rh6E=";
+    url = "https://releases.lmstudio.ai/darwin/arm64/${version}/LM%20Studio-${version}-arm64.dmg";
+    hash = "sha256-8m+gLZqX1rz8kVxEo880FKvU046juaO2DneeBg7Sc70=";
  };

  nativeBuildInputs = [ undmg ];
--- a/pkgs/by-name/lm/lmstudio/linux.nix
+++ b/pkgs/by-name/lm/lmstudio/linux.nix
@ -6,8 +6,8 @@
 }:
 let
  src = fetchurl {
-    url = "https://files.lmstudio.ai/linux/${version}/beta/LM_Studio-${version}.AppImage";
-    hash = "sha256-zC8QQNsT1X8ICiYLy/jYMVp8w8NP7ghtVF06UMC4eOg=";
+    url = "https://releases.lmstudio.ai/linux/x86/${version}/LM_Studio-${version}.AppImage";
+    hash = "sha256-zkTSa0wgKcyKywnIZPF0b6ZzKtyHn3hqjrQPgILF0eI=";
  };

  appimageContents = appimageTools.extractType2 { inherit pname version src; };
--- a/pkgs/by-name/lm/lmstudio/package.nix
+++ b/pkgs/by-name/lm/lmstudio/package.nix
@ -5,7 +5,7 @@
 }:
 let
  pname = "lmstudio";
-  version = "0.2.31";
+  version = "0.3.1";
  meta = {
    description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
    homepage = "https://lmstudio.ai/";
--- a/pkgs/by-name/md/mdt/package.nix
+++ b/pkgs/by-name/md/mdt/package.nix
@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "mdt";
-  version = "0.8.4";
+  version = "0.8.5";

  src = fetchFromGitHub {
    owner = "henriklovhaug";
    repo = "md-tui";
    rev = "v${version}";
-    hash = "sha256-J1UtyxDT8+UmBwayUMtcPOtnVVkRZLg6ECXnqDSJ2Ew=";
+    hash = "sha256-HUrL/+uXQ3753Qb5FZkftGZO+u+MsocFO3L3OzarEhg=";
  };

-  cargoHash = "sha256-X6Pl3oMsFHaKMdXLfPxQ9xSRfRMo4eueLkmDoDBqjaM=";
+  cargoHash = "sha256-O25cb4aNQiU4T2SzxgzjFqL+pCzbM0d+DkkZHvCkMv8=";

  buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ];

--- a/pkgs/by-name/mu/musly/0001-Fix-build-with-FFmpeg-7.patch
+++ b/pkgs/by-name/mu/musly/0001-Fix-build-with-FFmpeg-7.patch
@ -0,0 +1,341 @@
+From ab430ea4460aba050d97d3e3a712a3b6dd809db9 Mon Sep 17 00:00:00 2001
+From: Emily <hello@emily.moe>
+Date: Mon, 15 Jul 2024 00:41:04 +0100
+Subject: [PATCH 1/4] Fix build with FFmpeg 7
+
+---
+ libmusly/CMakeLists.txt     |   5 --
+ libmusly/decoders/libav.cpp | 136 +++++++++++-------------------------
+ 2 files changed, 42 insertions(+), 99 deletions(-)
+
+diff --git a/libmusly/CMakeLists.txt b/libmusly/CMakeLists.txt
+index d6d3680..98151df 100644
+--- a/libmusly/CMakeLists.txt
+++ b/libmusly/CMakeLists.txt
+@@ -16,11 +16,6 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/external")
+         PROPERTIES COMPILE_FLAGS "-DLIBMUSLY_EXTERNAL ${LIBMUSLY_EXTERNAL_FLAGS}")
+ endif()
+ 
+-if(EXISTS "${LIBAV_INCLUDE_DIRS}/libavutil/channel_layout.h")
+-    set_source_files_properties(decoders/libav.cpp
+-        PROPERTIES COMPILE_FLAGS "-DHAVE_AVUTIL_CHANNEL_LAYOUT")
+-endif()
+-
+ if(USE_OPENMP AND OPENMP_FOUND)
+     # disable OpenMP for kiss FFT, it slows things down terribly
+     set_source_files_properties(kissfft/kiss_fft.c
+diff --git a/libmusly/decoders/libav.cpp b/libmusly/decoders/libav.cpp
+index a78b904..90f93ae 100644
+--- a/libmusly/decoders/libav.cpp
+++ b/libmusly/decoders/libav.cpp
+@@ -20,37 +20,13 @@
+ extern "C" {
+     #include <libavcodec/avcodec.h>
+     #include <libavformat/avformat.h>
+-#ifdef HAVE_AVUTIL_CHANNEL_LAYOUT
+     #include <libavutil/channel_layout.h>
+-#endif
+ }
+ 
+ #include "minilog.h"
+ #include "resampler.h"
+ #include "libav.h"
+ 
+-// We define some macros to be compatible to different libav versions
+-// without spreading #if and #else all over the place.
+-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55, 45, 101)
+-#define AV_FRAME_ALLOC avcodec_alloc_frame
+-#define AV_FRAME_UNREF avcodec_get_frame_defaults
+-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 28, 0)
+-#define AV_FRAME_FREE(X) av_free(*(X))
+-#else
+-#define AV_FRAME_FREE avcodec_free_frame
+-#endif
+-#else
+-#define AV_FRAME_ALLOC av_frame_alloc
+-#define AV_FRAME_UNREF av_frame_unref
+-#define AV_FRAME_FREE av_frame_free
+-#endif
+-
+-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 7, 0)
+-#define AV_PACKET_UNREF av_free_packet
+-#else
+-#define AV_PACKET_UNREF av_packet_unref
+-#endif
+-
+ namespace musly {
+ namespace decoders {
+ 
+@@ -58,12 +34,6 @@ MUSLY_DECODER_REGIMPL(libav, 0);
+ 
+ libav::libav()
+ {
+-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 9, 100)
+-    av_register_all();
+-#endif
+-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
+-    avcodec_register_all();
+-#endif
+ }
+ 
+ int
+@@ -177,13 +147,7 @@ libav::decodeto_22050hz_mono_float(
+     AVStream *st = fmtx->streams[audio_stream_idx];
+ 
+     // find a decoder for the stream
+-#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 14, 0)) || ((LIBAVCODEC_VERSION_MICRO >= 100) && (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 33, 100)))
+-    // old libav version (libavcodec < 57.14 for libav, < 57.33 for ffmpeg):
+-    // stream has a codec context we can use
+-    AVCodecContext *decx = st->codec;
+-    #define AVCODEC_FREE_CONTEXT(x)
+-#else
+-    // new libav version: need to create codec context for stream
+    // need to create codec context for stream
+     AVCodecParameters *decp = st->codecpar;
+     AVCodecContext *decx = avcodec_alloc_context3(NULL);
+     if (!decx) {
+@@ -200,71 +164,63 @@ libav::decodeto_22050hz_mono_float(
+         avformat_close_input(&fmtx);
+         return std::vector<float>(0);
+     }
+-    #if LIBAVCODEC_VERSION_MICRO >= 100
+-    #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,3,102)
+-    // only available in ffmpeg, deprecated after 58
+-    av_codec_set_pkt_timebase(decx, st->time_base);
+-    #endif
+-    #endif
+-    #define AVCODEC_FREE_CONTEXT(x) avcodec_free_context(x)
+-#endif
+-    AVCodec *dec = avcodec_find_decoder(decx->codec_id);
+    const AVCodec *dec = avcodec_find_decoder(decx->codec_id);
+     if (!dec) {
+         MINILOG(logERROR) << "Could not find codec.";
+ 
+-        AVCODEC_FREE_CONTEXT(&decx);
+        avcodec_free_context(&decx);
+         avformat_close_input(&fmtx);
+         return std::vector<float>(0);
+     }
+ 
+     // open the decoder
+     // (kindly ask for stereo downmix and floats, but not all decoders care)
+-    decx->request_channel_layout = AV_CH_LAYOUT_STEREO_DOWNMIX;
+     decx->request_sample_fmt = AV_SAMPLE_FMT_FLT;
+ #ifdef _OPENMP
+     #pragma omp critical
+ #endif
+     {
+-    avret = avcodec_open2(decx, dec, NULL);
+    AVDictionary *options = NULL;
+    av_dict_set(&options, "downmix", "stereo", 0);
+    avret = avcodec_open2(decx, dec, &options);
+     }
+     if (avret < 0) {
+         MINILOG(logERROR) << "Could not open codec.";
+ 
+-        AVCODEC_FREE_CONTEXT(&decx);
+        avcodec_free_context(&decx);
+         avformat_close_input(&fmtx);
+         return std::vector<float>(0);
+     }
+ 
+     // Currently only mono and stereo files are supported.
+-    if ((decx->channels != 1) && (decx->channels != 2)) {
+    if ((decx->ch_layout.nb_channels != 1) && (decx->ch_layout.nb_channels != 2)) {
+         MINILOG(logWARNING) << "Unsupported number of channels: "
+-                << decx->channels;
+                << decx->ch_layout.nb_channels;
+ 
+-        AVCODEC_FREE_CONTEXT(&decx);
+        avcodec_free_context(&decx);
+         avformat_close_input(&fmtx);
+         return std::vector<float>(0);
+     }
+ 
+     // allocate a frame
+-    AVFrame* frame = AV_FRAME_ALLOC();
+    AVFrame* frame = av_frame_alloc();
+     if (!frame) {
+         MINILOG(logWARNING) << "Could not allocate frame";
+ 
+-        AVCODEC_FREE_CONTEXT(&decx);
+        avcodec_free_context(&decx);
+         avformat_close_input(&fmtx);
+         return std::vector<float>(0);
+     }
+ 
+     // allocate and initialize a packet
+-    AVPacket pkt;
+-    av_init_packet(&pkt);
+-    pkt.data = NULL;
+-    pkt.size = 0;
+    AVPacket* pkt = av_packet_alloc();
+    pkt->data = NULL;
+    pkt->size = 0;
+     int got_frame = 0;
+ 
+     // configuration
+     const int input_stride = av_get_bytes_per_sample(decx->sample_fmt);
+-    const int num_planes = av_sample_fmt_is_planar(decx->sample_fmt) ? decx->channels : 1;
+    const int num_planes = av_sample_fmt_is_planar(decx->sample_fmt) ? decx->ch_layout.nb_channels : 1;
+     const int output_stride = sizeof(float) * num_planes;
+     int decode_samples;  // how many samples to decode; zero to decode all
+ 
+@@ -296,7 +252,7 @@ libav::decodeto_22050hz_mono_float(
+         // fault when trying to access frame->data[i] for i > 0 further below)
+         if ((excerpt_start > 0) and (av_seek_frame(fmtx, audio_stream_idx,
+                     excerpt_start * st->time_base.den / st->time_base.num,
+-                    AVSEEK_FLAG_BACKWARD || AVSEEK_FLAG_ANY) >= 0)) {
+                    AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_ANY) >= 0)) {
+             // skipping went fine: decode only what's needed
+             decode_samples = excerpt_length * decx->sample_rate;
+             excerpt_start = 0;
+@@ -333,7 +289,7 @@ libav::decodeto_22050hz_mono_float(
+     // excerpt_start tells us up to how many seconds to cut from the beginning.
+ 
+     // read packets
+-    const int channels = decx->channels;
+    const int channels = decx->ch_layout.nb_channels;
+     const int sample_rate = decx->sample_rate;
+     float* buffer = NULL;
+     int buffersize = 0;
+@@ -344,35 +300,29 @@ libav::decodeto_22050hz_mono_float(
+     {
+         // skip all frames that are not part of the audio stream, and spurious
+         // frames possibly found after seeking (wrong channels / sample_rate)
+-        while (((avret = av_read_frame(fmtx, &pkt)) >= 0)
+-               && ((pkt.stream_index != audio_stream_idx) ||
+-                   (decx->channels != channels) ||
+        while (((avret = av_read_frame(fmtx, pkt)) >= 0)
+               && ((pkt->stream_index != audio_stream_idx) ||
+                   (decx->ch_layout.nb_channels != channels) ||
+                    (decx->sample_rate != sample_rate)))
+         {
+-            AV_PACKET_UNREF(&pkt);
+            av_packet_unref(pkt);
+             MINILOG(logTRACE) << "Skipping frame...";
+         }
+         if (avret < 0) {
+             // stop decoding if av_read_frame() failed
+-            AV_PACKET_UNREF(&pkt);
+            av_packet_unref(pkt);
+             break;
+         }
+ 
+-        uint8_t* data = pkt.data;
+-        int size = pkt.size;
+-        while (pkt.size > 0) {
+        uint8_t* data = pkt->data;
+        int size = pkt->size;
+        while (pkt->size > 0) {
+ 
+             // try to decode a frame
+-            AV_FRAME_UNREF(frame);
+            av_frame_unref(frame);
+ 
+             int len = 0;
+             got_frame = 0;
+-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 48, 101)
+-            len = avcodec_decode_audio4(decx, frame, &got_frame, &pkt);
+-            if (len < 0) {
+-                avret = AVERROR(EINVAL);
+-            }
+-#else
+             avret = avcodec_receive_frame(decx, frame);
+             if (avret == 0) {
+                 got_frame = 1;
+@@ -381,14 +331,13 @@ libav::decodeto_22050hz_mono_float(
+                 avret = 0;
+             }
+             if (avret == 0) {
+-                avret = avcodec_send_packet(decx, &pkt);
+                avret = avcodec_send_packet(decx, pkt);
+                 if (avret == 0) {
+-                    len = pkt.size;
+                    len = pkt->size;
+                 } else if (avret == AVERROR(EAGAIN)) {
+                     avret = 0;
+                 }
+             }
+-#endif
+             if (avret < 0) {
+                 MINILOG(logWARNING) << "Error decoding an audio frame";
+ 
+@@ -400,8 +349,8 @@ libav::decodeto_22050hz_mono_float(
+ 
+                 // if too many frames failed decoding, abort
+                 MINILOG(logERROR) << "Too many errors, aborting.";
+-                AV_FRAME_FREE(&frame);
+-                AV_PACKET_UNREF(&pkt);
+                av_frame_free(&frame);
+                av_packet_unref(pkt);
+                 avformat_close_input(&fmtx);
+                 if (buffer) {
+                     delete[] buffer;
+@@ -414,7 +363,7 @@ libav::decodeto_22050hz_mono_float(
+             // if we got a frame
+             if (got_frame) {
+                 // do we need to increase the buffer size?
+-                int input_samples = frame->nb_samples*decx->channels;
+                int input_samples = frame->nb_samples*decx->ch_layout.nb_channels;
+                 if (input_samples > buffersize) {
+                     if (buffer) {
+                         delete[] buffer;
+@@ -434,8 +383,8 @@ libav::decodeto_22050hz_mono_float(
+                             input_samples / num_planes) < 0) {
+                         MINILOG(logERROR) << "Strange sample format. Abort.";
+ 
+-                        AV_FRAME_FREE(&frame);
+-                        AV_PACKET_UNREF(&pkt);
+                        av_frame_free(&frame);
+                        av_packet_unref(pkt);
+                         avformat_close_input(&fmtx);
+                         if (buffer) {
+                             delete[] buffer;
+@@ -445,7 +394,7 @@ libav::decodeto_22050hz_mono_float(
+                 }
+ 
+                 // inplace downmix to mono, if required
+-                if (decx->channels == 2) {
+                if (decx->ch_layout.nb_channels == 2) {
+                     for (int i = 0; i < frame->nb_samples; i++) {
+                         buffer[i] = (buffer[i*2] + buffer[i*2+1]) / 2.0f;
+                     }
+@@ -457,13 +406,13 @@ libav::decodeto_22050hz_mono_float(
+             }
+ 
+             // consume the packet
+-            pkt.data += len;
+-            pkt.size -= len;
+            pkt->data += len;
+            pkt->size -= len;
+         }
+-        pkt.data = data;
+-        pkt.size = size;
+        pkt->data = data;
+        pkt->size = size;
+ 
+-        AV_PACKET_UNREF(&pkt);
+        av_packet_unref(pkt);
+     }
+     MINILOG(logTRACE) << "Decoding loop finished.";
+ 
+@@ -514,13 +463,12 @@ libav::decodeto_22050hz_mono_float(
+     if (buffer) {
+         delete[] buffer;
+     }
+-    AV_FRAME_FREE(&frame);
+    av_frame_free(&frame);
+ #ifdef _OPENMP
+     #pragma omp critical
+ #endif
+     {
+-    avcodec_close(decx);
+-    AVCODEC_FREE_CONTEXT(&decx);
+    avcodec_free_context(&decx);
+     avformat_close_input(&fmtx);
+     }
+ 
+-- 
+2.45.2
+
--- a/pkgs/by-name/mu/musly/0002-Fix-build-with-C-17.patch
+++ b/pkgs/by-name/mu/musly/0002-Fix-build-with-C-17.patch
@ -0,0 +1,35 @@
+From 75efe27cbb03f2883e53e7a7f68386d93e2c1874 Mon Sep 17 00:00:00 2001
+From: Emily <hello@emily.moe>
+Date: Sat, 3 Aug 2024 12:17:19 +0100
+Subject: [PATCH 2/4] Fix build with C++17
+
+---
+ musly/main.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/musly/main.cpp b/musly/main.cpp
+index a9644f2..bb8b7ae 100644
+--- a/musly/main.cpp
+++ b/musly/main.cpp
+@@ -14,6 +14,7 @@
+ #include <cstdio>
+ #include <iostream>
+ #include <fstream>
+#include <random>
+ #include <algorithm>
+ #include <limits>
+ #include <map>
+@@ -239,7 +240,9 @@ tracks_initialize(
+     else {
+         // use a random subset of 1000 tracks
+         std::vector<musly_track*> tracks2(tracks);
+-        std::random_shuffle(tracks2.begin(), tracks2.end());
+        std::random_device seeder;
+        std::default_random_engine rng(seeder());
+        std::shuffle(tracks2.begin(), tracks2.end(), rng);
+         ret = musly_jukebox_setmusicstyle(mj, tracks2.data(), 1000);
+     }
+     if (ret != 0) {
+-- 
+2.45.2
+
--- a/pkgs/by-name/mu/musly/0003-Modernize-CMake-build-system.patch
+++ b/pkgs/by-name/mu/musly/0003-Modernize-CMake-build-system.patch
@ -0,0 +1,151 @@
+From 8abe6385e433b44c43134b4deef208c7498ab0d7 Mon Sep 17 00:00:00 2001
+From: Emily <hello@emily.moe>
+Date: Sat, 3 Aug 2024 12:21:12 +0100
+Subject: [PATCH 3/4] Modernize CMake build system
+
+Use GNUInstallDirs, CTest, and FindPkgConfig.
+---
+ .travis.yml             |  2 +-
+ CMakeLists.txt          | 25 +++++++++++--------------
+ libmusly/CMakeLists.txt | 11 +++--------
+ musly/CMakeLists.txt    |  6 +-----
+ 4 files changed, 16 insertions(+), 28 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index 8556b26..b051004 100644
+--- a/.travis.yml
+++ b/.travis.yml
+@@ -19,7 +19,7 @@ matrix:
+ script:
+     - mkdir -p build
+     - cd build
+-    - cmake -DBUILD_TEST=ON ..
+    - cmake ..
+     - make -j
+     - ctest -V
+ 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4fab4ab..8d8bf0e 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -4,9 +4,11 @@
+ # (c) 2013-2014, Dominik Schnitzer <dominik@schnitzer.at>
+ #          2014, Jan Schlueter <jan.schlueter@ofai.at>
+ 
+-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.17)
+ 
+ project(musly)
+include(GNUInstallDirs)
+include(CTest)
+ set(MUSLY_VERSION "0.2")
+ add_definitions(-DMUSLY_VERSION="${MUSLY_VERSION}")
+ 
+@@ -36,8 +38,6 @@ else ()
+     set(BUILD_SHARED_LIBS ON)
+ endif ()
+ 
+-option(BUILD_TEST "Build selftest executable" OFF)
+-
+ option(USE_OPENMP "Compile with OpenMP support (Parallelization)" OFF)
+ if (USE_OPENMP)
+     find_package(OpenMP)
+@@ -54,26 +54,23 @@ if (USE_OPENMP)
+     endif()
+ endif ()
+ 
+-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+-
+-find_package(Eigen3 REQUIRED)
+-find_package(LibAV 0.8 COMPONENTS avcodec avformat avutil REQUIRED)
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(EIGEN3 REQUIRED IMPORTED_TARGET eigen3)
+pkg_check_modules(FFMPEG REQUIRED IMPORTED_TARGET
+    libavcodec
+    libavformat
+    libavutil)
+ 
+ include_directories(
+-    "${PROJECT_BINARY_DIR}"
+     "${PROJECT_SOURCE_DIR}/include")
+ 
+ add_subdirectory(libmusly) 
+ add_subdirectory(musly) 
+ add_subdirectory(include) 
+-if (BUILD_TEST)
+-    enable_testing()
+if (BUILD_TESTING)
+     add_subdirectory(test)
+ endif ()
+ 
+ # Documentation
+ set(musly_DOC_FILES AUTHORS COPYING README.md)
+-set(musly_DOC_PATH "share/doc/musly")
+-install(FILES ${musly_DOC_FILES}
+-        DESTINATION ${musly_DOC_PATH})
+-
+install(FILES ${musly_DOC_FILES} DESTINATION ${CMAKE_INSTALL_DOCDIR})
+diff --git a/libmusly/CMakeLists.txt b/libmusly/CMakeLists.txt
+index 98151df..b9f6d11 100644
+--- a/libmusly/CMakeLists.txt
+++ b/libmusly/CMakeLists.txt
+@@ -4,9 +4,6 @@
+ # (c) 2013-2014, Dominik Schnitzer <dominik@schnitzer.at>
+ #     2014-2016, Jan Schlueter <jan.schlueter@ofai.at>
+ 
+-add_subdirectory(
+-    libresample)
+-
+ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/external")
+     add_subdirectory(
+         external)
+@@ -24,8 +21,6 @@ endif()
+ 
+ include_directories(
+     ${LIBMUSLY_INCLUDE}
+-    ${EIGEN3_INCLUDE_DIR}
+-    ${LIBAV_INCLUDE_DIRS}
+     ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ add_library(libmusly
+@@ -60,7 +55,8 @@ set_target_properties(libmusly
+ 
+ target_link_libraries(libmusly
+     ${LIBMUSLY_LIBS}
+-    ${LIBAV_LIBRARIES})
+    PkgConfig::EIGEN3
+    PkgConfig::FFMPEG)
+ if(WIN32 OR MINGW)
+     # link against winsock2 for ntohl() and htonl()
+     target_link_libraries(libmusly ws2_32)
+@@ -69,5 +65,4 @@ endif()
+ set_target_properties(libmusly
+     PROPERTIES PREFIX "")
+ 
+-install(TARGETS libmusly
+-    DESTINATION lib)
+install(TARGETS libmusly)
+diff --git a/musly/CMakeLists.txt b/musly/CMakeLists.txt
+index 88d153b..846ed2c 100644
+--- a/musly/CMakeLists.txt
+++ b/musly/CMakeLists.txt
+@@ -3,10 +3,6 @@
+ 
+ # (c) 2013, Dominik Schnitzer <dominik@schnitzer.at>
+ 
+-include_directories(
+-    ${EIGEN3_INCLUDE_DIR})
+-
+-
+ add_executable(musly
+     tools.cpp
+     fileiterator.cpp
+@@ -17,4 +13,4 @@ add_executable(musly
+ target_link_libraries(musly
+     libmusly)
+ 
+-install(TARGETS musly DESTINATION bin)
+install(TARGETS musly)
+-- 
+2.45.2
+
--- a/pkgs/by-name/mu/musly/0004-Use-pkg-config-to-find-libresample-and-kissfft.patch
+++ b/pkgs/by-name/mu/musly/0004-Use-pkg-config-to-find-libresample-and-kissfft.patch
@ -0,0 +1,110 @@
+From e4a0d0b48905bb949831c30c941e921da0b6f09c Mon Sep 17 00:00:00 2001
+From: Emily <hello@emily.moe>
+Date: Sat, 3 Aug 2024 12:21:12 +0100
+Subject: [PATCH 4/4] Use pkg-config to find libresample and kissfft
+
+---
+ .travis.yml              |  2 ++
+ CMakeLists.txt           | 12 ++++++++++++
+ libmusly/CMakeLists.txt  | 12 +++---------
+ libmusly/powerspectrum.h |  2 +-
+ libmusly/resampler.h     |  2 +-
+ 5 files changed, 19 insertions(+), 11 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index b051004..b354641 100644
+--- a/.travis.yml
+++ b/.travis.yml
+@@ -31,3 +31,5 @@ addons:
+             - libavcodec-dev
+             - libavformat-dev
+             - libavutil-dev
+            - libresample-dev
+            - libkissfft-dev
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8d8bf0e..c5b0d2c 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -60,6 +60,18 @@ pkg_check_modules(FFMPEG REQUIRED IMPORTED_TARGET
+     libavcodec
+     libavformat
+     libavutil)
+pkg_check_modules(LIBRESAMPLE REQUIRED IMPORTED_TARGET libresample)
+pkg_search_module(KISSFFT REQUIRED IMPORTED_TARGET
+    kissfft-simd
+    kissfft-double
+    kissfft-float
+    kissfft-int32_t
+    kissfft-int16_t
+    kissfft-simd-openmp
+    kissfft-double-openmp
+    kissfft-float-openmp
+    kissfft-int32_t-openmp
+    kissfft-int16_t-openmp)
+ 
+ include_directories(
+     "${PROJECT_SOURCE_DIR}/include")
+diff --git a/libmusly/CMakeLists.txt b/libmusly/CMakeLists.txt
+index b9f6d11..6f8c8e9 100644
+--- a/libmusly/CMakeLists.txt
+++ b/libmusly/CMakeLists.txt
+@@ -13,19 +13,11 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/external")
+         PROPERTIES COMPILE_FLAGS "-DLIBMUSLY_EXTERNAL ${LIBMUSLY_EXTERNAL_FLAGS}")
+ endif()
+ 
+-if(USE_OPENMP AND OPENMP_FOUND)
+-    # disable OpenMP for kiss FFT, it slows things down terribly
+-    set_source_files_properties(kissfft/kiss_fft.c
+-        PROPERTIES COMPILE_FLAGS "-U_OPENMP")
+-endif()
+-
+ include_directories(
+     ${LIBMUSLY_INCLUDE}
+     ${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ add_library(libmusly
+-    kissfft/kiss_fft.c
+-    kissfft/kiss_fftr.c
+     methods/mandelellis.cpp
+     methods/timbre.cpp
+     decoders/libav.cpp
+@@ -56,7 +48,9 @@ set_target_properties(libmusly
+ target_link_libraries(libmusly
+     ${LIBMUSLY_LIBS}
+     PkgConfig::EIGEN3
+-    PkgConfig::FFMPEG)
+    PkgConfig::FFMPEG
+    PkgConfig::LIBRESAMPLE
+    PkgConfig::KISSFFT)
+ if(WIN32 OR MINGW)
+     # link against winsock2 for ntohl() and htonl()
+     target_link_libraries(libmusly ws2_32)
+diff --git a/libmusly/powerspectrum.h b/libmusly/powerspectrum.h
+index 6957db4..096fc31 100644
+--- a/libmusly/powerspectrum.h
+++ b/libmusly/powerspectrum.h
+@@ -14,7 +14,7 @@
+ 
+ #include <Eigen/Core>
+ extern "C" {
+-    #include "kissfft/kiss_fftr.h"
+    #include <kissfft/kiss_fftr.h>
+ }
+ 
+ 
+diff --git a/libmusly/resampler.h b/libmusly/resampler.h
+index df8aaa4..f48e22a 100644
+--- a/libmusly/resampler.h
+++ b/libmusly/resampler.h
+@@ -14,7 +14,7 @@
+ 
+ #include <vector>
+ extern "C" {
+-    #include "libresample/libresample.h"
+    #include <libresample.h>
+ }
+ 
+ namespace musly {
+-- 
+2.45.2
+
--- a/pkgs/by-name/mu/musly/package.nix
+++ b/pkgs/by-name/mu/musly/package.nix
@ -0,0 +1,72 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+  pkg-config,
+  eigen,
+  ffmpeg_7,
+  libresample,
+  kissfft,
+}:
+
+stdenv.mkDerivation {
+  pname = "musly";
+  version = "0.1-unstable-2019-09-05";
+
+  outputs = [
+    "bin"
+    "dev"
+    "out"
+    "doc"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "dominikschnitzer";
+    repo = "musly";
+    rev = "7a0c6a9a2782e6fca84fb86fce5232a8c8a104ed";
+    hash = "sha256-DOvGGx3pCcvPPsT97sQlINjT1sJy8ZWvxLsFGGZbgzE=";
+  };
+
+  patches = [
+    # Fix build with FFmpeg 7, C++17, and external libresample and kissfft
+    # https://github.com/dominikschnitzer/musly/pull/53
+    # Last commit omitted, as it is a large non‐functional removal
+    ./0001-Fix-build-with-FFmpeg-7.patch
+    ./0002-Fix-build-with-C-17.patch
+    ./0003-Modernize-CMake-build-system.patch
+    ./0004-Use-pkg-config-to-find-libresample-and-kissfft.patch
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    eigen
+    ffmpeg_7
+    libresample
+    kissfft
+  ];
+
+  doCheck = true;
+
+  meta = {
+    homepage = "https://www.musly.org";
+    description = "Fast and high-quality audio music similarity library written in C/C++";
+    longDescription = ''
+      Musly analyzes the the audio signal of music pieces to estimate their similarity.
+      No meta-data about the music piece is included in the similarity estimation.
+      To use Musly in your application, have a look at the library documentation
+      or try the command line application included in the package and start generating
+      some automatic music playlists right away.
+    '';
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ ggpeti ];
+    platforms = lib.platforms.unix;
+    mainProgram = "musly";
+  };
+}
--- a/pkgs/by-name/na/nanopb/generator-out.nix
+++ b/pkgs/by-name/na/nanopb/generator-out.nix
@ -1,11 +1,13 @@
-{ stdenv
-, cmake
-, python3
-, writeTextFile
-, protobuf
-, src
-, version
+{
+  stdenv,
+  cmake,
+  python3,
+  writeTextFile,
+  protobuf,
+  src,
+  version,
 }:
+
 let
  pyproject_toml = writeTextFile {
    name = "pyproject.toml";
@ -38,22 +40,26 @@ stdenv.mkDerivation {
  pname = "nanopb-generator-out";
  inherit src version;

-  nativeBuildInputs = [ cmake protobuf python3 ];
+  nativeBuildInputs = [
+    cmake
+    protobuf
+  ];
+
+  # don't let `find_program` find the bundled `protoc` script, so it will use the system `protoc` instead
+  preConfigure = ''
+    rm generator/protoc
+  '';

  cmakeFlags = [
    "-Dnanopb_BUILD_RUNTIME=OFF"
    "-Dnanopb_BUILD_GENERATOR=ON"
-    "-Dnanopb_PYTHON_INSTDIR_OVERRIDE=$out/lib/python/site-packages"
+    "-Dnanopb_PYTHON_INSTDIR_OVERRIDE=${placeholder "out"}/${python3.sitePackages}"
  ];

-  preConfigure = ''
-    cmakeFlags+=" -Dnanopb_PYTHON_INSTDIR_OVERRIDE=$out/lib/python/site-packages"
-  '';
-
  postInstall = ''
    rm -rf $out/include
    rm -rf $out/lib/cmake
-    ln -s $out/lib/python/site-packages $out/src
+    ln -s $out/${python3.sitePackages} $out/src
    ln -s ${pyproject_toml} $out/pyproject.toml
  '';
 }
--- a/pkgs/by-name/po/powerpipe/package.nix
+++ b/pkgs/by-name/po/powerpipe/package.nix
@ -11,16 +11,16 @@

 buildGoModule rec {
  pname = "powerpipe";
-  version = "0.4.2";
+  version = "0.4.3";

  src = fetchFromGitHub {
    owner = "turbot";
    repo = "powerpipe";
    rev = "refs/tags/v${version}";
-    hash = "sha256-wZav0MKnXEcIaO4WttCRJ+0sTabJeHHxL0vyb8qi4w8=";
+    hash = "sha256-WrjdxLlDvC+rq3bJ0U8pqSJvfqH9Y54BOoWUfb5pMho=";
  };

-  vendorHash = "sha256-2n1fImOLk1KIr2rqvbiw/Ze2LPeNlqaQ7mAdUuS/KQM=";
+  vendorHash = "sha256-zBwk03aEjWs+CfbIZh0g7absKc5+SNLTVhrctuTpjMk=";
  proxyVendor = true;

  nativeBuildInputs = [
--- a/pkgs/by-name/pr/prox/package.nix
+++ b/pkgs/by-name/pr/prox/package.nix
@ -5,17 +5,17 @@

 buildGoModule rec {
  pname = "prox";
-  # While upstream did release a v1.0.0, v0.5.2 is actually newer: https://github.com/fgrosse/prox/releases/tag/v0.5.2
-  version = "0.5.2";
+  # While upstream did release a v1.0.0, v1.1.0 is actually newer: https://github.com/fgrosse/prox/releases/tag/v1.1.0
+  version = "1.1.0";

  src = fetchFromGitHub {
    owner = "fgrosse";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-mqx8ICne0NnyW0N1Jeu+PJXWDBr12OASLxlePI6v6Bc=";
+    sha256 = "sha256-KSHTlcAmnuU8F17N0LBS0s5b/k6Of0OEHVd3v50bH3g=";
  };

-  vendorHash = "sha256-4gZfEbyAzAzxtOR6FhP7eUSdln+fANn87+duCq1aq5A=";
+  vendorHash = "sha256-i4QJ84Tne1E8s2Fprd5xeWlTQBIb/9tvwws80yHXhbg=";

  postPatch = ''
    substituteInPlace cmd/prox/version.go \
--- a/pkgs/by-name/ra/railway-wallet/package.nix
+++ b/pkgs/by-name/ra/railway-wallet/package.nix
@ -3,14 +3,13 @@
  appimageTools,
  fetchurl,
 }:
-
 appimageTools.wrapType2 rec {
  pname = "railway-wallet";
-  version = "5.17.0";
+  version = "5.17.10";

  src = fetchurl {
    url = "https://github.com/Railway-Wallet/Railway-Wallet/releases/download/v${version}/Railway-linux-x86_64.AppImage";
-    hash = "sha256-6IBVbBkYJ6Qsh87sVbx/SKRC43M9D7RElBuOo+5MA14=";
+    hash = "sha256-dTvoX+wC/LfSPU7/Cftkqm6fvNwzwvMzizxGgTLOJgw=";
  };

  meta = {
--- a/pkgs/by-name/re/reposilite/package.nix
+++ b/pkgs/by-name/re/reposilite/package.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "Reposilite";
-  version = "3.5.15";
+  version = "3.5.16";

  src = fetchurl {
    url = "https://maven.reposilite.com/releases/com/reposilite/reposilite/${finalAttrs.version}/reposilite-${finalAttrs.version}-all.jar";
-    hash = "sha256-KsuNAF/AXScOvEBU4NHiUkxztfK/zOp4lOUfXUQeKuY=";
+    hash = "sha256-zketAvn0XgBRAS+Bb3KcUcpdydbQQruS+gZ5Bfrjiig=";
  };

  dontUnpack = true;
--- a/pkgs/by-name/ry/ryujinx/deps.nix
+++ b/pkgs/by-name/ry/ryujinx/deps.nix
@ -27,7 +27,7 @@
  (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; hash = "sha256-ApU9y1yX60daSjPk3KYDBeJ7XZByKW8hse9NRZGcjeo="; })
  (fetchNuGet { pname = "Concentus"; version = "2.2.0"; hash = "sha256-7wbB76WoTd2CISIODGhmEiPIrydI0dqDMZGf4gdkogM="; })
  (fetchNuGet { pname = "DiscordRichPresence"; version = "1.2.1.24"; hash = "sha256-oRNrlF1/yK0QvrW2+48RsmSg9h9/pDIfA56/bpoHXFU="; })
-  (fetchNuGet { pname = "DynamicData"; version = "9.0.1"; hash = "sha256-dvo4eSHg8S9oS5QhvfCrbV+y7BVtlYRwH7PN7N1GubM="; })
+  (fetchNuGet { pname = "DynamicData"; version = "9.0.4"; hash = "sha256-3pyiJeWRwfaT7p1ArsoR13aI78Jo13aHOEw3BelTS9g="; })
  (fetchNuGet { pname = "ExCSS"; version = "4.2.3"; hash = "sha256-M/H6P5p7qqdFz/fgAI2MMBWQ7neN/GIieYSSxxjsM9I="; })
  (fetchNuGet { pname = "FluentAvaloniaUI"; version = "2.0.5"; hash = "sha256-EaJ6qR2yn+7p8lf62yx2vL3sGhnPOfbP5jBjR+pGY7o="; })
  (fetchNuGet { pname = "FSharp.Core"; version = "7.0.200"; hash = "sha256-680VgvYbZbztPQosO17r5y8vxg/Y/4Vmr5K3iLIJKMo="; })
@ -133,7 +133,7 @@
  (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.EXT"; version = "2.16.0"; hash = "sha256-brvWqisI0WwE7qRhLeRdWXDedztX4lOFon4h6oxDIRU="; })
  (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.KHR"; version = "2.16.0"; hash = "sha256-QU7xVauLOBAF6TDo8mcuRsA2sZWyVLqFq1M+Oc/WnMg="; })
  (fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0"; hash = "sha256-kyAQcZZOdD50Lo7l7z8qnFMerJjlAV66HNBq7BI6TNM="; })
-  (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.8"; hash = "sha256-5cBdYmF8I1TVi6VSXhMCYja7XTnosLaaYxYzldxHMxE="; })
+  (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.9"; hash = "sha256-5Gn8de23zgrlAzqH39kjVIHoGUrhNNxiVw1qNVJECvY="; })
  (fetchNuGet { pname = "SixLabors.ImageSharp.Drawing"; version = "1.0.0"; hash = "sha256-IH+UVkem5kk6zWAWfWsrtyINZNMh+Em1cF1CCfjvBj4="; })
  (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; hash = "sha256-WyMAjnQt8ZsuWpGLI89l/f4bHvv+cg7FdTAL7CtJBvs="; })
  (fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; hash = "sha256-y0wzgwdQXtgl5boCz/EgLWbK3SwC0cFVRUbBxOUPQXc="; })
--- a/pkgs/by-name/ry/ryujinx/package.nix
+++ b/pkgs/by-name/ry/ryujinx/package.nix
@ -26,13 +26,13 @@

 buildDotnetModule rec {
  pname = "ryujinx";
-  version = "1.1.1376"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
+  version = "1.1.1379"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml

  src = fetchFromGitHub {
    owner = "Ryujinx";
    repo = "Ryujinx";
-    rev = "0137c9e6353b7866153daf2859c48715a5c39349";
-    sha256 = "0rpm2sni7nj9pkw9kwqfgns8g0vgbdfnsxpn40xylz2i7n3b7nn1";
+    rev = "b45a81458a0b48acd519ce280c7b8f3970e0ffed";
+    sha256 = "1w3nfhx496im06m3gc67xw8w1n6qprs9ggka2sq0g8w2ssz4iy7f";
  };

  dotnet-sdk = dotnetCorePackages.sdk_8_0;
--- a/pkgs/by-name/sa/sabnzbd/package.nix
+++ b/pkgs/by-name/sa/sabnzbd/package.nix
@ -15,8 +15,8 @@
 }:

 let
-  sabctoolsVersion = "8.2.0";
-  sabctoolsHash = "sha256-dOMNZoKWQxHJt6yHiNKVtpnYvLJkK8nktOm+djsSTcM=";
+  sabctoolsVersion = "8.2.5";
+  sabctoolsHash = "sha256-ZEC813/JpGPEFL+nXKFAXFfUrrhECCIqONe27LwS00g=";

  pythonEnv = python3.withPackages (
    ps: with ps; [
@ -72,14 +72,14 @@ let
  ];
 in
 stdenv.mkDerivation rec {
-  version = "4.3.2";
+  version = "4.3.3";
  pname = "sabnzbd";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = version;
-    sha256 = "sha256-EJf5yTyGbWqS9qaCWdxnJqaSFzVu3h5N3CGGzAEsBtI=";
+    sha256 = "sha256-WJ58OawPSICCWMWQ042T4OmK5UBRZRU5tnLYxGPbDPc=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/by-name/sl/slumber/package.nix
+++ b/pkgs/by-name/sl/slumber/package.nix
@ -1,28 +1,30 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, rustPlatform
-, darwin
-,
+{
+  lib,
+  stdenv,
+  darwin,
+  fetchFromGitHub,
+  rustPlatform,
 }:
+
 rustPlatform.buildRustPackage rec {
  pname = "slumber";
-  version = "1.5.0";
+  version = "1.8.1";

  src = fetchFromGitHub {
    owner = "LucasPickering";
    repo = "slumber";
-    rev = "v${version}";
-    hash = "sha256-7JXkyRhoSjGYhse+2/v3Ndogar10K4N3ZUZNGpMiQ/A=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-u+IONDK3X+4kPmW9YXa0qQbAezBD+UADnlNEH1coKNE=";
  };

-  cargoHash = "sha256-wZcnaT8EjbdSX6Y/UNS7v9/hQ9ISxkyRwRqRotXPCWU=";
+  cargoHash = "sha256-V/wPzEoUppLu8E5/SbBT4sPftz/SIg4s00/AHQL9R+o=";

  buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ];

  meta = with lib; {
    description = "Terminal-based HTTP/REST client";
    homepage = "https://slumber.lucaspickering.me";
+    changelog = "https://github.com/LucasPickering/slumber/blob/v${version}/CHANGELOG.md";
    license = licenses.mit;
    mainProgram = "slumber";
    maintainers = with maintainers; [ javaes ];
--- a/pkgs/by-name/sp/spicetify-cli/package.nix
+++ b/pkgs/by-name/sp/spicetify-cli/package.nix
@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "spicetify-cli";
-  version = "2.37.2";
+  version = "2.37.4";

  src = fetchFromGitHub {
    owner = "spicetify";
    repo = "cli";
    rev = "v${version}";
-    hash = "sha256-SXHLkXOaHtgd4V+nzMbLw9mXZ3HeUbyqlnL7KwiyAXo=";
+    hash = "sha256-MiuQeyFNW0/RNYrJnVSi6Tyo1CSxciUnVytU3Wnug+g=";
  };

  vendorHash = "sha256-kv+bMyVOJTztn8mNNTK/kp4nvc5m1I5M041s3nPpob8=";
--- a/pkgs/by-name/te/terragrunt/package.nix
+++ b/pkgs/by-name/te/terragrunt/package.nix
@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "terragrunt";
-  version = "0.66.8";
+  version = "0.66.9";

  src = fetchFromGitHub {
    owner = "gruntwork-io";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-GDRduJMTPWhUo1dv6sFaEYj3dFUwkHg8D/QebyeOBK4=";
+    hash = "sha256-yL24oxuwdIMaMPQIZFHkp33B8x1TDwjXRkk9fQgMdrY=";
  };

  nativeBuildInputs = [ go-mockery ];
--- a/pkgs/by-name/ti/tinymist/Cargo.lock
+++ b/pkgs/by-name/ti/tinymist/Cargo.lock
@ -70,6 +70,15 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "ansi_colours"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14eec43e0298190790f41679fe69ef7a829d2a2ddd78c8c00339e84710e435fe"
+dependencies = [
+ "rgb",
+]
+
 [[package]]
 name = "anstream"
 version = "0.6.14"
@ -125,12 +134,6 @@ version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"

-[[package]]
-name = "append-only-vec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6cf1d5134ae83736dc3f4dc3e6107870b29cc2a9f8f7948630c133c6fdb6ba1"
-
 [[package]]
 name = "approx"
 version = "0.5.1"
@ -224,16 +227,6 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"

-[[package]]
-name = "base64-serde"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba368df5de76a5bea49aaf0cf1b39ccfbbef176924d1ba5db3e4135216cbe3c7"
-dependencies = [
- "base64 0.21.7",
- "serde",
-]
-
 [[package]]
 name = "biblatex"
 version = "0.9.3"
@ -941,15 +934,6 @@ version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"

-[[package]]
-name = "elsa"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d98e71ae4df57d214182a2e5cb90230c0192c6ddfcaa05c36453d46a54713e10"
-dependencies = [
- "stable_deref_trait",
-]
-
 [[package]]
 name = "embedded-io"
 version = "0.4.0"
@ -1166,12 +1150,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "fst"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a"
-
 [[package]]
 name = "funty"
 version = "2.0.0"
@ -2700,9 +2678,9 @@ dependencies = [

 [[package]]
 name = "reflexo"
-version = "0.5.0-rc5"
+version = "0.5.0-rc7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ae5af71dba0ab175d7e790ef57f64310c645dc300e88794bd22457d531fbc23"
+checksum = "2803fc3e89d63fe9b5201726f5c4490a3d4d415facdad9581082a5e7e647db52"
 dependencies = [
 "base64 0.22.1",
 "bitvec",
@ -2711,11 +2689,10 @@ dependencies = [
 "ecow 0.2.2",
 "fxhash",
 "instant",
- "once_cell",
 "parking_lot",
 "path-clean",
 "rkyv",
- "rustc-hash 1.1.0",
+ "rustc-hash 2.0.0",
 "serde",
 "serde_json",
 "serde_repr",
@ -2725,56 +2702,115 @@ dependencies = [
 ]

 [[package]]
-name = "reflexo-vfs"
-version = "0.5.0-rc5"
+name = "reflexo-typst"
+version = "0.5.0-rc7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acc80c7f1483dfc8ef7f413a2158181d7c8ecd18d22241c533ec2cd493d1bc0f"
+checksum = "6ac7cb43d90c023f5cbeedfb24b2022c550b1e29952fc0014bac947bf69d6647"
+dependencies = [
+ "codespan-reporting",
+ "comemo 0.4.0",
+ "ecow 0.2.2",
+ "futures",
+ "fxhash",
+ "indexmap 2.2.6",
+ "log",
+ "nohash-hasher",
+ "notify",
+ "parking_lot",
+ "pathdiff",
+ "rayon",
+ "reflexo",
+ "reflexo-typst2vec",
+ "reflexo-vfs",
+ "reflexo-world",
+ "serde",
+ "serde_json",
+ "tar",
+ "tokio",
+ "typst",
+]
+
+[[package]]
+name = "reflexo-typst2vec"
+version = "0.5.0-rc7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "104405c4eb839fecea0c88443961d1f10c7f533c13083d1b8355d83f01b1bbd1"
+dependencies = [
+ "bitvec",
+ "comemo 0.4.0",
+ "crossbeam-queue",
+ "dashmap",
+ "flate2",
+ "log",
+ "parking_lot",
+ "rayon",
+ "reflexo",
+ "rustc-hash 2.0.0",
+ "serde",
+ "serde_json",
+ "svgtypes",
+ "tiny-skia",
+ "tiny-skia-path",
+ "ttf-parser",
+ "typst",
+ "xmlparser",
+]
+
+[[package]]
+name = "reflexo-vec2svg"
+version = "0.5.0-rc7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e79d065724764ff3c5cb9a6203eede0472290b8b387b2df55f6740618661d59"
+dependencies = [
+ "base64 0.22.1",
+ "comemo 0.4.0",
+ "log",
+ "reflexo",
+ "reflexo-typst2vec",
+ "typst",
+]
+
+[[package]]
+name = "reflexo-vfs"
+version = "0.5.0-rc7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea592d6cfc00420d0719170a6c0dd71580b1cea6682a5f543b3b683991ec3f6"
 dependencies = [
- "append-only-vec",
 "indexmap 2.2.6",
 "log",
 "nohash-hasher",
- "once_cell",
 "parking_lot",
 "reflexo",
 "rpds",
- "rustc-hash 1.1.0",
 "typst",
 ]

 [[package]]
 name = "reflexo-world"
-version = "0.5.0-rc5"
+version = "0.5.0-rc7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68eb0f8f91035cbe75c17f42542be883aed8738e39b79a28c9a532b141127c5f"
+checksum = "1ec0d950f4a5087dcbf875b686dd4b67d82c436c10895f98bb5cc027b1aea9e2"
 dependencies = [
- "append-only-vec",
 "chrono",
 "codespan-reporting",
 "comemo 0.4.0",
- "dashmap",
 "dirs",
+ "ecow 0.2.2",
 "flate2",
 "fontdb",
 "hex",
- "indexmap 2.2.6",
 "log",
- "nohash-hasher",
- "notify",
- "once_cell",
 "parking_lot",
 "reflexo",
 "reflexo-vfs",
 "reqwest",
- "rustc-hash 1.1.0",
 "serde",
 "serde_json",
+ "serde_with",
 "sha2",
 "strum 0.25.0",
 "tar",
 "typst",
- "typst-ts-core",
- "walkdir",
 ]

 [[package]]
@ -3500,7 +3536,7 @@ dependencies = [

 [[package]]
 name = "sync-lsp"
-version = "0.11.19"
+version = "0.11.20"
 dependencies = [
 "anyhow",
 "clap",
@ -3639,7 +3675,7 @@ dependencies = [

 [[package]]
 name = "tests"
-version = "0.11.19"
+version = "0.11.20"
 dependencies = [
 "insta",
 "lsp-server",
@ -3736,7 +3772,7 @@ dependencies = [

 [[package]]
 name = "tinymist"
-version = "0.11.19"
+version = "0.11.20"
 dependencies = [
 "anyhow",
 "async-trait",
@ -3752,6 +3788,7 @@ dependencies = [
 "comemo 0.4.0",
 "crossbeam-channel",
 "dhat",
+ "dirs",
 "env_logger",
 "futures",
 "hyper",
@ -3766,13 +3803,16 @@ dependencies = [
 "pin-project-lite",
 "rayon",
 "reflexo",
+ "reflexo-typst",
+ "reflexo-vec2svg",
 "serde",
 "serde_json",
 "serde_yaml",
 "sync-lsp",
- "tinymist-assets 0.11.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tinymist-assets 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "tinymist-query",
 "tinymist-render",
+ "tinymist-world",
 "tokio",
 "tokio-util",
 "toml 0.8.14",
@ -3780,15 +3820,13 @@ dependencies = [
 "tower-service",
 "typlite",
 "typst",
+ "typst-ansi-hl",
 "typst-assets",
 "typst-pdf",
 "typst-preview",
 "typst-render",
 "typst-svg",
 "typst-timing",
- "typst-ts-compiler",
- "typst-ts-core",
- "typst-ts-svg-exporter",
 "typstfmt_lib",
 "typstyle",
 "unicode-script",
@ -3798,23 +3836,24 @@ dependencies = [

 [[package]]
 name = "tinymist-assets"
-version = "0.11.19"
+version = "0.11.20"

 [[package]]
 name = "tinymist-assets"
-version = "0.11.19"
+version = "0.11.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85be1e87f7b44cafd3fa5195af352c8ea5f8e747aefff207b76986174f1085ea"
+checksum = "31caeaeb5d57c7ecd5f5e64aa77504f169f930c534822ba9fd12681866a686e9"

 [[package]]
 name = "tinymist-query"
-version = "0.11.19"
+version = "0.11.20"
 dependencies = [
 "anyhow",
 "biblatex",
 "chrono",
 "comemo 0.4.0",
 "dashmap",
+ "dirs",
 "ecow 0.2.2",
 "ena",
 "hashbrown 0.14.5",
@ -3830,6 +3869,7 @@ dependencies = [
 "pathdiff",
 "percent-encoding",
 "reflexo",
+ "reflexo-typst",
 "regex",
 "rust_iso3166",
 "rust_iso639",
@ -3845,8 +3885,6 @@ dependencies = [
 "ttf-parser",
 "typst",
 "typst-assets",
- "typst-ts-compiler",
- "typst-ts-core",
 "unscanny",
 "walkdir",
 "yaml-rust2",
@ -3854,13 +3892,29 @@ dependencies = [

 [[package]]
 name = "tinymist-render"
-version = "0.11.19"
+version = "0.11.20"
 dependencies = [
 "base64 0.22.1",
 "log",
+ "reflexo-vec2svg",
 "serde",
 "tinymist-query",
- "typst-ts-svg-exporter",
+]
+
+[[package]]
+name = "tinymist-world"
+version = "0.11.20"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "clap",
+ "comemo 0.4.0",
+ "log",
+ "reflexo-typst",
+ "serde",
+ "serde_json",
+ "tinymist-assets 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "typst-assets",
 ]

 [[package]]
@ -4129,19 +4183,29 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"

 [[package]]
 name = "typlite"
-version = "0.11.19"
+version = "0.11.20"
 dependencies = [
 "base64 0.22.1",
 "comemo 0.4.0",
 "ecow 0.2.2",
 "insta",
 "regex",
+ "tinymist-query",
+ "tinymist-world",
 "typst",
- "typst-assets",
 "typst-svg",
 "typst-syntax 0.11.1",
 ]

+[[package]]
+name = "typlite-cli"
+version = "0.0.0"
+dependencies = [
+ "clap",
+ "tinymist-world",
+ "typlite",
+]
+
 [[package]]
 name = "typst"
 version = "0.11.1"
@ -4203,6 +4267,21 @@ dependencies = [
 "wasmi",
 ]

+[[package]]
+name = "typst-ansi-hl"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b457d0812d51dbc28f7a5b8583b8c28cd3c43628e1e7e5a0ae63975fda65351"
+dependencies = [
+ "ansi_colours",
+ "once_cell",
+ "syntect",
+ "termcolor",
+ "thiserror",
+ "two-face",
+ "typst-syntax 0.11.1",
+]
+
 [[package]]
 name = "typst-assets"
 version = "0.11.1"
@ -4247,7 +4326,7 @@ dependencies = [

 [[package]]
 name = "typst-preview"
-version = "0.11.19"
+version = "0.11.20"
 dependencies = [
 "clap",
 "comemo 0.4.0",
@ -4256,16 +4335,15 @@ dependencies = [
 "indexmap 2.2.6",
 "log",
 "once_cell",
+ "reflexo-typst",
+ "reflexo-vec2svg",
 "serde",
 "serde_json",
- "tinymist-assets 0.11.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tinymist-assets 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)",
 "tokio",
 "tokio-tungstenite",
 "typst",
 "typst-assets",
- "typst-ts-compiler",
- "typst-ts-core",
- "typst-ts-svg-exporter",
 ]

 [[package]]
@ -4348,95 +4426,6 @@ dependencies = [
 "typst-syntax 0.11.1",
 ]

-[[package]]
-name = "typst-ts-compiler"
-version = "0.5.0-rc5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd3f3a4d7b1c28314b2d664e321e8d5252fc5ad09091930b951557e386e20fcd"
-dependencies = [
- "base64 0.22.1",
- "codespan-reporting",
- "comemo 0.4.0",
- "flate2",
- "fst",
- "indexmap 2.2.6",
- "log",
- "nohash-hasher",
- "notify",
- "once_cell",
- "parking_lot",
- "pathdiff",
- "rayon",
- "reflexo",
- "reflexo-vfs",
- "reflexo-world",
- "rustc-hash 1.1.0",
- "serde",
- "serde_json",
- "tar",
- "tokio",
- "typst",
- "typst-ts-core",
- "typst-ts-svg-exporter",
-]
-
-[[package]]
-name = "typst-ts-core"
-version = "0.5.0-rc5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81026f9d356bb4d15d612a2e76274fc64379a98c356c2115c45add6565153262"
-dependencies = [
- "base64 0.22.1",
- "base64-serde",
- "bitvec",
- "byteorder",
- "comemo 0.4.0",
- "crossbeam-queue",
- "dashmap",
- "ecow 0.2.2",
- "elsa",
- "flate2",
- "fxhash",
- "hex",
- "log",
- "once_cell",
- "parking_lot",
- "path-clean",
- "rayon",
- "reflexo",
- "rustc-hash 1.1.0",
- "serde",
- "serde_json",
- "serde_repr",
- "serde_with",
- "sha2",
- "siphasher 1.0.1",
- "svgtypes",
- "tiny-skia",
- "tiny-skia-path",
- "ttf-parser",
- "typst",
- "xmlparser",
-]
-
-[[package]]
-name = "typst-ts-svg-exporter"
-version = "0.5.0-rc5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6425d6586ba1bdf3d1da75aea61717dca9774f0a3ab969e799b067010522f318"
-dependencies = [
- "base64 0.22.1",
- "comemo 0.4.0",
- "log",
- "once_cell",
- "rayon",
- "reflexo",
- "siphasher 1.0.1",
- "tiny-skia",
- "typst",
- "typst-ts-core",
-]
-
 [[package]]
 name = "typstfmt_lib"
 version = "0.2.7"
@ -4454,9 +4443,9 @@ dependencies = [

 [[package]]
 name = "typstyle"
-version = "0.11.31"
+version = "0.11.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04207b151e637bcf307d974e5963fc51c2912688343a0b7575246a3acb6aeab9"
+checksum = "87f3e79e77aac4d80934811be14abd1e2b0e7d3b4059653e24b841ab1ac5bae0"
 dependencies = [
 "anyhow",
 "itertools 0.13.0",
--- a/pkgs/by-name/ti/tinymist/package.nix
+++ b/pkgs/by-name/ti/tinymist/package.nix
@ -18,13 +18,13 @@ rustPlatform.buildRustPackage rec {
  pname = "tinymist";
  # Please update the corresponding vscode extension when updating
  # this derivation.
-  version = "0.11.19";
+  version = "0.11.20";

  src = fetchFromGitHub {
    owner = "Myriad-Dreamin";
    repo = "tinymist";
    rev = "refs/tags/v${version}";
-    hash = "sha256-ejumGfG98l3N3mA7UX86GYa46hIwxjEB2/jvAW9rv0I=";
+    hash = "sha256-wmXFMLLMjMFRuWX9AFk+gJz/4t0+DiOBrvcTx+LQ+tI=";
  };

  cargoLock = {
--- a/pkgs/by-name/tr/trealla/package.nix
+++ b/pkgs/by-name/tr/trealla/package.nix
@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
 ];
 stdenv.mkDerivation (finalAttrs: {
  pname = "trealla";
-  version = "2.55.22";
+  version = "2.55.25";

  src = fetchFromGitHub {
    owner = "trealla-prolog";
    repo = "trealla";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-qrOVirSJKLF3fzUoD5lxxtj0Uv67WgxEsdG/GNVLZvk=";
+    hash = "sha256-SQ80jT8uMOaQVr9ZmrV6IYbMMdNIcdxEJ2czsRHP2XI=";
  };

  postPatch = ''
--- a/pkgs/by-name/vc/vcluster/package.nix
+++ b/pkgs/by-name/vc/vcluster/package.nix
@ -68,7 +68,6 @@ buildGoModule rec {
      berryp
      peterromfeldhk
      qjoly
-      superherointj
    ];
  };
 }
--- a/pkgs/by-name/zp/zpaqfranz/package.nix
+++ b/pkgs/by-name/zp/zpaqfranz/package.nix
@ -6,13 +6,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "zpaqfranz";
-  version = "60.5";
+  version = "60.6";

  src = fetchFromGitHub {
    owner = "fcorbelli";
    repo = "zpaqfranz";
    rev = finalAttrs.version;
-    hash = "sha256-75+HNfxeecl/u8adw3fKRWtCqyyb7mEkT7J4esXD0Is=";
+    hash = "sha256-/lUczs4YrbLH7agZDyThPwtMLiSi07XMqwk0GgR/jFw=";
  };

  nativeBuildInputs = [
--- a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix
+++ b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
  meta = {
    description = "Schemas for DocBook 5.0, a semantic markup language for technical documentation";
    homepage = "https://docbook.org/xml/5.0/";
-    maintainers = [ lib.maintainers.eelco ];
+    maintainers = [ ];
    platforms = lib.platforms.all;
  };
 }
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
@ -70,7 +70,7 @@ let
        homepage = "https://github.com/docbook/wiki/wiki/DocBookXslStylesheets";
        description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats";
        license = lib.licenses.mit;
-        maintainers = [ lib.maintainers.eelco ];
+        maintainers = [ ];
        platforms = lib.platforms.all;
      };
    };
--- a/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix
+++ b/pkgs/desktops/xfce/art/xfce4-icon-theme/default.nix
@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
    description = "Icons for Xfce";
    license = licenses.gpl2Plus;
    platforms = platforms.linux;
-    maintainers = with maintainers; [ eelco ] ++ teams.xfce.members;
+    maintainers = teams.xfce.members;
  };
 }
--- a/pkgs/development/interpreters/perl/interpreter.nix
+++ b/pkgs/development/interpreters/perl/interpreter.nix
@ -235,7 +235,7 @@ stdenv.mkDerivation (rec {
    homepage = "https://www.perl.org/";
    description = "Standard implementation of the Perl 5 programming language";
    license = licenses.artistic1;
-    maintainers = [ maintainers.eelco ];
+    maintainers = [ ];
    platforms = platforms.all;
    priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl`
    mainProgram = "perl";
--- a/pkgs/development/interpreters/rascal/default.nix
+++ b/pkgs/development/interpreters/rascal/default.nix
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
    mainProgram = "rascal";
    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
    license = lib.licenses.epl10;
-    maintainers = [ lib.maintainers.eelco ];
+    maintainers = [ ];
    platforms = lib.platforms.unix;
  };
 }
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
    homepage = "https://apr.apache.org/";
    description = "Companion library to APR, the Apache Portable Runtime";
    mainProgram = "apu-1-config";
-    maintainers = [ maintainers.eelco ];
+    maintainers = [ ];
    platforms = platforms.unix;
    license = licenses.asl20;
  };
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
    mainProgram = "apr-1-config";
    platforms = platforms.all;
    license = licenses.asl20;
-    maintainers = [ maintainers.eelco ];
+    maintainers = [ ];
  };
 }
--- a/pkgs/development/libraries/audio/qm-dsp/default.nix
+++ b/pkgs/development/libraries/audio/qm-dsp/default.nix
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
    rmdir $out/include/qm-dsp
  '';

-  env.NIX_CFLAGS_COMPILE = "-I${kissfft}/include/kissfft";
+  env.NIX_CFLAGS_COMPILE = "-I${lib.getInclude kissfft}/include/kissfft";

  meta = with lib; {
    description = "C++ library of functions for DSP and Music Informatics purposes";
--- a/pkgs/development/libraries/aws-c-common/default.nix
+++ b/pkgs/development/libraries/aws-c-common/default.nix
@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/awslabs/aws-c-common";
    license = licenses.asl20;
    platforms = platforms.unix;
-    maintainers = with maintainers; [ orivej eelco r-burns ];
+    maintainers = with maintainers; [ orivej r-burns ];
  };
 }
--- a/pkgs/development/libraries/aws-c-event-stream/default.nix
+++ b/pkgs/development/libraries/aws-c-event-stream/default.nix
@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/awslabs/aws-c-event-stream";
    license = licenses.asl20;
    platforms = platforms.unix;
-    maintainers = with maintainers; [ orivej eelco ];
+    maintainers = with maintainers; [ orivej ];
  };
 }
--- a/pkgs/development/libraries/aws-checksums/default.nix
+++ b/pkgs/development/libraries/aws-checksums/default.nix
@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/awslabs/aws-checksums";
    license = licenses.asl20;
    platforms = platforms.unix;
-    maintainers = with maintainers; [ orivej eelco ];
+    maintainers = with maintainers; [ orivej ];
  };
 }
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@ -147,7 +147,7 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/aws/aws-sdk-cpp";
    license = licenses.asl20;
    platforms = platforms.unix;
-    maintainers = with maintainers; [ eelco orivej ];
+    maintainers = with maintainers; [ orivej ];
    # building ec2 runs out of memory: cc1plus: out of memory allocating 33554372 bytes after a total of 74424320 bytes
    broken = stdenv.buildPlatform.is32bit && ((builtins.elem "ec2" apis) || (builtins.elem "*" apis));
  };
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@ -156,7 +156,7 @@ stdenv.mkDerivation (finalAttrs: {
    description = "Library for image loading and manipulation";
    homepage = "https://gitlab.gnome.org/GNOME/gdk-pixbuf";
    license = licenses.lgpl21Plus;
-    maintainers = [ maintainers.eelco ] ++ teams.gnome.members;
+    maintainers = teams.gnome.members;
    mainProgram = "gdk-pixbuf-thumbnailer";
    pkgConfigModules = [ "gdk-pixbuf-2.0" ];
    platforms = platforms.unix;
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@ -294,7 +294,7 @@ stdenv.mkDerivation ({

    license = licenses.lgpl2Plus;

-    maintainers = with maintainers; [ eelco ma27 connorbaker ];
+    maintainers = with maintainers; [ ma27 connorbaker ];
    platforms = platforms.linux;
  } // (args.meta or {});
 })
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
    description = "OpenType text shaping engine";
    homepage = "https://harfbuzz.github.io/";
    changelog = "https://github.com/harfbuzz/harfbuzz/raw/${finalAttrs.version}/NEWS";
-    maintainers = [ maintainers.eelco ];
+    maintainers = [ ];
    license = licenses.mit;
    platforms = platforms.unix ++ platforms.windows;
    pkgConfigModules = [
--- a/pkgs/development/libraries/json-fortran/default.nix
+++ b/pkgs/development/libraries/json-fortran/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "json-fortran";
-  version = "9.0.1";
+  version = "9.0.2";

  src = fetchFromGitHub {
    owner = "jacobwilliams";
    repo = pname;
    rev = version;
-    hash = "sha256-nhT2zLyt3ORi35h9KzOiIuD50GGUCZ/Z5SX8UF3rqQs=";
+    hash = "sha256-mAdagehmj1s6nTDaJqwaYrirfkyIwiTWYge0ZWQBc6g=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch
+++ b/pkgs/development/libraries/kissfft/0001-pkgconfig-darwin.patch
@ -1,48 +0,0 @@
-From c0dc376be9154d143574a818417ceed23308b5f2 Mon Sep 17 00:00:00 2001
-From: OPNA2608 <christoph.neidahl@gmail.com>
-Date: Sun, 18 Apr 2021 01:45:20 +0200
-Subject: [PATCH] pkgconfig darwin
-
---
- Makefile | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 971c6d6..0f4be0c 100644
--- a/Makefile
-+++ b/Makefile
-@@ -153,7 +153,6 @@ endif
- # -DKISS_FFT_BUILD to TYPEFLAGS
- #
- 
-ifneq ($(shell uname -s),Darwin)
- 	PKGCONFIG_KISSFFT_VERSION = $(KFVER_MAJOR).$(KFVER_MINOR).$(KFVER_PATCH)
- 	PKGCONFIG_KISSFFT_OUTPUT_NAME = $(KISSFFTLIB_SHORTNAME)
- 	PKGCONFIG_PKG_KISSFFT_DEFS = $(TYPEFLAGS)
-@@ -170,7 +169,6 @@ ifneq ($(shell uname -s),Darwin)
- 	PKGCONFIG_KISSFFT_LIBDIR = $(ABS_LIBDIR)
-   endif
- 	PKGCONFIG_KISSFFT_PKGINCLUDEDIR = $${includedir}/kissfft
-endif
- 
- export TYPEFLAGS
- 
-@@ -226,7 +224,6 @@ ifneq ($(KISSFFT_STATIC), 1)
- 	ln -sf $(KISSFFTLIB_NAME) $(KISSFFTLIB_SODEVELNAME)
-   endif
- endif
-ifneq ($(shell uname -s),Darwin)
- 	mkdir "$(ABS_LIBDIR)/pkgconfig"
- 	sed \
- 		-e 's+@PKGCONFIG_KISSFFT_VERSION@+$(PKGCONFIG_KISSFFT_VERSION)+' \
-@@ -238,7 +235,6 @@ ifneq ($(shell uname -s),Darwin)
- 		-e 's+@PKGCONFIG_KISSFFT_LIBDIR@+$(PKGCONFIG_KISSFFT_LIBDIR)+' \
- 		-e 's+@PKGCONFIG_KISSFFT_PKGINCLUDEDIR@+$(PKGCONFIG_KISSFFT_PKGINCLUDEDIR)+' \
- 		kissfft.pc.in 1>"$(ABS_LIBDIR)/pkgconfig/$(KISSFFT_PKGCONFIG)"
-endif
- ifneq ($(KISSFFT_TOOLS), 0)
- 	make -C tools install
- endif
-- 
-2.29.3
-
--- a/pkgs/development/libraries/kissfft/default.nix
+++ b/pkgs/development/libraries/kissfft/default.nix
@ -1,85 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fftw
-, fftwFloat
-, python3
-, datatype ? "double"
-, withTools ? false
-, libpng
-, enableStatic ? stdenv.hostPlatform.isStatic
-, enableOpenmp ? false
-, llvmPackages
-}:
-let
-  py = python3.withPackages (ps: with ps; [ numpy ]);
-  option = cond: if cond then "1" else "0";
-in
-stdenv.mkDerivation rec {
-  pname = "kissfft-${datatype}${lib.optionalString enableOpenmp "-openmp"}";
-  version = "131.1.0";
-
-  src = fetchFromGitHub {
-    owner = "mborgerding";
-    repo = "kissfft";
-    rev = version;
-    sha256 = "1yfws5bn4kh62yk6hdyp9h9775l6iz7wsfisbn58jap6b56s8j5s";
-  };
-
-  patches = [
-    ./0001-pkgconfig-darwin.patch
-  ];
-
-  # https://bugs.llvm.org/show_bug.cgi?id=45034
-  postPatch = lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.cc.isClang && lib.versionOlder stdenv.cc.version "10") ''
-    substituteInPlace test/Makefile \
-      --replace "-ffast-math" ""
-  ''
-  + lib.optionalString (stdenv.hostPlatform.isDarwin) ''
-    substituteInPlace test/Makefile \
-      --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH"
-    # Don't know how to make math.h's double long constants available
-    substituteInPlace test/testcpp.cc \
-      --replace "M_PIl" "M_PI"
-  '';
-
-  makeFlags = [
-    "PREFIX=${placeholder "out"}"
-    "KISSFFT_DATATYPE=${datatype}"
-    "KISSFFT_TOOLS=${option withTools}"
-    "KISSFFT_STATIC=${option enableStatic}"
-    "KISSFFT_OPENMP=${option enableOpenmp}"
-  ];
-
-  buildInputs = lib.optionals (withTools && datatype != "simd") [ libpng ]
-    # TODO: This may mismatch the LLVM version in the stdenv, see #79818.
-    ++ lib.optional (enableOpenmp && stdenv.cc.isClang) llvmPackages.openmp;
-
-  doCheck = true;
-
-  nativeCheckInputs = [
-    py
-    (if datatype == "float" then fftwFloat else fftw)
-  ];
-
-  checkFlags = [ "testsingle" ];
-
-  postInstall = ''
-    ln -s ${pname}.pc $out/lib/pkgconfig/kissfft.pc
-  '';
-
-  # Tools can't find kissfft libs on Darwin
-  postFixup = lib.optionalString (withTools && stdenv.hostPlatform.isDarwin) ''
-    for bin in $out/bin/*; do
-      install_name_tool -change lib${pname}.dylib $out/lib/lib${pname}.dylib $bin
-    done
-  '';
-
-  meta = with lib; {
-    description = "Mixed-radix Fast Fourier Transform based up on the KISS principle";
-    homepage = "https://github.com/mborgerding/kissfft";
-    license = licenses.bsd3;
-    maintainers = [ ];
-    platforms = platforms.all;
-  };
-}
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/pkgs/development/libraries/libgudev/default.nix
@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
  meta = with lib; {
    description = "Library that provides GObject bindings for libudev";
    homepage = "https://gitlab.gnome.org/GNOME/libgudev";
-    maintainers = [ maintainers.eelco ] ++ teams.gnome.members;
+    maintainers = teams.gnome.members;
    platforms = platforms.linux;
    license = licenses.lgpl2Plus;
  };
--- a/pkgs/development/libraries/libmicrohttpd/generic.nix
+++ b/pkgs/development/libraries/libmicrohttpd/generic.nix
@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {

    homepage = "https://www.gnu.org/software/libmicrohttpd/";

-    maintainers = with maintainers; [ eelco fpletz ];
+    maintainers = with maintainers; [ fpletz ];
    platforms = platforms.unix;
  } // meta;
 })
--- a/pkgs/development/libraries/libpqxx/6.nix
+++ b/pkgs/development/libraries/libpqxx/6.nix
@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
    homepage = "https://pqxx.org/development/libpqxx/";
    license = lib.licenses.bsd3;
    platforms = lib.platforms.unix;
-    maintainers = [ lib.maintainers.eelco ];
+    maintainers = [ ];
  };
 }
--- a/Show More
+++ b/Show More