Merge master into staging-next

2026-05-17 18:22:52 +00:00
parent 535e86a9d6 f82b37fc30
commit c2cc02a354
81 changed files with 1131 additions and 913 deletions
@@ -308,7 +308,7 @@ Ensure that your buildToolsVersion and ndkVersion match what is declared in andr
 If you are using cmake, make sure its declared version is correct too.

 Otherwise, you may get cryptic errors from aapt2 and the Android Gradle plugin warning
-that it cannot install the build tools because the SDK directory is not writeable.
+that it cannot install the build tools because the SDK directory is not writable.

 ```gradle
 android {
@@ -205,7 +205,7 @@ pkgs.buildEmscriptenPackage {

 ## Debugging {#declarative-debugging}

-Use `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz` and from there you can go trough the individual steps. This makes it easy to build a good `unit test` or list the files of the project.
+Use `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz` and from there you can go through the individual steps. This makes it easy to build a good `unit test` or list the files of the project.

 1. `nix-shell -I nixpkgs=/some/dir/nixpkgs -A emscriptenPackages.libz`
 2. `cd /tmp/`
@@ -115,7 +115,7 @@

 - `nodePackages.browserify` has been removed, as it was unmaintained within nixpkgs.

- `command-not-found` package will be enabled by default if the source of nixpkgs contains the file `programs.sqlite`. This is the case if a nixpkgs tarball from https://channels.nixos.org is used. This usage will also make the database of `command-no-found` stateless.
+- `command-not-found` package will be enabled by default if the source of nixpkgs contains the file `programs.sqlite`. This is the case if a nixpkgs tarball from https://channels.nixos.org is used. This usage will also make the database of `command-not-found` stateless.

 - `nodePackages.sass` has been removed, as it was unmaintained within nixpkgs.

@@ -130,7 +130,7 @@

 - Keycloak has been updated to 26.6.X, bringing a lot new features like federated client authentication, JWT authorization grants, workflows and the ability to do
  zero-downtime patch releases. Read more about [all the exciting new capabilities in keycloak 26.6 here](https://github.com/keycloak/keycloak/releases/tag/26.6.0)
-  and [consult the migration guide to 26.6](https://www.keycloak.org/docs/latest/upgrading/index.html#migrating-to-26-6-0) to find out wether this is a breaking
+  and [consult the migration guide to 26.6](https://www.keycloak.org/docs/latest/upgrading/index.html#migrating-to-26-6-0) to find out whether this is a breaking
  change for your keycloak instance.

 - `elegant-sddm` has been updated to be Qt6 compatible. Themes for SDDM are slightly different so read the [wiki](https://wiki.nixos.org/wiki/SDDM_Themes) for more.
@@ -394,7 +394,7 @@ gnuradioMinimal.override {

 - The `nodejs_latest` alias now points to `nodejs_26` instead of `nodejs_24`.

- `nodejs-slim` no longer exposes a `corepack` executable, it has been moved to an ad-hoc output; to restore the previous behavior, `nodejs-slim.corepack` must be explicitely included.
+- `nodejs-slim` no longer exposes a `corepack` executable, it has been moved to an ad-hoc output; to restore the previous behavior, `nodejs-slim.corepack` must be explicitly included.

 - `nodejs` is now a simple wrapper for `nodejs-slim`+`nodejs-slim.npm`+`nodejs-slim.corepack`, meaning it is no longer possible to reference or override its attributes or outputs (e.g. `nodejs.libv8` must be replaced with `nodejs-slim.libv8`, `nodejs.nativeBuildInputs` with `nodejs-slim.nativeBuildInputs`, etc.).

@@ -16340,6 +16340,11 @@
    githubId = 208297;
    name = "Luz";
  };
+  lvanasse = {
+    github = "lvanasse";
+    githubId = 12837376;
+    name = "Ludovic Vanasse";
+  };
  lwb-2021 = {
    email = "lwb-2021@qq.com";
    github = "lwb-2021";
@@ -22,7 +22,7 @@ to `false`.
 In case there are multiple interfaces of the same type, it's better to
 assign custom names based on the device hardware address. For example,
 we assign the name `wan` to the interface with MAC address
-`52:54:00:12:01:01` using a netword link unit:
+`52:54:00:12:01:01` using a network link unit:

 ```nix
 {
@@ -389,7 +389,7 @@ When upgrading from a previous release, please be aware of the following incompa

  Additionally, `platform.kernelArch` moved to the top level as `linuxArch` to match the other `*Arch` variables.

-  The `platform` grouping of these things never meant anything, and was just a historial/implementation artifact that was overdue removal.
+  The `platform` grouping of these things never meant anything, and was just a historical/implementation artifact that was overdue removal.

 - `services.restic` now uses a dedicated cache directory for every backup defined in `services.restic.backups`. The old global cache directory, `/root/.cache/restic`, is now unused and can be removed to free up disk space.

@@ -196,7 +196,7 @@ In addition to numerous new and upgraded packages, this release has the followin
      # Provide languages as ISO 639-2 codes
      # separated by a plus (+) sign.
      # https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes
-      PAPERLESS_OCR_LANGUAGE = "deu+eng+jpn"; # German & English & Japanse
+      PAPERLESS_OCR_LANGUAGE = "deu+eng+jpn"; # German & English & Japanese
    };
  }
  ```
@@ -436,7 +436,7 @@ In addition to numerous new and upgraded packages, this release has the followin

 - `retroArchCores` has been removed. This means that using `nixpkgs.config.retroarch` to customize RetroArch cores is not supported anymore. Instead, use package overrides, for example: `retroarch.override { cores = with libretro; [ citra snes9x ]; };`. Also, `retroarchFull` derivation is available for those who want to have all RetroArch cores available.

- The Linux kernel for security reasons now restricts access to BPF syscalls via `BPF_UNPRIV_DEFAULT_OFF=y`. Unprivileged access can be reenabled via the `kernel.unprivileged_bpf_disabled` sysctl knob.
+- The Linux kernel for security reasons now restricts access to BPF syscalls via `BPF_UNPRIV_DEFAULT_OFF=y`. Unprivileged access can be re-enabled via the `kernel.unprivileged_bpf_disabled` sysctl knob.

 - `/usr` will always be included in the initial ramdisk. See the `fileSystems.<name>.neededForBoot` option.
  If any files exist under `/usr` (which is not typical for NixOS), they will be included in the initial ramdisk, increasing its size to a possibly problematic extent.
@@ -293,7 +293,7 @@ Make sure to also check the many updates in the [Nixpkgs library](#sec-release-2

 - `odoo` defaults to v16 now, updated from v15.

- `varnish` was upgraded from v7.2.x to v7.4.x. Refer to upgrade guides vor
+- `varnish` was upgraded from v7.2.x to v7.4.x. Refer to upgrade guides for
  [v7.3](https://varnish-cache.org/docs/7.3/whats-new/upgrading-7.3.html) and
  [v7.4](https://varnish-cache.org/docs/7.4/whats-new/upgrading-7.4.html). The
  current LTS version is still offered as `varnish60`.
@@ -692,7 +692,7 @@ Make sure to also check the many updates in the [Nixpkgs library](#sec-release-2
  NixOS configuration.

 - GNOME, Pantheon, Cinnamon modules no longer force Qt applications to use
-  Adwaita style. This implemantion  was buggy and is no longer maintained
+  Adwaita style. This implementation  was buggy and is no longer maintained
  upstream. Specifically, Cinnamon defaults to the gtk2 style instead now,
  following the default in Linux Mint). If you still want Adwaita used, you may
  add the following options to your configuration. Please be aware, that it
@@ -799,7 +799,7 @@ Make sure to also check the many updates in the [Nixpkgs library](#sec-release-2
    directly. Please upgrade to `nextcloud26` (or earlier) first. Nextcloud
    prohibits skipping major versions while upgrading. You may upgrade by
    declaring [`services.nextcloud.package =
