Merge master into haskell-updates

2024-09-19 00:15:39 +00:00 · 2024-09-19 00:15:39 +00:00 · 273bbacaef
commit 273bbacaef
parent bb260f91c4 db8da26fb9
212 changed files with 5357 additions and 5236 deletions
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@ -270,6 +270,12 @@
    - changed-files:
      - any-glob-to-any-file:
        - .github/**/*
+        - CONTRIBUTING.md
+        - pkgs/README.md
+        - nixos/README.md
+        - maintainers/README.md
+        - lib/README.md
+        - doc/README.md

 "6.topic: printing":
  - any:
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@ -429,8 +429,8 @@ checkConfigOutput '^null$' config.value.l1.l2.foo ./types-anything/nested-attrs.
 checkConfigOutput '^null$' config.value.l1.l2.l3.foo ./types-anything/nested-attrs.nix
 # Attribute sets that are coercible to strings shouldn't be recursed into
 checkConfigOutput '^"foo"$' config.value.outPath ./types-anything/attrs-coercible.nix
-# Multiple lists aren't concatenated together
-checkConfigError 'The option .* has conflicting definitions' config.value ./types-anything/lists.nix
+# Multiple lists aren't concatenated together if their definitions are not equal
+checkConfigError 'The option .* has conflicting definition values' config.value ./types-anything/lists.nix
 # Check that all equalizable atoms can be used as long as all definitions are equal
 checkConfigOutput '^0$' config.value.int ./types-anything/equal-atoms.nix
 checkConfigOutput '^false$' config.value.bool ./types-anything/equal-atoms.nix
@ -438,6 +438,7 @@ checkConfigOutput '^""$' config.value.string ./types-anything/equal-atoms.nix
 checkConfigOutput '^"/[^"]+"$' config.value.path ./types-anything/equal-atoms.nix
 checkConfigOutput '^null$' config.value.null ./types-anything/equal-atoms.nix
 checkConfigOutput '^0.1$' config.value.float ./types-anything/equal-atoms.nix
+checkConfigOutput '^\[1,"a",{"x":null}\]$' config.value.list ./types-anything/equal-atoms.nix
 # Functions can't be merged together
 checkConfigError "The option .value.multiple-lambdas.<function body>. has conflicting option types" config.applied.multiple-lambdas ./types-anything/functions.nix
 checkConfigOutput '^true$' config.valueIsFunction.single-lambda ./types-anything/functions.nix
--- a/lib/tests/modules/types-anything/equal-atoms.nix
+++ b/lib/tests/modules/types-anything/equal-atoms.nix
@ -12,6 +12,7 @@
      value.path = ./.;
      value.null = null;
      value.float = 0.1;
+      value.list = [1 "a" {x=null;}];
    }
    {
      value.int = 0;
@ -20,6 +21,7 @@
      value.path = ./.;
      value.null = null;
      value.float = 0.1;
+      value.list = [1 "a" {x=null;}];
    }
  ];

--- a/lib/tests/modules/types-anything/lists.nix
+++ b/lib/tests/modules/types-anything/lists.nix
@ -6,10 +6,10 @@

  config = lib.mkMerge [
    {
-      value = [ null ];
+      value = [ "a value" ];
    }
    {
-      value = [ null ];
+      value = [ "another value" ];
    }
  ];