-    pkgs.nextcloud26;`](options.html#opt-services.nextcloud.package) inbetween.
+    pkgs.nextcloud26;`](options.html#opt-services.nextcloud.package) in between.

 - `postgresql_11` has been removed since it'll stop receiving fixes on November
  9th 2023.
@@ -1131,7 +1131,7 @@ Make sure to also check the many updates in the [Nixpkgs library](#sec-release-2
  network interface is irrelevant.

 - `services.outline` can be configured to use local filesystem storage now.
-  Previously ony S3 storage was possible. This may be set using
+  Previously only S3 storage was possible. This may be set using
  [services.outline.storage.storageType](#opt-services.outline.storage.storageType).

 - `pkgs.openvpn3` optionally supports systemd-resolved now. `programs.openvpn3`
@@ -708,7 +708,7 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi
  The port can be specified in [`services.nextcloud.config.dbhost`](#opt-services.nextcloud.config.dbhost).

 - `services.kavita` now uses the free-form option `services.kavita.settings` for the application settings file.
-  The options `services.kavita.ipAdresses` and `services.kavita.port` now exist at `services.kavita.settings.IpAddresses`
+  The options `services.kavita.ipAddresses` and `services.kavita.port` now exist at `services.kavita.settings.IpAddresses`
  and `services.kavita.settings.IpAddresses`. The file at `services.kavita.tokenKeyFile` now needs to contain a secret with
  512+ bits instead of 128+ bits.

@@ -283,7 +283,7 @@ Alongside many enhancements to NixOS modules and general system improvements, th

 - The `virtualisation.hypervGuest.videoMode` option has been removed. Standard tooling can now be used to configure display modes for Hyper-V VMs.

- Nextcloud's default FPM pool settings have been increased according to upstream recommentations. It's advised
+- Nextcloud's default FPM pool settings have been increased according to upstream recommendations. It's advised
  to review the new defaults and description of
  [](#opt-services.nextcloud.poolSettings).

@@ -14,7 +14,7 @@
  - The `cryptsetup-askpass` program is not available; use `systemctl default` instead, which will prompt for passphrases as necessary. If you pipe password responses into SSH over stdin, use `ssh -o RequestTTY=force` to ensure `systemctl default` gets a TTY to prompt on.
  - Many kernel parameters have been replaced with native systemd versions; see [](#sec-boot-problems).

- The system.nix file has been added has an alternative entry point to configuration.nix (and flake.nix) that allows to configure NixOS without using `nix-channel`.
+- The system.nix file has been added as an alternative entry point to configuration.nix (and flake.nix) that allows to configure NixOS without using `nix-channel`.
  This file must evaluate to a NixOS system derivation or an attribute set of such derivations, in which case the attribute to build has to be selected with the `--attr` option of `nixos-rebuild` or `nixos-install`.
  For example,
  ```nix
@@ -179,6 +179,8 @@

 - `services.crabfit` was removed because its upstream packages are unmaintained and insecure.

+- `services.opensnitch.settings.Rules.Path` now defaults to `/var/lib/opensnitch/rules` instead of the previous `/etc/opensnitchd/rules` because it contains mutable data.
+
 - `services.mosquitto` now generates per-listener authentication and access control via the upstream `password-file` and `acl-file` plugins instead of the deprecated `password_file` and `acl_file` options. The plugins contain the same code, so behaviour is unchanged, but [](#opt-services.mosquitto.package) must now be at least version 2.1.

 - `sing-box` has been updated to 1.13.0, which has removed some deprecated options.  See [upstream documentation](https://sing-box.sagernet.org/configuration/) for details and migration options.
@@ -400,11 +402,11 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.

 - `security.acme` now defaults to a dynamic renewal duration, if
  [security.acme.defaults.validMinDays](#opt-security.acme.defaults.validMinDays)
-  remains unset. This accomodates certificates with different ACME profile:
+  remains unset. This accommodates certificates with different ACME profile:
    - For certificates with a total validity at or above 10 days renewal will happen
      after two thirds of the lifetime has passed (e.g. a certificate valid for 90
      days renews once the validity falls below 30 days)
-    - For shortlived certificates with a total validty below 10 days renewal
+    - For shortlived certificates with a total validity below 10 days renewal
      will happen after half of the total lifetime has passed

 - The module for the Dovecot IMAP server, *services.dovecot*, now uses RFC-42-style settings, exposing a structured interface to write the configuration file.
@@ -379,7 +379,7 @@ systemctl start acme-example.com.service

 ## Ensuring dependencies for services that need to be reloaded when a certificate changes {#module-security-acme-reload-dependencies}

-Services that depend on ACME certificates and need to be reloaded can use one of two approaches to reload upon successfull certificate acquisition or renewal:
+Services that depend on ACME certificates and need to be reloaded can use one of two approaches to reload upon successful certificate acquisition or renewal:

 1. **Using the `security.acme.certs.<name>.reloadServices` option**: This will cause `systemctl try-reload-or-restart` to be run for the listed services.

@@ -237,7 +237,7 @@ PostgreSQL's versioning policy is described [here](https://www.postgresql.org/su

 - Each major version is supported for 5 years.
 - Every three months there will be a new minor release, containing bug and security fixes.
- For criticial/security fixes there could be more minor releases inbetween. This happens *very* infrequently.
+- For critical/security fixes there could be more minor releases in between. This happens *very* infrequently.
 - After five years, a final minor version is released. This usually happens in early November.
 - After that a version is considered end-of-life (EOL).
 - Around February each year is the first time an EOL-release will not have received regular updates anymore.
@@ -9,7 +9,7 @@ built on top of the ledger plain-text-accounting tool.

 ## Usage {#module-services-paisa-usage}

-Paisa needs to have one of the following cli tools availabe in the PATH at
+Paisa needs to have one of the following cli tools available in the PATH at
 runtime:

 - ledger
@@ -29,7 +29,7 @@ which is read-only and accessible without authentication:
      "public" = {
        "path" = "/public";
        "read only" = "yes";
-        "browseable" = "yes";
+        "browsable" = "yes";
        "guest ok" = "yes";
        "comment" = "Public samba share.";
      };
@@ -56,7 +56,7 @@ certificate by leveraging the ACME
 [extraDomainNames](#opt-security.acme.certs._name_.extraDomainNames) module option.

 Provided the setup detailed in the previous section, you'll need the following acme configuration to generate
-a TLS certificate for the three endponits:
+a TLS certificate for the three endpoints:
 ```nix
 {
  security.acme = {
@@ -52,49 +52,41 @@ in
        };
      };

+      upstreamDefaults = lib.mkOption {
+        description = ''
+          Whether to base the config declared in {option}`services.opensnitch.settings` on the upstream example config (<https://github.com/evilsocket/opensnitch/blob/master/daemon/data/default-config.json>)
+
+          Disable this if you want to declare your opensnitch config from scratch.
+        '';
+        type = lib.types.bool;
+        default = true;
+      };
+
+      configFile = lib.mkOption {
+        description = ''
+          Path to JSON config file. See: <https://github.com/evilsocket/opensnitch/blob/master/daemon/data/default-config.json>
+          If this option is set, it will override any configuration done in options.services.opensnitch.settings.
+        '';
+        example = "/etc/opensnitchd/default-config.json";
+        type = lib.types.path;
+        default =
+          let
+            generatedConfig = format.generate "config.json" cfg.settings;
+          in
+          if cfg.upstreamDefaults then
+            pkgs.runCommand "opensnitch-config.json" { } ''
+              ${lib.getExe pkgs.jq} -s '.[0] * .[1]' ${cfg.package}/etc/opensnitchd/default-config.json ${format.generate "config.json" cfg.settings} >"$out"
+            ''
+          else
+            generatedConfig;
+        defaultText = lib.literalMD "JSON file generated from {option}`services.opensnitch.settings`";
+      };
+
      settings = lib.mkOption {
        type = lib.types.submodule {
          freeformType = format.type;

          options = {
-            Server = {
-
-              Address = lib.mkOption {
-                type = lib.types.str;
-                description = ''
-                  Unix socket path (unix:///tmp/osui.sock, the "unix:///" part is
-                  mandatory) or TCP socket (192.168.1.100:50051).
-                '';
-              };
-
-              LogFile = lib.mkOption {
-                type = lib.types.path;
-                description = ''
-                  File to write logs to (use /dev/stdout to write logs to standard
-                  output).
-                '';
-              };
-
-            };
-
-            DefaultAction = lib.mkOption {
-              type = lib.types.enum [
-                "allow"
-                "deny"
-              ];
-              description = ''
-                Default action whether to block or allow application internet
-                access.
-              '';
-            };
-
-            InterceptUnknown = lib.mkOption {
-              type = lib.types.bool;
-              description = ''
-                Whether to intercept spare connections.
-              '';
-            };
-
            ProcMonitorMethod = lib.mkOption {
              type = lib.types.enum [
                "ebpf"
@@ -102,47 +94,23 @@ in
                "ftrace"
                "audit"
              ];
+              default = "ebpf";
              description = ''
                Which process monitoring method to use.
              '';
            };

-            LogLevel = lib.mkOption {
-              type = lib.types.ints.between 0 4;
-              description = ''
-                Default log level from 0 to 4 (debug, info, important, warning,
-                error).
-              '';
-            };
-
            Firewall = lib.mkOption {
              type = lib.types.enum [
                "iptables"
                "nftables"
              ];
+              default = if config.networking.nftables.enable then "nftables" else "iptables";
+              defaultText = lib.literalExpression ''if config.networking.nftables.enable then "nftables" else "iptables"'';
              description = ''
                Which firewall backend to use.
              '';
            };
-
-            Stats = {
-
-              MaxEvents = lib.mkOption {
-                type = lib.types.int;
-                description = ''
-                  Max events to send to the GUI.
-                '';
-              };
-
-              MaxStats = lib.mkOption {
-                type = lib.types.int;
-                description = ''
-                  Max stats per item to keep in backlog.
-                '';
-              };
-
-            };
-
            Ebpf.ModulesPath = lib.mkOption {
              type = lib.types.nullOr lib.types.path;
              default =
@@ -152,7 +120,7 @@ in
                  null;
              defaultText = lib.literalExpression ''
                if cfg.settings.ProcMonitorMethod == "ebpf" then
-                  "\\$\\{config.boot.kernelPackages.opensnitch-ebpf\\}/etc/opensnitchd"
+                  "''${config.boot.kernelPackages.opensnitch-ebpf}/etc/opensnitchd"
                else null;
              '';
              description = ''
@@ -191,15 +159,6 @@ in

  config = lib.mkIf cfg.enable {

-    # pkg.opensnitch is referred to elsewhere in the module so we don't need to worry about it being garbage collected
-    services.opensnitch.settings = lib.mapAttrs (_: v: lib.mkDefault v) (
-      builtins.fromJSON (
-        builtins.unsafeDiscardStringContext (
-          builtins.readFile "${cfg.package}/etc/opensnitchd/default-config.json"
-        )
-      )
-    );
-
    security.auditd = lib.mkIf (cfg.settings.ProcMonitorMethod == "audit") {
      enable = true;
      plugins.af_unix.active = true;
@@ -211,16 +170,10 @@ in
        wantedBy = [ "multi-user.target" ];
        path = lib.optionals (cfg.settings.ProcMonitorMethod == "audit") [ pkgs.audit ];
        serviceConfig = {
-          ExecStart =
-            let
-              preparedSettings = removeAttrs cfg.settings (
-                lib.optional (cfg.settings.ProcMonitorMethod != "ebpf") "Ebpf"
-              );
-            in
-            [
-              ""
-              "${lib.getExe' cfg.package "opensnitchd"} --config-file ${format.generate "default-config.json" preparedSettings}"
-            ];
+          ExecStart = [
+            ""
+            "${lib.getExe' cfg.package "opensnitchd"} --config-file ${cfg.configFile}"
+          ];
        };
        preStart = lib.mkIf (cfg.rules != { }) (
          let
@@ -117,10 +117,10 @@ with your admin user to modify the storage limit.

 ## iOS background sync {#module-services-ente-ios-background-sync}

-On iOS, background sync is achived via a silent notification sent by the server
+On iOS, background sync is achieved via a silent notification sent by the server
 every 30 minutes that allows the phone to sync for about 30 seconds, enough for
 all but the largest videos to be synced on background (if the app is brought to
-foreground though, sync will resume as normal). To achive this however, a
+foreground though, sync will resume as normal). To achieve this however, a
 Firebase account is needed. In the settings option, configure credentials-dir
 to point towards the directory where the JSON containing the Firebase
 credentials are stored.
@@ -8,9 +8,6 @@ let
 in
 {
  name = "dendrite";
-  meta = {
-    maintainers = pkgs.lib.teams.matrix.members;
-  };

  nodes = {
    homeserver =
@@ -1210,7 +1210,7 @@ Security fixes are submitted in the same way as other changes and thus the same

 If a security fix applies to both master and a stable release then, similar to regular changes, they are preferably delivered via master first and cherry-picked to the release branch.

-Critical security fixes may by-pass the staging branches and be delivered directly to release branches such as `master` and `release-*`.
+Critical security fixes may bypass the staging branches and be delivered directly to release branches such as `master` and `release-*`.

 ### Vulnerability Roundup

@@ -12,7 +12,7 @@ buildNpmPackage {
  sourceRoot = "${src.name}/coolercontrol-ui";

  npmDepsFetcherVersion = 2;
-  npmDepsHash = "sha256-AzRw6DuloOFC7VN7yM9czqxosfVIoXAltv2xHUxac7k=";
+  npmDepsHash = "sha256-fWsksBQCwHHWYE82NG0Vf/f+Hk02YMCUaGMHFGhGx2U=";

  postBuild = ''
    cp -r dist $out
@@ -2,6 +2,7 @@
  rustPlatform,
  testers,
  hwdata,
+  pkg-config,
  libdrm,
  coolercontrol,
  runtimeShell,
@@ -22,11 +23,15 @@ rustPlatform.buildRustPackage {
  inherit version src;
  sourceRoot = "${src.name}/coolercontrold";

-  cargoHash = "sha256-rFwbHsGkKLD9UgkdTbxMIjARmU0Ewal1NIwlbzRL/vc=";
+  cargoHash = "sha256-f0SsTwriUo2rD97L+Z/bq7UahOSLjYjH8bbXg/Hx5qE=";

-  buildInputs = [ libdrm ];
+  buildInputs = [
+    hwdata
+    libdrm
+  ];

  nativeBuildInputs = [
+    pkg-config
    protobuf
    addDriverRunpath
    python3Packages.wrapPython
@@ -42,10 +47,6 @@ rustPlatform.buildRustPackage {
    # Hardcode a shell
    substituteInPlace daemon/src/repositories/utils.rs \
      --replace-fail 'Command::new("sh")' 'Command::new("${runtimeShell}")'
-
-    # This is supposed to be a "nix-compatible file path", but there is nothing that actually does the substitution
-    substituteInPlace daemon/src/repositories/hwmon/pci_ids.rs \
-      --replace-fail '@hwdata@' '${hwdata}'
  '';

  postInstall = ''
@@ -5,13 +5,13 @@
 }:

 let
-  version = "4.1.0";
+  version = "4.3.0";

  src = fetchFromGitLab {
    owner = "coolercontrol";
    repo = "coolercontrol";
    tag = version;
-    hash = "sha256-v1enPMezagA3gcYD5EbC1ecTOXEsMLRGWIKzgDxzRWg=";
+    hash = "sha256-hmxeqsCv0URBSe4sU637h4OYroLHQRcOtkFuyKoES7c=";
  };

  meta = {
@@ -27,8 +27,10 @@ let
      cmake
    ];

-    # Required for gcc-15 compatibility
-    env.NIX_CFLAGS_COMPILE = "-std=gnu17";
+    env = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
+      # Required for gcc-15 compatibility
+      NIX_CFLAGS_COMPILE = "-std=gnu17";
+    };

    cmakeFlags = [
      "-DBLAS_LIBRARIES=${blas}/lib"
@@ -2,7 +2,6 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  fetchpatch,
  ffmpeg_7,
  libaom,
  nasm,
@@ -11,30 +10,21 @@
  rav1e,
  rustPlatform,
  vapoursynth,
+  versionCheckHook,
 }:

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "av1an-unwrapped";
-  version = "0.4.4";
+  version = "0.5.2";

  src = fetchFromGitHub {
    owner = "rust-av";
-    repo = "av1an";
-    tag = finalAttrs.version;
-    hash = "sha256-YF+j349777pE+evvXWTo42DQn1CE0jlfKBEXUFTfcb8=";
+    repo = "Av1an";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-JwYnDl9ZSSE+dD+ZAxuN7ywqFN314Ib/9Flh52kL3do=";
  };

-  cargoPatches = [
-    # TODO: Remove in next version
-    # Avoids https://github.com/shssoichiro/ffmpeg-the-third/issues/63
-    # https://github.com/master-of-zen/Av1an/pull/912
-    (fetchpatch {
-      url = "https://github.com/rust-av/Av1an/commit/e6b29a5a624434eb0dc95b7e8aa31ccf624ccb9d.patch";
-      hash = "sha256-nFE04hlTzApYafSzgl/XOUdchxEjKvxXy+SKr/d6+0Q=";
-    })
-  ];
-
-  cargoHash = "sha256-PcxnWkruFH4d2FqS+y3PmyA70kSe9BKtmTdCnfKnfpU=";
+  cargoHash = "sha256-mxWYXujwp7tYAj9bM/ZhqbyISMjvX+AYG07otcB67pg=";

  nativeBuildInputs = [
    nasm
@@ -48,18 +38,36 @@ rustPlatform.buildRustPackage (finalAttrs: {
  ];

  nativeCheckInputs = [
-    libaom
+    libaom.bin
    rav1e
+    versionCheckHook
  ];

-  passthru = {
-    updateScript = nix-update-script {
-      extraArgs = [
-        "--version-regex"
-        "'^(\\d*\\.\\d*\\.\\d*)$'"
-      ];
-    };
-  };
+  # The encode_tests integration suite drives the full encode pipeline
+  # (external encoders, ffmpeg and vapoursynth source plugins at
+  # runtime) and only passes in upstream's prebuilt CI image, so limit
+  # the check phase to the unit tests.
+  cargoTestFlags = [
+    "--workspace"
+    "--lib"
+    "--bins"
+  ];
+
+  # libvapoursynth-script spins up an embedded Python and runs
+  # `import vapoursynth`; without this the VSScript API fails to
+  # initialize during unit tests that exercise the vapoursynth code path.
+  preCheck = ''
+    export PYTHONPATH=${vapoursynth}/${vapoursynth.python3.sitePackages}''${PYTHONPATH:+:$PYTHONPATH}
+  '';
+
+  # These unit tests load blank_1080p.mkv via core.lsmas.LWLibavSource,
+  # which needs the L-SMASH Works plugin.
+  checkFlags = [
+    "--skip=chunk::tests::apply_photon_noise_args_with_noise"
+    "--skip=scenes::tests::validate_zones_target_quality"
+  ];
+
+  passthru.updateScript = nix-update-script { };

  meta = {
    description = "Cross-platform command-line encoding framework";
@@ -72,7 +80,5 @@ rustPlatform.buildRustPackage (finalAttrs: {
    license = lib.licenses.gpl3Only;
    maintainers = with lib.maintainers; [ getchoo ];
    mainProgram = "av1an";
-    # symbol index out of range file '/private/tmp/nix-build-av1an-unwrapped-0.4.4.drv-0/rustcz0anL2/librav1e-ca440893f9248a14.rlib' for architecture x86_64
-    broken = stdenv.hostPlatform.system == "x86_64-darwin";
  };
 })
@@ -0,0 +1,11 @@
+{
+  avahi,
+  ...
+}@args:
+
+avahi.override (
+  {
+    withLibdnssdCompat = true;
+  }
+  // removeAttrs args [ "avahi" ]
+)
@@ -8,11 +8,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "bdf2psf";
-  version = "1.247";
+  version = "1.248";

  src = fetchurl {
    url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${finalAttrs.version}_all.deb";
-    sha256 = "sha256-56JC3wJZz80nGXn/YywWZ4wXiR1h+X//Y72qfLyPtyE=";
+    sha256 = "sha256-51PE9o1kmISd/kYHLm8NUBDKi2eyXJkL0MkWlp1f8co=";
  };

  nativeBuildInputs = [ dpkg ];
@@ -13,12 +13,12 @@
 # reference: https://boringssl.googlesource.com/boringssl/+/refs/tags/0.20250818.0/BUILDING.md
 stdenv.mkDerivation (finalAttrs: {
  pname = "boringssl";
-  version = "0.20260413.0";
+  version = "0.20260508.0";

  src = fetchgit {
    url = "https://boringssl.googlesource.com/boringssl";
    tag = finalAttrs.version;
-    hash = "sha256-JFKQleui4nNmEsx4k5L7xhvEFh3Ne3MEPnHDSRqEwPc=";
+    hash = "sha256-7fW0OmOj+Hduq5YCc5xpcfICpC8qAc/05/UMgZ70jhM=";
  };

  patches = [
@@ -23,13 +23,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "buildbox";
-  version = "1.4.5";
+  version = "1.4.6";

  src = fetchFromGitLab {
    owner = "BuildGrid";
    repo = "buildbox/buildbox";
    tag = finalAttrs.version;
-    hash = "sha256-f326mxdZD5INhfQAl3Rebt93r0Itk+ye8tAkw4BJsnA=";
+    hash = "sha256-zNZMk9C/KsiqqGZOzc6B1WjL4wemWmdrr0a+CMA2BlQ=";
  };

  nativeBuildInputs = [
@@ -6,16 +6,16 @@

 buildGoModule (finalAttrs: {
  pname = "comigo";
-  version = "1.2.30";
+  version = "1.2.31";

  src = fetchFromGitHub {
    owner = "yumenaka";
    repo = "comigo";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-JS+KgXmYEx3V5FnFqcDwFonxRHg5f5n8uH4MtpT0e3g=";
+    hash = "sha256-oQq1fPwTVuw/gzmTivkT2AUvHkMVMgECc9h+ZLg9FvA=";
  };

-  vendorHash = "sha256-OUmqbev7Eq79co8RdmwOF6fqcOWwwm6Kx4fbvd2DJU4=";
+  vendorHash = "sha256-o8XzCcX6IYb73QxQWoVYuxHOjKRcV949g0AwtM08Pys=";

  subPackages = [ "." ];

@@ -70,7 +70,6 @@ buildGoModule (finalAttrs: {
    description = "Second-generation Matrix homeserver written in Go";
    changelog = "https://github.com/element-hq/dendrite/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.agpl3Plus;
-    teams = [ lib.teams.matrix ];
    platforms = lib.platforms.unix;
  };
 })
@@ -5,6 +5,7 @@
  gitUpdater,
  cmake,
  pkg-config,
+  fetchpatch,
  libx11,
  libxrandr,
  libxinerama,
@@ -27,6 +28,15 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-9EbaME3kw2ptCWpaV9CnM0j5HOof264s5iFoOTcjwNg=";
  };

+  patches = [
+    (fetchpatch {
+      name = "fix-min-macos-version";
+      # https://github.com/asb2m10/dexed/pull/523
+      url = "https://github.com/asb2m10/dexed/commit/e41f1b8147bb6a5b7e9330a7ec6a598a1e74a524.patch";
+      sha256 = "sha256-8ZrAirXUACk8BJUPfA/LQORCUOqjSTsKoS9HFyrkvV8=";
+    })
+  ];
+
  postPatch = ''
    substituteInPlace CMakeLists.txt \
      --replace-fail 'set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE INTERNAL "")' '# Not forcing output archs'
@@ -1,6 +1,7 @@
 {
  lib,
  stdenv,
+  argp-standalone,
  fetchFromGitHub,
 }:

@@ -15,6 +16,10 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-1NmqG73sP25Uqf7DiSPgt7drONOg9ZkrtCS0tYVjSU0=";
  };

+  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    argp-standalone
+  ];
+
  # Don't blow up on warnings; it makes upgrading the compiler difficult.
  postPatch = ''
    substituteInPlace Makefile --replace-fail "-Werror" ""
@@ -4,14 +4,14 @@
  fetchFromGitHub,
  nix-update-script,
 }:
-buildNpmPackage rec {
+buildNpmPackage (finalAttrs: {
  pname = "eslint";
  version = "10.3.0";

  src = fetchFromGitHub {
    owner = "eslint";
    repo = "eslint";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
    hash = "sha256-b0Gv7soMPTsbMOZLqMe5vMCPwInk9AFusepf2jJH/Ng=";
  };

@@ -35,7 +35,7 @@ buildNpmPackage rec {
  };

  meta = {
-    changelog = "https://github.com/eslint/eslint/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/eslint/eslint/blob/${finalAttrs.src.rev}/CHANGELOG.md";
    description = "Find and fix problems in your JavaScript code";
    homepage = "https://eslint.org";
    license = lib.licenses.mit;
@@ -44,4 +44,4 @@ buildNpmPackage rec {
      onny
    ];
  };
-}
+})
@@ -25,6 +25,10 @@ stdenv.mkDerivation (finalAttrs: {
    })
  ];

+  env = {
+    CXXFLAGS = "-std=c++11";
+  };
+
  nativeBuildInputs = [
    cmake
  ];
@@ -12,16 +12,18 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "feedr";
-  version = "0.7.0";
+  version = "0.8.0";
+
+  __structuredAttrs = true;

  src = fetchFromGitHub {
    owner = "bahdotsh";
    repo = "feedr";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-5s4QgkUX27WNrTyzyYDQjf4VjKD0Kdkicjf7hlO9OKE=";
+    hash = "sha256-x8FypbvuAzARc/Jy9kSfSVSSVUsTTdLJU9ihNWpUbak=";
  };

-  cargoHash = "sha256-3xSvqj2kW0lOFUzkAbBJThJx6u7f1tSk1qgFdm2tVfg=";
+  cargoHash = "sha256-bUZnaAKlbNCOoMYufBZSHu2QLtxsrur3Cdmpd5y4Sw8=";

  nativeBuildInputs = [
    pkg-config
@@ -41,6 +43,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
    # event loop thread panicked
    "--skip=test_problematic_feeds"
    "--skip=test_reddit_style_atom_feeds"
+    "--skip=test_extract_article_rejects_non_http_scheme"
+    # bind 127.0.0.1: Os { code: 1, kind: PermissionDenied, message: "Operation not permitted" }
+    "--skip=test_extract_article_rejects_non_html_content_type"
+    "--skip=test_extract_article_follows_safe_redirect_to_public_target"
+    "--skip=test_extract_article_does_not_send_authorization_header"
+    "--skip=test_extract_article_rejects_oversized_content_length"
+    "--skip=test_extract_article_rejects_redirect_into_private_ip_via_safe_client"
  ];

  doInstallCheck = true;
@@ -1,33 +0,0 @@
-diff --git a/Build.PL b/Build.PL
-index b029d1e..8737395 100644
--- a/Build.PL
-+++ b/Build.PL
-@@ -16,13 +16,14 @@ use Games::FrozenBubble;
- my $prefix = Alien::SDL->config('prefix');
- my $cflags = '-I'
-   . File::Spec->catfile( $prefix, 'include' )
-+  . ' ' . `pkg-config --cflags SDL_mixer`
-   ;
- $cflags .= ' -fnested-functions' if $^O =~ /darwin/;
- ###!!! this looks strange, you perhaps meant "$cflags .= ..."
- ###!!! I intended Alien::SDL to add -I$prefix/include automatically, please tell me when it does not work (kmx)
- my $devnull = File::Spec->devnull();
- my @cflags =  ExtUtils::CBuilder->new->split_like_shell( $cflags );
-my @linkers = ( ExtUtils::CBuilder->new->split_like_shell( Alien::SDL->config('libs', '-lSDL_mixer', '-lSDL_Pango') ) );
-+my @linkers = ( ExtUtils::CBuilder->new->split_like_shell( Alien::SDL->config('libs', '-lSDL_Pango',`pkg-config --libs SDL_mixer`) ) );
- push @linkers, '-liconv'
-   if $^O =~ /win/i;    ###!!! really only Win needs this? ; BEWARE this matches also 'darwin', 'cygwin'!!!!
- 
-diff --git a/inc/My/Builder.pm b/inc/My/Builder.pm
-index 2ebaf91..c420b9a 100644
--- a/inc/My/Builder.pm
-+++ b/inc/My/Builder.pm
-@@ -123,7 +123,7 @@ sub ACTION_server {
-             push @ofiles, $cbuilder->compile(
-                 source               => catfile($server_directory, $cfile),
-                 extra_compiler_flags => [
-                    qw(-g -Wall -Werror -pipe), # verbatim from Makefile
-+                    qw(-g -pipe), # verbatim from Makefile
-                     '-I' . $server_directory, # does not seem to be necessary
-                     $cbuilder->split_like_shell(`pkg-config glib-2.0 --cflags`),
-                     $cbuilder->split_like_shell(`pkg-config glib-2.0 --libs`),
@@ -1,74 +0,0 @@
-{
-  lib,
-  fetchurl,
-  perlPackages,
-  pkg-config,
-  SDL,
-  SDL_mixer,
-  SDL_Pango,
-  glib,
-  copyDesktopItems,
-  makeDesktopItem,
-  fetchpatch,
-}:
-
-perlPackages.buildPerlModule {
-  pname = "frozen-bubble";
-  version = "2.212";
-
-  src = fetchurl {
-    url = "mirror://cpan/authors/id/K/KT/KTHAKORE/Games-FrozenBubble-2.212.tar.gz";
-    hash = "sha256-ch4E/2nFIzBgZWv79AAqoa6t2WyVNR8MV7uFtto1owU=";
-  };
-
-  patches = [
-    ./fix-compilation.patch
-    (fetchpatch {
-      # https://github.com/kthakore/frozen-bubble/pull/82
-      url = "https://github.com/kthakore/frozen-bubble/commit/1aacc67254a0aafd856086cc306e9f7b389c6bf4.patch?full_index=1";
-      hash = "sha256-RqJ+/UFv4esKWZBk0fttsEXhPMislEBTAl2oj4pLAZY=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    copyDesktopItems
-    pkg-config
-  ];
-
-  buildInputs = [
-    glib
-    SDL
-    SDL_mixer
-    SDL_Pango
-    perlPackages.SDL
-    perlPackages.FileSlurp
-  ];
-
-  propagatedBuildInputs = with perlPackages; [
-    AlienSDL
-    CompressBzip2
-    FileShareDir
-    FileWhich
-    IPCSystemSimple
-    LocaleMaketextLexicon
-  ];
-
-  perlPreHook = "export LD=$CC";
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "frozen-bubble";
-      exec = "frozen-bubble";
-      desktopName = "Frozen Bubble";
-      genericName = "Frozen Bubble";
-      comment = "Arcade/reflex colour matching game";
-      categories = [ "Game" ];
-    })
-  ];
-
-  meta = {
-    description = "Puzzle with Bubbles";
-    license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ puckipedia ];
-  };
-}
@@ -12,12 +12,12 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "fusesoc";
-  version = "2.4.5";
+  version = "2.4.6";
  pyproject = true;

  src = fetchPypi {
    inherit (finalAttrs) pname version;
-    hash = "sha256-VBjJ7wiEz441iVquLMGabtdYbK07+dtHY05x8QzdSL8=";
+    hash = "sha256-d04DFtV71CkrvX51x19cl0KSn2yOCMmYWGRv3AED8Xw=";
  };

  build-system = with python3Packages; [
@@ -11,16 +11,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "fzf-make";
-  version = "0.68.0";
+  version = "0.69.0";

  src = fetchFromGitHub {
    owner = "kyu08";
    repo = "fzf-make";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-6lnu+wIRfd2DwCjPe5nng/6qZx/H9YBj3jItSREY+fI=";
+    hash = "sha256-ezE7plWdPqfENprOWhl5YQnoXk9khXsDtsYf6Lifk3w=";
  };

-  cargoHash = "sha256-geAaKOD1FbRasb648fBmrkxMMwd1OnNzjg23lgjpY+0=";
+  cargoHash = "sha256-uF+oV0ZvGsRy20DkNrVowyb+RoYVtYN4R/gOZ6WzHQw=";

  nativeBuildInputs = [ makeBinaryWrapper ];

@@ -9,16 +9,16 @@

 buildGoModule (finalAttrs: {
  pname = "gcx";
-  version = "0.2.7";
+  version = "0.2.14";

  src = fetchFromGitHub {
    owner = "grafana";
    repo = "gcx";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-M4qZghOhEq8WgGeJkTB1Ff+RBs2KD8ZLr/zVpX0CB28=";
+    hash = "sha256-gN3l45wFpZSUnhprei/Ca1/4ptmOFtpNmNUpy6sn0aU=";
  };

-  vendorHash = "sha256-fgPyTVN7acPiRls038sINZwiEBs5dZXGXtB+c6CUUVw=";
+  vendorHash = "sha256-uxFYKMJgAYlj43Uri6T6vaXsv/UmYk4zfCSkvu0A6RM=";

  subPackages = [ "cmd/gcx" ];

@@ -7,7 +7,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "ggml";
-  version = "0.11.0";
+  version = "0.12.0";

  __structuredAttrs = true;
  strictDeps = true;
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "ggml-org";
    repo = "ggml";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-T/dacPlHo7wy1+lMYQdTPd+7exNDuKvZNeuvPDbKJJ0=";
+    hash = "sha256-xho510x/7LrCHzmw++zdTg+lI96SebJkdotqIUGLwac=";
  };

  # The cmake package does not handle absolute CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR
@@ -6,16 +6,16 @@

 buildGoModule (finalAttrs: {
  pname = "gotty";
-  version = "1.6.0";
+  version = "1.7.1";

  src = fetchFromGitHub {
    owner = "sorenisanerd";
    repo = "gotty";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-9J+8NZmdYg4mE8Jgs2bxcwcPyh4sVcOBYPnulVENdy0=";
+    sha256 = "sha256-zTdV6l7rrOY8oPwpSIfYC9rgwbdvSe2dsQYHvhnIq/Q=";
  };

-  vendorHash = "sha256-OcBwkA28k54rSZP66L+wdkiWPvUv7Z9pTlEK7/LXjBM=";
+  vendorHash = "sha256-MvNCq1kWhfVJz4h6G0yAwJd8Z4xRtcu2WjeEhoTW5L8=";

  # upstream did not update the tests, so they are broken now
  # https://github.com/sorenisanerd/gotty/issues/13
@@ -235,7 +235,7 @@ stdenv.mkDerivation (finalAttrs: {
  enableParallelBuilding = true;

  # GCC 14 makes these errors by default
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration -Wno-error=int-conversion";
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration -Wno-error=int-conversion -std=gnu17";

  desktopItems = [
    (makeDesktopItem {
@@ -8,16 +8,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "hath-rust";
-  version = "1.16.1";
+  version = "1.17.0";

  src = fetchFromGitHub {
    owner = "james58899";
    repo = "hath-rust";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-pRaheUWEbd2ClDxt5GDE0LF2xa+GU2/UnzZF/nH7DKc=";
+    hash = "sha256-X27YlTDviX8F5gZK+CV3DvLKwDCW3MyWeHAWbju2UnE=";
  };

-  cargoHash = "sha256-vndJckLMbu0bO5WLUtzX88xrb/SKRm3TwEfrV3S0bCU=";
+  cargoHash = "sha256-luXAi6JotliI0bUaXEv6qNv4hgYG/3dM8Jk/42aH7kk=";

  nativeInstallCheckInputs = [ versionCheckHook ];
  doInstallCheck = true;
@@ -64,7 +64,10 @@ stdenv.mkDerivation (finalAttrs: {
    ./numpy-header.patch
  ];

-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument";
+  env.NIX_CFLAGS_COMPILE = toString [
+    (lib.optionals stdenv.cc.isClang "-Wno-unused-command-line-argument")
+    "-std=gnu17"
+  ];

  # Workaround for https://github.com/NixOS/nixpkgs/issues/304528
  env.GAG_CPP = if stdenv.hostPlatform.isDarwin then "${gfortran.outPath}/bin/cpp" else "cpp";
@@ -9,15 +9,15 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "jsonschema-cli";
-  version = "0.46.4";
+  version = "0.46.5";

  src = fetchCrate {
    pname = "jsonschema-cli";
    inherit (finalAttrs) version;
-    hash = "sha256-Yze2iL+4SAR3WUgypGM94OKKFlD4PTLrvsP+nJz9Kho=";
+    hash = "sha256-/0ADUfUoGB6i8L8FahjwafsjxXsRx0B0SnZH1FhUGxs=";
  };

-  cargoHash = "sha256-28OtvYDv7OpIio7WghkuVA8t+d0b91bQ9U/llJEFzmw=";
+  cargoHash = "sha256-+V42oG6PYSmWKG6Dv2zllTxObeQqCABBcUOAvuLqAZ4=";

  preCheck = ''
    export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
@@ -54,16 +54,18 @@ let
      Cflags: -I/out/include
      Libs: -L/out/lib -lflux -lpthread
    '';
-    passAsFile = [ "pkgcfg" ];
    postInstall = ''
      mkdir -p $out/include $out/pkgconfig
      cp -r $NIX_BUILD_TOP/source/libflux/include/influxdata $out/include
-      substitute $pkgcfgPath $out/pkgconfig/flux.pc \
+      printf "%s" "$pkgcfg" > $out/pkgconfig/flux.pc
+      substituteInPlace $out/pkgconfig/flux.pc \
        --replace-fail /out $out
    ''
    + lib.optionalString stdenv.hostPlatform.isDarwin ''
      install_name_tool -id $out/lib/libflux.dylib $out/lib/libflux.dylib
    '';
+
+    __structuredAttrs = true;
  };
 in
 buildGoModule rec {
@@ -7,13 +7,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libmt32emu";
-  version = "2.7.3";
+  version = "2.8.0";

  src = fetchFromGitHub {
    owner = "munt";
    repo = "munt";
    tag = "libmt32emu_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
-    hash = "sha256-3sL9ZDM4/70vKPkOU6Et82c3RC5OYt0eQb5miDYRU0I=";
+    hash = "sha256-xvPLOpTqKM+hcjwMYgG61sVQ4HDnVHG2S1TwGLIP8zs=";
  };

  outputs = [
@@ -25,36 +25,27 @@
  pkg-config,
  python3,
  systemd,
+  wasmedge,
  wayland,
+  wayland-scanner,
  yaml-cpp,
 }:

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

  src = fetchFromGitHub {
    owner = "miracle-wm-org";
    repo = "miracle-wm";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-N8FDoQDEfv0xGjtnKx+jNfRwxvJdb4ETvQnZuBvlccQ=";
+    hash = "sha256-yrshySK7tstNAgb9jApqqx4R+c74G2Ada6fjmCeKsV0=";
  };

  postPatch = ''
    substituteInPlace CMakeLists.txt \
      --replace-fail 'DESTINATION /usr/lib' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}' \
      --replace-fail '-march=native' '# -march=native'
-  ''
-  # Fix compat with newer Mir
-  # https://github.com/miracle-wm-org/miracle-wm/commit/aaae6e64261d8a00c2a1df47e2eab99400382d69
-  # Remove when version > 0.8.3
-  + ''
-    substituteInPlace CMakeLists.txt \
-      --replace-fail 'pkg_check_modules(MIRRENDERER REQUIRED mirrenderer' 'pkg_check_modules(MIRRENDERER mirrenderer'
-  ''
-  + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
-    substituteInPlace CMakeLists.txt \
-      --replace-fail 'add_subdirectory(tests/)' ""
  '';

  strictDeps = true;
@@ -63,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
    cmake
    makeWrapper
    pkg-config
+    wayland-scanner
  ];

  buildInputs = [
@@ -85,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
        tenacity
      ]
    ))
+    wasmedge
    wayland
    yaml-cpp
  ];
@@ -93,6 +86,9 @@ stdenv.mkDerivation (finalAttrs: {

  cmakeFlags = [
    (lib.cmakeBool "ENABLE_LTO" true)
+    (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
+    # https://github.com/miracle-wm-org/miracle-wm/issues/865
+    (lib.cmakeBool "FEATURE_PLUGIN_SYSTEM" false)
    (lib.cmakeBool "SYSTEMD_INTEGRATION" true)
    (lib.cmakeBool "END_TO_END_TESTS" finalAttrs.finalPackage.doCheck)
  ];
@@ -6,16 +6,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "mqttui";
-  version = "0.22.1";
+  version = "0.23.0";

  src = fetchFromGitHub {
    owner = "EdJoPaTo";
    repo = "mqttui";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-wKqIDKng4pfqDuYtqFRh3UIeZQ4QzzFlLkQn5MXcVlU=";
+    hash = "sha256-Z9Xfg3y26e0sKhutm5Xvm8V6LYNJWvobjU5R6Inll0E=";
  };

-  cargoHash = "sha256-gk5nA6np7dK4+j26aySNWfMZ9t/+7nZRaPsnhlDEnes=";
+  cargoHash = "sha256-Nyaiu9DEMJK8EHZQ0xPWPKgvD0yhlFhtdvQ4JjbKcvs=";

  meta = {
    description = "Terminal client for MQTT";
@@ -1,7 +1,6 @@
 {
  fetchFromGitHub,
  lib,
-  nix,
  nix-update-script,
  rustPlatform,
 }:
@@ -0,0 +1,17 @@
+# generated by zon2nix (https://github.com/nix-community/zon2nix)
+
+{
+  linkFarm,
+  fetchzip,
+  fetchgit,
+}:
+
+linkFarm "zig-packages" [
+  {
+    name = "N-V-__8AAKEzFAAA695b9LXBhUSVK5MAV_VKSm1mEj3Acbze";
+    path = fetchzip {
+      url = "https://www.lua.org/ftp/lua-5.4.8.tar.gz";
+      hash = "sha256-6TMsVp2D3WtvnwyhvwodjQH3kvTXz1rSMWwiHazvKys=";
+    };
+  }
+]
@@ -1,8 +1,9 @@
 {
  lib,
  stdenv,
+  callPackage,
  fetchFromGitHub,
-  zig_0_15,
+  zig_0_16,
  pkg-config,
  libx11,
  libxft,
@@ -14,17 +15,24 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "oxwm";
-  version = "0.11.3";
+  version = "0.12.0";

  src = fetchFromGitHub {
    owner = "tonybanters";
    repo = "oxwm";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-W6muqajSk9UR646ZmLkx/wWfiaWLo+d1lJMiLm82NC8=";
+    hash = "sha256-N0uKA51AR0YFUcp6MdIiJS5HtHobSaDdXPRrMEOCSEM=";
  };

+  deps = callPackage ./build.zig.zon.nix { };
+
+  zigBuildFlags = [
+    "--system"
+    "${finalAttrs.deps}"
+  ];
+
  nativeBuildInputs = [
-    zig_0_15.hook
+    zig_0_16.hook
    pkg-config
  ];

@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
  ++ lib.optional withALSA "--enable-alsa";

  # Fix GCC 14 build
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types";
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types -std=gnu17";

  meta = {
    description = "Emulator for IBM PC computers and clones";
@@ -7,13 +7,13 @@

 buildGoModule (finalAttrs: {
  pname = "pocketbase";
-  version = "0.37.5";
+  version = "0.38.0";

  src = fetchFromGitHub {
    owner = "pocketbase";
    repo = "pocketbase";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-z5brZQEblcPkNNg6kNDw9C/3CwUCdMF/TPcOIFaPoKI=";
+    hash = "sha256-nN3yqf/CKHBTp0Dg31R1g8ZNXpinFfpkKsqYbt8EK5o=";
  };

  vendorHash = "sha256-8YtDQLeStdUb6HXX/KEifDHiX//9cH7XCBu2LtHrCQM=";
@@ -21,13 +21,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "rocketchat-desktop";
-  version = "4.14.0";
+  version = "4.14.1";

  src = fetchFromGitHub {
    owner = "RocketChat";
    repo = "Rocket.Chat.Electron";
    tag = finalAttrs.version;
-    hash = "sha256-5p0WmTKHqiRtNeWxJuBUKVHc2DHtAGMyBsXq9SpytWA=";
+    hash = "sha256-O30MSLv2eQIFs6yjo6LU6aMwHVl5fn7KsVMpIiFL25I=";
  };

  patches = [
@@ -1,13 +1,13 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    activemodel (7.2.2.1)
-      activesupport (= 7.2.2.1)
-    activerecord (7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activemodel (7.2.3.1)
+      activesupport (= 7.2.3.1)
+    activerecord (7.2.3.1)
+      activemodel (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
      timeout (>= 0.4.0)
-    activesupport (7.2.2.1)
+    activesupport (7.2.3.1)
      base64
      benchmark (>= 0.3)
      bigdecimal
@@ -16,79 +16,80 @@ GEM
      drb
      i18n (>= 1.6, < 2)
      logger (>= 1.4.2)
-      minitest (>= 5.1)
+      minitest (>= 5.1, < 6)
      securerandom (>= 0.3)
      tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
-    async (2.23.0)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
+    async (2.39.0)
      console (~> 1.29)
      fiber-annotation
-      io-event (~> 1.9)
+      io-event (~> 1.11)
      metrics (~> 0.12)
-      traces (~> 0.15)
+      traces (~> 0.18)
    async-dns (1.4.1)
      async
      io-endpoint
-    async-http (0.87.0)
+    async-http (0.95.1)
      async (>= 2.10.2)
-      async-pool (~> 0.9)
+      async-pool (~> 0.11)
      io-endpoint (~> 0.14)
      io-stream (~> 0.6)
      metrics (~> 0.12)
-      protocol-http (~> 0.49)
-      protocol-http1 (~> 0.30)
-      protocol-http2 (~> 0.22)
+      protocol-http (~> 0.62)
+      protocol-http1 (~> 0.39)
+      protocol-http2 (~> 0.26)
+      protocol-url (~> 0.2)
      traces (~> 0.10)
    async-io (1.43.2)
      async
-    async-pool (0.10.3)
-      async (>= 1.25)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
-    chars (0.3.3)
+    async-pool (0.11.2)
+      async (>= 2.0)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.1.2)
+    chars (0.3.4)
    combinatorics (0.5.0)
    command_kit (0.6.0)
    command_mapper (0.3.2)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
-    console (1.29.3)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
+    console (1.34.3)
      fiber-annotation
      fiber-local (~> 1.1)
      json
-    csv (3.3.2)
-    date (3.4.1)
-    drb (2.2.1)
-    dry-configurable (1.3.0)
-      dry-core (~> 1.1)
+    csv (3.3.5)
+    date (3.5.1)
+    drb (2.2.3)
+    dry-configurable (1.4.0)
+      dry-core (~> 1.0)
      zeitwerk (~> 2.6)
-    dry-core (1.1.0)
+    dry-core (1.2.0)
      concurrent-ruby (~> 1.0)
      logger
      zeitwerk (~> 2.6)
-    dry-inflector (1.2.0)
+    dry-inflector (1.3.1)
    dry-initializer (3.2.0)
    dry-logic (1.6.0)
      bigdecimal
      concurrent-ruby (~> 1.0)
      dry-core (~> 1.1)
      zeitwerk (~> 2.6)
-    dry-schema (1.14.0)
+    dry-schema (1.16.0)
      concurrent-ruby (~> 1.0)
      dry-configurable (~> 1.0, >= 1.0.1)
      dry-core (~> 1.1)
      dry-initializer (~> 3.2)
-      dry-logic (~> 1.5)
-      dry-types (~> 1.8)
+      dry-logic (~> 1.6)
+      dry-types (~> 1.9, >= 1.9.1)
      zeitwerk (~> 2.6)
-    dry-struct (1.7.1)
+    dry-struct (1.8.1)
      dry-core (~> 1.1)
      dry-types (~> 1.8, >= 1.8.2)
      ice_nine (~> 0.11)
      zeitwerk (~> 2.6)
-    dry-types (1.8.2)
-      bigdecimal (~> 3.0)
+    dry-types (1.9.1)
+      bigdecimal (>= 3.0)
      concurrent-ruby (~> 1.0)
      dry-core (~> 1.0)
      dry-inflector (~> 1.0)
@@ -100,8 +101,9 @@ GEM
      dry-initializer (~> 3.2)
      dry-schema (~> 1.14)
      zeitwerk (~> 2.6)
+    erb (6.0.4)
    fake_io (0.1.0)
-    ferrum (0.16)
+    ferrum (0.17.2)
      addressable (~> 2.5)
      base64 (~> 0.2)
      concurrent-ruby (~> 1.1)
@@ -110,31 +112,31 @@ GEM
    fiber-annotation (0.2.0)
    fiber-local (1.1.0)
      fiber-storage
-    fiber-storage (1.0.0)
+    fiber-storage (1.0.1)
    hexdump (1.0.1)
-    i18n (1.14.7)
+    i18n (1.14.8)
      concurrent-ruby (~> 1.0)
    ice_nine (0.11.2)
-    io-console (0.8.0)
-    io-endpoint (0.15.2)
-    io-event (1.9.0)
-    io-stream (0.6.1)
-    irb (1.15.1)
+    io-console (0.8.2)
+    io-endpoint (0.17.2)
+    io-event (1.16.0)
+    io-stream (0.13.0)
+    irb (1.18.0)
      pp (>= 0.6.0)
+      prism (>= 1.3.0)
      rdoc (>= 4.0.0)
      reline (>= 0.4.2)
-    json (2.10.1)
-    logger (1.6.6)
-    metrics (0.12.1)
-    mini_portile2 (2.8.8)
-    minitest (5.25.4)
-    multi_json (1.15.0)
-    mustermann (3.0.3)
-      ruby2_keywords (~> 0.0.1)
-    net-ftp (0.3.8)
+    json (2.19.5)
+    logger (1.7.0)
+    metrics (0.15.0)
+    mini_portile2 (2.8.9)
+    minitest (5.27.0)
+    multi_json (1.21.1)
+    mustermann (3.1.1)
+    net-ftp (0.3.9)
      net-protocol
      time
-    net-imap (0.5.6)
+    net-imap (0.6.4)
      date
      net-protocol
    net-pop (0.1.2)
@@ -143,8 +145,8 @@ GEM
      timeout
    net-smtp (0.5.1)
      net-protocol
-    nio4r (2.7.4)
-    nokogiri (1.18.3)
+    nio4r (2.7.5)
+    nokogiri (1.19.3)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
    nokogiri-diff (0.3.0)
@@ -154,42 +156,46 @@ GEM
      nokogiri (~> 1.0)
    open_namespace (0.4.2)
    pagy (6.5.0)
-    pp (0.6.2)
+    pp (0.6.3)
      prettyprint
    prettyprint (0.2.0)
+    prism (1.9.0)
    protocol-hpack (1.5.1)
-    protocol-http (0.49.0)
-    protocol-http1 (0.30.0)
-      protocol-http (~> 0.22)
-    protocol-http2 (0.22.1)
+    protocol-http (0.62.2)
+    protocol-http1 (0.39.0)
+      protocol-http (~> 0.62)
+    protocol-http2 (0.26.0)
      protocol-hpack (~> 1.4)
-      protocol-http (~> 0.47)
-    psych (5.2.3)
+      protocol-http (~> 0.62)
+    protocol-url (0.4.0)
+    psych (5.3.1)
      date
      stringio
-    public_suffix (6.0.1)
-    puma (6.6.0)
+    public_suffix (7.0.5)
+    puma (6.6.1)
      nio4r (~> 2.0)
    python-pickle (0.2.0)
    racc (1.8.1)
-    rack (2.2.11)
+    rack (2.2.23)
    rack-protection (3.2.0)
      base64 (>= 0.1.0)
      rack (~> 2.2, >= 2.2.4)
    rack-session (1.0.2)
      rack (< 3)
-    rack-user_agent (0.5.3)
+    rack-user_agent (0.6.0)
      rack (>= 1.5)
      woothee (>= 1.0.0)
-    rdoc (6.12.0)
+    rdoc (7.2.0)
+      erb
      psych (>= 4.0.0)
-    redis (5.4.0)
+      tsort
+    redis (5.4.1)
      redis-client (>= 0.22.0)
-    redis-client (0.23.2)
+    redis-client (0.29.0)
      connection_pool
    redis-namespace (1.11.0)
      redis (>= 4)
-    reline (0.6.0)
+    reline (0.6.3)
      io-console (~> 0.5)
    robots (0.10.1)
    ronin (2.1.1)
@@ -377,7 +383,6 @@ GEM
      nokogiri (~> 1.3)
    ruby-yasm (0.3.1)
      command_mapper (~> 0.1)
-    ruby2_keywords (0.0.5)
    securerandom (0.4.1)
    sidekiq (7.3.9)
      base64
@@ -403,26 +408,27 @@ GEM
      nokogiri (~> 1.3)
    sqlite3 (1.7.3)
      mini_portile2 (~> 2.8.0)
-    stringio (3.1.5)
+    stringio (3.2.0)
    tdiff (0.4.0)
    thread-local (1.1.0)
-    tilt (2.6.0)
-    time (0.4.1)
+    tilt (2.7.0)
+    time (0.4.2)
      date
-    timeout (0.4.3)
-    traces (0.15.2)
+    timeout (0.6.1)
+    traces (0.18.2)
+    tsort (0.2.0)
    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
    uri-query_params (0.8.2)
-    webrick (1.9.1)
+    webrick (1.9.2)
    websocket (1.2.11)
-    websocket-driver (0.7.7)
+    websocket-driver (0.8.0)
      base64
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
    woothee (1.13.0)
    wordlist (1.1.1)
-    zeitwerk (2.7.2)
+    zeitwerk (2.7.5)

 PLATFORMS
  ruby
@@ -435,4 +441,4 @@ DEPENDENCIES
  ronin

 BUNDLED WITH
-   2.5.16
+   2.7.2
@@ -5,10 +5,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1bzxvccj8349slymls7navb5y14anglkkasphcd6gi72kqgqd643";
+      sha256 = "1l60a6mqx1wgp15ki1cp68djci0czgrikpydii5bd877hndqdq9r";
      type = "gem";
    };
-    version = "7.2.2.1";
+    version = "7.2.3.1";
  };
  activerecord = {
    dependencies = [
@@ -20,10 +20,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1fgscw775wj4l7f5pj274a984paz23zy0111giqkhl9dqdqiz8vr";
+      sha256 = "0pd0f1hy6rvyanmrklqir33xq0jb2my4jajz7hc38nysfpi175dq";
      type = "gem";
    };
-    version = "7.2.2.1";
+    version = "7.2.3.1";
  };
  activesupport = {
    dependencies = [
@@ -43,10 +43,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1xa7hr4gp2p86ly6n1j2skyx8pfg6yi621kmnh7zhxr9m7wcnaw4";
+      sha256 = "0d6bhg9cim83g8cypjd7cms45ng4p9ga69v26i3vp823d98yvsqi";
      type = "gem";
    };
-    version = "7.2.2.1";
+    version = "7.2.3.1";
  };
  addressable = {
    dependencies = [ "public_suffix" ];
@@ -54,10 +54,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
+      sha256 = "1by7h2lwziiblizpd5yx87jsq8ppdhzvwf08ga34wzqgcv1nmpvz";
      type = "gem";
    };
-    version = "2.8.7";
+    version = "2.9.0";
  };
  async = {
    dependencies = [
@@ -71,10 +71,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0p29xccd3y96m7yb15yr96j362cz855ramn2x83g5z2642ag68w3";
+      sha256 = "1ah038cvb5k7vr29z5jkjhdwqpinrchglz87i1bv9fzjfc07666z";
      type = "gem";
    };
-    version = "2.23.0";
+    version = "2.39.0";
  };
  async-dns = {
    dependencies = [
@@ -100,16 +100,17 @@
      "protocol-http"
      "protocol-http1"
      "protocol-http2"
+      "protocol-url"
      "traces"
    ];
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "100s02s6cxzccsr5fdvi4yx7fzscps429mnaabiiwyxpggdz0pzv";
+      sha256 = "0v3q2kn9j5vfag7b4zv2vc1i4jkrqjz1pc109df6vh04q9cd8g8c";
      type = "gem";
    };
-    version = "0.87.0";
+    version = "0.95.1";
  };
  async-io = {
    dependencies = [ "async" ];
@@ -128,50 +129,50 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "12h0cmbw8sjlbfkng94wmb9d5mkrpc468ms40mnkvz9lrkggjhmm";
+      sha256 = "1vg3lwb3yhq0rad3dm00vp35vrahkbxgl4kx3d2rqkdh09xs2hqa";
      type = "gem";
    };
-    version = "0.10.3";
+    version = "0.11.2";
  };
  base64 = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
+      sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7";
      type = "gem";
    };
-    version = "0.2.0";
+    version = "0.3.0";
  };
  benchmark = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
+      sha256 = "0v1337j39w1z7x9zs4q7ag0nfv4vs4xlsjx2la0wpv8s6hig2pa6";
      type = "gem";
    };
-    version = "0.4.0";
+    version = "0.5.0";
  };
  bigdecimal = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g";
+      sha256 = "1g9zi8c4i7g8zz0c3hxrw6mblrjvgn7akys60clb9si7c1k1gljk";
      type = "gem";
    };
-    version = "3.1.9";
+    version = "4.1.2";
  };
  chars = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1vmpki1q4glglfp25flb2i6qy6jj80438z5x4rdqrcvvm869w8sd";
+      sha256 = "0bqcbk4c4vdxfmcr9hrq8ilvb7cl7s65602bgvxyqrdw2k12pl13";
      type = "gem";
    };
-    version = "0.3.3";
+    version = "0.3.4";
  };
  combinatorics = {
    groups = [ "default" ];
@@ -208,20 +209,20 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1";
+      sha256 = "1aymcakhzl83k77g2f2krz07bg1cbafbcd2ghvwr4lky3rz86mkb";
      type = "gem";
    };
-    version = "1.3.5";
+    version = "1.3.6";
  };
  connection_pool = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3";
+      sha256 = "02ifws3c4x7b54fv17sm4cca18d2pfw1saxpdji2lbd1f6xgbzrk";
      type = "gem";
    };
-    version = "2.5.0";
+    version = "3.0.2";
  };
  console = {
    dependencies = [
@@ -233,40 +234,40 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "00bd8bcra7sh9cnr9xm83gqv7npj15ksjpq2hkm0g36m3634v5dd";
+      sha256 = "1k0dxi072mz8j72r32kkzpky825hn092hb8hdxh4rz3yd5sbv7w6";
      type = "gem";
    };
-    version = "1.29.3";
+    version = "1.34.3";
  };
  csv = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0kmx36jjh2sahd989vcvw74lrlv07dqc3rnxchc5sj2ywqsw3w3g";
+      sha256 = "0gz7r2kazwwwyrwi95hbnhy54kwkfac5swh2gy5p5vw36fn38lbf";
      type = "gem";
    };
-    version = "3.3.2";
+    version = "3.3.5";
  };
  date = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz";
+      sha256 = "1h0db8r2v5llxdbzkzyllkfniqw9gm092qn7cbaib73v9lw0c3bm";
      type = "gem";
    };
-    version = "3.4.1";
+    version = "3.5.1";
  };
  drb = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
+      sha256 = "0wrkl7yiix268s2md1h6wh91311w95ikd8fy8m5gx589npyxc00b";
      type = "gem";
    };
-    version = "2.2.1";
+    version = "2.2.3";
  };
  dry-configurable = {
    dependencies = [
@@ -277,10 +278,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1a5g30p7kzp37n9w3idp3gy70hzkj30d8j951lhw2zsnb0l8cbc8";
+      sha256 = "1kkk3fs22ndslgihxwm6rwr0y03rvccljmhz6vpm65q87iginpg3";
      type = "gem";
    };
-    version = "1.3.0";
+    version = "1.4.0";
  };
  dry-core = {
    dependencies = [
@@ -292,20 +293,20 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "15di39ssfkwigyyqla65n4x6cfhgwa4cv8j5lmyrlr07jwd840q9";
+      sha256 = "18cn9s2p7cbgacy0z41h3sf9jvl75vjfmvj774apyffzi3dagi8c";
      type = "gem";
    };
-    version = "1.1.0";
+    version = "1.2.0";
  };
  dry-inflector = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0blgyg9l4gpzhb7rs9hqq9j7br80ngiigjp2ayp78w6m1ysx1x92";
+      sha256 = "1k1dd35sqqqg2abd2g2w78m94pa3mcwvmrsjbkr3hxpn0jxw5c3z";
      type = "gem";
    };
-    version = "1.2.0";
+    version = "1.3.1";
  };
  dry-initializer = {
    groups = [ "default" ];
@@ -347,10 +348,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1aa2ywjw2lwag18141z0b3sz3a2rgwinna1gpdy5jh1029g62h7c";
+      sha256 = "09spk1wfpg0v5fi2kblxifjs14pvqka9d452hbn6dbziq2mswfnd";
      type = "gem";
    };
-    version = "1.14.0";
+    version = "1.16.0";
  };
  dry-struct = {
    dependencies = [
@@ -363,10 +364,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1bjkxrmsi8wbymkx44fm0fyv89zpcw0a09np67ak4sd34hx92022";
+      sha256 = "1wc07v0qm8zbblr74w3iy2s74sxpifyfpw9b2x01a9259icnhf03";
      type = "gem";
    };
-    version = "1.7.1";
+    version = "1.8.1";
  };
  dry-types = {
    dependencies = [
@@ -381,10 +382,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "03zcngwfpq0nx9wmxma0s1c6sb3xxph93q8j7dy75721d7d9lkn8";
+      sha256 = "0y7icwaa26ycikz6h97gwd1hji3r280n4yr2kmn5sfgqp76yxsxs";
      type = "gem";
    };
-    version = "1.8.2";
+    version = "1.9.1";
  };
  dry-validation = {
    dependencies = [
@@ -403,6 +404,16 @@
    };
    version = "1.11.1";
  };
+  erb = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1ncmbdjf2bwmk0jf5cxywns9zbxyfiy4h4p3pzi7yddyjhv81qrq";
+      type = "gem";
+    };
+    version = "6.0.4";
+  };
  fake_io = {
    groups = [ "default" ];
    platforms = [ ];
@@ -425,10 +436,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1lwdra73yxinx9c2gffq5b7778b4dpfpwnw46ds7wshk4j2z7rnf";
+      sha256 = "1vp62wy85hr5fa0d29y3wh3zaj10sszj3pl19mps84dja2l4099c";
      type = "gem";
    };
-    version = "0.16";
+    version = "0.17.2";
  };
  fiber-annotation = {
    groups = [ "default" ];
@@ -456,10 +467,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0zxblmxwdpj3587wji5325y53gjdcmzxzm6126dyg58b3qzk42mq";
+      sha256 = "1qa0j9qjwav9xb0n3isx0rbh0942xrfback392n6vs8bidnmp3pl";
      type = "gem";
    };
-    version = "1.0.0";
+    version = "1.0.1";
  };
  hexdump = {
    groups = [ "default" ];
@@ -477,10 +488,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf";
+      sha256 = "1994i044vdmzzkyr76g8rpl1fq1532wf0sb21xg5r1ilj5iphmr8";
      type = "gem";
    };
-    version = "1.14.7";
+    version = "1.14.8";
  };
  ice_nine = {
    groups = [ "default" ];
@@ -497,44 +508,45 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "18pgvl7lfjpichdfh1g50rpz0zpaqrpr52ybn9liv1v9pjn9ysnd";
+      sha256 = "1k0lk3pwadm2myvpg893n8jshmrf2sigrd4ki15lymy7gixaxqyn";
      type = "gem";
    };
-    version = "0.8.0";
+    version = "0.8.2";
  };
  io-endpoint = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "09cghz7i1hpvz2skc0k0h6i60551mc2wafmlfn02hi9rd2xr0zhy";
+      sha256 = "0f1kzf4d5qgqgfjh52a8pf3pii5dmav6ib0zq4wmicqnq5kggsiz";
      type = "gem";
    };
-    version = "0.15.2";
+    version = "0.17.2";
  };
  io-event = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1hag7zbmsvkbmv0486bxqvnngym4mhsj32aywwmklr5d21k2n9jc";
+      sha256 = "143v7rhfq2kv10nadsq9fkhf2x0jf240jgq9wmvs9510pcyxjh9b";
      type = "gem";
    };
-    version = "1.9.0";
+    version = "1.16.0";
  };
  io-stream = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0vz9sad4kmgby53hn8jh31a462m9mkln7lxhk972dz9d870z0825";
+      sha256 = "0dhnkjf59ayw5xi873a939i63d47lrlqcpphvv73xprb635vq96f";
      type = "gem";
    };
-    version = "0.6.1";
+    version = "0.13.0";
  };
  irb = {
    dependencies = [
      "pp"
+      "prism"
      "rdoc"
      "reline"
    ];
@@ -542,81 +554,80 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1478m97wiy6nwg6lnl0szy39p46acsvrhax552vsh1s2mi2sgg6r";
+      sha256 = "1qs8a9vprg7s8krgq4s0pygr91hclqqyz98ik15p0m1sf2h5956y";
      type = "gem";
    };
-    version = "1.15.1";
+    version = "1.18.0";
  };
  json = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1p4l5ycdxfsr8b51gnvlvhq6s21vmx9z4x617003zbqv3bcqmj6x";
+      sha256 = "0n9ch455pnvl9vxs2f3j77bpdmxg5g3mn3vyr9wxa0a87raii2i1";
      type = "gem";
    };
-    version = "2.10.1";
+    version = "2.19.5";
  };
  logger = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx";
+      sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
      type = "gem";
    };
-    version = "1.6.6";
+    version = "1.7.0";
  };
  metrics = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1762zjanzjzr7jwig2arpj4h09ylhspipp9blx4pb9cjvgm8xv22";