--- a/lib/types.nix
+++ b/lib/types.nix
@ -253,12 +253,6 @@ rec {
          mergeFunction = {
            # Recursively merge attribute sets
            set = (attrsOf anything).merge;
-            # Safe and deterministic behavior for lists is to only accept one definition
-            # listOf only used to apply mkIf and co.
-            list =
-              if length defs > 1
-              then throw "The option `${showOption loc}' has conflicting definitions, in ${showFiles (getFiles defs)}."
-              else (listOf anything).merge;
            # This is the type of packages, only accept a single definition
            stringCoercibleSet = mergeOneOption;
            lambda = loc: defs: arg: anything.merge
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -12478,12 +12478,6 @@
    githubId = 7910815;
    name = "Alex McGrath";
  };
-  lychee = {
-    email = "itslychee+nixpkgs@protonmail.com";
-    githubId = 82718618;
-    github = "itslychee";
-    name = "Lychee";
-  };
  lyndeno = {
    name = "Lyndon Sanche";
    email = "lsanche@lyndeno.ca";
@ -16477,6 +16471,12 @@
    githubId = 20472367;
    name = "Peter Hebden";
  };
+  pixelsergey = {
+    email = "sergey.ichtchenko@gmail.com";
+    github = "PixelSergey";
+    githubId = 14542417;
+    name = "Sergey Ichtchenko";
+  };
  pjbarnoy = {
    email = "pjbarnoy@gmail.com";
    github = "waaamb";
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@ -46,6 +46,16 @@
  If you experience any issues, please report them.
  The original Perl script can still be used for now by setting `system.switch.enableNg` to `false`.

+- The [Xen Hypervisor](https://xenproject.org) is once again available as a virtualisation option under [`virtualisation.xen`](#opt-virtualisation.xen.enable).
+  - This release includes Xen [4.17.5](https://wiki.xenproject.org/wiki/Xen_Project_4.17_Release_Notes), [4.18.3](https://wiki.xenproject.org/wiki/Xen_Project_4.18_Release_Notes) and [4.19.0](https://wiki.xenproject.org/wiki/Xen_Project_4.19_Release_Notes), as well as support for booting the hypervisor on EFI systems.
+  ::: {.warning}
+      Booting into Xen through a legacy BIOS bootloader or with the legacy script-based Stage 1 initrd have been **deprecated**. Only EFI booting and the new systemd-based Stage 1 initrd are supported.
+  :::
+  - There are two flavours of Xen available by default: `xen`, which includes all built-in components, and `xen-slim`, which replaces the built-in components with their Nixpkgs equivalents.
+    - The `qemu-xen-traditional` component has been deprecated by upstream Xen, and is no longer available in any of the Xen packages.
+  - The OCaml-based Xen Store can now be configured using  [`virtualisation.xen.store.settings`](#opt-virtualisation.xen.store.settings).
+  - The `virtualisation.xen.bridge` options have been deprecated in this release cycle. Users who need network bridges are encouraged to set up their own networking configurations.
+
 ## New Modules {#sec-release-24.11-new-modules}

 - [TaskChampion Sync-Server](https://github.com/GothenburgBitFactory/taskchampion-sync-server), a [Taskwariror 3](https://taskwarrior.org/docs/upgrade-3/) sync server, replacing Taskwarrior 2's sync server named [`taskserver`](https://github.com/GothenburgBitFactory/taskserver).
@ -87,6 +97,8 @@

 - [HomeBox](https://github.com/sysadminsmedia/homebox): the inventory and organization system built for the Home User. Available as [services.homebox](#opt-services.homebox.enable).

+- [matrix-hookshot](https://matrix-org.github.io/matrix-hookshot), a Matrix bot for connecting to external services. Available as [services.matrix-hookshot](#opt-services.matrix-hookshot.enable).
+
 - [Renovate](https://github.com/renovatebot/renovate), a dependency updating tool for various git forges and language ecosystems. Available as [services.renovate](#opt-services.renovate.enable).

 - [Music Assistant](https://music-assistant.io/), a music library manager for your offline and online music sources which can easily stream your favourite music to a wide range of supported players. Available as [services.music-assistant](#opt-services.music-assistant.enable).
@ -510,6 +522,8 @@
 - Cinnamon has been updated to 6.2, please check [upstream announcement](https://www.linuxmint.com/rel_wilma_whatsnew.php) for more details.
  Following Mint 22 defaults, the Cinnamon module no longer ships geary and hexchat by default.

+- `zfs.latestCompatibleLinuxPackages` is deprecated and is now pointing at the default kernel. If using the stable LTS kernel (default `linuxPackages` is not possible then you must explicitly pin a specific kernel release. For example, `boot.kernelPackages = pkgs.linuxPackages_6_6`. Please be aware that non-LTS kernels are likely to go EOL before ZFS supports the latest supported non-LTS release, requiring manual intervention.
+
 - The `shadowstack` hardening flag has been added, though disabled by default.

 - `xxd` is now provided by the `tinyxxd` package, rather than `vim.xxd`, to reduce closure size and vulnerability impact. Since it has the same options and semantics as Vim's `xxd` utility, there is no user impact. Vim's `xxd` remains available as the `vim.xxd` package.
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@ -265,6 +265,7 @@
  ./programs/pqos-wrapper.nix
  ./programs/projecteur.nix
  ./programs/proxychains.nix
+  ./programs/pulseview.nix
  ./programs/qdmr.nix
  ./programs/qgroundcontrol.nix
  ./programs/qt5ct.nix
@ -698,6 +699,7 @@
  ./services/matrix/conduit.nix
  ./services/matrix/dendrite.nix
  ./services/matrix/hebbot.nix
+  ./services/matrix/hookshot.nix
  ./services/matrix/maubot.nix
  ./services/matrix/mautrix-facebook.nix
  ./services/matrix/mautrix-meta.nix
--- a/nixos/modules/programs/pulseview.nix
+++ b/nixos/modules/programs/pulseview.nix
@ -0,0 +1,28 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.programs.pulseview;
+in
+{
+  options.programs.pulseview = {
+    enable = lib.mkEnableOption "pulseview, a sigrok GUI";
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [
+      pkgs.pulseview
+    ];
+
+    services.udev = {
+      packages = [
+        # Pulseview needs some udev rules provided by libsigrok to access devices
+        pkgs.libsigrok
+      ];
+    };
+  };
+}
--- a/nixos/modules/programs/yubikey-touch-detector.nix
+++ b/nixos/modules/programs/yubikey-touch-detector.nix
@ -1,9 +1,44 @@
-{ config, lib, pkgs, ... }:
-let cfg = config.programs.yubikey-touch-detector;
-in {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib) types;
+  cfg = config.programs.yubikey-touch-detector;
+in
+{
  options = {
    programs.yubikey-touch-detector = {
+
      enable = lib.mkEnableOption "yubikey-touch-detector";
+
+      libnotify = lib.mkOption {
+        # This used to be true previously and using libnotify would be a sane default.
+        default = true;
+        type = types.bool;
+        description = ''
+          If set to true, yubikey-touch-detctor will send notifications using libnotify
+        '';
+      };
+
+      unixSocket = lib.mkOption {
+        default = true;
+        type = types.bool;
+        description = ''
+          If set to true, yubikey-touch-detector will send notifications to a unix socket
+        '';
+      };
+
+      verbose = lib.mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enables verbose logging
+        '';
+      };
+
    };
  };

@ -12,6 +47,13 @@ in {

    systemd.user.services.yubikey-touch-detector = {
      path = [ pkgs.gnupg ];
+
+      environment = {
+        YUBIKEY_TOUCH_DETECTOR_LIBNOTIFY = builtins.toString cfg.libnotify;
+        YUBIKEY_TOUCH_DETECTOR_NOSOCKET = builtins.toString (!cfg.unixSocket);
+        YUBIKEY_TOUCH_DETECTOR_VERBOSE = builtins.toString cfg.verbose;
+      };
+
      wantedBy = [ "graphical-session.target" ];
    };
    systemd.user.sockets.yubikey-touch-detector = {
--- a/nixos/modules/services/matrix/hookshot.nix
+++ b/nixos/modules/services/matrix/hookshot.nix
@ -0,0 +1,127 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  cfg = config.services.matrix-hookshot;
+  settingsFormat = pkgs.formats.yaml { };
+  configFile = settingsFormat.generate "matrix-hookshot-config.yml" cfg.settings;
+in
+{
+  options = {
+    services.matrix-hookshot = {
+      enable = lib.mkEnableOption "matrix-hookshot, a bridge between Matrix and project management services";
+
+      package = lib.mkPackageOption pkgs "matrix-hookshot" { };
+
+      registrationFile = lib.mkOption {
+        type = lib.types.path;
+        description = ''
+          Appservice registration file.
+          As it contains secret tokens, you may not want to add this to the publicly readable Nix store.
+        '';
+        example = lib.literalExpression ''
+          pkgs.writeText "matrix-hookshot-registration" \'\'
+            id: matrix-hookshot
+            as_token: aaaaaaaaaa
+            hs_token: aaaaaaaaaa
+            namespaces:
+              rooms: []
+              users:
+                - regex: "@_webhooks_.*:foobar"
+                  exclusive: true
+
+            sender_localpart: hookshot
+            url: "http://localhost:9993"
+            rate_limited: false
+            \'\'
+        '';
+      };
+
+      settings = lib.mkOption {
+        description = ''
+          {file}`config.yml` configuration as a Nix attribute set.
+
+          For details please see the [documentation](https://matrix-org.github.io/matrix-hookshot/latest/setup/sample-configuration.html).
+        '';
+        example = {
+          bridge = {
+            domain = "example.com";
+            url = "http://localhost:8008";
+            mediaUrl = "https://example.com";
+            port = 9993;
+            bindAddress = "127.0.0.1";
+          };
+          listeners = [
+            {
+              port = 9000;
+              bindAddress = "0.0.0.0";
+              resources = [ "webhooks" ];
+            }
+            {
+              port = 9001;
+              bindAddress = "localhost";
+              resources = [
+                "metrics"
+                "provisioning"
+              ];
+            }
+          ];
+        };
+        default = { };
+        type = lib.types.submodule {
+          freeformType = settingsFormat.type;
+          options = {
+            passFile = lib.mkOption {
+              type = lib.types.path;
+              default = "/var/lib/matrix-hookshot/passkey.pem";
+              description = ''
+                A passkey used to encrypt tokens stored inside the bridge.
+                File will be generated if not found.
+              '';
+            };
+          };
+        };
+      };
+
+      serviceDependencies = lib.mkOption {
+        type = with lib.types; listOf str;
+        default = lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;
+        defaultText = lib.literalExpression ''
+          lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit
+        '';
+        description = ''
+          List of Systemd services to require and wait for when starting the application service,
+          such as the Matrix homeserver if it's running on the same host.
+        '';
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.services.matrix-hookshot = {
+      description = "a bridge between Matrix and multiple project management services";
+
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "network-online.target" ] ++ cfg.serviceDependencies;
+      after = [ "network-online.target" ] ++ cfg.serviceDependencies;
+
+      preStart = ''
+        if [ ! -f '${cfg.settings.passFile}' ]; then
+          mkdir -p $(dirname '${cfg.settings.passFile}')
+          ${pkgs.openssl}/bin/openssl genpkey -out '${cfg.settings.passFile}' -outform PEM -algorithm RSA -pkeyopt rsa_keygen_bits:4096
+        fi
+      '';
+
+      serviceConfig = {
+        Type = "simple";
+        Restart = "always";
+        ExecStart = "${cfg.package}/bin/matrix-hookshot ${configFile} ${cfg.registrationFile}";
+      };
+    };
+  };
+
+  meta.maintainers = with lib.maintainers; [ flandweber ];
+}
--- a/nixos/modules/services/misc/mediatomb.nix
+++ b/nixos/modules/services/misc/mediatomb.nix
@ -36,7 +36,6 @@ let
        <transcode mimetype="video/x-flv" using="vlcmpeg" />
        <transcode mimetype="application/ogg" using="vlcmpeg" />
        <transcode mimetype="audio/ogg" using="ogg2mp3" />
-        <transcode mimetype="audio/x-flac" using="oggflac2raw"/>
      </mimetype-profile-mappings>
      <profiles>
        <profile name="ogg2mp3" enabled="no" type="external">
@ -52,7 +51,7 @@ let
          <accept-url>yes</accept-url>
          <first-resource>yes</first-resource>
          <accept-ogg-theora>yes</accept-ogg-theora>
-          <agent command="${libsForQt5.vlc}/bin/vlc"
+          <agent command="${lib.getExe vlc}"
            arguments="-I dummy %in --sout #transcode{venc=ffmpeg,vcodec=mp2v,vb=4096,fps=25,aenc=ffmpeg,acodec=mpga,ab=192,samplerate=44100,channels=2}:standard{access=file,mux=ps,dst=%out} vlc:quit" />
          <buffer size="14400000" chunk-size="512000" fill-size="120000" />
        </profile>
--- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix
+++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix
@ -54,6 +54,30 @@ in
        '';
      };

+      mirroredBoots = mkOption {
+        default = [ { path = "/boot"; } ];
+        example = [
+          { path = "/boot1"; }
+          { path = "/boot2"; }
+        ];
+        description = ''
+          Mirror the boot configuration to multiple paths.
+        '';
+
+        type = with types; listOf (submodule {
+          options = {
+            path = mkOption {
+              example = "/boot1";
+              type = types.str;
+              description = ''
+                The path to the boot directory where the extlinux-compatible
+                configuration files will be written.
+              '';
+            };
+          };
+        });
+      };
+
      populateCmd = mkOption {
        type = types.str;
        readOnly = true;
@ -72,11 +96,27 @@ in
    builderArgs = "-g ${toString cfg.configurationLimit} -t ${timeoutStr}"
      + lib.optionalString (dtCfg.name != null) " -n ${dtCfg.name}"
      + lib.optionalString (!cfg.useGenerationDeviceTree) " -r";
+    installBootLoader = pkgs.writeScript "install-extlinux-conf.sh" (''
+      #!${pkgs.runtimeShell}
+      set -e
+    '' + flip concatMapStrings cfg.mirroredBoots (args: ''
+      ${builder} ${builderArgs} -d '${args.path}' -c "$@"
+    ''));
  in
    mkIf cfg.enable {
-      system.build.installBootLoader = "${builder} ${builderArgs} -c";
+      system.build.installBootLoader = installBootLoader;
      system.boot.loader.id = "generic-extlinux-compatible";

      boot.loader.generic-extlinux-compatible.populateCmd = "${populateBuilder} ${builderArgs}";
+
+      assertions = [
+        {
+          assertion = cfg.mirroredBoots != [ ];
+          message = ''
+            You must not remove all elements from option 'boot.loader.generic-extlinux-compatible.mirroredBoots',
+            otherwise the system will not be bootable.
+          '';
+        }
+      ];
    };
 }
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@ -75,6 +75,11 @@ in {
      after = [ "multi-user.target" ];
      requires = [ "network-online.target" ];

+      path = [
+        "/run/wrappers"
+        "/run/current-system/sw"
+      ];
+
      restartIfChanged = false;
      unitConfig.X-StopOnRemoval = false;

--- a/nixos/modules/virtualisation/xen-boot-builder.sh
+++ b/nixos/modules/virtualisation/xen-boot-builder.sh
@ -0,0 +1,165 @@
+# This script is called by ./xen-dom0.nix to create the Xen boot entries.
+# shellcheck shell=bash
+
+# Handle input argument and exit if the flag is invalid. See virtualisation.xen.efi.bootBuilderVerbosity below.
+[[ $# -ne 1 ]] && echo -e "\e[1;31merror:\e[0m xenBootBuilder must be called with exactly one verbosity argument. See the \e[1;34mvirtualisation.xen.efi.bootBuilderVerbosity\e[0m option." && exit 1
+case "$1" in
+    "quiet") true ;;
+    "default" | "info") echo -n "Installing Xen Hypervisor boot entries..." ;;
+    "debug") echo -e "\e[1;34mxenBootBuilder:\e[0m called with the '$1' flag" ;;
+    *)
+        echo -e "\e[1;31merror:\e[0m xenBootBuilder was called with an invalid argument. See the \e[1;34mvirtualisation.xen.efi.bootBuilderVerbosity\e[0m option."
+        exit 2
+        ;;
+esac
+
+# Get the current Xen generations and store them in an array. This will be used
+# for displaying the diff later, if xenBootBuilder was called with `info`.
+# We also delete the current Xen entries here, as they'll be rebuilt later if
+# the corresponding NixOS generation still exists.
+mapfile -t preGenerations < <(find "$efiMountPoint"/loader/entries -type f -name 'xen-*.conf' | sort -V | sed 's_/loader/entries/nixos_/loader/entries/xen_g;s_^.*/xen_xen_g;s_.conf$__g')
+if [ "$1" = "debug" ]; then
+    if ((${#preGenerations[@]} == 0)); then
+        echo -e "\e[1;34mxenBootBuilder:\e[0m no previous Xen entries."
+    else
+        echo -e "\e[1;34mxenBootBuilder:\e[0m deleting the following stale xen entries:" && for debugGen in "${preGenerations[@]}"; do echo "                - $debugGen"; done
+    fi
+fi
+
+# Cleanup all Xen entries.
+rm -f "$efiMountPoint"/{loader/entries/xen-*.conf,efi/nixos/xen-*.efi}
+
+# Main array for storing which generations exist in $efiMountPoint after
+# systemd-boot-builder.py builds the main entries.
+mapfile -t gens < <(find "$efiMountPoint"/loader/entries -type f -name 'nixos-*.conf' | sort -V)
+[ "$1" = "debug" ] && echo -e "\e[1;34mxenBootBuilder:\e[0m found the following NixOS boot entries:" && for debugGen in "${gens[@]}"; do echo "                - $debugGen"; done
+
+# This is the main loop that installs the Xen entries.
+for gen in "${gens[@]}"; do
+
+    # We discover the path to Bootspec through the init attribute in the entries,
+    # as it is equivalent to $toplevel/init.
+    bootspecFile="$(sed -nr 's/^options init=(.*)\/init.*$/\1/p' "$gen")/boot.json"
+    [ "$1" = "debug" ] && echo -e "\e[1;34mxenBootBuilder:\e[0m processing bootspec file $bootspecFile"
+
+    # We do nothing if the Bootspec for the current $gen does not contain the Xen
+    # extension, which is added as a configuration attribute below.
+    if grep -sq '"org.xenproject.bootspec.v1"' "$bootspecFile"; then
+        [ "$1" = "debug" ] && echo -e "                \e[1;32msuccess:\e[0m found Xen entries in $gen."
+
+        # TODO: Support DeviceTree booting. Xen has some special handling for DeviceTree
+        # attributes, which will need to be translated in a boot script similar to this
+        # one. Having a DeviceTree entry is rare, and it is not always required for a
+        # successful boot, so we don't fail here, only warn with `debug`.
+        if grep -sq '"devicetree"' "$bootspecFile"; then
+            echo -e "\n\e[1;33mwarning:\e[0m $gen has a \e[1;34morg.nixos.systemd-boot.devicetree\e[0m Bootspec entry. Xen currently does not support DeviceTree, so this value will be ignored in the Xen boot entries, which may cause them to \e[1;31mfail to boot\e[0m."
+        else
+            [ "$1" = "debug" ] && echo -e "\e[1;34mxenBootBuilder:\e[0m no DeviceTree entries found in $gen."
+        fi
+
+        # Prepare required attributes for `xen.cfg/xen.conf`. It inherits the name of
+        # the corresponding nixos generation, substituting `nixos` with `xen`:
+        # `xen-$profile-generation-$number-specialisation-$specialisation.{cfg,conf}`
+        xenGen=$(echo "$gen" | sed 's_/loader/entries/nixos_/loader/entries/xen_g;s_^.*/xen_xen_g;s_.conf$__g')
+        bootParams=$(jq -re '."org.xenproject.bootspec.v1".xenParams | join(" ")' "$bootspecFile")
+        kernel=$(jq -re '."org.nixos.bootspec.v1".kernel | sub("^/nix/store/"; "") | sub("/bzImage"; "-bzImage.efi")' "$bootspecFile")
+        kernelParams=$(jq -re '."org.nixos.bootspec.v1".kernelParams | join(" ")' "$bootspecFile")
+        initrd=$(jq -re '."org.nixos.bootspec.v1".initrd | sub("^/nix/store/"; "") | sub("/initrd"; "-initrd.efi")' "$bootspecFile")
+        init=$(jq -re '."org.nixos.bootspec.v1".init' "$bootspecFile")
+        title=$(sed -nr 's/^title (.*)$/\1/p' "$gen")
+        version=$(sed -nr 's/^version (.*)$/\1/p' "$gen")
+        machineID=$(sed -nr 's/^machine-id (.*)$/\1/p' "$gen")
+        sortKey=$(sed -nr 's/^sort-key (.*)$/\1/p' "$gen")
+
+        # Write `xen.cfg` to a temporary location prior to UKI creation.
+        tmpCfg=$(mktemp)
+        [ "$1" = "debug" ] && echo -ne "\e[1;34mxenBootBuilder:\e[0m writing $xenGen.cfg to temporary file..."
+        cat > "$tmpCfg" << EOF
+[global]
+default=xen
+
+[xen]
+options=$bootParams
+kernel=$kernel init=$init $kernelParams
+ramdisk=$initrd
+EOF
+        [ "$1" = "debug" ] && echo -e "done."
+
+        # Create Xen UKI for $generation. Most of this is lifted from
+        # https://xenbits.xenproject.org/docs/unstable/misc/efi.html.
+        [ "$1" = "debug" ] && echo -e "\e[1;34mxenBootBuilder:\e[0m making Xen UKI..."
+        xenEfi=$(jq -re '."org.xenproject.bootspec.v1".xen' "$bootspecFile")
+        padding=$(objdump --header --section=".pad" "$xenEfi" | awk '/\.pad/ { printf("0x%016x\n", strtonum("0x"$3) + strtonum("0x"$4))};')
+        [ "$1" = "debug" ] && echo "               - padding: $padding"
+        objcopy \
+            --add-section .config="$tmpCfg" \
+            --change-section-vma .config="$padding" \
+            "$xenEfi" \
+            "$efiMountPoint"/EFI/nixos/"$xenGen".efi
+        [ "$1" = "debug" ] && echo -e "               - \e[1;32msuccessfully built\e[0m $xenGen.efi"
+        rm -f "$tmpCfg"
+
+        # Write `xen.conf`.
+        [ "$1" = "debug" ] && echo -ne "\e[1;34mxenBootBuilder:\e[0m writing $xenGen.conf to EFI System Partition..."
+        cat > "$efiMountPoint"/loader/entries/"$xenGen".conf << EOF
+title $title (with Xen Hypervisor)
+version $version
+efi /EFI/nixos/$xenGen.efi
+machine-id $machineID
+sort-key $sortKey
+EOF
+        [ "$1" = "debug" ] && echo -e "done."
+
+    # Sometimes, garbage collection weirdness causes a generation to still exist in
+    # the loader entries, but its Bootspec file was deleted. We consider such a
+    # generation to be invalid, but we don't write extra code to handle this
+    # situation, as supressing grep's error messages above is quite enough, and the
+    # error message below is still technically correct, as no Xen can be found in
+    # something that does not exist.
+    else
+        [ "$1" = "debug" ] && echo -e "                \e[1;33mwarning:\e[0m \e[1;31mno Xen found\e[0m in $gen."
+    fi
+done
+
+# Counterpart to the preGenerations array above. We use it to diff the
+# generations created/deleted when callled with the `info` argument.
+mapfile -t postGenerations < <(find "$efiMountPoint"/loader/entries -type f -name 'xen-*.conf' | sort -V | sed 's_/loader/entries/nixos_/loader/entries/xen_g;s_^.*/xen_xen_g;s_.conf$__g')
+
+# In the event the script does nothing, guide the user to debug, as it'll only
+# ever run when Xen is enabled, and it makes no sense to enable Xen and not have
+# any hypervisor boot entries.
+if ((${#postGenerations[@]} == 0)); then
+    case "$1" in
+        "default" | "info") echo "none found." && echo -e "If you believe this is an error, set the \e[1;34mvirtualisation.xen.efi.bootBuilderVerbosity\e[0m option to \e[1;34m\"debug\"\e[0m and rebuild to print debug logs." ;;
+        "debug") echo -e "\e[1;34mxenBootBuilder:\e[0m wrote \e[1;31mno generations\e[0m. Most likely, there were no generations with a valid \e[1;34morg.xenproject.bootspec.v1\e[0m entry." ;;
+    esac
+
+# If the script is successful, change the default boot, say "done.", write a
+# diff, or print the total files written, depending on the argument this script
+# was called with. We use some dumb dependencies here, like `diff` or `bat` for
+# colourisation, but they're only included  with the `info` argument.
+#
+# It's also fine to change the default here, as this runs after the
+# `systemd-boot-builder.py` script, which overwrites the file, and this script
+# does not run after an user disables the Xen module.
+else
+    sed --in-place 's/^default nixos-/default xen-/g' "$efiMountPoint"/loader/loader.conf
+    case "$1" in
+        "default" | "info") echo "done." ;;
+        "debug") echo -e "\e[1;34mxenBootBuilder:\e[0m \e[1;32msuccessfully wrote\e[0m the following generations:" && for debugGen in "${postGenerations[@]}"; do echo "                - $debugGen"; done ;;
+    esac
+    if [ "$1" = "info" ]; then
+        if [[ ${#preGenerations[@]} == "${#postGenerations[@]}" ]]; then
+            echo -e "\e[1;33mNo Change:\e[0m Xen Hypervisor boot entries were refreshed, but their contents are identical."
+        else
+            echo -e "\e[1;32mSuccess:\e[0m Changed the following boot entries:"
+            # We briefly unset errexit and pipefail here, as GNU diff has no option to not fail when files differ.
+            set +o errexit
+            set +o pipefail
+            diff <(echo "${preGenerations[*]}" | tr ' ' '\n') <(echo "${postGenerations[*]}" | tr ' ' '\n') -U 0 | grep --invert-match --extended-regexp '^(@@|---|\+\+\+).*' | sed '1{/^-$/d}' | bat --language diff --theme ansi --paging=never --plain
+            true
+            set -o errexit
+            set -o pipefail
+        fi
+    fi
+fi
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@ -685,7 +685,7 @@ in {
  nix-misc = handleTest ./nix/misc.nix {};
  nix-upgrade = handleTest ./nix/upgrade.nix {inherit (pkgs) nixVersions;};
  nix-required-mounts = runTest ./nix-required-mounts;
-  nix-serve = handleTest ./nix-serve.nix {};
+  nix-serve = runTest ./nix-serve.nix;
  nix-serve-ssh = handleTest ./nix-serve-ssh.nix {};
  nixops = handleTest ./nixops/default.nix {};
  nixos-generate-config = handleTest ./nixos-generate-config.nix {};
--- a/nixos/tests/nix-serve.nix
+++ b/nixos/tests/nix-serve.nix
@ -1,4 +1,4 @@
-import ./make-test-python.nix ({ pkgs, ... }:
+{ config, ... }:
 {
  name = "nix-serve";
  nodes.machine = { pkgs, ... }: {
@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
  };
  testScript = let
    pkgHash = builtins.head (
-      builtins.match "${builtins.storeDir}/([^-]+).+" (toString pkgs.hello)
+      builtins.match "${builtins.storeDir}/([^-]+).+" (toString config.node.pkgs.hello)
    );
  in ''
    start_all()
@ -19,4 +19,4 @@ import ./make-test-python.nix ({ pkgs, ... }:
        "curl --fail -g http://0.0.0.0:5000/nar/${pkgHash}.nar -o /tmp/hello.nar"
    )
  '';
-})
+}
--- a/pkgs/applications/audio/waylyrics/default.nix
+++ b/pkgs/applications/audio/waylyrics/default.nix
@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "waylyrics";
-  version = "0.3.13";
+  version = "0.3.15";

  src = fetchFromGitHub {
    owner = "waylyrics";
    repo = "waylyrics";
    rev = "v${version}";
-    hash = "sha256-hx0g5JBf0v7B26GCcU5BkmxVvbHQNPSQ2d+ohDk3080=";
+    hash = "sha256-iW3NIPdnMoardC95kgU/jgzHy7qu/7wpJrkMdJE/r9U=";
  };

-  cargoHash = "sha256-v1+1ivbJAZLqnnFaR6vmpcZ7vd5j3afZliggXaHiwWM=";
+  cargoHash = "sha256-3nPLi7/F8AG5pqHHPHzLCbXKZFeV/Z+LR3nK2BbrlEE=";

  nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
  buildInputs = [ openssl dbus ];
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@ -46,6 +46,20 @@ lib.makeScope pkgs.newScope (self:
      withPgtk = true;
    };

+    emacs30 = callPackage (self.sources.emacs30) inheritedArgs;
+
+    emacs30-gtk3 = self.emacs30.override {
+      withGTK3 = true;
+    };
+
+    emacs30-nox = self.emacs30.override {
+      noGui = true;
+    };
+
+    emacs30-pgtk = self.emacs30.override {
+      withPgtk = true;
+    };
+
    emacs28-macport = callPackage (self.sources.emacs28-macport) inheritedArgs;

    emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs;
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@ -75,6 +75,8 @@
 , withGlibNetworking ? withPgtk || withGTK3 || (withX && withXwidgets)
 , withGpm ? stdenv.isLinux
 , withImageMagick ? lib.versionOlder version "27" && (withX || withNS)
+# Emacs 30+ has native JSON support
+, withJansson ? lib.versionOlder version "30"
 , withMailutils ? true
 , withMotif ? false
 , withNS ? stdenv.isDarwin && !(variant == "macport" || noGui)
@ -157,7 +159,9 @@ mkDerivation (finalAttrs: {
    (substituteAll {
      src = if lib.versionOlder finalAttrs.version "29"
            then ./native-comp-driver-options-28.patch
-            else ./native-comp-driver-options.patch;
+            else if lib.versionOlder finalAttrs.version "30"
+            then ./native-comp-driver-options.patch
+            else ./native-comp-driver-options-30.patch;
      backendPath = (lib.concatStringsSep " "
        (builtins.map (x: ''"-B${x}"'') ([
          # Paths necessary so the JIT compiler finds its libraries:
@ -212,13 +216,15 @@ mkDerivation (finalAttrs: {
  ] ++ lib.optionals srcRepo [
    autoreconfHook
    texinfo
-  ] ++ lib.optional (withPgtk || withX && (withGTK3 || withXwidgets)) wrapGAppsHook3;
+  ] ++ lib.optionals (withPgtk || withX && (withGTK3 || withXwidgets)) [ wrapGAppsHook3 ];

  buildInputs = [
    gettext
    gnutls
-    harfbuzz.dev
+    (lib.getDev harfbuzz)
+  ] ++ lib.optionals withJansson [
    jansson
+  ] ++ [
    libxml2
    ncurses
  ] ++ lib.optionals withAcl [
--- a/pkgs/applications/editors/emacs/native-comp-driver-options-30.patch
+++ b/pkgs/applications/editors/emacs/native-comp-driver-options-30.patch
@ -0,0 +1,16 @@
+diff -Naur a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
+--- old/lisp/emacs-lisp/comp.el	1969-12-31 21:00:01.000000000 -0300
+++ source/lisp/emacs-lisp/comp.el	2024-09-13 14:26:37.246614196 -0300
+@@ -101,8 +101,10 @@
+   :version "28.1")
+ 
+ (defcustom native-comp-driver-options
+-  (cond ((eq system-type 'darwin) '("-Wl,-w"))
+-        ((eq system-type 'cygwin) '("-Wl,-dynamicbase")))
+  (append
+   (cond ((eq system-type 'darwin) '("-Wl,-w"))
+         ((eq system-type 'cygwin) '("-Wl,-dynamicbase")))
+   '(@backendPath@))
+   "Options passed verbatim to the native compiler's back-end driver.
+ Note that not all options are meaningful; typically only the options
+ affecting the assembler and linker are likely to be useful.
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@ -110,6 +110,14 @@ in
    hash = "sha256-FCP6ySkN9mAdp2T09n6foS2OciqZXc/54guRZ0B4Z2s=";
  });

+  emacs30 = import ./make-emacs.nix (mkArgs {
+    pname = "emacs";
+    version = "30.0.91";
+    variant = "mainline";
+    rev = "30.0.91";
+    hash = "sha256-X5J34BUY42JgA1s76eVeGA9WNtesU2c+JyndIHFbONQ=";
+  });
+
  emacs28-macport = import ./make-emacs.nix (mkArgs {
    pname = "emacs-mac";
    version = "28.2";
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -6363,6 +6363,354 @@ final: prev:
    meta.homepage = "https://github.com/hadronized/mind.nvim/";
  };

+  mini-git = buildVimPlugin {
+    pname = "mini-git";
+    version = "2024-08-10";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini-git";
+      rev = "25651b097bedf519421f9744cdc91a693dfa463a";
+      sha256 = "0535awbbl8hxyi41iwj5w44jajvjiys28z2qgs1fczsgwbpwx6z1";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini-git/";
+  };
+
+  mini-ai = buildVimPlugin {
+    pname = "mini.ai";
+    version = "2024-08-06";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.ai";
+      rev = "a9b992b13d22a8db8df6beac25afa59a10b5584d";
+      sha256 = "12a9xyd3gj9qvll1fj4kv4cdv4jz1sfaxp176c73f2hlv4w4p6ri";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.ai/";
+  };
+
+  mini-align = buildVimPlugin {
+    pname = "mini.align";
+    version = "2024-07-01";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.align";
+      rev = "b54d88b16bfac62ca6b3d699566135639a3ca4fa";
+      sha256 = "1llrq86hbx299zbzfr04yrylrf5cqgpzanhiahb0mq3y5z0fpvcx";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.align/";
+  };
+
+  mini-animate = buildVimPlugin {
+    pname = "mini.animate";
+    version = "2024-07-01";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.animate";
+      rev = "320fb35460238c436407cd779f63abad98e84870";
+      sha256 = "1ksaln0r5lm5w4rxccbb4b3yz0ycgv67brbcnbkz2aifva1pza9y";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.animate/";
+  };
+
+  mini-base16 = buildVimPlugin {
+    pname = "mini.base16";
+    version = "2024-08-16";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.base16";
+      rev = "b434a7c03f1c3581bed8c17dbc512168920de5c6";
+      sha256 = "04lfciwlmrdzn58c49yshva6xyr46f4imnp4dh408cvdnw0j5yqv";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.base16/";
+  };
+
+  mini-basics = buildVimPlugin {
+    pname = "mini.basics";
+    version = "2024-07-01";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.basics";
+      rev = "1af88d68b9d9c8cbf0dde9bd7ad510b93eafd9aa";
+      sha256 = "0iynhxwc029lg62c3xfydpnnin2gnr4sbrxja4dj02j544y2kyss";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.basics/";
+  };
+
+  mini-bracketed = buildVimPlugin {
+    pname = "mini.bracketed";
+    version = "2024-08-13";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.bracketed";
+      rev = "072d50801d8d4aaeb4b9765fa35c61639e0cff6b";
+      sha256 = "047hcwcp8lms3zhvbckq2cqs9ir9g4z3i0lmf1qrd807aqih7fxp";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.bracketed/";
+  };
+
+  mini-bufremove = buildVimPlugin {
+    pname = "mini.bufremove";
+    version = "2024-07-01";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.bufremove";
+      rev = "1ee294a97e091d3cf967974df622c0d887890dc2";
+      sha256 = "0jhhh2f4zzbixcqbp7540bzgbzgwwipi37knqj1ykpf5py4kp0dm";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.bufremove/";
+  };
+
+  mini-clue = buildVimPlugin {
+    pname = "mini.clue";
+    version = "2024-07-01";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.clue";
+      rev = "847376b3a044129348cea9eedb841106379e0796";
+      sha256 = "19bzb4hawll898dr4w53jhy9h56dnf4c3cjisqlyjh3qgl0h588s";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.clue/";
+  };
+
+  mini-colors = buildVimPlugin {
+    pname = "mini.colors";
+    version = "2024-07-01";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.colors";
+      rev = "9fa904dd46da5d84028478b9cc689be021732fab";
+      sha256 = "1n81am3b3lphq75vs3fwwl14ajk58hqr5znjd4dbcdpr7mz94bzc";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.colors/";
+  };
+
+  mini-comment = buildVimPlugin {
+    pname = "mini.comment";
+    version = "2024-07-21";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.comment";
+      rev = "03c13e37318bdb18481311c0ac1adc9ed731caf1";
+      sha256 = "0hdi07c704jx5a7fbxziw8rqmzm5hx66gj04jpzwgqs1c3hchppf";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.comment/";
+  };
+
+  mini-completion = buildVimPlugin {
+    pname = "mini.completion";
+    version = "2024-07-30";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.completion";
+      rev = "ad99bbe569aa5ceb70c2ff4c36368f94a89496c5";
+      sha256 = "0w9hgf4fq8plbns1fnq283s2difg9np8k8888fryd97yd3nys4pd";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.completion/";
+  };
+
+  mini-cursorword = buildVimPlugin {
+    pname = "mini.cursorword";
+    version = "2024-07-01";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.cursorword";
+      rev = "7a9f1ec73c52124abc39f0309d332ababefc68b2";
+      sha256 = "1wwwila2k8yap1k6v2ndzqylaw49pw1wk1l011pi12hcaimixba5";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.cursorword/";
+  };
+
+  mini-deps = buildVimPlugin {
+    pname = "mini.deps";
+    version = "2024-08-10";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.deps";
+      rev = "dbee3da96d3cf68ff311d8f324a9b236a08ad429";
+      sha256 = "1plgz5fssa4yczr32h230kn65dldi729sjrlxp4x9307n3s80zk1";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.deps/";
+  };
+
+  mini-diff = buildVimPlugin {
+    pname = "mini.diff";
+    version = "2024-07-11";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.diff";
+      rev = "d58f9cb13400aedc5b5a0ef70fcdf31871ba2ee6";
+      sha256 = "09qg43c3qwk0csqlvy9c7s3l9anp4pg0jrrzv8idvii3za2zrwsq";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.diff/";
+  };
+
+  mini-doc = buildVimPlugin {
+    pname = "mini.doc";
+    version = "2024-08-10";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.doc";
+      rev = "bb73a3d1ff390f7e2740027ea2567017099a237c";
+      sha256 = "1jsamvgdk6zxaimn9v949gbghf92d0ii8jhn2sjjy7arbl8w0w23";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.doc/";
+  };
+
+  mini-extra = buildVimPlugin {
+    pname = "mini.extra";
+    version = "2024-08-17";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.extra";
+      rev = "05ddb1e3056c5ab541477a38d2c61d96d19fd299";
+      sha256 = "0z0lsgsmjchc0arspzm04p5vfd5mdc3lyx4d4qibsxq5i0834r6y";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.extra/";
+  };
+
+  mini-files = buildVimPlugin {
+    pname = "mini.files";
+    version = "2024-08-17";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.files";
+      rev = "170d0dd321ca377cb427fb5576d4d75601c1c2da";
+      sha256 = "14p5syc4w43mgp522zj6hwpri4a49zkq36in3sifmr6h8bwhx87g";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.files/";
+  };
+
+  mini-fuzzy = buildVimPlugin {
+    pname = "mini.fuzzy";
+    version = "2024-07-01";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.fuzzy";
+      rev = "ea9d1380ad925c4d0e890f68dbf830d2b19bae5d";
+      sha256 = "10ng6rq4ig0ijvbj2bbm428dg3asf40x9b7dsvndk33ikfrlbazz";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.fuzzy/";
+  };
+
+  mini-hipatterns = buildVimPlugin {
+    pname = "mini.hipatterns";
+    version = "2024-07-23";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.hipatterns";
+      rev = "1811b0661721285fc83494d2e687d538fb3ddac8";
+      sha256 = "0b8sswy6533rifxgfy52mssdbxrds8p0xxp8981q97pp0z64k2yq";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.hipatterns/";
+  };
+
+  mini-hues = buildVimPlugin {
+    pname = "mini.hues";
+    version = "2024-08-16";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.hues";
+      rev = "0e46bdc04d3df4185097ecff08ad208868572b98";
+      sha256 = "0s71n5mh49jvkzwamm7hnrrq39qlhhnpdg6l2x87mnyq5c0f8cvs";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.hues/";
+  };
+
+  mini-icons = buildVimPlugin {
+    pname = "mini.icons";
+    version = "2024-07-30";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.icons";
+      rev = "fe63fe080e76d80713557e5f0c65bc15b14b152d";
+      sha256 = "0z6jmrn5gf6c51dlnc7qwab8xg1dv1f5d5vmkmy8x2d6iapnlyqv";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.icons/";
+  };
+
+  mini-indentscope = buildVimPlugin {
+    pname = "mini.indentscope";
+    version = "2024-08-12";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.indentscope";
+      rev = "d2e7b5f0260789c325f92ab3421ff9884ea01842";
+      sha256 = "1w49n9nv32h70wf8ahya9xj1hfcxnx3bqxwpkhhz8ck95c84mmaa";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.indentscope/";
+  };
+
+  mini-jump = buildVimPlugin {
+    pname = "mini.jump";
+    version = "2024-07-01";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.jump";
+      rev = "795f26e6640589382c277cffa494bda0a127bef4";
+      sha256 = "0s51zsy0cm9bldxzzk5hnvqhccv9nh53qd07dlijd5403vsx77wa";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.jump/";
+  };
+
+  mini-jump2d = buildVimPlugin {
+    pname = "mini.jump2d";
+    version = "2024-07-18";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.jump2d";
+      rev = "f39cc3eed3163799730166ac9cf382d44ce7159f";
+      sha256 = "1bz2ymhvib10mb5cc8410yssi7k72hqs80n708p0dm3lyy3lw83w";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.jump2d/";
+  };
+
+  mini-map = buildVimPlugin {
+    pname = "mini.map";
+    version = "2024-07-01";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.map";
+      rev = "290c3da965196d64f87050a076de9787a136e57a";
+      sha256 = "09i26nh398i098lqsqajkjpr94762x54vnqlkcvbg5ak1fx3rajr";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.map/";
+  };
+
+  mini-misc = buildVimPlugin {
+    pname = "mini.misc";
+    version = "2024-08-18";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.misc";
+      rev = "e51fa9430a4e18679d8b913ed2441182b5da2176";
+      sha256 = "0r5kz4835srl8vgq8bhfx6qsqap6cbxnyk7247m5qy1j1hqdgchx";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.misc/";
+  };
+
+  mini-move = buildVimPlugin {
+    pname = "mini.move";
+    version = "2024-08-15";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.move";
+      rev = "4caa1c212f5ca3d1633d21cfb184808090ed74b1";
+      sha256 = "0f4nrg9n8air507h6bd61dmb1rjjhykyl36qgr0ai72cb011wzcx";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.move/";
+  };
+
+  mini-notify = buildVimPlugin {
+    pname = "mini.notify";
+    version = "2024-07-01";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.notify";
+      rev = "a6101a5fa7eff7bdfbfc887ad9a331305729f0ec";
+      sha256 = "1xkls37g2a6wfiyhhgaw0hzdrj602j1iv55b1a1l3pcj81w9p23l";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.notify/";
+  };
+
  mini-nvim = buildVimPlugin {
    pname = "mini.nvim";
    version = "2024-09-10";
@ -6375,6 +6723,150 @@ final: prev:
    meta.homepage = "https://github.com/echasnovski/mini.nvim/";
  };

+  mini-operators = buildVimPlugin {
+    pname = "mini.operators";
+    version = "2024-07-01";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.operators";
+      rev = "7d30c0bc5baaa1f0d3a63dd18b35c8581bc164f4";
+      sha256 = "0zghwk8rs7n9sgpssb2fbyrm8vnynwqa6ins2mshsirvmrbkz30z";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.operators/";
+  };
+
+  mini-pairs = buildVimPlugin {
+    pname = "mini.pairs";
+    version = "2024-07-01";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.pairs";
+      rev = "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51";
+      sha256 = "1016q19ndmzmbdaxi40w6wskhf91nc5qzbza6hyvcxdfpd81rl6q";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.pairs/";
+  };
+
+  mini-pick = buildVimPlugin {
+    pname = "mini.pick";
+    version = "2024-08-17";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.pick";
+      rev = "2f0bdb96a3a1ef2a31a731e03b51fa97074df0d2";
+      sha256 = "0ypz1zj3xpfwhx712i6dcwklmjriqbbg0kcq3zih1c3sz5la708m";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.pick/";
+  };
+
+  mini-sessions = buildVimPlugin {
+    pname = "mini.sessions";
+    version = "2024-08-10";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.sessions";
+      rev = "3c80dcf01d9901ff3e4a40328bee8a44c65718b2";
+      sha256 = "07kjgr31yd1kjlxhkaq3dy879s40c5zj89zjlxpspw0x49m167f8";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.sessions/";
+  };
+
+  mini-splitjoin = buildVimPlugin {
+    pname = "mini.splitjoin";
+    version = "2024-07-01";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.splitjoin";
+      rev = "3e92f6764e770ba392325cad3a4497adcada695f";
+      sha256 = "126z8rsyg3849ijix1siwq77f9slwr93l61rwg499flzja3incic";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.splitjoin/";
+  };
+
+  mini-starter = buildVimPlugin {
+    pname = "mini.starter";
+    version = "2024-07-02";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.starter";
+      rev = "394994b2bec10a997c69575825d5c444957b9ff9";
+      sha256 = "003fas6clkpql54w3lfqd088cy5cvd2iisl88adv54p3bfasppsp";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.starter/";
+  };
+
+  mini-statusline = buildVimPlugin {
+    pname = "mini.statusline";
+    version = "2024-08-12";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.statusline";
+      rev = "85014aa9e4afe9a3ff1896ad768bf09584bff574";
+      sha256 = "0aqf3wh0ibr4m9jjpi4p7vdfwc0knlm83axzlisy78x25xviks04";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.statusline/";
+  };
+
+  mini-surround = buildVimPlugin {
+    pname = "mini.surround";
+    version = "2024-08-17";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.surround";
+      rev = "d8913ed23be0a1a4585ae34414821cc343a46174";
+      sha256 = "182v214d8in864i3yirs7vg5lxb2kibfxpdh9cap14hbj4nbc6mi";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.surround/";
+  };
+
+  mini-tabline = buildVimPlugin {
+    pname = "mini.tabline";
+    version = "2024-08-01";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.tabline";
+      rev = "27c38016a28b0efc375bbe11593391ca337849c1";
+      sha256 = "0sxkyyb1igysj5n1cwa43m15dk307nj5d6njd93dmyrsawl4p0pw";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.tabline/";
+  };
+
+  mini-test = buildVimPlugin {
+    pname = "mini.test";
+    version = "2024-08-10";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.test";
+      rev = "64bdbf6517032d29aab74525e212023631295a2f";
+      sha256 = "02a6064sqdaajz99ga7sw7ijljlxjdd7v7i33razw2y3n5mx5f5d";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.test/";
+  };
+
+  mini-trailspace = buildVimPlugin {
+    pname = "mini.trailspace";
+    version = "2024-07-01";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.trailspace";
+      rev = "c48d74a3cecf93f5adc6a7518c7ced60e6302895";
+      sha256 = "0cywnra2v7hi76n3004wpv8r0w5qdpzwdmjrc21jv7hljq5q7av5";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.trailspace/";
+  };
+
+  mini-visits = buildVimPlugin {
+    pname = "mini.visits";
+    version = "2024-08-10";
+    src = fetchFromGitHub {
+      owner = "echasnovski";
+      repo = "mini.visits";
+      rev = "76646d885b3700d594a8c4e6bca24b8cb79ff07f";
+      sha256 = "0s4936yvjkv8l7hzzr8gs63h3a8f26y9lw2ibfn1fdyvpdp7nndk";
+    };
+    meta.homepage = "https://github.com/echasnovski/mini.visits/";
+  };
+
  minimap-vim = buildVimPlugin {
    pname = "minimap.vim";
    version = "2024-03-17";
@ -10811,6 +11303,18 @@ final: prev:
    meta.homepage = "https://github.com/vim-syntastic/syntastic/";
  };

+  syntax-tree-surfer = buildVimPlugin {
+    pname = "syntax-tree-surfer";
+    version = "2023-10-06";
+    src = fetchFromGitHub {
+      owner = "ziontee113";
+      repo = "syntax-tree-surfer";
+      rev = "732ea6d0f868bcccd2f526be73afa46997d5a2fb";
+      sha256 = "0x7kpmxq3n8531ca2bz506swww92wd3x16d125wrk54rxp1lv1cd";
+    };
+    meta.homepage = "https://github.com/ziontee113/syntax-tree-surfer/";
+  };
+
  tabby-nvim = buildVimPlugin {
    pname = "tabby.nvim";
    version = "2024-07-31";
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -1709,6 +1709,11 @@
      };
    };

+  syntax-tree-surfer = super.syntax-tree-surfer.overrideAttrs {
+    dependencies = with self; [ nvim-treesitter ];
+    meta.maintainers = with lib.maintainers; [ callumio ];
+  };
+
  taskwarrior3 = buildVimPlugin {
    inherit (taskwarrior3) version pname;
    src = "${taskwarrior3.src}/scripts/vim";
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -532,7 +532,48 @@ https://github.com/lsig/messenger.nvim/,HEAD,
 https://github.com/xero/miasma.nvim/,,
 https://github.com/dasupradyumna/midnight.nvim/,,
 https://github.com/hadronized/mind.nvim/,HEAD,
+https://github.com/echasnovski/mini-git/,HEAD,
+https://github.com/echasnovski/mini.ai/,HEAD,
+https://github.com/echasnovski/mini.align/,HEAD,
+https://github.com/echasnovski/mini.animate/,HEAD,
+https://github.com/echasnovski/mini.base16/,HEAD,
+https://github.com/echasnovski/mini.basics/,HEAD,
+https://github.com/echasnovski/mini.bracketed/,HEAD,
+https://github.com/echasnovski/mini.bufremove/,HEAD,
+https://github.com/echasnovski/mini.clue/,HEAD,
+https://github.com/echasnovski/mini.colors/,HEAD,
+https://github.com/echasnovski/mini.comment/,HEAD,
+https://github.com/echasnovski/mini.completion/,HEAD,
+https://github.com/echasnovski/mini.cursorword/,HEAD,
+https://github.com/echasnovski/mini.deps/,HEAD,
+https://github.com/echasnovski/mini.diff/,HEAD,
+https://github.com/echasnovski/mini.doc/,HEAD,
+https://github.com/echasnovski/mini.extra/,HEAD,
+https://github.com/echasnovski/mini.files/,HEAD,
+https://github.com/echasnovski/mini.fuzzy/,HEAD,
+https://github.com/echasnovski/mini.hipatterns/,HEAD,
+https://github.com/echasnovski/mini.hues/,HEAD,
+https://github.com/echasnovski/mini.icons/,HEAD,
+https://github.com/echasnovski/mini.indentscope/,HEAD,
+https://github.com/echasnovski/mini.jump/,HEAD,
+https://github.com/echasnovski/mini.jump2d/,HEAD,
+https://github.com/echasnovski/mini.map/,HEAD,
+https://github.com/echasnovski/mini.misc/,HEAD,
+https://github.com/echasnovski/mini.move/,HEAD,
+https://github.com/echasnovski/mini.notify/,HEAD,
 https://github.com/echasnovski/mini.nvim/,,
+https://github.com/echasnovski/mini.operators/,HEAD,
+https://github.com/echasnovski/mini.pairs/,HEAD,
+https://github.com/echasnovski/mini.pick/,HEAD,
+https://github.com/echasnovski/mini.sessions/,HEAD,
+https://github.com/echasnovski/mini.splitjoin/,HEAD,
+https://github.com/echasnovski/mini.starter/,HEAD,
+https://github.com/echasnovski/mini.statusline/,HEAD,
+https://github.com/echasnovski/mini.surround/,HEAD,
+https://github.com/echasnovski/mini.tabline/,HEAD,
+https://github.com/echasnovski/mini.test/,HEAD,
+https://github.com/echasnovski/mini.trailspace/,HEAD,
+https://github.com/echasnovski/mini.visits/,HEAD,
 https://github.com/wfxr/minimap.vim/,,
 https://github.com/jghauser/mkdir.nvim/,main,
 https://github.com/jakewvincent/mkdnflow.nvim/,HEAD,
@ -908,6 +949,7 @@ https://github.com/keith/swift.vim/,,
 https://github.com/AndrewRadev/switch.vim/,,
 https://github.com/simrat39/symbols-outline.nvim/,,
 https://github.com/vim-syntastic/syntastic/,,
+https://github.com/ziontee113/syntax-tree-surfer/,HEAD,
 https://github.com/nanozuki/tabby.nvim/,HEAD,
 https://github.com/kdheepak/tabline.nvim/,,
 https://github.com/vim-scripts/tabmerge/,,
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@ -15,10 +15,10 @@
        "src": {
            "owner": "libretro",
            "repo": "libretro-atari800",
-            "rev": "72884ccbf9ec8ce7b65d7fc6f44e127e3abdf799",
-            "hash": "sha256-+trOeRe9YJzOfGgtKGb5UGYKf8RVxEc+rxEw+bgFz5M="
+            "rev": "173edee31172db46f46512918cda11192a2bd977",
+            "hash": "sha256-liZKtoiAlA/CFFY0AsfxUkWUQCXIgtLlJCaNydvYCXE="
        },
-        "version": "unstable-2024-09-06"
+        "version": "unstable-2024-09-13"
    },
    "beetle-gba": {
        "fetcher": "fetchFromGitHub",
@ -85,10 +85,10 @@
        "src": {
            "owner": "libretro",
            "repo": "beetle-psx-libretro",
-            "rev": "12a9895466fc1d895e3f4570494af7b398470975",
-            "hash": "sha256-O0pdGapKKEcjHamEtRs88++L/HF+eppV7Z7GVQrV8ZM="
+            "rev": "261e52b7dd35e8fd2c8b1f760a3ba4cf7fce60c5",
+            "hash": "sha256-HV/O7zJscLJAzhAoch44kKwBKavasdvf1VDvudLU2q0="
        },
-        "version": "unstable-2024-09-06"
+        "version": "unstable-2024-09-16"
    },
    "beetle-saturn": {
        "fetcher": "fetchFromGitHub",
@ -246,10 +246,10 @@
        "src": {
            "owner": "schellingb",
            "repo": "dosbox-pure",
-            "rev": "dd8d2989a652d56a7a1588b65a42cc58477638c2",
-            "hash": "sha256-XA6hBJa/GFUaRG/+PSUBXaFJedjsRVLfR7Z5pmEwY0k="
+            "rev": "ea7b947a8ed156a1ce2ce49329a5686c69f80075",
+            "hash": "sha256-aqNyYG7H+YBLhQlnkfBfmX3PkBF8GeYXc+KHkvkxlRo="
        },
-        "version": "unstable-2024-08-25"
+        "version": "unstable-2024-09-16"
    },
    "easyrpg": {
        "fetcher": "fetchFromGitHub",
@ -287,10 +287,10 @@
        "src": {
            "owner": "libretro",
            "repo": "fbneo",
-            "rev": "a03a6f526684067823de922f1b15d7eb27fd5394",
-            "hash": "sha256-7J/RuBTpjqG306IsQe9PBnJnT+QzFVNgpG124XaAcRA="
+            "rev": "ea3f1696173441f32e35ddd7295c330443691f00",
+            "hash": "sha256-spTZ7ZjaBiF6CdQwtrTcafKAszHGJxEnR/mzrlD/1mI="
        },
-        "version": "unstable-2024-09-03"
+        "version": "unstable-2024-09-12"
    },
    "fceumm": {
        "fetcher": "fetchFromGitHub",
@ -307,11 +307,11 @@
        "src": {
            "owner": "flyinghead",
            "repo": "flycast",
-            "rev": "9691fe962228ab0c08f3a4801e6fa0a3c47218ef",
-            "hash": "sha256-pRrc5EAZQ6fz9JAzOa2mPVByplQ66On2KMqGPVhmA4A=",
+            "rev": "38de2868a09a015186d692eb01d5fd89308c8128",
+            "hash": "sha256-eC2BH/3c+2/kktWtYiq6MeI2I5bAkOfwOsTSjkPNqlg=",
            "fetchSubmodules": true
        },
-        "version": "unstable-2024-08-30"
+        "version": "unstable-2024-09-16"
    },
    "fmsx": {
        "fetcher": "fetchFromGitHub",
@ -338,30 +338,30 @@
        "src": {
            "owner": "libretro",
            "repo": "fuse-libretro",
-            "rev": "4d511d7fc3faa7714fa5de2e824793d35d5f4da8",
-            "hash": "sha256-mfCv7PvroPqzJ/nXCa74h0c7lHlbTVnJM3rNIj3UvQI="
+            "rev": "b7f789133970b69ab27d1d181bc8c8930a462130",
+            "hash": "sha256-LzKWc6mWXxrYu44HwOmVBzXoebvQIwccwLIwUulKFto="
        },
-        "version": "unstable-2024-06-28"
+        "version": "unstable-2024-09-13"
    },
    "gambatte": {
        "fetcher": "fetchFromGitHub",
        "src": {
            "owner": "libretro",
            "repo": "gambatte-libretro",
-            "rev": "1fbeee0a46b12d3ab28c4795172929ebb31808ea",
-            "hash": "sha256-EusFBTtJheGNfbA3lXHGt1IlSbvT6uAY/J/XkIaLJag="
+            "rev": "f775ef92c93c495432bbd51d854568c686ec711b",
+            "hash": "sha256-0WnrCN1F8S+Zy4Mxygm+cc1cSVc6Q91a+VVv7EbmgjA="
        },
-        "version": "unstable-2024-08-30"
+        "version": "unstable-2024-09-06"
    },
    "genesis-plus-gx": {
        "fetcher": "fetchFromGitHub",
        "src": {
            "owner": "libretro",
            "repo": "Genesis-Plus-GX",
-            "rev": "f0a21a7b30e033cef8e4870f7ab3781dad3606db",
-            "hash": "sha256-h9QJVlAoztlObYKqOWWRxxJ18+VhgmpMRUQOE+/PCI0="
+            "rev": "1eb04313cdd1d4d79e166d9f3e75c4b3223b142c",
+            "hash": "sha256-lAMVsw0NBFPrG3CRsj6IGKDrVUhH2vDUuAzl2rEEhdk="
        },
-        "version": "unstable-2024-08-30"
+        "version": "unstable-2024-09-15"
    },
    "gpsp": {
        "fetcher": "fetchFromGitHub",
@ -408,11 +408,11 @@
        "src": {
            "owner": "libretro",
            "repo": "mame",
-            "rev": "8b9b8f5f5b47161327d93522318c81fba2087b2f",
-            "hash": "sha256-xnIYMvLsd4k4wdu3IvWBJy3V8l3NfZvUjYOISunHnwI=",
+            "rev": "184cebe571ab6b06f5015404bd40404d25433d9a",
+            "hash": "sha256-8lnpgpNo9wVkaIiZyXMakTnia5CVHnaTMUpB47iVVhE=",
            "fetchSubmodules": true
        },
-        "version": "unstable-2024-08-31"
+        "version": "unstable-2024-09-15"
    },
    "mame2000": {
        "fetcher": "fetchFromGitHub",
@ -439,10 +439,10 @@
        "src": {
            "owner": "libretro",
            "repo": "mame2003-plus-libretro",
-            "rev": "5f5e32598720cd795dbcf53c1400a122ef0fcd76",
-            "hash": "sha256-TJUgDHDPPKGx4QnKOI6FpCYcLsY2j7GM1atEoq5zg8Y="
+            "rev": "3aa773e2a4e1ded9e255428ec7ef617f09840d6d",
+            "hash": "sha256-zMD6bC6KNCspDAkTB5lFEiV7wMfYy+mHgljjYOA2b6E="
        },
-        "version": "unstable-2024-09-06"
+        "version": "unstable-2024-09-09"
    },
    "mame2010": {
        "fetcher": "fetchFromGitHub",
@ -652,22 +652,22 @@
        "src": {
            "owner": "jpd002",
            "repo": "Play-",
-            "rev": "9752b303037186a2e2581b864bc25136402cdc79",
-            "hash": "sha256-zJFgZjE9CvozH/5hFdnGsVL6q2Pb4QFvyipebzYjB3g=",
+            "rev": "2ecf0923f8000464b0056d42c369f698421187b5",
+            "hash": "sha256-fKfN1e7UANs+CAJzjqWmzFsEzSwoRz6vW8ZD7sh9O7E=",
            "fetchSubmodules": true
        },
-        "version": "unstable-2024-09-04"
+        "version": "unstable-2024-09-12"
    },
    "ppsspp": {
        "fetcher": "fetchFromGitHub",
        "src": {
            "owner": "hrydgard",
            "repo": "ppsspp",
-            "rev": "4250bdc2a6cadbd450aa48f7e5fbc67b2df172bf",
-            "hash": "sha256-4Vf7D7aUkZ+eL7Nz0fToDIGB35xi6vc+UJTM0rKpdXE=",
+            "rev": "0bb69a0ccf5655310de1a41af96fde50cdc85840",
+            "hash": "sha256-h5edSaaqu0YEqKeMEY4iGWmp0w2AbqbEHergd0DsCGI=",
            "fetchSubmodules": true
        },
-        "version": "unstable-2024-09-06"
+        "version": "unstable-2024-09-17"
    },
    "prboom": {
        "fetcher": "fetchFromGitHub",
@ -694,10 +694,10 @@
        "src": {
            "owner": "libretro",
            "repo": "libretro-uae",
-            "rev": "3ef950be5b45b89d09e05bdc1f8f2f4a794dd7a6",
-            "hash": "sha256-364KIt7LoJqW3nsdy30CDwctWgqH+tgtWUjsmf8AswA="
+            "rev": "4b4875f5c29e59fcc7aaab0decdce7af694b70e1",
+            "hash": "sha256-XaEa3QAzPzboRFdrPlhLmTPy52ClwyR/eQTpo/V++zU="
        },
-        "version": "unstable-2024-08-26"
+        "version": "unstable-2024-09-17"
    },
    "quicknes": {
        "fetcher": "fetchFromGitHub",
@ -754,10 +754,10 @@
        "src": {
            "owner": "snes9xgit",
            "repo": "snes9x",
-            "rev": "645a4712e797486787e2a0521928dea7cca143fd",
-            "hash": "sha256-2WgkouQZ6OW3mmPTMjioPikvg077Jx+bzIwV6Wz4blA="
+            "rev": "0727b4a474bf496d06ad42dd7ecc5527996aff3a",
+            "hash": "sha256-Zx36Yzftascnsqnd3ltutFKGB4fRBcP81vKYJRB2FjU="
        },
-        "version": "unstable-2024-09-05"
+        "version": "unstable-2024-09-15"
    },
    "snes9x2002": {
        "fetcher": "fetchFromGitHub",
--- a/pkgs/applications/graphics/pureref/default.nix
+++ b/pkgs/applications/graphics/pureref/default.nix
@ -2,11 +2,11 @@

 appimageTools.wrapType1 rec {
  pname = "pureref";
-  version = "2.0.2";
+  version = "2.0.3";

  src = runCommand "PureRef-${version}_x64.Appimage" {
    nativeBuildInputs = [ curl gnugrep cacert ];
-    outputHash = "sha256-dCiQlYtjIkh/3x3Rt3Yzbn1KN7ip37Rxv1u8D9y+EMA=";
+    outputHash = "sha256-0iR1cP2sZvWWqKwRAwq6L/bmIBSYHKrlI8u8V2hANfM=";
  } ''
    key="$(curl "https://www.pureref.com/download.php" --silent | grep '%3D%3D' | cut -d '"' -f2)"
    curl -L "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@ -38,11 +38,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "shotwell";
-  version = "0.32.8";
+  version = "0.32.9";

  src = fetchurl {
    url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-RwY8AXnl2A9TQ3PcVg4c6Ad6rdWE7u8GxSOkYOL5KcM=";
+    sha256 = "sha256-EjKjPcnBftI6oA2P8lUA5xC73JiZ1VtEFbaLdCnlYOs=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/oxker/default.nix
+++ b/pkgs/applications/misc/oxker/default.nix
@ -2,14 +2,14 @@

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

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-bn+5LBqZNwrhVX0KfXNBS00rE+BybN/NJmL4lu/oua0=";
+    hash = "sha256-Qh/mUEfCvrOrUHJ1kEWb3BLBmMyP/MzUyfFoB+eYj9w=";
  };

-  cargoHash = "sha256-ssjLfNPP8g+2IOv0AQb+Soe/0e1H2LoqFSpmljj/z3o=";
+  cargoHash = "sha256-VYA5Y6CjhKx3MgQ0pyOO7vw44cKykRjlgUZopgR9pYo=";

  meta = with lib; {
    description = "Simple tui to view & control docker containers";
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@ -312,9 +312,12 @@ let
      # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61
      # allowing us to use our rustc and our clang.
      ./patches/chromium-121-rust.patch
-    ] ++ lib.optionals (chromiumVersionAtLeast "126") [
+    ] ++ lib.optionals (versionRange "126" "129") [
      # Rebased variant of patch right above to build M126+ with our rust and our clang.
      ./patches/chromium-126-rust.patch
+    ] ++ lib.optionals (chromiumVersionAtLeast "129") [
+      # Rebased variant of patch right above to build M129+ with our rust and our clang.
+      ./patches/chromium-129-rust.patch
    ];

    postPatch = ''
--- a/pkgs/applications/networking/browsers/chromium/patches/chromium-129-rust.patch
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-129-rust.patch
@ -0,0 +1,21 @@
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 45086d6838cac..81132ad8ecb31 100644
+--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
+@@ -1727,16 +1727,6 @@ config("runtime_library") {
+     configs += [ "//build/config/c++:runtime_library" ]
+   }
+ 
+-  # Rust and C++ both provide intrinsics for LLVM to call for math operations. We
+-  # want to use the C++ intrinsics, not the ones in the Rust compiler_builtins
+-  # library. The Rust symbols are marked as weak, so that they can be replaced by
+-  # the C++ symbols. This config ensures the C++ symbols exist and are strong in
+-  # order to cause that replacement to occur by explicitly linking in clang's
+-  # compiler-rt library.
+-  if (is_clang && !is_nacl && !is_cronet_build) {
+-    configs += [ "//build/config/clang:compiler_builtins" ]
+-  }
+-
+   # TODO(crbug.com/40570904): Come up with a better name for is POSIX + Fuchsia
+   # configuration.
+   if (is_posix || is_fuchsia) {
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@ -1,22 +1,22 @@
 {
  stable = {
    chromedriver = {
-      hash_darwin = "sha256-UtBJZG+pRdqwxWsvuxYrRJsmFdMEa5h6lWXt39cPxF0=";
+      hash_darwin = "sha256-303weqU04cCCwlLlSVnEyvKvHu09RjGFLmg5cf/exss=";
      hash_darwin_aarch64 =
-        "sha256-2HFrIwc8Jzlg6/eKkJqfd8kwS8c6powU2RnpBGMSBak=";
-      hash_linux = "sha256-8EEJL0A/t0VabaKHEHC2WHwygUo+PCsKeU09SqRzkVE=";
-      version = "128.0.6613.137";
+        "sha256-TybJYKeMzm9FQp0Jqx82VF1OOiVSpS/QgNUEDlWG7Uc=";
+      hash_linux = "sha256-D8aKGKnbFT6YUhyhZUuz/XhCrUVS+Y7I7GaI6Qfv2bE=";
+      version = "129.0.6668.58";
    };
    deps = {
      gn = {
-        hash = "sha256-BiMGbML5aNUt4JzzVqSszBj+8BMlEc92csNugo5qjUk=";
-        rev = "b2afae122eeb6ce09c52d63f67dc53fc517dbdc8";
+        hash = "sha256-8o3rDdojqVHMQCxI2T3MdJOXKlW3XX7lqpy3zWhJiaA=";
+        rev = "d010e218ca7077928ad7c9e9cc02fe43b5a8a0ad";
        url = "https://gn.googlesource.com/gn";
-        version = "2024-06-11";
+        version = "2024-08-19";
      };
    };
-    hash = "sha256-/q+Z1a1EFZRQvC3pmuDbzJWzSSYkI7bfgUAaJRBaj00=";
-    version = "128.0.6613.137";
+    hash = "sha256-8dKWu2/ZKw5ZthH1s5wR+h9b0aIqlDhNsPUrlE9DMQg=";
+    version = "129.0.6668.58";
  };
  ungoogled-chromium = {
    deps = {
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@ -49,12 +49,6 @@ in
 rec {
  mkKops = generic;

-  kops_1_26 = mkKops rec {
-    version = "1.26.6";
-    sha256 = "sha256-qaehvPgB3phZl/K577hig4G4RxAUi6Im94vXP5ctnWM=";
-    rev = "v${version}";
-  };
-
  kops_1_27 = mkKops rec {
    version = "1.27.1";
    sha256 = "sha256-WV+0380yj8GHckY4PDM3WspbZ/YuYZOAQEMd2ygEOjo=";
@ -62,8 +56,8 @@ rec {
  };

  kops_1_28 = mkKops rec {
-    version = "1.28.5";
-    sha256 = "sha256-spw3lTrp6RlxkTNoZ/3Yz/U2tdvBnwiYORS2QtOSX9k=";
+    version = "1.28.7";
+    sha256 = "sha256-rTf7+w/o8MGSBKV9wCzZOEI0v31exZhOJpRABeF/KyI=";
    rev = "v${version}";
  };

@ -72,4 +66,10 @@ rec {
    sha256 = "sha256-SRj0x9N+yfTG/UL/hu1ds46Zt6d5SUYU0PA9lPHO6jQ=";
    rev = "v${version}";
  };
+
+  kops_1_30 = mkKops rec {
+    version = "1.30.1";
+    sha256 = "sha256-aj2OnjkXlBEH830RoJiAlhiFfS1zjVoX38PrsgAaB7A=";
+    rev = "v${version}";
+  };
 }
--- a/pkgs/applications/networking/cluster/kubeone/default.nix
+++ b/pkgs/applications/networking/cluster/kubeone/default.nix
@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "kubeone";
-  version = "1.8.2";
+  version = "1.8.3";

  src = fetchFromGitHub {
    owner = "kubermatic";
    repo = "kubeone";
    rev = "v${version}";
-    hash = "sha256-H+EzSsXCjURMBJW9+1EWXsfO4faUXcTcYckK/QJYEFk=";
+    hash = "sha256-+9Dw6W/Tbg7zRC/ARuuXqZGTcMeSrtdoTvHtsQevigg=";
  };

  vendorHash = "sha256-z1BBE+PH2s7VxWNxneu5y2ZerfzCZNPJowZJVq821Kk=";
--- a/pkgs/applications/networking/cluster/rke/default.nix
+++ b/pkgs/applications/networking/cluster/rke/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "rke";
-  version = "1.6.0";
+  version = "1.6.2";

  src = fetchFromGitHub {
    owner = "rancher";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-ZxNU76W7IGSn1cdzmiLI/eMO3dAd8bUQX+1cvANci2k=";
+    hash = "sha256-KBN7QFjH9wr5G40/224BcTz59aHu+HZISU+LMr54b9c=";
  };

  vendorHash = "sha256-Rr2BXCpliv9KF9wkXQLy6LxKxyPo1pO5SHUTcy2wETM=";
--- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
+++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "tektoncd-cli";
-  version = "0.38.0";
+  version = "0.38.1";

  src = fetchFromGitHub {
    owner = "tektoncd";
    repo = "cli";
    rev = "v${version}";
-    sha256 = "sha256-gg3FhPDXqnn3y/tcvlHTd0t8KxtPGTrN/2buBSVffBg=";
+    sha256 = "sha256-FZbuYKYT/LJ9php66N2RYGGYDJxDI9fWfIZAI8X+iRk=";
  };

  vendorHash = null;
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@ -165,9 +165,9 @@ rec {
  mkTerraform = attrs: pluggable (generic attrs);

  terraform_1 = mkTerraform {
-    version = "1.9.5";
-    hash = "sha256-fWyqBDvuBrwqgwi1WU4RsdWssKmaClNyP5zyUf+JmTU=";
-    vendorHash = "sha256-CAZUs1hxjHXcAteuVJZmkqwnMYUoIau++IFdD1b7yYY=";
+    version = "1.9.6";
+    hash = "sha256-rlqpqiMlLcn2LqqKRU9iFaVqUz/QQtpiiZ39h5ZvpbI=";
+    vendorHash = "sha256-tH9KQF4oHcQh34ikB9Bx6fij/iLZN+waxv5ZilqGGlU=";
    patches = [ ./provider-path-0_15.patch ];
    passthru = {
      inherit plugins;
--- a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix
+++ b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix
@ -1,29 +1,35 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchYarnDeps
-, yarn
-, fixup-yarn-lock
-, nodejs
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarn,
+  fixup-yarn-lock,
+  nodejs,
+  olm,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "hydrogen-web";
-  version = "0.4.0";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "element-hq";
    repo = "hydrogen-web";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-u8Yex3r7EZH+JztQHJbfncYeyyl6hgb1ZNFIg//wcb0=";
+    hash = "sha256-pXrmWPp4/MYIS1FHEGzAxGbh4OnTaiPudg+NauvA6Vc=";
  };

  offlineCache = fetchYarnDeps {
    yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-N9lUAhfYLlEAIaWSNS3Ecq+aBTz+f7Z22Sclwj9rp6w=";
+    hash = "sha256-j+BwlmL0ncaccy9qQbzb9GpDRC4KB9MwOR2ISx+vbLE=";
  };

-  nativeBuildInputs = [ yarn fixup-yarn-lock nodejs ];
+  nativeBuildInputs = [
+    yarn
+    fixup-yarn-lock
+    nodejs
+  ];

  configurePhase = ''
    runHook preConfigure
@ -61,5 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
    maintainers = lib.teams.matrix.members;
    license = lib.licenses.asl20;
    platforms = lib.platforms.all;
+    inherit (olm.meta) knownVulnerabilities;
  };
 })
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix
@ -2,7 +2,7 @@
 callPackage ./generic.nix { } rec {
  pname = "signal-desktop";
  dir = "Signal";
-  version = "7.19.0";
+  version = "7.23.0";
  url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb";
-  hash = "sha256-wyXVZUuY1TDGAVq7Gx9r/cuBuoMmSk9KQttTJlIN+k8=";
+  hash = "sha256-fQb2nYE1+q6DNcMF0z5NadGlffYaCFNgcu8IIGVUtf8=";
 }
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix
@ -2,7 +2,7 @@
 callPackage ./generic.nix { } rec {
  pname = "signal-desktop-beta";
  dir = "Signal Beta";
-  version = "7.23.0-beta.1";
+  version = "7.25.0-beta.2";
  url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
-  hash = "sha256-qVPvzz5dEzff9+qmy92X2VWOhcfYdeoOsV4hX/PcJ+k=";
+  hash = "sha256-7L+ldJYJXB9VkC12s8AyUdECVXnyN8PNo7AFIyEHcS8=";
 }
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
@ -2,7 +2,7 @@
 callPackage ./generic.nix { } rec {
  pname = "signal-desktop";
  dir = "Signal";
-  version = "7.22.0";
+  version = "7.24.1";
  url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-  hash = "sha256-om3hhGYgrBrcNt3tV9QHZOKuhN/ljaR6SG/6S51xqOo=";
+  hash = "sha256-wT8pbUcdDYVEVAOroHeORl4+rwzfWJvZNxC1pnNsnjQ=";
 }
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
@ -63,14 +63,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "telegram-desktop";
-  version = "5.5.2";
+  version = "5.5.5";

  src = fetchFromGitHub {
    owner = "telegramdesktop";
    repo = "tdesktop";
    rev = "v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-5edk3+RusCq93A6mkzCoegxr6J2fRc9rtGk6IpGHBAY=";
+    hash = "sha256-LWIOgyHp43bLN4RQtBKH2HitfVI6AKstPK5es2s+wVw=";
  };

  patches = [
--- a/pkgs/applications/networking/iroh/default.nix
+++ b/pkgs/applications/networking/iroh/default.nix
@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "iroh";
-  version = "0.24.0";
+  version = "0.25.0";

  src = fetchFromGitHub {
    owner = "n0-computer";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-ZHBgsR17U0hWnRZ79S1/TXoOATofvlf3UloHQh1p8Oo=";
+    hash = "sha256-hF1Nf4+uJXVPpkfsLFKjySMmCSmJdX2LeSHNb0vrBoA=";
  };

-  cargoHash = "sha256-j/Trm6Y64cOxBdHfP172E+YiORZ8B9ukJOpzrLTGI7k=";
+  cargoHash = "sha256-t1re2vpxGZkC45n0jUytqe2SPAC/+fh4Itq1h9znYnM=";

  buildInputs = lib.optionals stdenv.isDarwin (
    with darwin.apple_sdk.frameworks; [
--- a/pkgs/applications/networking/mailreaders/alot/default.nix
+++ b/pkgs/applications/networking/mailreaders/alot/default.nix
@ -5,12 +5,14 @@
 , gnupg
 , gawk
 , procps
+, notmuch
 , withManpage ? false
 }:

 with python311.pkgs; buildPythonApplication rec {
  pname = "alot";
-  version = "0.10";
+  version = "0.11";
+  pyproject = true;

  outputs = [
    "out"
@ -23,16 +25,18 @@ with python311.pkgs; buildPythonApplication rec {
  src = fetchFromGitHub {
    owner = "pazz";
    repo = "alot";
-    rev = version;
-    sha256 = "sha256-1reAq8X9VwaaZDY5UfvcFzHDKd71J88CqJgH3+ANjis=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-mXaRzl7260uxio/BQ36BCBxgKhl1r0Rc6PwFZA8qNqc=";
  };

  postPatch = ''
    substituteInPlace alot/settings/manager.py \
-      --replace /usr/share "$out/share"
+      --replace-fail /usr/share "$out/share"
  '';

-  nativeBuildInputs = lib.optional withManpage sphinx;
+  nativeBuildInputs = [
+    setuptools-scm
+  ] ++ lib.optional withManpage sphinx;

  propagatedBuildInputs = [
    configobj
@ -53,6 +57,7 @@ with python311.pkgs; buildPythonApplication rec {
    mock
    procps
    pytestCheckHook
+    notmuch
  ];

  postBuild = lib.optionalString withManpage [
@ -80,7 +85,7 @@ with python311.pkgs; buildPythonApplication rec {
      cp -r extra/themes $out/share/alot

      substituteInPlace extra/completion/alot-completion.zsh \
-        --replace "python3" "${completionPython.interpreter}"
+        --replace-fail "python3" "${completionPython.interpreter}"
      install -D extra/completion/alot-completion.zsh $out/share/zsh/site-functions/_alot

      sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@ -107,6 +107,14 @@ let
      hash = "sha256-d9XmXHq264rTT80zphYcKLxS+AyUhjb19D3DuBJvMI4=";
      fetchSubmodules = true;
    };
+
+    patches = [
+      (fetchpatch {
+        name = "GCC14.patch";
+        url = "https://github.com/mumble-voip/mumble/commit/56945a9dfb62d29dccfe561572ebf64500deaed1.patch";
+        hash = "sha256-Frct9XJ/ZuHPglx+GB9h3vVycR8YY039dStIbfkPPDk=";
+      })
+    ];
  };
 in {
  mumble  = client source;
--- a/pkgs/applications/science/biology/veryfasttree/default.nix
+++ b/pkgs/applications/science/biology/veryfasttree/default.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "veryfasttree";
-  version = "4.0.3";
+  version = "4.0.4";

  src = fetchFromGitHub {
    owner = "citiususc";
    repo = "veryfasttree";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-Sp331VJRaYv/BTwFj3HwUcUsWjYf6YEXWjYdOzDhBBA=";
+    hash = "sha256-S4FW91VEdTPOIwRamz62arLSN9inxoKXpKsen2ISXMo=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/applications/system/monitor/default.nix
+++ b/pkgs/applications/system/monitor/default.nix
@ -28,13 +28,13 @@

 stdenv.mkDerivation rec {
  pname = "monitor";
-  version = "0.17.1";
+  version = "0.17.2";

  src = fetchFromGitHub {
    owner = "stsdc";
    repo = "monitor";
    rev = version;
-    hash = "sha256-Eo0nwATKrx6SmTsaXe3oFIkp0BUTmjcjIc3Vjt+Cr20=";
+    hash = "sha256-Kk3L4hfHon0B6Y6vU7en1UFpg221+EiVCxMX9mvu7pU=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/virtualization/tart/default.nix
+++ b/pkgs/applications/virtualization/tart/default.nix
@ -10,11 +10,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "tart";
-  version = "2.18.0";
+  version = "2.18.2";

  src = fetchurl {
      url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz";
-      hash = "sha256-no05QZpvaF7Kn9lU26lXjimHJn7xHydmh7Rv50aXPm4=";
+      hash = "sha256-0057/lRisAw3fzh2LNqHUx72PR/67mW/cqm7hU34GAU=";
  };
  sourceRoot = ".";

--- a/pkgs/build-support/node/fetch-yarn-deps/yarn-install-hook.sh
+++ b/pkgs/build-support/node/fetch-yarn-deps/yarn-install-hook.sh
@ -17,7 +17,7 @@ yarnInstallHook() {
        --offline
    )

-    local -r tmpDir="$(mktemp -d yarnInstallHook.XXXXXX)"
+    local -r tmpDir="$(mktemp -d)"

    # yarn pack does not work at all with bundleDependencies.
    # Since we are imediately unpacking, we can just remove them from package.json
--- a/pkgs/os-specific/linux/adcli/default.nix
+++ b/pkgs/os-specific/linux/adcli/default.nix
@ -1,16 +1,17 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, openldap
-, libkrb5
-, libxslt
-, autoreconfHook
-, pkg-config
-, cyrus_sasl
-, util-linux
-, xmlto
-, docbook_xsl
-, docbook_xml_dtd_43
+{
+  lib,
+  stdenv,
+  autoreconfHook,
+  cyrus_sasl,
+  docbook_xml_dtd_43,
+  docbook_xsl,
+  fetchFromGitLab,
+  libkrb5,
+  libxslt,
+  openldap,
+  pkg-config,
+  util-linux,
+  xmlto,
 }:

 stdenv.mkDerivation rec {
@ -20,40 +21,40 @@ stdenv.mkDerivation rec {
  src = fetchFromGitLab {
    domain = "gitlab.freedesktop.org";
    owner = "realmd";
-    repo = pname;
+    repo = "adcli";
    rev = version;
-    sha256 = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE=";
+    hash = "sha256-dipNKlIdc1DpXLg/YJjUxZlNoMFy+rt8Y/+AfWFA4dE=";
  };

  nativeBuildInputs = [
    autoreconfHook
-    pkg-config
    docbook_xsl
+    pkg-config
    util-linux
    xmlto
  ];

  buildInputs = [
-    openldap
+    cyrus_sasl
    libkrb5
    libxslt
-    cyrus_sasl
+    openldap
  ];

  configureFlags = [ "--disable-debug" ];

  postPatch = ''
    substituteInPlace tools/Makefile.am \
-      --replace 'sbin_PROGRAMS' 'bin_PROGRAMS'
+      --replace-fail 'sbin_PROGRAMS' 'bin_PROGRAMS'

    substituteInPlace doc/Makefile.am \
-        --replace 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' \
-                  '${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl'
+      --replace-fail 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' \
+                     '${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl'

    function patch_docbook() {
      substituteInPlace $1 \
-        --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
-                  "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
+        --replace-fail "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
+                       "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd"
    }
    patch_docbook doc/adcli.xml
    patch_docbook doc/adcli-devel.xml
@ -65,7 +66,10 @@ stdenv.mkDerivation rec {
    description = "Helper library and tools for Active Directory client operations";
    mainProgram = "adcli";
    license = licenses.lgpl21Only;
-    maintainers = with maintainers; [ SohamG anthonyroussel ];
+    maintainers = with maintainers; [
+      SohamG
+      anthonyroussel
+    ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/tools/admin/amazon-ec2-utils/default.nix
+++ b/pkgs/tools/admin/amazon-ec2-utils/default.nix
@ -1,11 +1,12 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, bash
-, python3
-, installShellFiles
-, gawk
-, curl
+{
+  stdenv,
+  lib,
+  bash,
+  curl,
+  fetchFromGitHub,
+  gawk,
+  installShellFiles,
+  python3,
 }:

 stdenv.mkDerivation rec {
@ -19,20 +20,23 @@ stdenv.mkDerivation rec {
    hash = "sha256-plTBh2LAXkYVSxN0IZJQuPr7QxD7+OAqHl/Zl8JPCmg=";
  };

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

  strictDeps = true;

+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
  buildInputs = [
    bash
    python3
  ];

-  nativeBuildInputs = [
-    installShellFiles
-  ];
-
-  installPhase = ''
+  postInstall = ''
    install -Dm755 -t $out/bin/ ebsnvme-id
    install -Dm755 -t $out/bin/ ec2-metadata
    install -Dm755 -t $out/bin/ ec2nvme-nsid
@ -48,14 +52,14 @@ stdenv.mkDerivation rec {
  '';

  postFixup = ''
-    for i in $out/etc/udev/rules.d/*.rules $out/lib/udev/rules.d/*.rules ; do
-      substituteInPlace "$i" \
-        --replace '/usr/sbin' "$out/bin" \
-        --replace '/bin/awk' '${gawk}/bin/awk'
-    done
+    substituteInPlace $out/lib/udev/rules.d/{51-ec2-hvm-devices,70-ec2-nvme-devices}.rules \
+      --replace-fail '/usr/sbin' "$out/bin"
+
+    substituteInPlace $out/lib/udev/rules.d/53-ec2-read-ahead-kb.rules \
+      --replace-fail '/bin/awk' '${gawk}/bin/awk'

    substituteInPlace "$out/bin/ec2-metadata" \
-      --replace 'curl' '${curl}/bin/curl'
+      --replace-fail 'curl' '${curl}/bin/curl'
  '';

  doInstallCheck = true;
@ -73,6 +77,10 @@ stdenv.mkDerivation rec {
    description = "Contains a set of utilities and settings for Linux deployments in EC2";
    homepage = "https://github.com/amazonlinux/amazon-ec2-utils";
    license = licenses.mit;
-    maintainers = with maintainers; [ ketzacoatl thefloweringash anthonyroussel ];
+    maintainers = with maintainers; [
+      ketzacoatl
+      thefloweringash
+      anthonyroussel
+    ];
  };
 }
--- a/pkgs/by-name/as/asouldocs/package.nix
+++ b/pkgs/by-name/as/asouldocs/package.nix
@ -1,4 +1,10 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{
+  lib,
+  asouldocs,
+  buildGoModule,
+  fetchFromGitHub,
+  testers,
+}:

 buildGoModule rec {
  pname = "asouldocs";
@ -13,6 +19,11 @@ buildGoModule rec {

  vendorHash = "sha256-T/KLiSK6bxXGkmVJ5aGrfHTUfLs/ElGyWSoCL5kb/KU=";

+  passthru.tests.version = testers.testVersion {
+    package = asouldocs;
+    command = "asouldocs --version";
+  };
+
  meta = with lib; {
    description = "Web server for multi-language, real-time synchronization and searchable documentation";
    homepage = "https://asouldocs.dev/";
--- a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix
+++ b/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix
@ -1,9 +1,10 @@
-{ lib
-, python3
-, fetchPypi
-, nix-update-script
-, testers
-, aws-encryption-sdk-cli
+{
+  lib,
+  aws-encryption-sdk-cli,
+  fetchPypi,
+  nix-update-script,
+  python3,
+  testers,
 }:

 let
@ -41,8 +42,8 @@ localPython.pkgs.buildPythonApplication rec {
    attrs
    aws-encryption-sdk
    base64io
-    urllib3
    setuptools # for pkg_resources
+    urllib3
  ];

  doCheck = true;
@ -59,7 +60,10 @@ localPython.pkgs.buildPythonApplication rec {
  ];

  # Upstream did not adapt to pytest 8 yet.
-  pytestFlagsArray = [ "-W" "ignore::pytest.PytestRemovedIn8Warning" ];
+  pytestFlagsArray = [
+    "-W"
+    "ignore::pytest.PytestRemovedIn8Warning"
+  ];

  passthru = {
    updateScript = nix-update-script { };
--- a/pkgs/servers/http/tomcat/axis2/default.nix
+++ b/pkgs/servers/http/tomcat/axis2/default.nix
@ -1,12 +1,12 @@
 {
  lib,
  stdenvNoCC,
-  fetchurl,
  ant,
+  fetchurl,
  jdk,
+  nixosTests,
  stripJavaArchivesHook,
  unzip,
-  nixosTests,
 }:

 stdenvNoCC.mkDerivation (finalAttrs: {
--- a/pkgs/by-name/ba/basedpyright/package.nix
+++ b/pkgs/by-name/ba/basedpyright/package.nix
@ -11,13 +11,13 @@
 }:

 let
-  version = "1.17.4";
+  version = "1.17.5";

  src = fetchFromGitHub {
    owner = "detachhead";
    repo = "basedpyright";
    rev = "refs/tags/v${version}";
-    hash = "sha256-7lJUyn7UAY+wdbPXcLFz54m2Jl90EMZ6ieSPWysMoWE=";
+    hash = "sha256-DaNxPGY0ahTcluCnsEZNL2oP9zKWQlON8i1bxeJ5GnU=";
  };

  patchedPackageJSON = runCommand "package.json" { } ''
@ -47,7 +47,7 @@ let
    pname = "pyright-internal";
    inherit version src;
    sourceRoot = "${src.name}/packages/pyright-internal";
-    npmDepsHash = "sha256-hd85cCpxx0vqtUXDUorHK8I9IbGZiwewI/RxKF/9ZNw=";
+    npmDepsHash = "sha256-A1XP2IMfQMI1fFk2leuvm/57MsK43Md6Kyag9dQVAdg=";
    dontNpmBuild = true;
    # Uncomment this flag when using unreleased peer dependencies
    # npmFlags = [ "--legacy-peer-deps" ];
@ -94,7 +94,7 @@ buildNpmPackage rec {
  inherit version src;

  sourceRoot = "${src.name}/packages/pyright";
-  npmDepsHash = "sha256-UKxFWhgarMdT24rFU5Ev+JoKbT6ByLnZ1CTKd34YrRE=";
+  npmDepsHash = "sha256-wvxwvPdTKcw4X8F5800ft4an7/xwmRPlL1Wzcm5jim8=";

  postPatch = ''
    chmod +w ../../
--- a/pkgs/by-name/bo/boxbuddy/package.nix
+++ b/pkgs/by-name/bo/boxbuddy/package.nix
@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "boxbuddy";
-  version = "2.2.11";
+  version = "2.2.12";

  src = fetchFromGitHub {
    owner = "Dvlv";
    repo = "BoxBuddyRS";
    rev = version;
-    hash = "sha256-MPeGaAoKbLit/d0UCZjAEso4i2vZ8H4D8Ia8Mutqnvg=";
+    hash = "sha256-PoPIIwe2SlK/iQTyqIhMG0dRobU98L5hnOciMmi9coo=";
  };

-  cargoHash = "sha256-5tSM5sqrePpP7YOLuKi4i78F48oSexLVHQSyx6g7fio=";
+  cargoHash = "sha256-En5TVCW/URJEry4sTd+vdi8K1YO2L0X5pYu/TGsrx6U=";

  # The software assumes it is installed either in flatpak or in the home directory
  # so the xdg data path needs to be patched here
--- a/pkgs/by-name/c2/c2patool/package.nix
+++ b/pkgs/by-name/c2/c2patool/package.nix
@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "c2patool";
-  version = "0.9.8";
+  version = "0.9.9";

  src = fetchFromGitHub {
    owner = "contentauth";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-f1Ec2dJGVjk9Jp5nmcVYwTyIlmnZmERj1pV9weVO3lI=";
+    hash = "sha256-OU1X8EB0IBABlXJklUUCOBhwbcnJNczzjnTl4e8/BYY=";
  };

-  cargoHash = "sha256-wUGOabFTKLCEmg4zNPUklK3YddIIM4N3pev2TtlVthM=";
+  cargoHash = "sha256-0/fdQ9l4vm5Zy8QEvftKqt5GqPn+BkntyJoRiSaSbmU=";

  # use the non-vendored openssl
  OPENSSL_NO_VENDOR = 1;
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/tools/security/ccid/default.nix
@ -1,13 +1,14 @@
-{ lib
-, stdenv
-, fetchurl
-, flex
-, pcsclite
-, pkg-config
-, libusb1
-, perl
-, zlib
-, gitUpdater
+{
+  lib,
+  stdenv,
+  fetchurl,
+  flex,
+  gitUpdater,
+  libusb1,
+  pcsclite,
+  perl,
+  pkg-config,
+  zlib,
 }:

 stdenv.mkDerivation rec {
@ -21,7 +22,7 @@ stdenv.mkDerivation rec {

  postPatch = ''
    patchShebangs .
-    substituteInPlace src/Makefile.in --replace /bin/echo echo
+    substituteInPlace src/Makefile.in --replace-fail /bin/echo echo
  '';

  configureFlags = [
@ -39,25 +40,25 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [
    flex
-    pkg-config
    perl
+    pkg-config
  ];

  buildInputs = [
-    pcsclite
    libusb1
+    pcsclite
    zlib
  ];

  postInstall = ''
    install -Dm 0444 -t $out/lib/udev/rules.d src/92_pcscd_ccid.rules
    substituteInPlace $out/lib/udev/rules.d/92_pcscd_ccid.rules \
-      --replace "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd"
+      --replace-fail "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd"
  '';

  # The resulting shared object ends up outside of the default paths which are
  # usually getting stripped.
-  stripDebugList = ["pcsc"];
+  stripDebugList = [ "pcsc" ];

  passthru.updateScript = gitUpdater {
    url = "https://salsa.debian.org/rousseau/CCID.git";
--- a/pkgs/by-name/ce/celeste64/package.nix
+++ b/pkgs/by-name/ce/celeste64/package.nix
@ -78,7 +78,7 @@ buildDotnetModule rec {
  meta = {
    license = with lib.licenses; [ unfree mit ];
    platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ];
-    maintainers = with lib.maintainers; [ lychee ];
+    maintainers = with lib.maintainers; [ ];
    mainProgram = "Celeste64";
    homepage = "https://github.com/ExOK/Celeste64";
    description = "Celeste 64: Fragments of the Mountain";
--- a/pkgs/by-name/di/dissent/package.nix
+++ b/pkgs/by-name/di/dissent/package.nix
@ -44,6 +44,8 @@ buildGoModule rec {
  ];

  postInstall = ''
+    substituteInPlace nix/so.libdb.dissent.service \
+      --replace-warn "/usr/bin/dissent" "$out/bin/dissent"
    install -D -m 444 -t $out/share/applications nix/so.libdb.dissent.desktop
    install -D -m 444 -t $out/share/icons/hicolor/scalable/apps internal/icons/hicolor/scalable/apps/so.libdb.dissent.svg
    install -D -m 444 -t $out/share/icons/hicolor/symbolic/apps internal/icons/symbolic/apps/so.libdb.dissent-symbolic.svg
--- a/pkgs/by-name/gi/git-spice/package.nix
+++ b/pkgs/by-name/gi/git-spice/package.nix
@ -1,6 +1,5 @@
 {
  lib,
-  fetchpatch,
  buildGo123Module,
  fetchFromGitHub,
  git,
@ -9,24 +8,16 @@

 buildGo123Module rec {
  pname = "git-spice";
-  version = "0.5.2";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "abhinav";
    repo = "git-spice";
    rev = "refs/tags/v${version}";
-    hash = "sha256-ftNLe/3akvk6nUrseBqpbJQSiUPEJO6cTEc7uEBKX3k=";
+    hash = "sha256-VODBN+3xDa+sGynhnWnnhPy0VEKPWOQeh2Ge75OTS0A=";
  };

-  vendorHash = "sha256-f7bjlTVwCFoQrgbeyAvsVAS6vy5uE/AvMGKEutE1lfs=";
-
-  # Fixes flaky test. Remove next release.
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/abhinav/git-spice/commit/92c28474bab81881443129e4a8e9bfc3f1564931.patch";
-      hash = "sha256-6v++jG7Wm6awqHRiNzwjX25BB8X9yGYhSzcUDNQKJ7k=";
-    })
-  ];
+  vendorHash = "sha256-irYXuh0KmCmeZ2fKNduu7zpVqDQmmR7H2bNTMa2zOjI=";

  subPackages = [ "." ];

--- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix
+++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix
@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
  stdenvNoCC.mkDerivation
  {
    inherit pname;
-    version = "0-unstable-2024-07-22";
+    version = "0-unstable-2024-09-12";

    src = fetchFromGitHub {
      owner = "Fausto-Korpsvart";
      repo = "Gruvbox-GTK-Theme";
-      rev = "f14a99e1369a6348a4ecd4a5b2d9c067b83f7b2a";
-      hash = "sha256-WuZX2A5nLk8vMlK0ZlDlbeb79wCCWrGUf2CbqfnbUzk=";
+      rev = "48faf6afee9eea5f3b8c277c936bcb9f76bd95f7";
+      hash = "sha256-LAMVTDVCxjk+reS/StsVdTlsx0DrCxNLClWk6za5D5o=";
    };

    propagatedUserEnvPkgs = [ gtk-engine-murrine ];
--- a/pkgs/by-name/ip/ipxe/package.nix
+++ b/pkgs/by-name/ip/ipxe/package.nix
@ -0,0 +1,144 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  unstableGitUpdater,
+  buildPackages,
+  gnu-efi,
+  mtools,
+  openssl,
+  perl,
+  xorriso,
+  xz,
+  syslinux,
+  embedScript ? null,
+  additionalTargets ? { },
+  additionalOptions ? [ ],
+}:
+
+let
+  targets =
+    additionalTargets
+    // lib.optionalAttrs stdenv.isx86_64 {
+      "bin-x86_64-efi/ipxe.efi" = null;
+      "bin-x86_64-efi/ipxe.efirom" = null;
+      "bin-x86_64-efi/ipxe.usb" = "ipxe-efi.usb";
+      "bin-x86_64-efi/snp.efi" = null;
+    }
+    // lib.optionalAttrs stdenv.hostPlatform.isx86 {
+      "bin/ipxe.dsk" = null;
+      "bin/ipxe.usb" = null;
+      "bin/ipxe.iso" = null;
+      "bin/ipxe.lkrn" = null;
+      "bin/undionly.kpxe" = null;
+    }
+    // lib.optionalAttrs stdenv.isAarch32 {
+      "bin-arm32-efi/ipxe.efi" = null;
+      "bin-arm32-efi/ipxe.efirom" = null;
+      "bin-arm32-efi/ipxe.usb" = "ipxe-efi.usb";
+      "bin-arm32-efi/snp.efi" = null;
+    }
+    // lib.optionalAttrs stdenv.isAarch64 {
+      "bin-arm64-efi/ipxe.efi" = null;
+      "bin-arm64-efi/ipxe.efirom" = null;
+      "bin-arm64-efi/ipxe.usb" = "ipxe-efi.usb";
+      "bin-arm64-efi/snp.efi" = null;
+    };
+in
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ipxe";
+  version = "1.21.1-unstable-2024-09-13";
+
+  nativeBuildInputs = [
+    gnu-efi
+    mtools
+    openssl
+    perl
+    xorriso
+    xz
+  ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux;
+
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "ipxe";
+    repo = "ipxe";
+    rev = "c85ad1246890cf3c0c5f2ac6de06ab046ddd0043";
+    hash = "sha256-Py0mXcCj/NhVW3crngR9ZLHvH9N0QJeVmykc3k+yi6Y=";
+  };
+
+  # Calling syslinux on a FAT image isn't going to work on Aarch64.
+  postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 ''
+    substituteInPlace src/util/genfsimg --replace "	syslinux " "	true "
+  '';
+
+  # Hardening is not possible due to assembler code.
+  hardeningDisable = [
+    "pic"
+    "stackprotector"
+  ];
+
+  makeFlags = [
+    "ECHO_E_BIN_ECHO=echo"
+    "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here.
+    "CROSS=${stdenv.cc.targetPrefix}"
+  ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}";
+
+  enabledOptions = [
+    "PING_CMD"
+    "IMAGE_TRUST_CMD"
+    "DOWNLOAD_PROTO_HTTP"
+    "DOWNLOAD_PROTO_HTTPS"
+  ] ++ additionalOptions;
+
+  configurePhase =
+    ''
+      runHook preConfigure
+      for opt in ${lib.escapeShellArgs finalAttrs.enabledOptions}; do echo "#define $opt" >> src/config/general.h; done
+      substituteInPlace src/Makefile.housekeeping --replace '/bin/echo' echo
+    ''
+    + lib.optionalString stdenv.hostPlatform.isx86 ''
+      substituteInPlace src/util/genfsimg --replace /usr/lib/syslinux ${syslinux}/share/syslinux
+    ''
+    + ''
+      runHook postConfigure
+    '';
+
+  preBuild = "cd src";
+
+  buildFlags = lib.attrNames targets;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    ${lib.concatStringsSep "\n" (
+      lib.mapAttrsToList (
+        from: to: if to == null then "cp -v ${from} $out" else "cp -v ${from} $out/${to}"
+      ) targets
+    )}
+
+    # Some PXE constellations especially with dnsmasq are looking for the file with .0 ending
+    # let's provide it as a symlink to be compatible in this case.
+    ln -s undionly.kpxe $out/undionly.kpxe.0
+
+    runHook postInstall
+  '';
+
+  enableParallelBuilding = true;
+
+  passthru.updateScript = unstableGitUpdater {
+    tagPrefix = "v";
+  };
+
+  meta = {
+    description = "Network boot firmware";
+    homepage = "https://ipxe.org/";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ sigmasquadron ];
+  };
+})
--- a/pkgs/development/tools/jira-cli-go/default.nix
+++ b/pkgs/development/tools/jira-cli-go/default.nix
@ -1,4 +1,15 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, less, more, installShellFiles, testers, jira-cli-go, nix-update-script }:
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  jira-cli-go,
+  less,
+  more,
+  nix-update-script,
+  testers,
+}:

 buildGoModule rec {
  pname = "jira-cli-go";
@ -7,33 +18,22 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "ankitpokhrel";
    repo = "jira-cli";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
    hash = "sha256-edytj9hB8lDwy3qGSyLudu5G4DSRGKhD0vDoWz5eUgs=";
  };

  vendorHash = "sha256-DAdzbANqr0fa4uO8k/yJFoirgbZiKOQhOH8u8d+ncao=";

+  nativeBuildInputs = [ installShellFiles ];
+
  ldflags = [
-    "-s" "-w"
+    "-s"
+    "-w"
    "-X github.com/ankitpokhrel/jira-cli/internal/version.GitCommit=${src.rev}"
    "-X github.com/ankitpokhrel/jira-cli/internal/version.SourceDateEpoch=0"
    "-X github.com/ankitpokhrel/jira-cli/internal/version.Version=${version}"
  ];

-  __darwinAllowLocalNetworking = true;
-
-  nativeCheckInputs = [ less more ]; # Tests expect a pager in $PATH
-
-  passthru = {
-    tests.version = testers.testVersion {
-      package = jira-cli-go;
-      command = "jira version";
-      inherit version;
-    };
-    updateScript = nix-update-script { };
-  };
-
-  nativeBuildInputs = [ installShellFiles ];
  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
    installShellCompletion --cmd jira \
      --bash <($out/bin/jira completion bash) \
@ -44,12 +44,31 @@ buildGoModule rec {
    installManPage man/*
  '';

+  nativeCheckInputs = [
+    less
+    more
+  ]; # Tests expect a pager in $PATH
+
+  passthru = {
+    tests.version = testers.testVersion {
+      package = jira-cli-go;
+      command = "jira version";
+      inherit version;
+    };
+    updateScript = nix-update-script { };
+  };
+
+  __darwinAllowLocalNetworking = true;
+
  meta = with lib; {
    description = "Feature-rich interactive Jira command line";
    homepage = "https://github.com/ankitpokhrel/jira-cli";
    changelog = "https://github.com/ankitpokhrel/jira-cli/releases/tag/v${version}";
    license = licenses.mit;
-    maintainers = with maintainers; [ bryanasdev000 anthonyroussel ];
+    maintainers = with maintainers; [
+      bryanasdev000
+      anthonyroussel
+    ];
    mainProgram = "jira";
  };
 }
--- a/pkgs/by-name/ki/kitex/package.nix
+++ b/pkgs/by-name/ki/kitex/package.nix
@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "kitex";
-  version = "0.11.0";
+  version = "0.11.3";

  src = fetchFromGitHub {
    owner = "cloudwego";
    repo = "kitex";
    rev = "v${version}";
-    hash = "sha256-SD898LbygIHL0X5YVSoJRdP1GQiB8NGfIAFAlx4Gfe8=";
+    hash = "sha256-FjFhbkEMxuBUVfytPk27mrBaAlGXZ9RPWeBy+m0bPV8=";
  };

-  vendorHash = "sha256-tdtiG0jf7Ilvs1KZWggGyqBOQXAWs+zlF09AN80AoC0=";
+  vendorHash = "sha256-e98x8lSwO/u8lFbqDmbVNjVG57Y93/P0ls2UUgRvkH0=";

  subPackages = [ "tool/cmd/kitex" ];

--- a/pkgs/by-name/li/libcsa/package.nix
+++ b/pkgs/by-name/li/libcsa/package.nix
@ -0,0 +1,30 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  unstableGitUpdater,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  name = "csa";
+  version = "1.26-unstable-2024-03-22";
+
+  src = fetchFromGitHub {
+    owner = "sakov";
+    repo = "csa-c";
+    rev = "7b48134613d1d3b337af6d5762df9999a703fb1a";
+    hash = "sha256-G/VhXpdvXBT9I6pwiQXVqCoXhc29wJQpGyLeM3kgv7I=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/csa";
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = with lib; {
+    description = "C code for cubic spline approximation of 2D scattered data";
+    homepage = "https://github.com/sakov/csa-c/";
+    platforms = platforms.unix;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ mkez ];
+    mainProgram = "csabathy";
+  };
+})
--- a/pkgs/development/libraries/libspatialindex/default.nix
+++ b/pkgs/development/libraries/libspatialindex/default.nix
@ -1,4 +1,10 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  fixDarwinDylibNames,
+}:

 stdenv.mkDerivation (finalAttrs: {
  pname = "libspatialindex";
@ -15,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
    patchShebangs test/
  '';

-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;

  cmakeFlags = [
    (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
@ -31,11 +37,15 @@ stdenv.mkDerivation (finalAttrs: {

  doCheck = true;

-  meta = with lib; {
+  postFixup = lib.optionalString stdenv.isDarwin ''
+    install_name_tool -change "@rpath/libspatialindex.7.dylib" "$out/lib/libspatialindex.7.dylib" $out/lib/libspatialindex_c.dylib
+  '';
+
+  meta = {
    description = "Extensible spatial index library in C++";
    homepage = "https://libspatialindex.org";
-    license = licenses.mit;
-    maintainers = teams.geospatial.members;
-    platforms = platforms.unix;
+    license = lib.licenses.mit;
+    maintainers = lib.teams.geospatial.members;
+    platforms = lib.platforms.unix;
  };
 })
--- a/pkgs/by-name/md/mdbook-alerts/package.nix
+++ b/pkgs/by-name/md/mdbook-alerts/package.nix
@ -7,7 +7,7 @@
  CoreServices ? darwin.apple_sdk.frameworks.CoreServices,
 }:
 let
-  version = "0.6.4";
+  version = "0.6.5";
 in
 rustPlatform.buildRustPackage {
  pname = "mdbook-alerts";
@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
    owner = "lambdalisue";
    repo = "rs-mdbook-alerts";
    rev = "v${version}";
-    hash = "sha256-bg3X7M2H553tGxH8cEkkT0XK20fWwkp2nTVEgtZ819s=";
+    hash = "sha256-vlp1tjtdbaH1sax3HAN665fspqRheHZzu5u/QjEejHg=";
  };

-  cargoHash = "sha256-MMhpH3WIAXnjw6xOl2HNfrIFEwjHfVDPquWnFhhZCMU=";
+  cargoHash = "sha256-nzVvktweqrow7P/I8DhDoVJNj1COCeEhx6HLY536hYE=";

  buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

--- a/pkgs/by-name/me/meow/package.nix
+++ b/pkgs/by-name/me/meow/package.nix
@ -0,0 +1,31 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "meow";
+  version = "2.1.3";
+
+  src = fetchFromGitHub {
+    owner = "PixelSergey";
+    repo = "meow";
+    rev = "v${version}";
+    hash = "sha256-PB871c137uxxPaYbV6NB8kECVUrQWTeVz0ciVLHrph4=";
+  };
+
+  cargoHash = "sha256-4BoKZUgt4jf8jy2HU3J6RuT0GXNqkJnBUR09wNlNm7E=";
+
+  postInstall = ''
+    ln -s $out/bin/meow-cli $out/bin/meow
+  '';
+
+  meta = {
+    description = "Print ASCII cats to your terminal";
+    homepage = "https://github.com/PixelSergey/meow";
+    license = lib.licenses.mit;
+    mainProgram = "meow";
+    maintainers = with lib.maintainers; [ pixelsergey ];
+  };
+}
--- a/pkgs/by-name/mo/modelscan/package.nix
+++ b/pkgs/by-name/mo/modelscan/package.nix
@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "modelscan";
-  version = "0.8.0";
+  version = "0.8.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "protectai";
    repo = "modelscan";
    rev = "refs/tags/v${version}";
-    hash = "sha256-G+jBbDiDiQr3E5JuUdNvfIjVpoVCpsDQRoZ7L659BF0=";
+    hash = "sha256-90VnIVQFjtKgLCHc+tmOtDdgJP8aaH4h5ZiOOejnXgQ=";
  };

  build-system = with python3.pkgs; [
--- a/pkgs/by-name/ni/nix-ld/package.nix
+++ b/pkgs/by-name/ni/nix-ld/package.nix
@ -6,17 +6,18 @@
  lib,
 }:

-rustPlatform.buildRustPackage {
-  name = "nix-ld";
+rustPlatform.buildRustPackage rec {
+  pname = "nix-ld";
+  version = "2.0.0";

  src = fetchFromGitHub {
    owner = "mic92";
    repo = "nix-ld";
-    rev = "2.0.0";
+    rev = version;
    hash = "sha256-rmSXQ4MYQe/OFDBRlqqw5kyp9b/aeEg0Fg9c167xofg=";
  };

-  cargoHash = "sha256-w6CQx9kOyBtM2nMwdFb+LtU4oHVEYrTNVmH1A6R5DHM=";
+  cargoHash = "sha256-BVulfs4zm3Iruq00H49QcxR3V+iZvePtLBTytdXfLP4=";

  hardeningDisable = [ "stackprotector" ];

--- a/pkgs/by-name/ni/nix-update/nix-update-script.nix
+++ b/pkgs/by-name/ni/nix-update/nix-update-script.nix
@ -0,0 +1,11 @@
+{
+  lib,
+  nix-update,
+}:
+
+{
+  attrPath ? null,
+  extraArgs ? [ ],
+}:
+
+[ "${lib.getExe nix-update}" ] ++ extraArgs ++ lib.optionals (attrPath != null) [ attrPath ]
--- a/pkgs/by-name/ni/nix-update/package.nix
+++ b/pkgs/by-name/ni/nix-update/package.nix
@ -1,42 +1,62 @@
-{ lib
-, python3
-, fetchFromGitHub
-, nix
-, nix-prefetch-git
-, nixpkgs-review
+{
+  lib,
+  callPackage,
+  fetchFromGitHub,
+  nix,
+  nix-prefetch-git,
+  nixpkgs-review,
+  python3Packages,
 }:

-python3.pkgs.buildPythonApplication rec {
-  pname = "nix-update";
-  version = "1.5.1";
-  pyproject = true;
+let
+  self = python3Packages.buildPythonApplication {
+    pname = "nix-update";
+    version = "1.5.1";
+    pyproject = true;

-  src = fetchFromGitHub {
-    owner = "Mic92";
-    repo = pname;
-    rev = "refs/tags/${version}";
-    hash = "sha256-JXls4EgMDAWtd736nXS2lYTUv9QIjRpkCTimxNtMN7Q=";
+    src = fetchFromGitHub {
+      owner = "Mic92";
+      repo = "nix-update";
+      rev = "refs/tags/${self.version}";
+      hash = "sha256-JXls4EgMDAWtd736nXS2lYTUv9QIjRpkCTimxNtMN7Q=";
+    };
+
+    build-system = [ python3Packages.setuptools ];
+
+    makeWrapperArgs = [
+      "--prefix"
+      "PATH"
+      ":"
+      (lib.makeBinPath [
+        nix
+        nix-prefetch-git
+        nixpkgs-review
+      ])
+    ];
+
+    checkPhase = ''
+      runHook preCheck
+
+      $out/bin/nix-update --help >/dev/null
+
+      runHook postCheck
+    '';
+
+    passthru = {
+      nix-update-script = callPackage ./nix-update-script.nix { nix-update = self; };
+    };
+
+    meta = {
+      homepage = "https://github.com/Mic92/nix-update/";
+      description = "Swiss-knife for updating nix packages";
+      changelog = "https://github.com/Mic92/nix-update/releases/tag/${self.version}";
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [
+        figsoda
+        mic92
+      ];
+      mainProgram = "nix-update";
+    };
  };
-
-  nativeBuildInputs = [
-    python3.pkgs.setuptools
-  ];
-
-  makeWrapperArgs = [
-    "--prefix" "PATH" ":" (lib.makeBinPath [ nix nix-prefetch-git nixpkgs-review ])
-  ];
-
-  checkPhase = ''
-    $out/bin/nix-update --help >/dev/null
-  '';
-
-  meta = with lib; {
-    description = "Swiss-knife for updating nix packages";
-    inherit (src.meta) homepage;
-    changelog = "https://github.com/Mic92/nix-update/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda mic92 ];
-    mainProgram = "nix-update";
-    platforms = platforms.all;
-  };
-}
+in
+self
--- a/pkgs/by-name/op/openfga-cli/package.nix
+++ b/pkgs/by-name/op/openfga-cli/package.nix
@ -7,7 +7,7 @@

 let
  pname = "openfga-cli";
-  version = "0.6.0";
+  version = "0.6.1";
 in

 buildGoModule {
@ -17,7 +17,7 @@ buildGoModule {
    owner = "openfga";
    repo = "cli";
    rev = "v${version}";
-    hash = "sha256-6bzVT+SnYAFDYdy5nyXPpmUuLsmjvUuaIlPkICjw30U=";
+    hash = "sha256-cAfBEhgHnzmSD8/pVi8VVjnC3O+WgokzdPSzvE5hDec=";
  };

  vendorHash = "sha256-jIcuyt4tzfz+WkyQnMZs6viLnmwtGbVawgnz9M/xAS8=";
--- a/pkgs/by-name/pi/picocrypt-cli/package.nix
+++ b/pkgs/by-name/pi/picocrypt-cli/package.nix
@ -5,17 +5,17 @@

 buildGoModule rec {
  pname = "picocrypt-cli";
-  version = "2.07";
+  version = "2.08";

  src = fetchFromGitHub {
    owner = "Picocrypt";
    repo = "CLI";
    rev = version;
-    hash = "sha256-z6xtqo0VBLneXNaP6NdyuHTX905cqrzxvECIHVBGNlY=";
+    hash = "sha256-6/VmacOXQOCkjLFyzDPyohOueF3WKJu7XCAD9oiFXEc=";
  };

  sourceRoot = "${src.name}/picocrypt";
-  vendorHash = "sha256-Nuo4oIJxp+liNLNXRvbFTE1ElEIM1OBp5CTb0KEV/7g=";
+  vendorHash = "sha256-QIeuqdoC17gqxFgKJ/IU024dgofBCizWTj2S7CCmED4=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/po/powertop/package.nix
+++ b/pkgs/by-name/po/powertop/package.nix
@ -0,0 +1,76 @@
+{
+  lib,
+  stdenv,
+  autoconf-archive,
+  autoreconfHook,
+  fetchFromGitHub,
+  gettext,
+  libnl,
+  ncurses,
+  nix-update-script,
+  pciutils,
+  pkg-config,
+  powertop,
+  testers,
+  xorg,
+  zlib,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "powertop";
+  version = "2.15";
+
+  src = fetchFromGitHub {
+    owner = "fenrus75";
+    repo = "powertop";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-53jfqt0dtMqMj3W3m6ravUTzApLQcljDHfdXejeZa4M=";
+  };
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  nativeBuildInputs = [
+    autoconf-archive
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    gettext
+    libnl
+    ncurses
+    pciutils
+    zlib
+  ];
+
+  postPatch = ''
+    substituteInPlace src/main.cpp --replace-fail "/sbin/modprobe" "modprobe"
+    substituteInPlace src/calibrate/calibrate.cpp --replace-fail "/usr/bin/xset" "${lib.getExe xorg.xset}"
+    substituteInPlace src/tuning/bluetooth.cpp --replace-fail "/usr/bin/hcitool" "hcitool"
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.version = testers.testVersion {
+      package = powertop;
+      command = "powertop --version";
+      inherit version;
+    };
+  };
+
+  meta = with lib; {
+    inherit (src.meta) homepage;
+    changelog = "https://github.com/fenrus75/powertop/releases/tag/v${version}";
+    description = "Analyze power consumption on Intel-based laptops";
+    mainProgram = "powertop";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [
+      fpletz
+      anthonyroussel
+    ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix
@ -1,17 +1,17 @@
 { lib, buildGoModule, fetchFromGitHub }:

 let
-  version = "1.3.0";
+  version = "1.3.1";
  src = fetchFromGitHub {
    owner = "tynany";
    repo = "frr_exporter";
    rev = "v${version}";
-    hash = "sha256-6a58COPlV6xyy/EAJmt+lXH23ULJY5ysMM6+3VDiTmE=";
+    hash = "sha256-SDtI7CvCeuRL1cXNsWGCl/zupVbgMxv5bzYYqJWTrMw=";
  };
 in
 buildGoModule {
  pname = "prometheus-frr-exporter";
-  vendorHash = "sha256-AvJzt9+81WDFXU0IOo9nqT/mEYixuhBIJfBx395Wsdo=";
+  vendorHash = "sha256-G+S4XORrg0AEKoAqYdmg+uW6x0Ub5diQTyQGY0iebHg=";
  inherit src version;

  ldflags = [
--- a/pkgs/by-name/py/pysqlrecon/package.nix
+++ b/pkgs/by-name/py/pysqlrecon/package.nix
@ -1,31 +1,32 @@
-{ lib
-, fetchFromGitHub
-, python3
+{
+  lib,
+  fetchFromGitHub,
+  python3,
 }:

 python3.pkgs.buildPythonApplication rec {
  pname = "pysqlrecon";
-  version = "0.2.0";
+  version = "0.3.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "Tw1sm";
    repo = "PySQLRecon";
    rev = "refs/tags/v${version}";
-    hash = "sha256-AJCvGpOjnh5ih5HrrpI+x0zyB7P6rMGL70707UunhEM=";
+    hash = "sha256-+pme4uOgsh6iZEL73PaR1Y55r+Z/SPEVD2QWBsnMsNs=";
  };

  pythonRelaxDeps = [
+    "impacket"
    "rich"
    "typer"
  ];

-  nativeBuildInputs = with python3.pkgs; [
-    poetry-core
-  ];
+  nativeBuildInputs = with python3.pkgs; [ poetry-core ];

  propagatedBuildInputs = with python3.pkgs; [
    impacket
+    pycryptodome
    rich
    typer
  ];
@ -33,9 +34,7 @@ python3.pkgs.buildPythonApplication rec {
  # Project has no tests
  doCheck = false;

-  pythonImportsCheck = [
-    "pysqlrecon"
-  ];
+  pythonImportsCheck = [ "pysqlrecon" ];

  meta = with lib; {
    description = "Offensive MSSQL toolkit";
--- a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
+++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix
@ -12,13 +12,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "raspberrypi-eeprom";
-  version = "2024.07.30-2712";
+  version = "2024.09.10-2712";

  src = fetchFromGitHub {
    owner = "raspberrypi";
    repo = "rpi-eeprom";
    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-4rTq8O6TqE7vRr4o+/149FraYLmKFUQRUFffzC0aeIQ=";
+    hash = "sha256-SLPLZzSRsPDxGtFnFFu99z3HqGDLDNuMWbgUKdeJyuI=";
  };

  buildInputs = [ python3 ];
--- a/pkgs/by-name/re/remnote/package.nix
+++ b/pkgs/by-name/re/remnote/package.nix
@ -6,10 +6,10 @@
 }:
 let
  pname = "remnote";
-  version = "1.16.111";
+  version = "1.16.116";
  src = fetchurl {
    url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
-    hash = "sha256-aelkdrILxe7Wf1BZmSIQ5XMJsyxHM9oW8h6DDzeA0uQ=";
+    hash = "sha256-H89ge4b8Xm6YJXQSiPA/FBnlbekAG0Vobr2EQ4459q4=";
  };
  appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in
--- a/pkgs/by-name/sa/sanjuuni/package.nix
+++ b/pkgs/by-name/sa/sanjuuni/package.nix
@ -7,6 +7,7 @@
  poco,
  ocl-icd,
  opencl-clhpp,
+  gitUpdater,
  callPackage,
 }:

@ -38,8 +39,11 @@ stdenv.mkDerivation rec {
    runHook postInstall
  '';

-  passthru.tests = {
-    run-on-nixos-artwork = callPackage ./tests/run-on-nixos-artwork.nix { };
+  passthru = {
+    tests = {
+      run-on-nixos-artwork = callPackage ./tests/run-on-nixos-artwork.nix { };
+    };
+    updateScript = gitUpdater { };
  };

  meta = with lib; {
--- a/pkgs/by-name/sc/scalingo/package.nix
+++ b/pkgs/by-name/sc/scalingo/package.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "scalingo";
-  version = "1.33.0";
+  version = "1.34.0";

  src = fetchFromGitHub {
    owner = pname;
    repo = "cli";
    rev = version;
-    hash = "sha256-7hb1RU33wGeSESxY16pYJfQ2O3QOT92Em6jlh8oP/Zc=";
+    hash = "sha256-SJFQFOd9m+38TsclIs4FxAl9kejgcUG895qjy4iXKdk=";
  };

  vendorHash = null;
--- a/pkgs/by-name/se/serie/package.nix
+++ b/pkgs/by-name/se/serie/package.nix
@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "serie";
-  version = "0.3.0";
+  version = "0.4.0";

  src = fetchFromGitHub {
    owner = "lusingander";
    repo = "serie";
    rev = "v${version}";
-    hash = "sha256-LjWpWgOInnPL4Ke8Ntk+bEJBljPSEe14RCKzN50JUGA=";
+    hash = "sha256-RP9Tv6IrDfawjXCQp0nB0nd7b6IwkdykHcEfGEguFHo=";
  };

-  cargoHash = "sha256-Ynnp7jSnkNHbL98JOXjV6v97IXWwi2HiZC5SkChCRv0=";
+  cargoHash = "sha256-HxIyWlFKDRod5nSENZguNYz/vn+E9Ux0K3dMhX7I/zQ=";

  buildInputs = lib.optionals stdenv.isDarwin (
    with darwin.apple_sdk.frameworks;
--- a/pkgs/by-name/sn/sn-pro/package.nix
+++ b/pkgs/by-name/sn/sn-pro/package.nix
@ -2,13 +2,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "sn-pro";
-  version = "1.1.0";
+  version = "1.2.0";

  src = fetchFromGitHub {
    owner = "supernotes";
    repo = "sn-pro";
    rev = version;
-    hash = "sha256-G/DIHWs91HYVbrV/jZ4aFsCCjqORo8YeqcHGN0LZ8p4=";
+    hash = "sha256-7GrCEYgP6kfdlAWjNddmkwJrB/s1mFmugMGPPOM34JA=";
  };

  installPhase = ''
--- a/pkgs/by-name/so/solfege/css.patch
+++ b/pkgs/by-name/so/solfege/css.patch
--- a/pkgs/by-name/so/solfege/menubar.patch
+++ b/pkgs/by-name/so/solfege/menubar.patch
--- a/pkgs/by-name/so/solfege/package.nix
+++ b/pkgs/by-name/so/solfege/package.nix
@ -1,17 +1,34 @@
-{ lib, fetchurl, gettext, pkg-config, texinfo, wrapGAppsHook3
-, buildPythonApplication, pycairo, pygobject3
-, gdk-pixbuf, gobject-introspection, gtk3, librsvg
-, alsa-utils, timidity, mpg123, vorbis-tools, csound, lilypond
-, automake, autoconf, txt2man
+{
+  lib,
+  alsa-utils,
+  autoconf,
+  automake,
+  csound,
+  fetchurl,
+  gdk-pixbuf,
+  gettext,
+  gobject-introspection,
+  gtk3,
+  librsvg,
+  lilypond,
+  mpg123,
+  pkg-config,
+  python3Packages,
+  texinfo,
+  timidity,
+  txt2man,
+  vorbis-tools,
+  wrapGAppsHook3,
 }:

-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
  pname = "solfege";
  version = "3.23.4";
+  format = "other";

  src = fetchurl {
    url = "https://alpha.gnu.org/gnu/solfege/solfege-${version}.tar.gz";
-    sha256 = "0sc17vf4xz6gy0s0z9ghi68yskikdmyb4gdaxx6imrm40734k8mp";
+    hash = "sha256-t6JJxgGk5hpN76o9snxtM07tkYnwpQ808M/8Ttw+gWk=";
  };

  patches = [
@ -27,15 +44,14 @@ buildPythonApplication rec {
  '';

  nativeBuildInputs = [
-    automake
    autoconf
+    automake
    gdk-pixbuf
    gettext
+    gobject-introspection
    pkg-config
    texinfo
    txt2man
-
-    gobject-introspection
    wrapGAppsHook3
  ];

@ -44,7 +60,7 @@ buildPythonApplication rec {
    librsvg
  ];

-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3Packages; [
    pycairo
    pygobject3
  ];
@ -59,7 +75,11 @@ buildPythonApplication rec {
           default.config
  '';

-  format = "other";
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';

  enableParallelBuilding = true;

@ -68,7 +88,11 @@ buildPythonApplication rec {
    homepage = "https://www.gnu.org/software/solfege/";
    license = licenses.gpl3Only;
    platforms = platforms.linux;
-    maintainers = with maintainers; [ bjornfor orivej anthonyroussel ];
+    maintainers = with maintainers; [
+      bjornfor
+      orivej
+      anthonyroussel
+    ];
    mainProgram = "solfege";
  };
 }
--- a/pkgs/by-name/so/solfege/texinfo.patch
+++ b/pkgs/by-name/so/solfege/texinfo.patch
--- a/pkgs/by-name/so/solfege/webbrowser.patch
+++ b/pkgs/by-name/so/solfege/webbrowser.patch
--- a/pkgs/servers/search/sonic-server/default.nix
+++ b/pkgs/servers/search/sonic-server/default.nix
@ -1,11 +1,12 @@
-{ lib
-, stdenv
-, rustPlatform
-, fetchFromGitHub
-, nix-update-script
-, nixosTests
-, testers
-, sonic-server
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nix-update-script,
+  nixosTests,
+  rustPlatform,
+  sonic-server,
+  testers,
 }:

 rustPlatform.buildRustPackage rec {
@ -21,9 +22,6 @@ rustPlatform.buildRustPackage rec {

  cargoHash = "sha256-bH9u38gvH6QEySQ3XFXEHBiSqKKtB+kjcZRLjx4Z6XM=";

-  # Found argument '--test-threads' which wasn't expected, or isn't valid in this context
-  doCheck = false;
-
  nativeBuildInputs = [
    rustPlatform.bindgenHook
  ];
@ -31,19 +29,22 @@ rustPlatform.buildRustPackage rec {
  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation";

  postPatch = ''
-    substituteInPlace src/main.rs --replace "./config.cfg" "$out/etc/sonic/config.cfg"
+    substituteInPlace src/main.rs \
+      --replace-fail "./config.cfg" "$out/etc/sonic/config.cfg"
  '';

  postInstall = ''
    install -Dm444 -t $out/etc/sonic config.cfg
    install -Dm444 -t $out/lib/systemd/system debian/sonic.service

-    substituteInPlace \
-      $out/lib/systemd/system/sonic.service \
-      --replace /usr/bin/sonic $out/bin/sonic \
-      --replace /etc/sonic.cfg $out/etc/sonic/config.cfg
+    substituteInPlace $out/lib/systemd/system/sonic.service \
+      --replace-fail /usr/bin/sonic $out/bin/sonic \
+      --replace-fail /etc/sonic.cfg $out/etc/sonic/config.cfg
  '';

+  # Found argument '--test-threads' which wasn't expected, or isn't valid in this context
+  doCheck = false;
+
  passthru = {
    tests = {
      inherit (nixosTests) sonic-server;
@ -62,6 +63,9 @@ rustPlatform.buildRustPackage rec {
    license = licenses.mpl20;
    platforms = platforms.unix;
    mainProgram = "sonic";
-    maintainers = with maintainers; [ pleshevskiy anthonyroussel ];
+    maintainers = with maintainers; [
+      pleshevskiy
+      anthonyroussel
+    ];
  };
 }
--- a/pkgs/by-name/so/soteria/package.nix
+++ b/pkgs/by-name/so/soteria/package.nix
@ -56,7 +56,6 @@ rustPlatform.buildRustPackage {
    mainProgram = "soteria";
    maintainers = with lib.maintainers; [
      NotAShelf
-      lychee
    ];
    inherit (polkit.meta) platforms;
  };
--- a/pkgs/by-name/st/stu/package.nix
+++ b/pkgs/by-name/st/stu/package.nix
@ -8,7 +8,7 @@
  testers,
 }:
 let
-  version = "0.5.2";
+  version = "0.6.2";
 in
 rustPlatform.buildRustPackage {
  pname = "stu";
@ -18,10 +18,10 @@ rustPlatform.buildRustPackage {
    owner = "lusingander";
    repo = "stu";
    rev = "v${version}";
-    hash = "sha256-R+ebDW6qkYK92seQHCWGKby544UrNGg+CfdK1NLIwas=";
+    hash = "sha256-fxVnOftYkl4G6H+jMSy6r/YQgmK15EjKAjdf8MdoaS0=";
  };

-  cargoHash = "sha256-6uporgZTii97xLdEt7KXuSxoRMmFOGEGU3bPXP7Z14g=";
+  cargoHash = "sha256-/a91ONvKG6aRFAnHDkpOQQFtfGlO1WahWM9LdPs75iw=";

  buildInputs = lib.optionals stdenv.isDarwin [
    darwin.apple_sdk.frameworks.AppKit
--- a/pkgs/by-name/su/surrealdb/package.nix
+++ b/pkgs/by-name/su/surrealdb/package.nix
@ -16,16 +16,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
  pname = "surrealdb";
-  version = "1.5.5";
+  version = "2.0.1";

  src = fetchFromGitHub {
    owner = "surrealdb";
    repo = "surrealdb";
    rev = "v${version}";
-      hash = "sha256-C2ppLbNv68qpl2bcqWp/PszcCeGCsD0LbEdAM9P1asg=";
+    hash = "sha256-JFkTD/MGvak8EuDEABGH1xLykSNj4rtnnENAruls6W8=";
  };

-  cargoHash = "sha256-gLepa9JxY9AYyGepV6Uzt1g7apkKWJxf0SiNCSkjUDg=";
+  cargoHash = "sha256-N/4VHvBA9ij+VLPxJ+1237fnOHGoC6guZ62CYrwfHM4=";

  # error: linker `aarch64-linux-gnu-gcc` not found
  postPatch = ''
--- a/pkgs/by-name/sy/syn2mas/package.nix
+++ b/pkgs/by-name/sy/syn2mas/package.nix
@ -5,26 +5,26 @@

 buildNpmPackage rec {
  pname = "syn2mas";
-  version = "0.10.0";
+  version = "0.12.0";

  src = fetchFromGitHub {
-    owner = "matrix-org";
+    owner = "element-hq";
    repo = "matrix-authentication-service";
    rev = "v${version}";
-    hash = "sha256-cZJ9ibBtxVBBVCBTGhtfM6lQTFvgUnO1WPO1WmDGuks=";
+    hash = "sha256-QLtyYxV2yXHJtwWgGcyi7gRcKypYoy9Z8bkEuTopVXc=";
  };

  sourceRoot = "${src.name}/tools/syn2mas";

-  npmDepsHash = "sha256-Dk/aSkCbuHiZN5H/f692/Yef+f5SJDSXuSMbePkU66g=";
+  npmDepsHash = "sha256-pRa5qqLsI8Hx9v5tMPDkehczXZjWWAOjfDfLLh2V6Q4=";

  dontBuild = true;

-  meta = with lib; {
+  meta = {
    description = "Tool to help with the migration of a Matrix Synapse installation to the Matrix Authentication Service";
-    homepage = "https://github.com/matrix-org/matrix-authentication-service/tree/main/tools/syn2mas";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ teutat3s ];
+    homepage = "https://github.com/element-hq/matrix-authentication-service/tree/main/tools/syn2mas";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ teutat3s ];
    mainProgram = "syn2mas";
  };
 }
--- a/pkgs/by-name/ta/taler-depolymerization/package.nix
+++ b/pkgs/by-name/ta/taler-depolymerization/package.nix
@ -0,0 +1,55 @@
+{
+  lib,
+  rustPlatform,
+  fetchgit,
+  stdenv,
+  darwin,
+}:
+rustPlatform.buildRustPackage {
+  pname = "taler-depolymerization";
+  version = "0-unstable-2024-06-17";
+
+  src = fetchgit {
+    url = "https://git.taler.net/depolymerization.git/";
+    rev = "a0d27ac3bba22d4934ca9f7b244b0d9e45bb484f";
+    hash = "sha256-HmQ/DPq/O6aODWms/bSsCVgBF7z246xxfYxiHrAkgYw=";
+  };
+
+  cargoHash = "sha256-NgoLCTHhEs45cnx21bU2ko3oWxePSzKgUpnCGqhjvTs=";
+
+  outputs = [
+    "out"
+    "doc"
+  ];
+
+  postPatch = ''
+    # fix missing expression in test docs
+    substituteInPlace common/src/status.rs \
+      --replace-fail '          -> Requested' '()        -> Requested'
+  '';
+
+  postInstall = ''
+    mkdir -p $doc/share/doc $out/share/examples
+
+    cp -R docs $doc/share/doc/taler-depolymerization
+    cp docs/*.conf $out/share/examples
+  '';
+
+  buildInputs = lib.optionals stdenv.isDarwin (
+    with darwin.apple_sdk.frameworks;
+    [
+      CoreFoundation
+      Security
+      SystemConfiguration
+    ]
+  );
+
+  meta = {
+    description = "Wire gateway for Bitcoin/Ethereum";
+    homepage = "https://git.taler.net/depolymerization.git/";
+    license = lib.licenses.agpl3Only;
+    maintainers = [
+      # maintained by the team working on NGI-supported software, no group for this yet
+    ];
+  };
+}
--- a/pkgs/by-name/ta/taler-wallet-core/package.nix
+++ b/pkgs/by-name/ta/taler-wallet-core/package.nix
@ -37,12 +37,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "taler-wallet-core";
-  version = "0.13.1";
+  version = "0.13.3";

  src = fetchgit {
    url = "https://git.taler.net/wallet-core.git";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-1TM2kD4HfL3QPzZ3Xzq5Sfycevf94Pkw7HpEoMkujN8=";
+    hash = "sha256-9pRhaQNnIzbhahMaTVVZqLTlAxh7GZxoz4Gf3TDldAA=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@ -15,13 +15,13 @@

 buildNpmPackage rec {
  pname = "teams-for-linux";
-  version = "1.9.6";
+  version = "1.10.2";

  src = fetchFromGitHub {
    owner = "IsmaelMartinez";
    repo = "teams-for-linux";
    rev = "refs/tags/v${version}";
-    hash = "sha256-VonydbN7EiXnQIArOSKgNsIV7zIZQsLihZ41geSx1AA=";
+    hash = "sha256-AcKjh3DAUoIpsMr+K/T0FT5knbBx54pZmJKCK9HRZVQ=";
  };

  npmDepsHash = "sha256-vDRFFxkIQo5qU9gmkSwUhPz4FG2XbUNkTw6SCuvMqCc=";
--- a/pkgs/servers/monitoring/thanos/default.nix
+++ b/pkgs/servers/monitoring/thanos/default.nix
@ -1,11 +1,12 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, go
-, nix-update-script
-, nixosTests
-, testers
-, thanos
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  go,
+  nix-update-script,
+  nixosTests,
+  testers,
+  thanos,
 }:

 buildGoModule rec {
@ -21,18 +22,22 @@ buildGoModule rec {

  vendorHash = "sha256-d+jHGmCfx9Ffm5pajm1RvKnMea99JswL0I8nmILXN50=";

-  doCheck = true;
-
  subPackages = "cmd/thanos";

-  ldflags = let t = "github.com/prometheus/common/version"; in [
-    "-X ${t}.Version=${version}"
-    "-X ${t}.Revision=unknown"
-    "-X ${t}.Branch=unknown"
-    "-X ${t}.BuildUser=nix@nixpkgs"
-    "-X ${t}.BuildDate=unknown"
-    "-X ${t}.GoVersion=${lib.getVersion go}"
-  ];
+  ldflags =
+    let
+      t = "github.com/prometheus/common/version";
+    in
+    [
+      "-X ${t}.Version=${version}"
+      "-X ${t}.Revision=unknown"
+      "-X ${t}.Branch=unknown"
+      "-X ${t}.BuildUser=nix@nixpkgs"
+      "-X ${t}.BuildDate=unknown"
+      "-X ${t}.GoVersion=${lib.getVersion go}"
+    ];
+
+  doCheck = true;

  passthru = {
    updateScript = nix-update-script { };
@ -51,6 +56,9 @@ buildGoModule rec {
    changelog = "https://github.com/thanos-io/thanos/releases/tag/v${version}";
    license = licenses.asl20;
    mainProgram = "thanos";
-    maintainers = with maintainers; [ basvandijk anthonyroussel ];
+    maintainers = with maintainers; [
+      basvandijk
+      anthonyroussel
+    ];
  };
 }
--- a/pkgs/by-name/ti/tigerbeetle/package.nix
+++ b/pkgs/by-name/ti/tigerbeetle/package.nix
@ -1,36 +1,41 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, zig_0_11
-, testers
-, tigerbeetle
-, nix-update-script
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+  testers,
+  tigerbeetle,
+  nix-update-script,
 }:
 let
-  # Read [these comments](pkgs/development/compilers/zig/hook.nix#L12-L30) on the default Zig flags, and the associated links. tigerbeetle stopped exposing the `-Doptimize` build flag, so we can't use the default Nixpkgs zig hook as-is. tigerbeetle only exposes a boolean `-Drelease` flag which we'll add in the tigerbeetle derivation in this file.
-  custom_zig_hook = zig_0_11.hook.overrideAttrs (previousAttrs: {
-    zig_default_flags = builtins.filter (flag: builtins.match "-Doptimize.*" flag == null) previousAttrs.zig_default_flags;
-  });
+  platform =
+    if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
+  hash = builtins.getAttr platform {
+    "universal-macos" = "sha256-ls2QFCiPkXMTiCHo8AXb5bFl118zjtuQAGl26c4huwU=";
+    "x86_64-linux" = "sha256-QjQjP5p2fpOLWNGiU2aMMs2bUEFOWfBZrbPGLTOFozg=";
+    "aarch64-linux" = "sha256-DMxGakZBJhLTgZp7B9lwxilr6yhDVDe/GQCMFaRTWe4=";
+  };
 in
-stdenv.mkDerivation (finalAttrs: {
+stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "tigerbeetle";
-  version = "0.15.3";
+  version = "0.15.5";

-  src = fetchFromGitHub {
-    owner = "tigerbeetle";
-    repo = "tigerbeetle";
-    rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-3+uCMoOnyvI//ltEaqTIXytUxxgJrfMnFly11WCh66Q=";
+  src = fetchzip {
+    url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";
+    inherit hash;
  };

-  env.TIGERBEETLE_RELEASE = finalAttrs.version;
+  dontUnpack = true;
+  dontConfigure = true;
+  dontBuild = true;

-  nativeBuildInputs = [ custom_zig_hook ];
+  installPhase = ''
+    runHook preInstall

-  zigBuildFlags = [
-    "-Drelease"
-    "-Dgit-commit=0000000000000000000000000000000000000000"
-  ];
+    mkdir -p $out/bin
+    cp $src/tigerbeetle $out/bin/tigerbeetle
+
+    runHook postInstall
+  '';

  passthru = {
    tests.version = testers.testVersion {
@ -45,7 +50,11 @@ stdenv.mkDerivation (finalAttrs: {
    description = "Financial accounting database designed to be distributed and fast";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ danielsidhion ];
-    platforms = lib.platforms.linux;
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ] ++ lib.platforms.darwin;
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
    mainProgram = "tigerbeetle";
  };
 })
--- a/Show More
+++ b/Show More