+      sha256 = "0wlh0g4xmfqa41dsh4m3514q3jcvy6jx97mwn6ayj62ir6xdbpk1";
      type = "gem";
    };
-    version = "0.12.1";
+    version = "0.15.0";
  };
  mini_portile2 = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
+      sha256 = "12f2830x7pq3kj0v8nz0zjvaw02sv01bqs1zwdrc04704kwcgmqc";
      type = "gem";
    };
-    version = "2.8.8";
+    version = "2.8.9";
  };
  minitest = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0izrg03wn2yj3gd76ck7ifbm9h2kgy8kpg4fk06ckpy4bbicmwlw";
+      sha256 = "1mbpz92ml19rcxxfjrj91gmkif9khb1xpzyw38f81rvglgw1ffrd";
      type = "gem";
    };
-    version = "5.25.4";
+    version = "5.27.0";
  };
  multi_json = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
+      sha256 = "1040lr5y2phn7avdyam6zw6ikprlmk77biw3yhclsfwfh0qnl4p6";
      type = "gem";
    };
-    version = "1.15.0";
+    version = "1.21.1";
  };
  mustermann = {
-    dependencies = [ "ruby2_keywords" ];
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "123ycmq6pkivv29bqbv79jv2cs04xakzd0fz1lalgvfs5nxfky6i";
+      sha256 = "163i29mdcr1h0nximk3d51a1fgp7vz3sfasn8p1rjm2d4g3p0qac";
      type = "gem";
    };
-    version = "3.0.3";
+    version = "3.1.1";
  };
  net-ftp = {
    dependencies = [
@@ -627,10 +638,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0kw7g0j35fla8438s90m72b3xr0mqnpgm910qcwrgnvyg903xmi8";
+      sha256 = "0r9vn7q6c66y4iw048qdbqviv7bankdkcziz12fzfa7lyz61fy1h";
      type = "gem";
    };
-    version = "0.3.8";
+    version = "0.3.9";
  };
  net-imap = {
    dependencies = [
@@ -641,10 +652,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1rgva7p9gvns2ndnqpw503mbd36i2skkggv0c0h192k8xr481phy";
+      sha256 = "0ax0f0r97jm83q462vsrcbdxprs894fyyc44v62c48ihgb39hmcs";
      type = "gem";
    };
-    version = "0.5.6";
+    version = "0.6.4";
  };
  net-pop = {
    dependencies = [ "net-protocol" ];
@@ -684,10 +695,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1a9www524fl1ykspznz54i0phfqya4x45hqaz67in9dvw1lfwpfr";
+      sha256 = "18fwy5yqnvgixq3cn0h63lm8jaxsjjxkmj8rhiv8wpzv9271d43c";
      type = "gem";
    };
-    version = "2.7.4";
+    version = "2.7.5";
  };
  nokogiri = {
    dependencies = [
@@ -698,10 +709,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0npx535cs8qc33n0lpbbwl0p9fi3a5bczn6ayqhxvknh9yqw77vb";
+      sha256 = "1s30b7h7qpyim30m8060xs415mbr3ci7i5hdg09chh1aqfx2qcbq";
      type = "gem";
    };
-    version = "1.18.3";
+    version = "1.19.3";
  };
  nokogiri-diff = {
    dependencies = [
@@ -754,10 +765,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1zxnfxjni0r9l2x42fyq0sqpnaf5nakjbap8irgik4kg1h9c6zll";
+      sha256 = "1xlxmg86k5kifci1xvlmgw56x88dmqf04zfzn7zcr4qb8ladal99";
      type = "gem";
    };
-    version = "0.6.2";
+    version = "0.6.3";
  };
  prettyprint = {
    groups = [ "default" ];
@@ -769,6 +780,16 @@
    };
    version = "0.2.0";
  };
+  prism = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "11ggfikcs1lv17nhmhqyyp6z8nq5pkfcj6a904047hljkxm0qlvv";
+      type = "gem";
+    };
+    version = "1.9.0";
+  };
  protocol-hpack = {
    groups = [ "default" ];
    platforms = [ ];
@@ -784,10 +805,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1dvpyl26q3zm2ca1sys9r8lp5qryy8i6glaq4vdi4jd71sk9lhdm";
+      sha256 = "0fvpza7nnbyd3nfxkn5gych6diwns386g2ib9s6azh99c3sz5hg1";
      type = "gem";
    };
-    version = "0.49.0";
+    version = "0.62.2";
  };
  protocol-http1 = {
    dependencies = [ "protocol-http" ];
@@ -795,10 +816,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0sn3r9rzkwxwix1c8af1njwzxf1nmhn0xmi39pz0jsfa9hd9d4ll";
+      sha256 = "1syqgaklsn9rf11xmll2s3ms7jvpd5zjng9jdb3r8pbgv963z6z4";
      type = "gem";
    };
-    version = "0.30.0";
+    version = "0.39.0";
  };
  protocol-http2 = {
    dependencies = [
@@ -809,10 +830,20 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0s575j0xp1xkb37640fgw7ldyy4hln8ji9nm9ysyk4p7hdq6x5li";
+      sha256 = "11kl6768hpzgvvvlpyvmr74v0jqf2vslcwngs3643cl2h3brrj5s";
      type = "gem";
    };
-    version = "0.22.1";
+    version = "0.26.0";
+  };
+  protocol-url = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1qd9vsn9sif58swfqsyj429aynqyv6hpgbzxqrd83baidcxw1m34";
+      type = "gem";
+    };
+    version = "0.4.0";
  };
  psych = {
    dependencies = [
@@ -823,20 +854,20 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4";
+      sha256 = "0x0r3gc66abv8i4dw0x0370b5hrshjfp6kpp7wbp178cy775fypb";
      type = "gem";
    };
-    version = "5.2.3";
+    version = "5.3.1";
  };
  public_suffix = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
+      sha256 = "08znfv30pxmdkjyihvbjqbvv874dj3nybmmyscl958dy3f7v12qs";
      type = "gem";
    };
-    version = "6.0.1";
+    version = "7.0.5";
  };
  puma = {
    dependencies = [ "nio4r" ];
@@ -844,10 +875,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "11xd3207k5rl6bz0qxhcb3zcr941rhx7ig2f19gxxmdk7s3hcp7j";
+      sha256 = "07pajhv7pqz82kcjc6017y4d0hwz5kp746cydpx1npd79r56xddr";
      type = "gem";
    };
-    version = "6.6.0";
+    version = "6.6.1";
  };
  python-pickle = {
    groups = [ "default" ];
@@ -874,10 +905,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "12mv97fz3jp6nl4bc36wiqwdiivv5lgqcpfnan91w20rzapljk22";
+      sha256 = "175ni9qsai9x2ykwvdbd5dzfyncaxpyn6dhjxjw70iq60xz9vzm8";
      type = "gem";
    };
-    version = "2.2.11";
+    version = "2.2.23";
  };
  rack-protection = {
    dependencies = [
@@ -913,21 +944,25 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1l1gw8xx1g04kdxc89hsy4aawdz8r2an4b78yzk9cc3y8qmw16v7";
+      sha256 = "131a7v696ddzh3aric141gdsz3nshq4s763jb5b8mdl9cbf6gj8w";
      type = "gem";
    };
-    version = "0.5.3";
+    version = "0.6.0";
  };
  rdoc = {
-    dependencies = [ "psych" ];
+    dependencies = [
+      "erb"
+      "psych"
+      "tsort"
+    ];
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1q2nkyk6r3m15a2an7lwm4ilkcxzdh3j93s4ib8sbzqb0xp70vvx";
+      sha256 = "14iiyb4yi1chdzrynrk74xbhmikml3ixgdayjma3p700singfl46";
      type = "gem";
    };
-    version = "6.12.0";
+    version = "7.2.0";
  };
  redis = {
    dependencies = [ "redis-client" ];
@@ -935,10 +970,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0syhyw1bp9nbb0fvcmm58y1c6iav6xw6b4bzjz1rz2j1d7c012br";
+      sha256 = "1bpsh5dbvybsa8qnv4dg11a6f2zn4sndarf7pk4iaayjgaspbrmm";
      type = "gem";
    };
-    version = "5.4.0";
+    version = "5.4.1";
  };
  redis-client = {
    dependencies = [ "connection_pool" ];
@@ -946,10 +981,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1yin53x7d817rs55gyw93acc5fbbjfbd4vayz7z5q5f8h9kanfz3";
+      sha256 = "18xy2nd8mcb186gqd11sy3vfwkq5n85mq26v7l325jkdiwgvyr8c";
      type = "gem";
    };
-    version = "0.23.2";
+    version = "0.29.0";
  };
  redis-namespace = {
    dependencies = [ "redis" ];
@@ -968,10 +1003,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1lirwlw59apc8m1wjk85y2xidiv0fkxjn6f7p84yqmmyvish6qjp";
+      sha256 = "0d8q5c4nh2g9pp758kizh8sfrvngynrjlm0i1zn3cnsnfd4v160i";
      type = "gem";
    };
-    version = "0.6.0";
+    version = "0.6.3";
  };
  robots = {
    groups = [ "default" ];
@@ -1513,16 +1548,6 @@
    };
    version = "0.3.1";
  };
-  ruby2_keywords = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
-      type = "gem";
-    };
-    version = "0.0.5";
-  };
  securerandom = {
    groups = [ "default" ];
    platforms = [ ];
@@ -1624,10 +1649,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1j1mgvrgkxhadi6nb6pz1kcff7gsb5aivj1vfhsia4ssa5hj9adw";
+      sha256 = "1q92y9627yisykyscv0bdsrrgyaajc2qr56dwlzx7ysgigjv4z63";
      type = "gem";
    };
-    version = "3.1.5";
+    version = "3.2.0";
  };
  tdiff = {
    groups = [ "default" ];
@@ -1654,10 +1679,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96";
+      sha256 = "1cvaikq1dcbfl008i16c1pi1gmdax7vfkvmhch64jdkakyk9nnqd";
      type = "gem";
    };
-    version = "2.6.0";
+    version = "2.7.0";
  };
  time = {
    dependencies = [ "date" ];
@@ -1665,30 +1690,40 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0qgarmdyqypzsaanf4w9vqrd9axrcrjqilxwrfmxp954102kcpq3";
+      sha256 = "1arxpii25xgb3fkgqp5acyc0x6179j3qzld78lflgsdxqfcf897k";
      type = "gem";
    };
-    version = "0.4.1";
+    version = "0.4.2";
  };
  timeout = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "03p31w5ghqfsbz5mcjzvwgkw3h9lbvbknqvrdliy8pxmn9wz02cm";
+      sha256 = "1jxcji88mh6xsqz0mfzwnxczpg7cyniph7wpavnavfz7lxl77xbq";
      type = "gem";
    };
-    version = "0.4.3";
+    version = "0.6.1";
  };
  traces = {
    groups = [ "default" ];
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "109dh1xmsmvkg1pf3306svigh3m8kdmjqlznyk4bi2r4nws7hm6j";
+      sha256 = "05722prvh34n96irnxa762wz0yj2nyrz70ab2zby3b6snjf69wc0";
      type = "gem";
    };
-    version = "0.15.2";
+    version = "0.18.2";
+  };
+  tsort = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "17q8h020dw73wjmql50lqw5ddsngg67jfw8ncjv476l5ys9sfl4n";
+      type = "gem";
+    };
+    version = "0.2.0";
  };
  tzinfo = {
    dependencies = [ "concurrent-ruby" ];
@@ -1716,10 +1751,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl";
+      sha256 = "0ca1hr2rxrfw7s613rp4r4bxb454i3ylzniv9b9gxpklqigs3d5y";
      type = "gem";
    };
-    version = "1.9.1";
+    version = "1.9.2";
  };
  websocket = {
    groups = [ "default" ];
@@ -1740,10 +1775,10 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "1d26l4qn55ivzahbc7fwc4k4z3j7wzym05i9n77i4mslrpr9jv85";
+      sha256 = "0qj9dmkmgahmadgh88kydb7cv15w13l1fj3kk9zz28iwji5vl3gd";
      type = "gem";
    };
-    version = "0.7.7";
+    version = "0.8.0";
  };
  websocket-extensions = {
    groups = [ "default" ];
@@ -1780,9 +1815,9 @@
    platforms = [ ];
    source = {
      remotes = [ "https://rubygems.org" ];
-      sha256 = "0ws6rpyj0y9iadjg1890dwnnbjfdbzxsv6r48zbj7f8yn5y0cbl4";
+      sha256 = "1pbkiwwla5gldgb3saamn91058nl1sq1344l5k36xsh9ih995nnq";
      type = "gem";
    };
-    version = "2.7.2";
+    version = "2.7.5";
  };
 }
@@ -26,7 +26,7 @@ bundlerEnv rec {

  postBuild = ''
    shopt -s extglob
-    rm $out/bin/!(ronin*)
+    rm -f $out/bin/!(ronin*)
  '';

  passthru.updateScript = bundlerUpdateScript "ronin";
@@ -1,26 +1,26 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2026-03-14
+# Last updated: 2026-05-14
 { fetchurl }:
 {
  aarch64-darwin = {
-    version = "4.48.100";
+    version = "4.49.89";
    src = fetchurl {
-      url = "https://downloads.slack-edge.com/desktop-releases/mac/arm64/4.48.100/Slack-4.48.100-macOS.dmg";
-      hash = "sha256-vzgxVBRncNQ4mchSgbe9vm3kEiPXHeMlhm3Xq4COi7A=";
+      url = "https://downloads.slack-edge.com/desktop-releases/mac/arm64/4.49.89/Slack-4.49.89-macOS.dmg";
+      hash = "sha256-u5NppmmRyC+6HaPIcSSGOOdVRiZdT9GE1eHvad6rYdY=";
    };
  };
  x86_64-darwin = {
-    version = "4.48.100";
+    version = "4.49.89";
    src = fetchurl {
-      url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.48.100/Slack-4.48.100-macOS.dmg";
-      hash = "sha256-5IEIgDxdE2Pnpy3gkJT3Cwzo3hRoTPziFAj30SnapVQ=";
+      url = "https://downloads.slack-edge.com/desktop-releases/mac/x64/4.49.89/Slack-4.49.89-macOS.dmg";
+      hash = "sha256-eysKaQ1SXScsL0vji+32r/NgWN0eni62+LkB4svTHUE=";
    };
  };
  x86_64-linux = {
-    version = "4.48.100";
+    version = "4.49.89";
    src = fetchurl {
-      url = "https://downloads.slack-edge.com/desktop-releases/linux/x64/4.48.100/slack-desktop-4.48.100-amd64.deb";
-      hash = "sha256-un+GE8zKDrag6YQMYN8+0ki7J3877FfMFqqucHhPBgk=";
+      url = "https://downloads.slack-edge.com/desktop-releases/linux/x64/4.49.89/slack-desktop-4.49.89-amd64.deb";
+      hash = "sha256-Shf4/igTudAwg0ve8iGjpLIS8AL/k90RDN92JyAMGy8=";
    };
  };
 }
@@ -0,0 +1,181 @@
+{
+  coreutils,
+  fetchurl,
+  fontconfig,
+  freetype,
+  glib,
+  gsettings-desktop-schemas,
+  gtk3,
+  jdk21,
+  lib,
+  libx11,
+  libxrender,
+  libxtst,
+  makeDesktopItem,
+  makeWrapper,
+  imagemagick,
+  shared-mime-info,
+  stdenv,
+  testers,
+  webkitgtk_4_1,
+  xvfb-run,
+  zlib,
+}:
+
+let
+  version = "11.2.0";
+  buildId = "20251212-2003";
+  archiveName = "trace-compass-${version}-${buildId}-linux.gtk.x86_64.tar.gz";
+
+  desktopItem = makeDesktopItem {
+    name = "tracecompass";
+    exec = "tracecompass";
+    icon = "tracecompass";
+    comment = "Trace Compass";
+    desktopName = "Trace Compass";
+    categories = [
+      "Development"
+      "Profiling"
+    ];
+  };
+in
+stdenv.mkDerivation (finalAttrs: rec {
+  pname = "tracecompass";
+  inherit version;
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  # Use the upstream RCP release tarball; building Trace Compass from source
+  # would require a much heavier Eclipse/Tycho build pipeline.
+  src = fetchurl {
+    url = "https://download.eclipse.org/tracecompass/releases/${version}/rcp/${archiveName}";
+    hash = "sha256-QNJAJkgpV8v94IJx/jnQQ5HhX0kuASET3ywa/nfhsEs=";
+  };
+
+  sourceRoot = "trace-compass";
+
+  nativeBuildInputs = [
+    makeWrapper
+    imagemagick
+  ];
+
+  postPatch = ''
+        substituteInPlace tracecompass.ini \
+          --replace-fail '-vmargs' "-vm
+    ${lib.getExe jdk21}
+    -vmargs"
+  '';
+
+  dontBuild = true;
+  dontConfigure = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    cp -r . $out/trace-compass
+
+    patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $out/trace-compass/tracecompass
+
+    mkdir -p $out/bin
+    makeWrapper $out/trace-compass/tracecompass $out/bin/tracecompass \
+      --prefix PATH : ${lib.makeBinPath [ jdk21 ]} \
+      --set JAVA_HOME ${jdk21} \
+      --prefix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath [
+          fontconfig
+          freetype
+          glib
+          gtk3
+          libx11
+          libxrender
+          libxtst
+          webkitgtk_4_1
+          zlib
+        ]
+      } \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
+      --set-default GDK_BACKEND x11 \
+      --run 'if [[ " $* " != *" -configuration "* ]]; then
+         set -- -configuration "$HOME/.tracecompass/${version}/configuration" "$@"
+       fi'
+
+
+    mkdir -p $out/share/applications
+    cp ${desktopItem}/share/applications/* $out/share/applications
+
+    for size in 16 24 32 48 64 128 256; do
+      dir="$out/share/icons/hicolor/''${size}x''${size}/apps"
+      mkdir -p "$dir"
+      magick icon.xpm -resize "''${size}x''${size}" \
+        "$dir/tracecompass.png"
+    done
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    updateScript = ./update.sh;
+    tests.smoke = testers.runCommand {
+      name = "tracecompass-smoke-test";
+      nativeBuildInputs = [
+        coreutils
+        xvfb-run
+      ];
+      meta.timeout = 120;
+      script = ''
+        export HOME=$(mktemp -d)
+        export XDG_CACHE_HOME="$HOME/.cache"
+        export XDG_CONFIG_HOME="$HOME/.config"
+
+        workspace="$HOME/workspace"
+        mkdir -p "$workspace"
+        logFile="$workspace/.metadata/.log"
+
+        if timeout 30s xvfb-run -s "-screen 0 1920x1080x24" \
+          ${lib.getExe finalAttrs.finalPackage} \
+            --launcher.suppressErrors \
+            -nosplash \
+            -application org.eclipse.tracecompass.rcp.ui.application \
+            -data "$workspace" \
+            -configuration "$HOME/.tracecompass/${version}/configuration" \
+            -vmargs -Djava.awt.headless=true
+        then
+          echo "Trace Compass exited before the timeout" >&2
+          if [ -f "$logFile" ]; then
+            cat "$logFile" >&2
+          fi
+          exit 1
+        else
+          status=$?
+          if [ "$status" -ne 124 ]; then
+            echo "Trace Compass failed with status $status" >&2
+            if [ -f "$logFile" ]; then
+              cat "$logFile" >&2
+            fi
+            exit $status
+          fi
+        fi
+
+        touch $out
+      '';
+    };
+  };
+
+  meta = with lib; {
+    description = "Eclipse Trace Compass trace event analyzer";
+    longDescription = ''
+      Trace Compass is an Eclipse application for analyzing and visualizing traces and logs.
+      It helps diagnose performance issues in the Linux kernel, Android, and other systems
+      by understanding what the system is doing over time.
+    '';
+    homepage = "https://www.eclipse.org/tracecompass/";
+    changelog = "https://github.com/eclipse-tracecompass/org.eclipse.tracecompass/wiki/New_In_Trace_Compass";
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = licenses.epl20;
+    maintainers = with maintainers; [ lvanasse ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "tracecompass";
+  };
+})
@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd -- "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$SCRIPT_DIR/../../../.."
+
+if [[ -z ${IN_NIX_SHELL:-} ]]; then
+  cmd=(bash "$0" "$@")
+  exec nix-shell -I "nixpkgs=$REPO_ROOT" -p bash curl gnused gnugrep coreutils common-updater-scripts nix \
+    --command "$(printf '%q ' "${cmd[@]}")"
+fi
+
+cd "$REPO_ROOT"
+
+RELEASES_ROOT="https://download.eclipse.org/tracecompass/releases"
+
+latest_version=$(
+  curl -fsSL "${RELEASES_ROOT}/" \
+    | grep -oP "/tracecompass/releases/\\K[0-9.]+(?=')" \
+    | grep -E '[0-9]' \
+    | sort -V \
+    | sed -n '$p'
+)
+
+if [[ -z ${latest_version:-} ]]; then
+  echo "Failed to detect latest Trace Compass release version from ${RELEASES_ROOT}" >&2
+  exit 1
+fi
+
+release_page=$(curl -fsSL "${RELEASES_ROOT}/${latest_version}/rcp/")
+latest_build=$(
+  printf "%s" "$release_page" \
+    | grep -oP "trace-compass-${latest_version}-\\K[0-9]{8}-[0-9]{4}(?=-linux\\.gtk\\.x86_64\\.tar\\.gz)" \
+    | sort \
+    | sed -n '$p'
+)
+
+if [[ -z ${latest_build:-} ]]; then
+  echo "Failed to detect linux build inside ${RELEASES_ROOT}/${latest_version}/rcp/" >&2
+  exit 1
+fi
+
+version="$latest_version"
+build="$latest_build"
+
+archive="trace-compass-${version}-${build}-linux.gtk.x86_64.tar.gz"
+url="${RELEASES_ROOT}/${version}/rcp/${archive}"
+
+echo "Latest Trace Compass: version=${version}, build=${build}"
+
+base32_hash=$(nix-prefetch-url --type sha256 "$url")
+hash=$(nix hash to-sri --type sha256 "$base32_hash")
+
+update-source-version tracecompass "$version" "$hash" \
+  --file=pkgs/by-name/tr/tracecompass/package.nix \
+  --ignore-same-version
+
+sed -i -E "0,/buildId = \"[^\"]+\";/s//buildId = \"$build\";/" pkgs/by-name/tr/tracecompass/package.nix
+
+echo "Updated tracecompass to $version ($build)"
@@ -14,7 +14,7 @@ with the most recent available "by name" as `tracy`.
 ## Version Retention Guidelines

 Older releases of Tracy are provided as a convenience, not a guarantee. Maintainers
-should balance relevance to nixpkgs, maintainance burden, and user need.
+should balance relevance to nixpkgs, maintenance burden, and user need.

 - Dependants in nixpkgs use `tracy` rather than a pinned version;
 - No more than three pinned versions of Tracy are maintained, assuming annual release
@@ -126,7 +126,7 @@ CPM `NAME`.

 Package is not available in nixpkgs or is incompatible.

-### Mechansim
+### Mechanism

 Uses the same mechanism as a nixpkg src, except the source is downloaded with a fetcher such as
 `fetchFromGithub`.
@@ -11,11 +11,11 @@

 stdenv.mkDerivation rec {
  pname = "evisum";
-  version = "2.0.7";
+  version = "2.0.9";

  src = fetchurl {
    url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "5WpBdzAwpUn6Aen6ShqKB/smcddu0Znn54FYpZ3SlwY=";
+    sha256 = "iTmeXrNqltpALEnJRz4oiNzikGLJzprmeZH7/3RmEkk=";
  };

  nativeBuildInputs = [
@@ -111,6 +111,14 @@ stdenv.mkDerivation (finalAttrs: {
      hash = "sha256-9YRWMV+1UT+EQd9Uq1+6enNzz+HDlSt3LTPM1BKJxiE=";
    })

+    # Compatibility with newer lomiri-api
+    # Remove when version > 0.5.0
+    (fetchpatch {
+      name = "0002-lomiri-Adjust-to-newer-lomiri-api.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri/-/commit/26cbfa458766df406ed7d2c351ec84522371b083.patch";
+      hash = "sha256-1mPDtitMpktuvLs3Zn+6pCaMGTwGvIglGBdrm4Y8QwA=";
+    })
+
    ./9901-lomiri-Disable-Wizard.patch
    (replaceVars ./9902-Layout-fallback-file.patch {
      nixosLayoutFile = "/etc/" + finalAttrs.finalPackage.passthru.etcLayoutsFile;
@@ -20,18 +20,26 @@
  withDocumentation ? true,
 }:

+# Juuuuust in case this ever changes
+assert lib.asserts.assertMsg (lib.strings.hasPrefix "lib/" qtbase.qtQmlPrefix)
+  "Assumption that qtbase.qtQmlPrefix (${qtbase.qtQmlPrefix} starts with 'lib/' no longer holds, SHELL_PLUGINDIR_SUFFIX in lomiri-api needs to be adjusted!";
+
 let
  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
+
+  # TODO This is likely not supposed to be the regular Qt QML import prefix
+  # but otherwise i.e. lomiri-notifications cannot be found in lomiri
+  shellPlugindirSuffix = lib.strings.removePrefix "lib/" qtbase.qtQmlPrefix;
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "lomiri-api";
-  version = "0.3.1";
+  version = "0.3.2";

  src = fetchFromGitLab {
    owner = "ubports";
    repo = "development/core/lomiri-api";
    tag = finalAttrs.version;
-    hash = "sha256-2CVSKPZXZ74KUU5xVYSVIZLSPSyIudUcKR0CSfSpJyw=";
+    hash = "sha256-5w1cXKi8RZL2tbYMnqVFnlCK4BxcpCBg4jRwI7jB6AQ=";
  };

  outputs = [
@@ -44,15 +52,13 @@ stdenv.mkDerivation (finalAttrs: {

  postPatch = ''
    patchShebangs $(find test -name '*.py')
-
-    substituteInPlace data/liblomiri-api.pc.in \
-      --replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" '@CMAKE_INSTALL_FULL_LIBDIR@'
-
-    # Variable is queried via pkg-config by reverse dependencies
-    # TODO This is likely not supposed to be the regular Qt QML import prefix
-    # but otherwise i.e. lomiri-notifications cannot be found in lomiri
+  ''
+  # Variable is queried via pkg-config by reverse dependencies
+  # Qt6 one is already correct as-is
+  + ''
    substituteInPlace CMakeLists.txt \
-      --replace-fail 'SHELL_PLUGINDIR ''${CMAKE_INSTALL_LIBDIR}/lomiri/qml' 'SHELL_PLUGINDIR ${qtbase.qtQmlPrefix}'
+      --replace-fail 'SHELL_PLUGINDIR_SUFFIX lomiri/qml' 'SHELL_PLUGINDIR_SUFFIX ${shellPlugindirSuffix}' \
+      --replace-fail 'string(APPEND SHELL_PLUGINDIR_SUFFIX "6")' '# string(APPEND SHELL_PLUGINDIR_SUFFIX "6")'
  '';

  strictDeps = true;
@@ -2,6 +2,7 @@
  stdenv,
  lib,
  fetchFromGitLab,
+  fetchpatch,
  gitUpdater,
  cmake,
  dbus,
@@ -23,13 +24,28 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-rGs+MTt/Z+Gk3jSxU7tfNAUdypG/HJ4pDqvC+U722Eg=";
  };

+  patches = [
+    # Remove when version > 1.3.2
+    (fetchpatch {
+      name = "0001-lomiri-notifications-support-qt6-and-newer-lomiri-api.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri-notifications/-/commit/55e9b61d2214edb31613d67fa66284acfa171dc5.patch";
+      excludes = [
+        "debian/*"
+      ];
+      hash = "sha256-BURficKpFd15RyNFWyZ+hqxFHnIbv4krFpTARQ86Ykw=";
+    })
+  ];
+
  postPatch = ''
    substituteInPlace CMakeLists.txt \
-      --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
-
-    # Need to replace prefix to not try to install into lomiri-api prefix
+      --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
+  ''
+  # Need to replace prefix to not try to install into lomiri-api prefix
+  + ''
    substituteInPlace src/CMakeLists.txt \
-      --replace-fail '--variable=plugindir' '--define-variable=prefix=''${CMAKE_INSTALL_PREFIX} --variable=plugindir'
+      --replace-fail \
+        '--variable=plugindir lomiri-shell-api' \
+        '--define-variable=libdir=''${CMAKE_INSTALL_LIBDIR} --variable=plugindir lomiri-shell-api'
  ''
  + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
    substituteInPlace CMakeLists.txt \
@@ -1,6 +1,7 @@
 {
  lib,
  fetchFromGitHub,
+  fetchpatch2,
  buildPythonPackage,
  setuptools,
  websockets,
@@ -20,6 +21,20 @@ buildPythonPackage rec {
    hash = "sha256-mFg9mWrlnfXiQpgZ1rxvUy9TBfwy41XEKmsCf2nvxGo=";
  };

+  patches = [
+    # fix asyncio.get_event_loop() usage in tests for python 3.14
+    (fetchpatch2 {
+      url = "https://github.com/kyuupichan/aiorpcX/commit/b8ce32889c45c98b44c4e247ec0b0ae206e9ee91.patch?full_index=1";
+      hash = "sha256-EIxGR3M5dfX4ZyPFftVdPFcsg9WwYBG/h31edu6Te8o=";
+      includes = [ "tests/test_util.py" ];
+    })
+    # make test_misc async so it runs inside pytest-asyncio's loop on python 3.14
+    (fetchpatch2 {
+      url = "https://github.com/kyuupichan/aiorpcX/commit/25043621700672ee375d20b78804118acac43b1b.patch?full_index=1";
+      hash = "sha256-q4tqbcPQj6SU06Xn/4ns1NriLLx8zmUOGJo11ucA6Dk=";
+    })
+  ];
+
  build-system = [ setuptools ];

  optional-dependencies.ws = [ websockets ];
@@ -37,6 +52,8 @@ buildPythonPackage rec {

  pythonImportsCheck = [ "aiorpcx" ];

+  __darwinAllowLocalNetworking = true;
+
  meta = {
    description = "Transport, protocol and framing-independent async RPC client and server implementation";
    homepage = "https://github.com/kyuupichan/aiorpcX";
@@ -39,6 +39,13 @@ buildPythonPackage rec {
    })
  ];

+  # Pass non-callable type= (typing.Union, X | Y) through argparse.
+  postPatch = ''
+    substituteInPlace draccus/wrappers/field_wrapper.py \
+      --replace-fail '_arg_options["type"] = tpe' \
+                     '_arg_options["type"] = tpe if callable(tpe) else str'
+  '';
+
  build-system = [
    setuptools
  ];
@@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "python-pooldose";
-  version = "0.9.0";
+  version = "0.9.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "lmaertin";
    repo = "python-pooldose";
    tag = version;
-    hash = "sha256-7oG0qm0GMiFVgs6tQo9o2jaCZ/rou96QPRpLU853AQs=";
+    hash = "sha256-1WHNiVPquL/D5lpN27iXSA2cWU+VjCPIcW9Th65axVA=";
  };

  build-system = [ setuptools ];
@@ -41,9 +41,17 @@ stdenv.mkDerivation rec {

  installFlags = [ "INSTALL_ROOT=$(out)" ];

-  postInstall = ''
-    ln -s $out/bin/LogAnalyzer $out/bin/loganalyzer
-  '';
+  postInstall =
+    let
+      outBin =
+        if stdenv.hostPlatform.isDarwin then
+          "LogAnalyzer.app/Contents/MacOS/LogAnalyzer"
+        else
+          "LogAnalyzer";
+    in
+    ''
+      ln -s $out/bin/${outBin} $out/bin/loganalyzer
+    '';

  meta = {
    description = "Tool that helps you to analyze your log files by reducing the content with patterns you define";
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
    sha256 = "0wh06nix8bd4w1aq4k2fbbkdq5i30a9lxz3xczf3ff28yy0kfwzm";
  };

+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    NIX_CFLAGS_COMPILE = "-std=gnu17";
+  };
+
  postPatch = ''
    patchShebangs tests
  '';
@@ -1,7 +1,6 @@
 {
  lib,
  stdenv,
-  fetchpatch2,
  fetchurl,
  ncurses,
  pkg-config,
@@ -312,9 +312,14 @@ stdenv.mkDerivation (
      ]
      ++ lib.optionals (lib.strings.versionOlder version "2.17.0") [ "mircookie" ]
      ++ lib.optionals (lib.strings.versionAtLeast version "2.17.0") [
-        "mircommon-internal"
        "mirserver-internal"
      ]
+      ++
+        lib.optionals
+          (lib.strings.versionAtLeast version "2.17.0" && lib.strings.versionOlder version "2.26.0")
+          [
+            "mircommon-internal"
+          ]
      ++ lib.optionals (lib.strings.versionOlder version "2.25.0") [
        "mir-renderer-gl-dev"
        "mirrenderer"
@@ -5,18 +5,9 @@ let
 in
 {
  mir = common {
-    version = "2.25.2";
-    hash = "sha256-+nahWuAcGWgxBM6/a2HWwDw5DkQpUt5i/CEGzTLwNQw=";
-    cargoHash = "sha256-fVD+RGU/2UGVihIktKg2+eDWmlWomDOAcrY6k2XwF1c=";
-    patches = [
-      # Fix leftover boost_system references when linking miracle-wm (library no longer exists)
-      # https://github.com/canonical/mir/pull/4721
-      (fetchpatch {
-        name = "mir-tests-mirtest.pc.in-Drop-remaining-references-to-boost_system.patch";
-        url = "https://github.com/canonical/mir/commit/14d396ecef4611e9182d78890a2d908439478799.patch";
-        hash = "sha256-IpX/7lkuYwoITzOz/gF5q7TAFUg4YH0IY2fWkorIEiM=";
-      })
-    ];
+    version = "2.26.0";
+    hash = "sha256-gADqNNkaYj8KQ67wWzUWT4LuTQh1S+w/qLhVDKdBH4Q=";
+    cargoHash = "sha256-bG2p5Gz34yQJLI1Wuejq6o+jXLn6O2eZE1XGddvxkV4=";
  };

  mir_2_15 = common {
@@ -4,7 +4,6 @@
  fetchurl,
  ed,
  autoreconfHook,
-  testers,
 }:

 stdenv.mkDerivation (finalAttrs: {
@@ -27,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
    "ac_cv_func_strnlen_working=yes"
  ];

-  doCheck = stdenv.hostPlatform.libc != "musl"; # not cross;
+  doCheck = stdenv.hostPlatform.libc != "musl";
  nativeCheckInputs = [ ed ];

  meta = {
@@ -797,6 +797,7 @@ mapAliases {
  freeimage = throw "freeimage was removed due to numerous vulnerabilities"; # Added 2025-10-23
  freerdp3 = throw "'freerdp3' has been renamed to/replaced by 'freerdp'"; # Converted to throw 2025-10-27
  freerdpUnstable = throw "'freerdpUnstable' has been renamed to/replaced by 'freerdp'"; # Converted to throw 2025-10-27
+  frozen-bubble = throw "'frozen-bubble' has been removed because it is broken and unmaintained"; # Added 2026-05-17
  frugal = throw "'frugal' was removed because upstream has been pulled"; # Added 2025-12-20
  fusee-launcher = throw "'fusee-launcher' was removed as upstream removed the original source repository fearing legal repercussions"; # Added 2025-07-05
  fusionInventory = warnAlias "'fusionInventory' has been renamed to 'fusioninventory-agent'" fusioninventory-agent; # Added 2026-02-08
@@ -1554,10 +1554,6 @@ with pkgs;

  apprise = with python3Packages; toPythonApplication apprise;

-  avahi-compat = callPackage ../by-name/av/avahi/package.nix {
-    withLibdnssdCompat = true;
-  };
-
  babelfish = callPackage ../shells/fish/babelfish.nix { };

  bat-extras = recurseIntoAttrs (lib.makeScope newScope (import ../tools/misc/bat-extras));
@@ -30474,51 +30474,6 @@ with self;
    };
  };

-  SDL = buildPerlModule {
-    pname = "SDL";
-    version = "2.548";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/F/FR/FROGGS/SDL-2.548.tar.gz";
-      hash = "sha256-JSoZK/qcIHCkiDcH0TnDpF2cRRjM1moeaZtbeVm9T7U=";
-    };
-    patches = [
-      # https://github.com/PerlGameDev/SDL/pull/304
-      ../development/perl-modules/sdl-modern-perl.patch
-      # sdl-compat correctly reports the bit depth of the test image,
-      # while SDL_classic rounded to the next byte
-      ../development/perl-modules/sdl-compat-bit-depth.patch
-      (fetchpatch {
-        url = "https://aur.archlinux.org/cgit/aur.git/plain/surface-xs-declare-calc-offset-earlier.diff?h=perl-sdl&id=d4b6da86d33046cde0e84fa2cd6eaccff1667cab";
-        hash = "sha256-dQ2O4dO18diSAilSZrZj6II+mBuKKI3cx9fR1SJqUvo=";
-      })
-    ];
-    preCheck = "rm t/core_audiospec.t";
-    buildInputs = [
-      pkgs.SDL
-      pkgs.SDL_gfx
-      pkgs.SDL_mixer
-      pkgs.SDL_image
-      pkgs.SDL_ttf
-      pkgs.SDL_Pango
-      pkgs.SDL_net
-      AlienSDL
-      CaptureTiny
-      TestDeep
-      TestDifferences
-      TestException
-      TestMost
-      TestWarn
-    ];
-    propagatedBuildInputs = [
-      FileShareDir
-      TieSimple
-    ];
-    meta = {
-      description = "SDL bindings to Perl";
-      license = with lib.licenses; [ lgpl21Plus ];
-    };
-  };
-
  SeleniumRemoteDriver = buildPerlPackage {
    pname = "Selenium-Remote-Driver";
    version = "1.49";
@@ -39746,4 +39701,5 @@ with self;
  MongoDB = throw "MongoDB has been removed"; # 2025-09-12
  pcscperl = throw "'pcscperl' has been renamed to 'ChipcardPCSC'"; # Added 2023-12-07
  HTTPHeaderParserXS = throw "HTTPHeaderParserXS has been removed"; # Added 2025-11-08
+  SDL = throw "'SDL' has been removed as it was broken and unused"; # Added 2026-05-17
 }