Merge release-26.05 into staging-next-26.05

2026-07-22 00:20:58 +00:00 · 2026-07-19 00:34:46 +00:00
parent 70e4772ef1 9190072aee
commit 62eaae30cd
63 changed files with 806 additions and 1951 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,7 +59,7 @@ jobs:
          merged-as-untrusted-at: ${{ inputs.mergedSha }}
          target-as-trusted-at: ${{ inputs.targetSha }}

-      - uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
+      - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
        with:
          # Sandbox is disabled on MacOS by default.
          extra_nix_config: sandbox = true
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -147,7 +147,7 @@ jobs:
          merged-as-untrusted-at: ${{ inputs.mergedSha }}
          target-as-trusted-at: ${{ inputs.targetSha }}

-      - uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
+      - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0

      - uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17
        continue-on-error: true
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -139,7 +139,7 @@ jobs:
            core.info(`Found pinned.json commit: ${ciPinBumpCommit}`)

      - name: Install Nix
-        uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
+        uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0

      - name: Load supported versions
        id: versions
@@ -187,7 +187,7 @@ jobs:
          target-as-trusted-at: ${{ inputs.targetSha }}

      - name: Install Nix
-        uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
+        uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0

      - uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17
        continue-on-error: true
@@ -277,7 +277,7 @@ jobs:
          merge-multiple: true

      - name: Install Nix
-        uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
+        uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0

      - name: Combine all output paths and eval stats
        run: |
@@ -486,7 +486,7 @@ jobs:
          merged-as-untrusted-at: ${{ inputs.mergedSha }}

      - name: Install Nix
-        uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
+        uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0

      - name: Ensure flake outputs on all systems still evaluate
        run: nix flake check --all-systems --no-build './nixpkgs/untrusted?shallow=1'
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -35,7 +35,7 @@ jobs:
        with:
          merged-as-untrusted-at: ${{ inputs.mergedSha }}

-      - uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
+      - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0

      # TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well,
      # because the cache would be invalidated on every commit - treefmt checks every file.
@@ -70,7 +70,7 @@ jobs:
        with:
          merged-as-untrusted-at: ${{ inputs.mergedSha }}

-      - uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
+      - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0

      - uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17
        continue-on-error: true
@@ -100,7 +100,7 @@ jobs:
          merged-as-untrusted-at: ${{ inputs.mergedSha }}
          target-as-trusted-at: ${{ inputs.targetSha }}

-      - uses: cachix/install-nix-action@a49548c11d9846ad46ecc0115273879b045f001c # v31.10.7
+      - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0

      - uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17
        continue-on-error: true
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -713,6 +713,15 @@ with lib.maintainers;
    github = "security-review";
  };

+  stardust-xr = {
+    members = [
+      pandapip1
+      technobaboo
+    ];
+    scope = "Maintain Stardust XR packages";
+    shortName = "StardustXR";
+  };
+
  stdenv = {
    enableFeatureFreezePing = true;
    github = "stdenv";
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1565,6 +1565,8 @@ in
  sssd-ldap = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd-ldap.nix { };
  sssd-legacy-config = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd-legacy-config.nix { };
  stalwart = runTest ./stalwart/stalwart.nix;
+  stardust-xr-atmosphere = runTest ./stardust-xr/atmosphere.nix;
+  stardust-xr-flatland = runTest ./stardust-xr/flatland.nix;
  stargazer = runTest ./web-servers/stargazer.nix;
  starship = runTest ./starship.nix;
  startx = import ./startx.nix { inherit pkgs runTest; };
--- a/nixos/tests/common/openxr.nix
+++ b/nixos/tests/common/openxr.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+
+{
+  imports = [
+    ./user-account.nix
+    ./x11.nix
+  ];
+  test-support.displayManager.auto.user = "alice";
+  systemd.user.targets.xdg-desktop-autostart = {
+    wantedBy = [ "graphical-session.target" ];
+    after = [ "graphical-session.target" ];
+  };
+
+  hardware.graphics.enable = true;
+
+  services.monado = {
+    enable = true;
+    defaultRuntime = true;
+    forceDefaultRuntime = true;
+  };
+  systemd.user.services.monado = {
+    requires = [ "graphical-session.target" ];
+    environment = {
+      # Stop Monado from probing for any hardware
+      SIMULATED_ENABLE = "1";
+      SIMULATED_LEFT = "simple";
+      SIMULATED_RIGHT = "simple";
+      # Run as X11 client rather than using direct mode
+      XRT_COMPOSITOR_FORCE_XCB = "1";
+      # And run fullscreen so that we can hide the DE
+      XRT_COMPOSITOR_XCB_FULLSCREEN = "1";
+    };
+  };
+}
--- a/nixos/tests/monado.nix
+++ b/nixos/tests/monado.nix
@@ -3,47 +3,57 @@
  name = "monado";

  nodes.machine =
-    { pkgs, ... }:
+    {
+      lib,
+      pkgs,
+      config,
+      ...
+    }:

    {
-      hardware.graphics.enable = true;
-      users.users.alice = {
-        isNormalUser = true;
-        uid = 1000;
+      imports = [ ./common/openxr.nix ];
+
+      systemd.user.services.print-openxr-info = {
+        wantedBy = [ "xdg-desktop-autostart.target" ];
+        requires = [ "monado.service" ];
+        script = lib.getExe' pkgs.openxr-loader "openxr_runtime_list";
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+        };
      };

-      services.monado = {
-        enable = true;
-        defaultRuntime = true;
-
-        forceDefaultRuntime = true;
+      systemd.user.services.xrgears = {
+        wantedBy = [ "xdg-desktop-autostart.target" ];
+        requires = [ "monado.service" ];
+        script = lib.getExe pkgs.xrgears;
      };
-      # Stop Monado from probing for any hardware
-      systemd.user.services.monado.environment.SIMULATED_ENABLE = "1";
-
-      environment.systemPackages = with pkgs; [ openxr-loader ];
    };

  testScript =
    { nodes, ... }:
-    let
-      userId = toString nodes.machine.users.users.alice.uid;
-      runtimePath = "/run/user/${userId}";
-    in
    ''
-      # for defaultRuntime
-      machine.succeed("stat /etc/xdg/openxr/1/active_runtime.json")
+      with subtest("Ensure X11 starts"):
+        start_all()
+        machine.succeed("loginctl enable-linger alice")
+        machine.wait_for_x()

-      machine.succeed("loginctl enable-linger alice")
-      machine.wait_for_unit("user@${userId}.service")
+      with subtest("Ensure default runtime present"):
+        machine.succeed("stat /etc/xdg/openxr/1/active_runtime.json")

-      machine.wait_for_unit("monado.socket", "alice")
-      machine.systemctl("start monado.service", "alice")
-      machine.wait_for_unit("monado.service", "alice")
+      with subtest("Ensure forced runtime present"):
+        # Monado needs to be started to create the forced runtime file
+        machine.systemctl("start monado.service", "alice")
+        machine.wait_for_unit("monado.service", "alice")
+        machine.succeed("stat /home/alice/.config/openxr/1/active_runtime.json")

-      # for forceDefaultRuntime
-      machine.succeed("stat /home/alice/.config/openxr/1/active_runtime.json")
+      with subtest("Ensure openxr_runtime_list can find runtime"):
+        machine.wait_for_unit("print-openxr-info.service", "alice")

-      machine.succeed("su -- alice -c env XDG_RUNTIME_DIR=${runtimePath} openxr_runtime_list")
+      with subtest("Ensure xrgears launches"):
+        machine.wait_for_unit("xrgears.service", "alice")
+        # TODO: 10 seconds should be long enough for anything, but this is theoretically flaky
+        machine.sleep(10)
+        machine.screenshot("screen")
    '';
 }
--- a/nixos/tests/stardust-xr/atmosphere.nix
+++ b/nixos/tests/stardust-xr/atmosphere.nix
@@ -0,0 +1,54 @@
+{ ... }:
+{
+  name = "stardust-xr-atmosphere";
+
+  # Doesn't understand @polling_condition
+  skipTypeCheck = true;
+
+  nodes.machine =
+    {
+      lib,
+      pkgs,
+      config,
+      ...
+    }:
+
+    {
+      imports = [ ./common.nix ];
+
+      virtualisation.memorySize = 4096;
+
+      systemd.user.services.stardust-xr-atmosphere = {
+        wantedBy = [ "xdg-desktop-autostart.target" ];
+        requires = [ "stardust-xr-server.service" ];
+        after = [ "stardust-xr-server.service" ];
+        script = ''
+          set -eufx pipefail
+          ${lib.getExe pkgs.stardust-xr-atmosphere} install ${pkgs.stardust-xr-atmosphere}/share/atmosphere/default_envs/the_grid
+          ${lib.getExe pkgs.stardust-xr-atmosphere} set-default the_grid
+          ${lib.getExe pkgs.stardust-xr-atmosphere} show
+        '';
+        environment.RUST_BACKTRACE = "full";
+      };
+    };
+
+  testScript =
+    { nodes, ... }:
+    ''
+      @polling_condition()
+      def atmosphere_running():
+        machine.wait_for_unit("stardust-xr-atmosphere.service", "alice")
+
+      with subtest("Ensure X11 starts"):
+        start_all()
+        machine.succeed("loginctl enable-linger alice")
+        machine.wait_for_x()
+
+      with subtest("Ensure system works"):
+        with atmosphere_running:
+          # TODO(@Pandapip1): 20 seconds should be long enough for anything, but this is theoretically flaky
+          # Adding systemd notify support to stardust-xr-atmosphere should resolve this
+          machine.sleep(20)
+          machine.screenshot("screen")
+    '';
+}
--- a/nixos/tests/stardust-xr/common.nix
+++ b/nixos/tests/stardust-xr/common.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [ ../common/openxr.nix ];
+
+  # TODO(@Pandapip1): For the time being, Stardust doesn't like controllers rather than hand tracking
+  services.monado.enable = lib.mkForce false;
+
+  systemd.user.services.stardust-xr-server = {
+    wantedBy = [ "xdg-desktop-autostart.target" ];
+    # requires = [ "monado.service" ];
+    serviceConfig = {
+      Type = "notify";
+      NotifyAccess = "all";
+      ExecStart = "${lib.getExe pkgs.stardust-xr-server} -e ${pkgs.writeShellScript "notifyReady" "systemd-notify --ready"}";
+    };
+    environment.RUST_BACKTRACE = "full";
+  };
+}
--- a/nixos/tests/stardust-xr/flatland.nix
+++ b/nixos/tests/stardust-xr/flatland.nix
@@ -0,0 +1,57 @@
+{ ... }:
+{
+  name = "stardust-xr-flatland";
+
+  # Doesn't understand @polling_condition
+  skipTypeCheck = true;
+
+  nodes.machine =
+    {
+      lib,
+      pkgs,
+      config,
+      ...
+    }:
+
+    {
+      imports = [ ./common.nix ];
+
+      systemd.user.services.stardust-xr-flatland = {
+        wantedBy = [ "xdg-desktop-autostart.target" ];
+        requires = [ "stardust-xr-server.service" ];
+        after = [ "stardust-xr-server.service" ];
+        script = lib.getExe pkgs.stardust-xr-flatland;
+        environment.RUST_BACKTRACE = "full";
+      };
+
+      systemd.user.services.test-wayland-app = {
+        wantedBy = [ "xdg-desktop-autostart.target" ];
+        requires = [ "stardust-xr-flatland.service" ];
+        after = [ "stardust-xr-flatland.service" ];
+        script = lib.getExe pkgs.wayland-colorbar;
+        environment = {
+          DISPLAY = "";
+          WAYLAND_DISPLAY = "wayland-0";
+        };
+      };
+    };
+
+  testScript =
+    { nodes, ... }:
+    ''
+      @polling_condition()
+      def wayland_client_running():
+        machine.wait_for_unit("test-wayland-app.service", "alice")
+
+      with subtest("Ensure X11 starts"):
+        start_all()
+        machine.succeed("loginctl enable-linger alice")
+        machine.wait_for_x()
+
+      with subtest("Ensure system works"):
+        with wayland_client_running:
+          # TODO: 20 seconds should be long enough for anything, but this is theoretically flaky
+          machine.sleep(20)
+          machine.screenshot("screen")
+    '';
+}
--- a/nixos/tests/wordpress.nix
+++ b/nixos/tests/wordpress.nix
@@ -90,6 +90,7 @@ rec {
        "6_7"
        "6_8"
        "6_9"
+        "7_0"
      ];

  testScript = ''
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
@@ -10,11 +10,11 @@
 buildMozillaMach rec {
  pname = "firefox-beta";
  binaryName = "firefox-beta";
-  version = "152.0b10";
+  version = "153.0b13";
  applicationName = "Firefox Beta";
  src = fetchurl {
    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "531117225f690736e529d654766136878e3c719ec500860fcd578d9bf93f2e46f2887f0c4ba21dd17884cc41bda37fbd735c998091a0e1b0eb72d5d43f4f2339";
+    sha512 = "fecfb1837d1907d54ed52bc40113804b6637352c2cbe6eb906f950d7749cbece32446b42c392102fa9e16591949619237dc2dbeb13bec18697ddd42e9ce8d4dd";
  };

  meta = {
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
  pname = "firefox-devedition";
  binaryName = "firefox-devedition";
-  version = "152.0b1";
+  version = "153.0b13";
  applicationName = "Firefox Developer Edition";
  requireSigning = false;
  branding = "browser/branding/aurora";
  src = fetchurl {
    url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "1fcbb8bd7b80415639dec2e1f28e6e893b43592115e1a445f447868f114f04b9b20307af030017fd19fa9f3d7b8ae13e7083229aaa1af9d092f44f6eaa0ae798";
+    sha512 = "ee1a699ab3f390031e7eb85b6cc394d3431cc2e2960e97cabc393cc4edad1bd1a2ba62e7d834e2ae52fa7fcf3a08c6194c1801ba7e62fa3ceb98ee08ac27981d";
  };

  # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
--- a/pkgs/by-name/ar/archisteamfarm/deps.json
+++ b/pkgs/by-name/ar/archisteamfarm/deps.json
@@ -281,8 +281,8 @@
  },
  {
    "pname": "Markdig.Signed",
-    "version": "1.1.3",
-    "hash": "sha256-luLhgpC0d2ZTtvoSvaH/yaIc/IDppyf4P8M7sGbExJw="
+    "version": "1.2.0",
+    "hash": "sha256-dC75KeDfJOretrOkaH1Ai/uEYWvxjBosn4NMEhD+LCo="
  },
  {
    "pname": "Microsoft.ApplicationInsights",
@@ -291,8 +291,8 @@
  },
  {
    "pname": "Microsoft.AspNetCore.OpenApi",
-    "version": "10.0.7",
-    "hash": "sha256-WlAW49otxYzgrmuqHewUoBsjDcAZwhNz5WVbCT4EiIA="
+    "version": "10.0.8",
+    "hash": "sha256-v2E7nwc4Nac8Ns5cQ2KmzLash9AEMbfQbMo2bFy7oZM="
  },
  {
    "pname": "Microsoft.CodeAnalysis.ResxSourceGenerator",
@@ -431,23 +431,23 @@
  },
  {
    "pname": "Microsoft.Testing.Extensions.Telemetry",
-    "version": "2.2.2",
-    "hash": "sha256-4rXpgfroh8MnLWjYxUtYo/VcErYe9gpCaz80np3r1CI="
+    "version": "2.2.3",
+    "hash": "sha256-e70IRoXt5Aiwhxwd6nay0SBQD3ESXcAGh0lCucNtCAE="
  },
  {
    "pname": "Microsoft.Testing.Extensions.TrxReport",
-    "version": "2.2.2",
-    "hash": "sha256-IOgroCb3Wvwas4z2Xxy4ils5AswZpKT/wvjQM5e95ig="
+    "version": "2.2.3",
+    "hash": "sha256-guXkeZ4AcbP9uu87/9IpSuZZdt03mFxShU/z2avv3oY="
  },
  {
    "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions",
-    "version": "2.2.2",
-    "hash": "sha256-aP+mw/Q5U6lfNmMJCzLqVMpZ+TnBMTqXH0VGhR2FvbI="
+    "version": "2.2.3",
+    "hash": "sha256-eLb2Sm0lzQkgkdFdcZ76aIGShIf4lRPmpcMauUWN5QE="
  },
  {
    "pname": "Microsoft.Testing.Extensions.VSTestBridge",
-    "version": "2.2.2",
-    "hash": "sha256-rtyA0w70swCKfz+ly6ev/BlNXH8WUHurfxsaWoo1LbA="
+    "version": "2.2.3",
+    "hash": "sha256-bSNPv1gAWEU7DVtqYS1qjbBN3lu9TTh6+/nDQCcIIHk="
  },
  {
    "pname": "Microsoft.Testing.Platform",
@@ -456,13 +456,13 @@
  },
  {
    "pname": "Microsoft.Testing.Platform",
-    "version": "2.2.2",
-    "hash": "sha256-azYgL1c9oVE1JDYs0HUWTClaIumw1xvxgmNz4Mx0q30="
+    "version": "2.2.3",
+    "hash": "sha256-Mz///qqkbdQsgpIjjAiHf/ptvjeQIsO6S99+tg+F8Fw="
  },
  {
    "pname": "Microsoft.Testing.Platform.MSBuild",
-    "version": "2.2.2",
-    "hash": "sha256-uuhiI0aGFpM+I2ASh99rsfsRhKf8b/JUNx4Hcd2Ac6Q="
+    "version": "2.2.3",
+    "hash": "sha256-mwt+i2y8UV30JrssGCx9kgjcZ+upWhAxEBs5fCXA/6k="
  },
  {
    "pname": "Microsoft.TestPlatform.ObjectModel",
@@ -476,23 +476,23 @@
  },
  {
    "pname": "MSTest",
-    "version": "4.2.2",
-    "hash": "sha256-hTD140FHBWOoUxKmCkmL261gvwgJRXnzAwSl37sp6XI="
+    "version": "4.2.3",
+    "hash": "sha256-G6agMAoiK8oMPTpq25i7zsUXXCDxGMP/UBU72Wky9t0="
  },
  {
    "pname": "MSTest.Analyzers",
-    "version": "4.2.2",
-    "hash": "sha256-m6FRWUdYM9tuNnm7ehY+j1wIr2i12+0LeK5JcpJdp5M="
+    "version": "4.2.3",
+    "hash": "sha256-XlSqWrZVG1nC/qDjNuSs51pM90nQ9QlQtwDKJQVsMPg="
  },
  {
    "pname": "MSTest.TestAdapter",
-    "version": "4.2.2",
-    "hash": "sha256-QFjHNHVyijmuq29MuhUNMnaWEcJWPWGVp21BQj0Hb7M="
+    "version": "4.2.3",
+    "hash": "sha256-ckBpU7gg4LY2ZBPljRWz2yCj33vRf93Qm/JY7uGfeOs="
  },
  {
    "pname": "MSTest.TestFramework",
-    "version": "4.2.2",
-    "hash": "sha256-+yrzh3fmkvOMnqk+eYKQTC1267uKeUDcS3TV1+3Gnck="
+    "version": "4.2.3",
+    "hash": "sha256-og5IO5g/fXm1y9hSNkqZ+libfD9o0dRm/8I9CF0J2So="
  },
  {
    "pname": "Newtonsoft.Json",
@@ -586,8 +586,8 @@
  },
  {
    "pname": "Scalar.AspNetCore",
-    "version": "2.14.11",
-    "hash": "sha256-NOH8fyTW+uuvggup1581IwO1Gv1FyvpCQMsPWItBlwA="
+    "version": "2.14.14",
+    "hash": "sha256-/9lh1yFvp8/ROxdQcJEhEtFwrpOCdRNwFfz8B53epVk="
  },
  {
    "pname": "SteamKit2",
@@ -596,33 +596,33 @@
  },
  {
    "pname": "System.Composition",
-    "version": "10.0.7",
-    "hash": "sha256-+D0uPBsF3vIl1IU3DZ1aCWpdQompwSvyFLvxprUErAE="
+    "version": "10.0.8",
+    "hash": "sha256-sp1IzwdxzVZwEF3mOCkobc5SYUGm/u3FDZUPkekoxZs="
  },
  {
    "pname": "System.Composition.AttributedModel",
-    "version": "10.0.7",
-    "hash": "sha256-PxE1IuviKGncIzrCFNqhqFMNzEdnN5/A9kFHSyvg4P4="
+    "version": "10.0.8",
+    "hash": "sha256-6iUFdykgMj6yOG10qR3TOz6mrQnfDGsr4Q8WP65hBFU="
  },
  {
    "pname": "System.Composition.Convention",
-    "version": "10.0.7",
-    "hash": "sha256-oPAOsNnNF0tOXHZoxnQt7PC2R4f+iqmzYKg++zPCdaA="
+    "version": "10.0.8",
+    "hash": "sha256-MIQePJ3OkWpA07U+xH1PwiV88WtSGBaTxUrA1j4hD6Y="
  },
  {
    "pname": "System.Composition.Hosting",
-    "version": "10.0.7",
-    "hash": "sha256-bBoobvUuurRqog2nqchZKTwkIn7Weq7M3auboVgwALA="
+    "version": "10.0.8",
+    "hash": "sha256-SOAD0Yz8A/XJ8tEi7Q8DL9H7FzTcgg8HAbnZYKiyZNk="
  },
  {
    "pname": "System.Composition.Runtime",
-    "version": "10.0.7",
-    "hash": "sha256-sZTjqpSbbEy4KsRMDoEKvvfjHkl7IL9pcD2N8kFVWro="
+    "version": "10.0.8",
+    "hash": "sha256-hRkoJ8S1oD4FKjnaDYwfzX2Pys6QvGiiX6YxrdGgAyA="
  },
  {
    "pname": "System.Composition.TypedParts",
-    "version": "10.0.7",
-    "hash": "sha256-gqDp0guxUnnEJaB6I/9PSgxXWDbE5YhyrTa9Yu4s0OM="
+    "version": "10.0.8",
+    "hash": "sha256-NYo2dvMJ9WU0BKIGDkuIpFQHkbZE1sGJAtY8fINFpqo="
  },
  {
    "pname": "System.IO.Hashing",
@@ -631,8 +631,8 @@
  },
  {
    "pname": "System.Security.Cryptography.ProtectedData",
-    "version": "10.0.7",
-    "hash": "sha256-IhiXDRoBQil9KAVV97PiCOhiIQCSTIJuKQOOfBECSz0="
+    "version": "10.0.8",
+    "hash": "sha256-GYRQSkRnDWytMIQcoNrAVbJda5nzfbtg1HJuwRZVxH0="
  },
  {
    "pname": "Tmds.DBus.Protocol",
--- a/pkgs/by-name/ar/archisteamfarm/package.nix
+++ b/pkgs/by-name/ar/archisteamfarm/package.nix
@@ -21,13 +21,13 @@ in
 buildDotnetModule rec {
  pname = "archisteamfarm";
  # nixpkgs-update: no auto update
-  version = "6.3.6.0";
+  version = "6.3.6.1";

  src = fetchFromGitHub {
    owner = "JustArchiNET";
    repo = "ArchiSteamFarm";
-    rev = version;
-    hash = "sha256-S2T741eOO0s8a3pikHz0hy/PBPpw5fmtpzGv0cmRk0I=";
+    tag = version;
+    hash = "sha256-C0n3e/t1Bq02vlrF/KyT7vlhtNDIbAsg9zAk9aKZ5/g=";
  };

  dotnet-runtime = dotnetCorePackages.aspnetcore_10_0;
@@ -103,6 +103,7 @@ buildDotnetModule rec {

  meta = {
    description = "Application with primary purpose of idling Steam cards from multiple accounts simultaneously";
+    changelog = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/tag/${src.tag}";
    homepage = "https://github.com/JustArchiNET/ArchiSteamFarm";
    license = lib.licenses.asl20;
    mainProgram = "ArchiSteamFarm";
--- a/pkgs/by-name/fo/forgejo/generic.nix
+++ b/pkgs/by-name/fo/forgejo/generic.nix
@@ -13,7 +13,6 @@
  brotli,
  buildGoModule,
  coreutils,
-  fetchpatch,
  forgejo,
  git,
  gzip,
@@ -80,9 +79,6 @@ buildGoModule rec {
    git
    openssh
    writableTmpDirAsHomeHook
-  ]
-  ++ lib.optionals (lib.versionAtLeast version "16") [
-    coreutils
  ];

  patches = [
--- a/pkgs/by-name/li/libgcrypt/package.nix
+++ b/pkgs/by-name/li/libgcrypt/package.nix
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchurl,
+  fetchpatch,
  gettext,
  libgpg-error,
  enableCapabilities ? false,
@@ -24,6 +25,16 @@ stdenv.mkDerivation rec {
    hash = "sha256-fOM8JJIiGgQ2+WqFACFenz49y1/SanV81BXnqEO6vV4=";
  };

+  patches = lib.optionals stdenv.hostPlatform.isRiscV64 [
+    # Remove in next release
+    # https://github.com/gpg/libgcrypt/commit/3f684fc6ab3ac98320e245a06b3563ad37ec56f5
+    # zvkned AES corrupts CBC/CFB/CTR/OCB/XTS output on VLEN>128 hardware
+    (fetchpatch {
+      url = "https://github.com/gpg/libgcrypt/commit/3f684fc6ab3ac98320e245a06b3563ad37ec56f5.patch";
+      hash = "sha256-1LSrIwsN0n5IBRDZ+9MJTEjzY+/T6LQO6hX1ke8hSuc=";
+    })
+  ];
+
  outputs = [
    "bin"
    "lib"
--- a/pkgs/by-name/lm/lms/package.nix
+++ b/pkgs/by-name/lm/lms/package.nix
@@ -19,17 +19,18 @@
  openssl,
  xxhash,
  pugixml,
+  onnxruntime,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "lms";
-  version = "3.74.0";
+  version = "3.78.0";

  src = fetchFromGitHub {
    owner = "epoupon";
    repo = "lms";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-D1Sg6XzZ8t/dFKrVh7k+KGLg2r6LeLGJk4FweVb4L1A=";
+    hash = "sha256-uOijIipay4ncE8hP6vJG9vOGiD/Ad6WJHEQ7P1HKi/Y=";
  };

  strictDeps = true;
@@ -53,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
    openssl
    xxhash
    pugixml
+    onnxruntime
  ];

  postPatch = ''
@@ -62,8 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
  postInstall = ''
    substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/bin/ffmpeg" "${lib.getExe ffmpeg}"
    substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/Wt/resources" "${wt}/share/Wt/resources"
-    substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/lms/docroot" "$out/share/lms/docroot"
-    substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/lms/approot" "$out/share/lms/approot"
+    substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/lms" "$out/share/lms"
    substituteInPlace $out/share/lms/default.service --replace-fail "/usr/bin/lms" "$out/bin/lms"
    install -Dm444 $out/share/lms/default.service -T $out/lib/systemd/system/lmsd.service
  '';
--- a/pkgs/by-name/ma/mawk/package.nix
+++ b/pkgs/by-name/ma/mawk/package.nix
@@ -21,10 +21,15 @@ stdenv.mkDerivation (finalAttrs: {

  depsBuildBuild = [ buildPackages.stdenv.cc ];

+  hardeningDisable = [
+    "strictflexarrays1"
+  ];
+
  passthru = {
    tests.version = testers.testVersion {
      package = finalAttrs.finalPackage;
      command = "mawk -W version";
+      version = lib.replaceString "-" " " finalAttrs.version;
    };
    updateScript = directoryListingUpdater {
      inherit (finalAttrs) pname version;
--- a/pkgs/by-name/me/mediawiki/package.nix
+++ b/pkgs/by-name/me/mediawiki/package.nix
@@ -7,11 +7,11 @@

 stdenvNoCC.mkDerivation rec {
  pname = "mediawiki";
-  version = "1.45.3";
+  version = "1.45.4";

  src = fetchurl {
    url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz";
-    hash = "sha256-XqjB8yHJ+Nuk0aweTsoYJ/sTUZ1KIZDiOfUUMgWKQmk=";
+    hash = "sha256-y3yCRGjrWlEacvCOYpHQncivEuCg/9wlMu4/drsMrXw=";
  };

  postPatch = ''
--- a/pkgs/by-name/op/opencode-desktop/package.nix
+++ b/pkgs/by-name/op/opencode-desktop/package.nix
@@ -143,7 +143,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
      ''
      (lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
        mkdir -p $out/Applications $out/bin
-        mv packages/desktop/dist/mac-*/OpenCode.app "$out/Applications/OpenCode.app"
+        mv packages/desktop/dist/mac*/OpenCode.app "$out/Applications/OpenCode.app"
        ln -s "$out/Applications/OpenCode.app/Contents/MacOS/OpenCode" $out/bin/OpenCode
      '')
      (lib.optionalString stdenvNoCC.hostPlatform.isLinux ''
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -187,6 +187,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
      "aarch64-linux"
      "x86_64-linux"
      "aarch64-darwin"
+      "x86_64-darwin"
    ];
    mainProgram = "opencode";
  };
--- a/pkgs/by-name/pr/prosody/package.nix
+++ b/pkgs/by-name/pr/prosody/package.nix
@@ -37,11 +37,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "prosody";
-  version = "13.0.3"; # also update communityModules
+  version = "13.0.6"; # also update communityModules

  src = fetchurl {
    url = "https://prosody.im/downloads/source/prosody-${finalAttrs.version}.tar.gz";
-    hash = "sha256-pR7T6+VMGazWOO5fVAFKs2lsEvmf/HWsKT1p8vD/3As=";
+    hash = "sha256-7GlvnPViw69KBLB9P7NqHO3MTmmjkv3c/FJLxn2TBQ8=";
  };

  # The following community modules are necessary for the nixos module
@@ -56,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
  # version.
  communityModules = fetchhg {
    url = "https://hg.prosody.im/prosody-modules";
-    rev = "ce716e5e0fee";
-    hash = "sha256-jjsHL9+lLwhFXO61h6SmQjwEdRJQ/zKgc1PDnH+wHxs=";
+    rev = "15a7749c7acb";
+    hash = "sha256-RvhPV6YMdwxxIeHhpqXPfBh6087PAPAQV8D+stpXmBs=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/by-name/qp/qpwgraph/package.nix
+++ b/pkgs/by-name/qp/qpwgraph/package.nix
@@ -11,14 +11,14 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "qpwgraph";
-  version = "1.0.1";
+  version = "1.0.3";

  src = fetchFromGitLab {
    domain = "gitlab.freedesktop.org";
    owner = "rncbc";
    repo = "qpwgraph";
    tag = "v${finalAttrs.version}";
-    sha256 = "sha256-RU6FD8/H4Z/IxaP+eTHNqkcP63nJ1Tos4PXpZE+i9d4=";
+    sha256 = "sha256-xzAnZG9tPeVKgOBIX0PdB6bWlK49nMLZWpfDJpnjP4o=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/re/repomix/package.nix
+++ b/pkgs/by-name/re/repomix/package.nix
@@ -8,16 +8,16 @@

 buildNpmPackage rec {
  pname = "repomix";
-  version = "1.14.0";
+  version = "1.15.0";

  src = fetchFromGitHub {
    owner = "yamadashy";
    repo = "repomix";
    tag = "v${version}";
-    hash = "sha256-xvRCblm7WRvxFBjsxe3AjvLt8AvL4Q9F6SQuOv39ADA=";
+    hash = "sha256-M96q1oJ2ipDMfeos5P0FBbngjStC86qBlQcRFXitkt4=";
  };

-  npmDepsHash = "sha256-Pw2/w0rn5UloUqPZrze2l1Qi7JEdAXxlpPm7dxEHzWU=";
+  npmDepsHash = "sha256-3AP+mMFipVUfO7vLY7ZjaJ8FG4uwpxC2+jYtaHz49YI=";

  nativeInstallCheckInputs = [ versionCheckHook ];
  doInstallCheck = true;
--- a/pkgs/by-name/ro/rocketchat-desktop/package.nix
+++ b/pkgs/by-name/ro/rocketchat-desktop/package.nix
@@ -7,7 +7,7 @@
  pkg-config,
  node-gyp,
  python3Packages,
-  electron_40,
+  electron_42,
  vips,
  xvfb-run,
  copyDesktopItems,
@@ -17,17 +17,17 @@
 }:
 let
  yarn-berry = yarn-berry_4;
-  electron = electron_40;
+  electron = electron_42;
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "rocketchat-desktop";
-  version = "4.14.1";
+  version = "4.15.6";

  src = fetchFromGitHub {
    owner = "RocketChat";
    repo = "Rocket.Chat.Electron";
    tag = finalAttrs.version;
-    hash = "sha256-O30MSLv2eQIFs6yjo6LU6aMwHVl5fn7KsVMpIiFL25I=";
+    hash = "sha256-cCCE+d/YXUqTb5gMgcxsOjh2nDUZuuQ4L4QZYzIN4r0=";
  };

  patches = [
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {

  offlineCache = yarn-berry.fetchYarnBerryDeps {
    inherit (finalAttrs) src missingHashes patches;
-    hash = "sha256-xb4HwmLjO1xCQ/KEav3EM2FwCu0vi/tXZVY+gSoonyQ=";
+    hash = "sha256-XYfC5K7oXVjxP6Ndlc3qYb47Zh3GnwPx7c4+vBiA2AI=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/sh/shaka-packager/package.nix
+++ b/pkgs/by-name/sh/shaka-packager/package.nix
@@ -22,13 +22,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "shaka-packager";
-  version = "3.8.0";
+  version = "3.9.2";

  src = fetchFromGitHub {
    owner = "shaka-project";
    repo = "shaka-packager";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-GdBNysDHDWy1Zgtf+gfKtyvqCiPFJeA3K1mErK/GoRk=";
+    hash = "sha256-pKbTIDIveJFaKaCX4SPqYUIUI8QDk1WeZBgtmdZzg/o=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/st/stardust-xr-atmosphere/package.nix
+++ b/pkgs/by-name/st/stardust-xr-atmosphere/package.nix
@@ -7,18 +7,26 @@
  nix-update-script,
 }:

-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "stardust-xr-atmosphere";
-  version = "0-unstable-2024-08-22";
+  version = "0.51.1";

  src = fetchFromGitHub {
    owner = "stardustxr";
    repo = "atmosphere";
-    rev = "0c8bfb91e8ca32a4895f858067334ed265517309";
-    hash = "sha256-pk1+kkPV6fx+7Xz9hKFFVw402iztcvNC31zVCc3hfTY=";
+    tag = finalAttrs.version;
+    hash = "sha256-FH9Y+p17bGczRhLEfxVqc1peg9Aubw1pu7QOYb6RWvc=";
  };

-  cargoHash = "sha256-eQjRbavmUW2iw0OEC/DPk2FflTc4QCn0K/c4Og+sGW4=";
+  cargoHash = "sha256-TVAm6BdIAE+gxWkpEUqF3R99UKhIGGSZK9qQ7urR7Uc=";
+
+  postInstall = ''
+    mkdir -p $out/share/atmosphere
+    cp -r default_envs $out/share/atmosphere
+  '';
+
+  __structuredAttrs = true;
+  strictDeps = true;

  passthru = {
    tests.versionTest = testers.testVersion {
@@ -26,9 +34,7 @@ rustPlatform.buildRustPackage {
      command = "atmosphere --version";
      version = "stardust-xr-atmosphere 0.4.0";
    };
-    updateScript = nix-update-script {
-      extraArgs = [ "--version=branch" ];
-    };
+    updateScript = nix-update-script { };
  };

  meta = {
@@ -36,10 +42,7 @@ rustPlatform.buildRustPackage {
    homepage = "https://stardustxr.org";
    license = lib.licenses.mit;
    mainProgram = "atmosphere";
-    maintainers = with lib.maintainers; [
-      pandapip1
-      technobaboo
-    ];
-    platforms = lib.platforms.linux;
+    teams = with lib.teams; [ stardust-xr ];
+    platforms = lib.platforms.unix;
  };
-}
+})
--- a/pkgs/by-name/st/stardust-xr-flatland/fix-reify-test-signature.patch
+++ b/pkgs/by-name/st/stardust-xr-flatland/fix-reify-test-signature.patch
@@ -0,0 +1,26 @@
+diff --git a/src/resize_handles.rs b/src/resize_handles.rs
+index 0fcb071..69d2f2f 100644
+--- a/src/resize_handles.rs
+++ b/src/resize_handles.rs
+@@ -451,7 +451,7 @@ impl<State: ValidState> CustomElement<State> for ResizeHandles<State> {
+ #[tokio::test]
+ async fn test_resize_handles() {
+ 	use serde::{Deserialize, Serialize};
+-	use stardust_xr_asteroids::{client, ClientState, Migrate, Reify, Transformable};
+	use stardust_xr_asteroids::{client, ClientState, Migrate, Reify, Tasker, Transformable};
+ 
+ 	// Simple test state
+ 	#[derive(Debug, Serialize, Deserialize)]
+@@ -474,7 +474,11 @@ async fn test_resize_handles() {
+ 		const APP_ID: &'static str = "org.stardustxr.flatland.ResizeHandles";
+ 	}
+ 	impl Reify for State {
+-		fn reify(&self) -> impl stardust_xr_asteroids::Element<Self> {
+		fn reify(
+			&self,
+			_context: &Context,
+			_tasks: impl Tasker<Self>,
+		) -> impl stardust_xr_asteroids::Element<Self> {
+ 			stardust_xr_asteroids::elements::Spatial::default()
+ 				.rot(Quat::from_rotation_y(self.time / 10.0))
+ 				.build()
--- a/pkgs/by-name/st/stardust-xr-flatland/package.nix
+++ b/pkgs/by-name/st/stardust-xr-flatland/package.nix
@@ -7,32 +7,32 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "stardust-xr-flatland";
-  version = "0-unstable-2024-04-13";
+  version = "0.51.1";

  src = fetchFromGitHub {
    owner = "stardustxr";
    repo = "flatland";
-    rev = "b3b0f29c4ea1b82c96cf9de507837bf15a5e4c0e";
-    hash = "sha256-m7c6XpmpTM1URuqMG2KqtaWbL2Vt8vJFJtmvq123BmY=";
+    tag = finalAttrs.version;
+    hash = "sha256-Gp2r6PJiyNb+augDwS/vGPJfwb5U6pVYgSyhS9QlggY=";
  };

+  patches = [ ./fix-reify-test-signature.patch ];
+
  env.STARDUST_RES_PREFIXES = "${finalAttrs.src}/res";

-  cargoHash = "sha256-oM4nQUEc3iq1x4uRp8Kw5WtE/L5b6VlLOfElMT9Tk98=";
+  cargoHash = "sha256-2LT/Szwzs83Poe7BojmUFh9yyUEhSgHmBR5QaO/BE4g=";

-  passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version=branch" ];
-  };
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  passthru.updateScript = nix-update-script { };

  meta = {
    description = "Flat window for Stardust XR";
    homepage = "https://stardustxr.org";
    license = lib.licenses.mit;
    mainProgram = "flatland";
-    maintainers = with lib.maintainers; [
-      pandapip1
-      technobaboo
-    ];
-    platforms = lib.platforms.linux;
+    teams = with lib.teams; [ stardust-xr ];
+    platforms = lib.platforms.unix;
  };
 })
--- a/pkgs/by-name/st/stardust-xr-gravity/package.nix
+++ b/pkgs/by-name/st/stardust-xr-gravity/package.nix
@@ -5,32 +5,30 @@
  nix-update-script,
 }:

-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
  pname = "stardust-xr-gravity";
-  version = "0-unstable-2024-12-29";
+  version = "0.51.1";

  src = fetchFromGitHub {
    owner = "stardustxr";
    repo = "gravity";
-    rev = "eca5e835cd3abee69984ce6312610644801457a9";
+    tag = finalAttrs.version;
    hash = "sha256-upw0MjGccSI1B10wabKPMGrEo7ATfg4a7Hzaucbf99w=";
  };

+  __structuredAttrs = true;
+  strictDeps = true;
+
  cargoHash = "sha256-tkWY+dLFDnyir6d0supR3Z202p5i4UewY+J66mL1x/o=";

-  passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version=branch" ];
-  };
+  passthru.updateScript = nix-update-script { };

  meta = {
    description = "Utility to launch apps and stardust clients at an offet";
    homepage = "https://stardustxr.org";
    license = lib.licenses.mit;
    mainProgram = "gravity";
-    maintainers = with lib.maintainers; [
-      pandapip1
-      technobaboo
-    ];
-    platforms = lib.platforms.linux;
+    teams = with lib.teams; [ stardust-xr ];
+    platforms = lib.platforms.unix;
  };
-}
+})
--- a/pkgs/by-name/st/stardust-xr-kiara/package.nix
+++ b/pkgs/by-name/st/stardust-xr-kiara/package.nix
@@ -1,59 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-  makeBinaryWrapper,
-  niri,
-  stardust-xr-kiara,
-  testers,
-  nix-update-script,
-}:
-
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "stardust-xr-kiara";
-  version = "0-unstable-2024-07-13";
-
-  src = fetchFromGitHub {
-    owner = "stardustxr";
-    repo = "kiara";
-    rev = "186b00a460c9dd8179f9af42fb9a420506ac3aff";
-    hash = "sha256-e89/x66S+MpJFtqat1hYEyRVUYFjef62LDN2hQPjNVw=";
-  };
-
-  cargoHash = "sha256-C1eD974cEGbo0vHJqdnCPUopDPDDa6hAFJdzSm8t618=";
-
-  nativeBuildInputs = [ makeBinaryWrapper ];
-
-  passthru = {
-    updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
-    tests.helpTest = testers.runCommand {
-      name = "stardust-xr-kiara";
-      script = ''
-        kiara --help
-        touch $out
-      '';
-      nativeBuildInputs = [ stardust-xr-kiara ];
-    };
-  };
-
-  postInstall = ''
-    wrapProgram $out/bin/kiara --prefix PATH : ${niri}/bin
-  '';
-
-  env = {
-    NIRI_CONFIG = "${finalAttrs.src}/src/niri_config.kdl";
-    STARDUST_RES_PREFIXES = "${finalAttrs.src}/res";
-  };
-
-  meta = {
-    description = "360-degree app shell / DE for Stardust XR using Niri";
-    homepage = "https://stardustxr.org/";
-    license = lib.licenses.mit;
-    mainProgram = "kiara";
-    maintainers = with lib.maintainers; [
-      pandapip1
-      technobaboo
-    ];
-    platforms = lib.platforms.linux;
-  };
-})
--- a/pkgs/by-name/st/stardust-xr-magnetar/package.nix
+++ b/pkgs/by-name/st/stardust-xr-magnetar/package.nix
@@ -1,36 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-  nix-update-script,
-}:
-
-rustPlatform.buildRustPackage {
-  pname = "stardust-xr-magnetar";
-  version = "0-unstable-2025-04-03";
-
-  src = fetchFromGitHub {
-    owner = "stardustxr";
-    repo = "magnetar";
-    rev = "63ff648bb64c23023a0047ea3ff2c0b6b1fd3caf";
-    hash = "sha256-LRI3HKuOUfUb93mHB8DUpp0hvES+GbzsKAxpkLCLzKQ=";
-  };
-
-  cargoHash = "sha256-ixzasTQDVVU8cGhSW3j8ELJmmYudwfnYQEIoULLQRyo=";
-
-  passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version=branch" ];
-  };
-
-  meta = {
-    description = "Workspaces client for Stardust";
-    homepage = "https://stardustxr.org";
-    license = lib.licenses.mit;
-    mainProgram = "magnetar";
-    maintainers = with lib.maintainers; [
-      pandapip1
-      technobaboo
-    ];
-    platforms = lib.platforms.linux;
-  };
-}
--- a/pkgs/by-name/st/stardust-xr-non-spatial-input/package.nix
+++ b/pkgs/by-name/st/stardust-xr-non-spatial-input/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  cmake,
+  libGL,
+  libinput,
+  libxkbcommon,
+  pkg-config,
+  udev,
+  wayland,
+  libx11,
+  libxcursor,
+  libxrandr,
+  libxi,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "stardust-xr-non-spatial-input";
+  version = "0.51.1";
+
+  src = fetchFromGitHub {
+    owner = "stardustxr";
+    repo = "non-spatial-input";
+    tag = finalAttrs.version;
+    hash = "sha256-CWPEu+WvTtCo2zUXzyQkFcb5bFG9yVu/OnjPuoGKDGA=";
+  };
+
+  cargoHash = "sha256-QZaVDMeuxqHy9iQngb/wpv/P+KxevkoQqGojYIVzo2s=";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+  buildInputs = [
+    libGL
+    libinput
+    libxkbcommon
+    udev
+    wayland
+    libx11
+    libxcursor
+    libxrandr
+    libxi
+  ];
+  nativeCheckInputs = [
+    versionCheckHook
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Utilities that allow using non-spatial (e.g. keyboard and mouse) inputs in Stardust";
+    homepage = "https://stardustxr.org";
+    license = lib.licenses.mit;
+    teams = with lib.teams; [ stardust-xr ];
+    platforms = lib.platforms.unix;
+  };
+})
--- a/pkgs/by-name/st/stardust-xr-phobetor/package.nix
+++ b/pkgs/by-name/st/stardust-xr-phobetor/package.nix
@@ -1,38 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-  nix-update-script,
-}:
-
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "stardust-xr-phobetor";
-  version = "0-unstable-2024-02-10";
-
-  src = fetchFromGitHub {
-    owner = "stardustxr";
-    repo = "phobetor";
-    rev = "f47d10c9ab8b37941bc9ca94677d6c80332376f3";
-    hash = "sha256-7CWOoirQ/8zKCO7lBA9snyShlwsKYONiYkl39lQrpTY=";
-  };
-
-  env.STARDUST_RES_PREFIXES = "${finalAttrs.src}/res";
-
-  cargoHash = "sha256-H65uAHMAIkJ9D5q/5HxMEbvcfoRhYdFgTQejp6bvu5w=";
-
-  passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version=branch" ];
-  };
-
-  meta = {
-    description = "Handheld panel shell for Stardust XR";
-    homepage = "https://stardustxr.org";
-    license = lib.licenses.mit;
-    mainProgram = "phobetor";
-    maintainers = with lib.maintainers; [
-      pandapip1
-      technobaboo
-    ];
-    platforms = lib.platforms.linux;
-  };
-})
--- a/pkgs/by-name/st/stardust-xr-protostar/package.nix
+++ b/pkgs/by-name/st/stardust-xr-protostar/package.nix
@@ -7,18 +7,21 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "stardust-xr-protostar";
-  version = "0-unstable-2024-12-29";
+  version = "0.51.1";

  src = fetchFromGitHub {
    owner = "stardustxr";
    repo = "protostar";
-    rev = "9b73eb1e128b49a6d40a27a4cde7715d8cbd2674";
-    hash = "sha256-9KJO1Z3Aq0+hh9QqufWBxpMmfFOmdgMUJxfgGZMg2n4=";
+    rev = finalAttrs.version;
+    hash = "sha256-mL7LnBvc2B9Y56NCDeNyqIDQsuWb4iMehZ7koR1KkX8=";
  };

  env.STARDUST_RES_PREFIXES = "${finalAttrs.src}/res";

-  cargoHash = "sha256-9XJ+nnvpTzr/3ii9dFkfZDex/++W5Mq9k0bh2Y6tueA=";
+  cargoHash = "sha256-6NiEKm6m4xX6ZSF9Gp7APG/lku3fKoobPSS4AodjCI8=";
+
+  __structuredAttrs = true;
+  strictDeps = true;

  checkFlags = [
    # ---- xdg::test_get_desktop_files stdout ----
@@ -39,18 +42,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
    "--skip=xdg::test_render_svg_to_png"
  ];

-  passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version=branch" ];
-  };
+  passthru.updateScript = nix-update-script { };

  meta = {
    description = "Prototype application launchers for Stardust XR";
    homepage = "https://stardustxr.org";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      pandapip1
-      technobaboo
-    ];
-    platforms = lib.platforms.linux;
+    teams = with lib.teams; [ stardust-xr ];
+    platforms = lib.platforms.unix;
  };
 })
--- a/pkgs/by-name/st/stardust-xr-server/fix-seat-unwrap-panic.patch
+++ b/pkgs/by-name/st/stardust-xr-server/fix-seat-unwrap-panic.patch
@@ -0,0 +1,58 @@
+diff --git a/src/wayland/xdg/backend.rs b/src/wayland/xdg/backend.rs
+index e3860b8..9404a86 100644
+--- a/src/wayland/xdg/backend.rs
+++ b/src/wayland/xdg/backend.rs
+@@ -29,9 +29,9 @@ pub struct XdgBackend {
+ }
+ 
+ impl XdgBackend {
+-	pub fn new(seat: &Arc<Seat>, toplevel: &Arc<Toplevel>) -> Self {
+	pub fn new(seat: Weak<Seat>, toplevel: &Arc<Toplevel>) -> Self {
+ 		Self {
+-			seat: Arc::downgrade(seat),
+			seat,
+ 			toplevel: Arc::downgrade(toplevel),
+ 			children: DashMap::new(),
+ 		}
+diff --git a/src/wayland/xdg/surface.rs b/src/wayland/xdg/surface.rs
+index ddc3562..df733da 100644
+--- a/src/wayland/xdg/surface.rs
+++ b/src/wayland/xdg/surface.rs
+@@ -74,7 +74,6 @@ impl XdgSurface for Surface {
+ 
+ 		let toplevel_weak = Arc::downgrade(&toplevel);
+ 		let display = client.get::<Display>(ObjectId::DISPLAY).unwrap();
+-		let seat = Arc::downgrade(display.seat.get().unwrap());
+ 		let pid = display.pid;
+ 		let configured = self.configured.clone();
+ 		let mut first_commit = true;
+@@ -94,7 +93,8 @@ impl XdgSurface for Surface {
+ 				&& configured.load(std::sync::atomic::Ordering::SeqCst)
+ 				&& surface.currently_has_valid_buffer()
+ 			{
+-				let mapped_inner = MappedInner::create(&seat.upgrade().unwrap(), &toplevel, pid);
+				let seat = display.seat.get().map(Arc::downgrade).unwrap_or_default();
+				let mapped_inner = MappedInner::create(seat, &toplevel, pid);
+ 				*surface.panel_item.lock() = Arc::downgrade(&mapped_inner.panel_item);
+ 				mapped_lock.replace(mapped_inner);
+ 				return false;
+diff --git a/src/wayland/xdg/toplevel.rs b/src/wayland/xdg/toplevel.rs
+index b10223e..a2e0f93 100644
+--- a/src/wayland/xdg/toplevel.rs
+++ b/src/wayland/xdg/toplevel.rs
+@@ -13,6 +13,7 @@ use crate::{
+ use mint::Vector2;
+ use parking_lot::Mutex;
+ use std::sync::Arc;
+use std::sync::Weak;
+ use waynest::ObjectId;
+ pub use waynest_protocols::server::stable::xdg_shell::xdg_toplevel::*;
+ use waynest_server::Client as _;
+@@ -23,7 +24,7 @@ pub struct MappedInner {
+ 	pub panel_item: Arc<PanelItem<XdgBackend>>,
+ }
+ impl MappedInner {
+-	pub fn create(seat: &Arc<Seat>, toplevel: &Arc<Toplevel>, pid: Option<i32>) -> Self {
+	pub fn create(seat: Weak<Seat>, toplevel: &Arc<Toplevel>, pid: Option<i32>) -> Self {
+ 		let (panel_item_node, panel_item) =
+ 			PanelItem::create(Box::new(XdgBackend::new(seat, toplevel)), pid);
--- a/pkgs/by-name/st/stardust-xr-server/package.nix
+++ b/pkgs/by-name/st/stardust-xr-server/package.nix
@@ -1,53 +1,71 @@
 {
  lib,
  fetchFromGitHub,
-  nix-update-script,
  rustPlatform,
-  cmake,
-  cpm-cmake,
-  fontconfig,
+  alsa-lib,
  libGL,
+  libx11,
+  libxcursor,
+  libxcb,
+  libxi,
  libxkbcommon,
-  libgbm,
  openxr-loader,
  pkg-config,
-  libxfixes,
-  libx11,
+  vulkan-loader,
+  wayland,
+  nix-update-script,
 }:

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "stardust-xr-server";
-  version = "0.44.1";
+  version = "0.51.1";

  src = fetchFromGitHub {
    owner = "stardustxr";
    repo = "server";
    tag = finalAttrs.version;
-    hash = "sha256-sCatpWDdy7NFWOWUARjN3fZMDVviX2iV79G0HTxfYZU=";
+    hash = "sha256-ntVc5fc1qMjR1FDqoNq35Y6PkG9VPNDVplyTpO6VhKA=";
  };

-  cargoHash = "sha256-jCtMCZG3ku30tabTnVdGfgcLl5DoqhkJpLKPPliJgDU=";
+  patches = [
+    # nixosTests/flatland hits a bug:
+    # it is permissible for a client to create an xdg_toplevel
+    # before binding wl_seat; weston-presentation-shm never
+    # binds a wl_seat since it doesn't need to accept input
+    # TODO(@Pandapip1): upstream
+    ./fix-seat-unwrap-panic.patch
+  ];

+  cargoHash = "sha256-5HQkrkupBohmopGJh9t3JndVTU6cjbW0LgtBPb+YAr0=";
+
+  __structuredAttrs = true;
+  strictDeps = true;
  nativeBuildInputs = [
-    cmake
    pkg-config
-    rustPlatform.bindgenHook
  ];
-
  buildInputs = [
-    fontconfig
-    libGL
-    libxkbcommon
-    libgbm
-    openxr-loader
-    libx11
-    libxfixes
+    alsa-lib
+    wayland
  ];

-  env.CPM_SOURCE_CACHE = "./build";
-
-  postPatch = ''
-    install -D ${cpm-cmake}/share/cpm/CPM.cmake $(echo $cargoDepsCopy/*/stereokit-sys-*/StereoKit)/build/cpm/CPM_0.32.2.cmake
+  postFixup = ''
+    patchelf $out/bin/stardust-xr-server --add-rpath ${
+      lib.makeLibraryPath [
+        # wgpu-hal hardcodes ash's runtime libvulkan dlopen() path (ash does expose an optional linked feature)
+        vulkan-loader
+        # Likewise, bevy_openxr doesn't use openxr's linked feature
+        openxr-loader
+        # x11-dl via winit x11
+        libx11
+        libxcursor
+        libxi
+        libxcb
+        # x11rb via winit and xkbcommon-dl
+        libxkbcommon
+        # wgpu-hal I think
+        libGL
+      ]
+    }
  '';

  passthru.updateScript = nix-update-script { };
@@ -58,10 +76,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    changelog = "https://github.com/StardustXR/server/releases";
    license = lib.licenses.gpl2Plus;
    mainProgram = "stardust-xr-server";
-    maintainers = with lib.maintainers; [
-      pandapip1
-      technobaboo
-    ];
-    platforms = lib.platforms.linux;
+    teams = with lib.teams; [ stardust-xr ];
+    platforms = lib.platforms.unix;
  };
 })
--- a/pkgs/by-name/st/stardust-xr-sphereland/package.nix
+++ b/pkgs/by-name/st/stardust-xr-sphereland/package.nix
@@ -1,43 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-  libxkbcommon,
-  nix-update-script,
-}:
-
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "stardust-xr-sphereland";
-  version = "0-unstable-2023-11-07";
-
-  src = fetchFromGitHub {
-    owner = "stardustxr";
-    repo = "sphereland";
-    rev = "39552d918c99a84eaf5f2d5e8734a472bf196f65";
-    hash = "sha256-LKdqTl14cdgD14IwAP34mWdDgREhy1CHOT86HywOxqM=";
-  };
-
-  env.STARDUST_RES_PREFIXES = "${finalAttrs.src}/res";
-
-  cargoHash = "sha256-4mESTxfogMQxfDMQRVML752fkinOIqkddW3PHmvxekc=";
-
-  buildInputs = [
-    libxkbcommon
-  ];
-
-  passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version=branch" ];
-  };
-
-  meta = {
-    description = "Pointer/keyboard operated window manager for Stardust XR";
-    homepage = "https://stardustxr.org";
-    license = lib.licenses.mit;
-    mainProgram = "sphereland";
-    maintainers = with lib.maintainers; [
-      pandapip1
-      technobaboo
-    ];
-    platforms = lib.platforms.linux;
-  };
-})
--- a/pkgs/by-name/th/thunar-unwrapped/package.nix
+++ b/pkgs/by-name/th/thunar-unwrapped/package.nix
@@ -30,7 +30,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "thunar";
-  version = "4.20.8";
+  version = "4.20.9";

  outputs = [
    "out"
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "xfce";
    repo = "thunar";
    tag = "thunar-${finalAttrs.version}";
-    hash = "sha256-gcNo9HNBY5NGhJ8N8DBTXYb5gsNAXrItvWuo3XdSBRg=";
+    hash = "sha256-rKKxCl7hoIcEDcKVaaRJfU+hyDHE/vpL0gxXExX6NeI=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ve/vesktop/package.nix
+++ b/pkgs/by-name/ve/vesktop/package.nix
@@ -8,7 +8,7 @@
  makeDesktopItem,
  copyDesktopItems,
  vencord,
-  electron_40,
+  electron_42,
  libicns,
  pipewire,
  libpulseaudio,
@@ -26,7 +26,7 @@
  withSystemVencord ? false,
 }:
 let
-  electron = electron_40;
+  electron = electron_42;
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "vesktop";
@@ -89,9 +89,10 @@ stdenv.mkDerivation (finalAttrs: {

  preBuild = ''
    # Validate electron version matches upstream package.json
-    if [ "`jq -r '.devDependencies.electron' < package.json | cut -d. -f1 | tr -d '^'`" != "${lib.versions.major electron.version}" ]
-    then
-      echo "ERROR: electron version mismatch between package.json and nixpkgs"
+    expectedMajor="$(jq -r '.devDependencies.electron | ltrimstr("^") | split(".") | .[0]' < package.json)"
+    actualMajor="${lib.versions.major electron.version}"
+    if [ "$actualMajor" -lt "$expectedMajor" ] 2>/dev/null; then
+      echo "ERROR: nixpkgs electron version (major $actualMajor) is older than upstream package.json requirement (major $expectedMajor)"
      exit 1
    fi

--- a/pkgs/by-name/vi/victorialogs/package.nix
+++ b/pkgs/by-name/vi/victorialogs/package.nix
@@ -10,13 +10,13 @@

 buildGoModule (finalAttrs: {
  pname = "VictoriaLogs";
-  version = "1.51.0";
+  version = "1.52.0";

  src = fetchFromGitHub {
    owner = "VictoriaMetrics";
    repo = "VictoriaLogs";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-8rUDMV7bxMxyU0NYIMFSqGzSMwGogKFDliGXf4VSoCI=";
+    hash = "sha256-V4TWpv72LJ0FUYruwXvhmCpOLQh5l+7Of7aJS8vF6J0=";
  };

  vendorHash = null;
--- a/pkgs/by-name/wa/wayland-colorbar/package.nix
+++ b/pkgs/by-name/wa/wayland-colorbar/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  stdenv,
+  fetchFromCodeberg,
+  cmake,
+  libffi,
+  pkg-config,
+  wayland,
+  wayland-protocols,
+  wayland-scanner,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "wayland-colorbar";
+  version = "0.1.1";
+
+  src = fetchFromCodeberg {
+    owner = "Pandapip1";
+    repo = "wayland-colorbar";
+    tag = finalAttrs.version;
+    hash = "sha256-QaJWx5/DkxSc53BFufJwxYwwsJNSV2mYV5EjbFDmx3c=";
+  };
+
+  __structuredAttrs = true;
+  strictDeps = true;
+  separateDebugInfo = true;
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wayland-scanner
+  ];
+  buildInputs = [
+    libffi
+    wayland
+    wayland-protocols
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "A simple wayland client that can be used for testing";
+    homepage = "https://codeberg.org/Pandapip1/wayland-colorbar";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ pandapip1 ];
+    mainProgram = "wayland-colorbar";
+    platforms = lib.platforms.unix;
+  };
+})
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -92,9 +92,9 @@
        major = "3";
        minor = "15";
        patch = "0";
-        suffix = "b3";
+        suffix = "b4";
      };
-      hash = "sha256-apNa4jSmfmVJiUNzsM/rg2EYLQOyFEIyiulZirdCISc=";
+      hash = "sha256-k++5yI17ZjM2jn97j4226YmI9/dhwJt3hJRHJihBzjo=";
      inherit passthruFun;
    };

--- a/pkgs/development/libraries/nss/latest.nix
+++ b/pkgs/development/libraries/nss/latest.nix
@@ -5,8 +5,8 @@
 #       Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert

 import ./generic.nix {
-  version = "3.125";
-  hash = "sha256-pIRoFJYsQZzI+hJcNzTX+WT91tfXDygWE0RrirfyBPc=";
+  version = "3.126";
+  hash = "sha256-+yiBEc8WLZ6qiO8MBQBiIXfm4OEJ9EFgmw2rY+U/bp8=";
  filename = "latest.nix";
  versionRegex = "NSS_(\\d+)_(\\d+)(?:_(\\d+))?_RTM";
 }
--- a/pkgs/development/libraries/wt/default.nix
+++ b/pkgs/development/libraries/wt/default.nix
@@ -18,6 +18,8 @@
  openssl,
  harfbuzz,
  icu,
+  libice,
+  libsm,
 }:

 let
@@ -57,6 +59,12 @@ let

      dontWrapQtApps = true;
      cmakeFlags = [
+        "-DCMAKE_INSTALL_RPATH=${
+          lib.makeLibraryPath [
+            libice
+            libsm
+          ]
+        }"
        "-DWT_CPP_11_MODE=-std=c++11"
        "--no-warn-unused-cli"
      ]
--- a/pkgs/development/python-modules/beets-alternatives/default.nix
+++ b/pkgs/development/python-modules/beets-alternatives/default.nix
@@ -38,6 +38,11 @@ buildPythonPackage rec {
      url = "https://github.com/geigerzaehler/beets-alternatives/commit/84fdb0fa15225cce1e881b07bddcb52715677915.patch";
      hash = "sha256-rURvP7aNJ+I9bPjk43t8rYujOK1iUS1J4RFMAHfa5AU=";
    })
+    # Fix for Beets 2.12; see https://github.com/geigerzaehler/beets-alternatives/pull/234
+    (fetchpatch {
+      url = "https://github.com/geigerzaehler/beets-alternatives/commit/e27772bb627d1b0763685d7add209d40987f2b95.patch";
+      hash = "sha256-47HhaYWzHQakGlbUWdfG5qkfvbadbow1i+O74JnKPwM=";
+    })
  ];

  build-system = [
--- a/pkgs/development/python-modules/beets-filetote/default.nix
+++ b/pkgs/development/python-modules/beets-filetote/default.nix
@@ -4,7 +4,7 @@
  buildPythonPackage,

  # build-system
-  poetry-core,
+  uv-build,

  # nativeBuildInputs
  beets-minimal,
@@ -13,31 +13,31 @@
  pytestCheckHook,
  beets-audible,
  mediafile,
-  pytest,
  reflink,
  toml,
  typeguard,
  writableTmpDirAsHomeHook,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  pname = "beets-filetote";
-  version = "1.1.1";
+  version = "1.3.6";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "gtronset";
    repo = "beets-filetote";
-    tag = "v${version}";
-    hash = "sha256-NsYBsP60SiCfQ63C4WMkshyreFqOSmx3LP5Gwq6ECF0=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ZrF9Z3Eaem8ZzNJgQoW45MvsNOCoLsd7l/yLQ2pldR0=";
  };

+  # https://github.com/gtronset/beets-filetote/issues/328
  postPatch = ''
-    substituteInPlace pyproject.toml --replace-fail "poetry-core<2.0.0" "poetry-core"
+    substituteInPlace pyproject.toml --replace-fail "uv_build>=0.11.21,<0.12" "uv-build"
  '';

  build-system = [
-    poetry-core
+    uv-build
  ];

  nativeBuildInputs = [
@@ -46,9 +46,6 @@ buildPythonPackage rec {

  dependencies = [
    mediafile
-    reflink
-    toml
-    typeguard
  ];

  nativeCheckInputs = [
@@ -61,26 +58,23 @@ buildPythonPackage rec {
    writableTmpDirAsHomeHook
  ];

-  pytestFlags = [
-    # This is the same as:
-    #   -r fEs
-    "-rfEs"
-  ];
-
  disabledTestPaths = [
-    "tests/test_cli_operation.py"
-    "tests/test_pruning.py"
-    "tests/test_version.py"
+    # Tests fail for Beets 2.12.x, see:
+    # https://github.com/gtronset/beets-filetote/issues/328
+    "tests/test_exclude.py::TestExclude::test_exclude_strseq_of_filenames_by_string"
+    "tests/test_exclude.py::TestExclude::test_exclude_strseq_of_filenames_by_list"
+    "tests/test_printignored.py::TestPrintIgnored::test_print_ignored"
  ];

  meta = {
    description = "Beets plugin to move non-music files during the import process";
    homepage = "https://github.com/gtronset/beets-filetote";
-    changelog = "https://github.com/gtronset/beets-filetote/blob/${src.tag}/CHANGELOG.md";
-    maintainers = with lib.maintainers; [ dansbandit ];
+    changelog = "https://github.com/gtronset/beets-filetote/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    maintainers = with lib.maintainers; [
+      dansbandit
+      returntoreality
+    ];
    license = lib.licenses.mit;
    inherit (beets-minimal.meta) platforms;
-    # https://github.com/gtronset/beets-filetote/issues/211
-    broken = true;
  };
-}
+})
--- a/pkgs/development/python-modules/beets/default.nix
+++ b/pkgs/development/python-modules/beets/default.nix
@@ -115,12 +115,12 @@

 buildPythonPackage (finalAttrs: {
  pname = "beets";
-  version = "2.11.0";
+  version = "2.12.0";
  src = fetchFromGitHub {
    owner = "beetbox";
    repo = "beets";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-fi6D0P2GtEO41VL6UKAArRedZVxw97yqDUAoilktUho=";
+    hash = "sha256-u2qoZ0/qWq9YUcwbOpsqtIjX5BZ2z2wj00X59Pf+/fk=";
  };
  pyproject = true;

--- a/pkgs/development/tools/electron/40-angle-patchdir.patch
+++ b/pkgs/development/tools/electron/40-angle-patchdir.patch
@@ -1,13 +0,0 @@
-diff --git a/electron/patches/config.json b/electron/patches/config.json
-index f5dbe8600f..9e1e5e0704 100644
--- a/electron/patches/config.json
-+++ b/electron/patches/config.json
-@@ -15,5 +15,5 @@
-   { "patch_dir": "src/electron/patches/reclient-configs", "repo": "src/third_party/engflow-reclient-configs" },
-   { "patch_dir": "src/electron/patches/sqlite", "repo": "src/third_party/sqlite/src" },
-   { "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia" },
-  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle/src" },
-+  { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle" },
-   { "patch_dir": "src/electron/patches/pdfium", "repo": "src/third_party/pdfium" },
-   { "patch_dir": "src/electron/patches/libaom", "repo": "src/third_party/libaom/source/libaom" }
- ]
--- a/pkgs/development/tools/electron/binary/generic.nix
+++ b/pkgs/development/tools/electron/binary/generic.nix
@@ -61,7 +61,7 @@ let
    ];
    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
    # https://www.electronjs.org/docs/latest/tutorial/electron-timelines
-    knownVulnerabilities = lib.optional (lib.versionOlder version "40.0.0") "Electron version ${version} is EOL";
+    knownVulnerabilities = lib.optional (lib.versionOlder version "41.0.0") "Electron version ${version} is EOL";
  };

  fetcher =
--- a/pkgs/development/tools/electron/common.nix
+++ b/pkgs/development/tools/electron/common.nix
@@ -106,12 +106,6 @@ in

  src = null;

-  patches =
-    base.patches
-    ++ lib.optionals (lib.versions.major info.version == "40") [
-      ./40-angle-patchdir.patch
-    ];
-
  postPatch = ''
    mkdir -p third_party/jdk/current/bin

--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -53,8 +53,8 @@ let
      hash = "sha256-WOFDJYhx31FYm2UcBiBdq+xIdmpdu6PCWZm2m1C+WY4=";
    };
    "11" = {
-      version = "11.11.0";
-      hash = "sha256-he8u/yFqGukIBMAMjfv6ZoU1NkRlDRCQaok8Ba7c2IQ=";
+      version = "11.13.1";
+      hash = "sha256-EAErV9I7lnO8U0Fo/1axrGVbpKJzf/N/bZ0ZpVFEr6o=";
    };
  };

--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -25,18 +25,18 @@
        "lts": true
    },
    "6.12": {
-        "version": "6.12.95",
-        "hash": "sha256:1xmrsi0kimirky4cailnkkrbd72pp9n8irfx6lfmss8yrcgwbs59",
+        "version": "6.12.96",
+        "hash": "sha256:1hapz6xz7plq56jc0drbzcsfcm1amlnphwbfhl0klsxkb9finbkx",
        "lts": true
    },
    "6.18": {
-        "version": "6.18.38",
-        "hash": "sha256:0igh9xy1lk2hv2jni00dqyy27j4zqh86waw7i65ryvnmmc4fa9mc",
+        "version": "6.18.39",
+        "hash": "sha256:1c4c3wf00pb8x4kxxrmn46n7mgpnnm78sfi2jx0yg5cxmv9f79x7",
        "lts": true
    },
    "7.1": {
-        "version": "7.1.3",
-        "hash": "sha256:1p6iknvzmd04alrf49zn8mxw863v0yzgznyckfhl4llgx1lc0hdy",
+        "version": "7.1.4",
+        "hash": "sha256:0blfl34vi6vlcdjxd7mbhskl2p7i0zpgdy707a7d6xcn24m94qqw",
        "lts": false
    }
 }
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -13,4 +13,8 @@ builtins.mapAttrs (_: callPackage ./generic.nix) rec {
    version = "6.9.4";
    hash = "sha256-22EK2fVJ4Ku1rz49XGcpxY2HRDllTN8K/qQlsuqJXzU=";
  };
+  wordpress_7_0 = {
+    version = "7.0";
+    hash = "sha256-UwyP3rFvsK/9tT63J7agS7jRZmIcIAKeOJyrsBoPqSE=";
+  };
 }
--- a/pkgs/servers/web-apps/wordpress/generic.nix
+++ b/pkgs/servers/web-apps/wordpress/generic.nix
@@ -8,12 +8,15 @@
  writeScript,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "wordpress";
  inherit version;

+  __structuredAttrs = true;
+  strictDeps = true;
+
  src = fetchurl {
-    url = "https://wordpress.org/${pname}-${version}.tar.gz";
+    url = "https://wordpress.org/wordpress-${finalAttrs.version}.tar.gz";
    inherit hash;
  };

@@ -50,8 +53,11 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = "https://wordpress.org";
    description = "Open source software you can use to create a beautiful website, blog, or app";
-    license = [ lib.licenses.gpl2Plus ];
-    maintainers = [ lib.maintainers.basvandijk ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [
+      bartoostveen
+      basvandijk
+    ];
    platforms = lib.platforms.all;
  };
-}
+})
--- a/pkgs/servers/web-apps/wordpress/packages/languages.json
+++ b/pkgs/servers/web-apps/wordpress/packages/languages.json
@@ -1,26 +1,26 @@
 {
  "de_DE": {
    "path": "de_DE",
-    "rev": "1551261",
-    "sha256": "0d4kxfzvpyp9p4kl7mfhvm2pilh27rbvsd3hv3p0y8hl33r96avb",
-    "version": "6.6"
+    "rev": "2214206",
+    "sha256": "03yrqgk0r6lin1hlq6lib4g5h358ckxf9g7rp0h3sfj6yb9l9b88",
+    "version": "7.0"
  },
  "fr_FR": {
    "path": "fr_FR",
-    "rev": "1566738",
-    "sha256": "1x4sxs40fal6qlbj9x8f0wwbji20729l25axcxx62rd98y47llg5",
-    "version": "6.6"
+    "rev": "2212303",
+    "sha256": "0ac31iy80qd3bd42k8454zmgsvl93sqvrb391y8l3bzk6k5h692r",
+    "version": "7.0"
  },
  "ro_RO": {
    "path": "ro_RO",
-    "rev": "1551215",
-    "sha256": "00i2grjcr7n2bqknff39ar7maz7gk7d17dqrl2p9smlhkj6m1bbp",
-    "version": "6.6"
+    "rev": "2213066",
+    "sha256": "033dnjrjwnssl8a8izx5v94sdpfgyhx90pb5lfm340a6fgqk9j21",
+    "version": "7.0"
  },
  "ru_RU": {
    "path": "ru_RU",
-    "rev": "1551262",
-    "sha256": "0d5bdq99h9g6pcs3fw7czb4w4p60cjiizxqlbzan4p1g9056mmbl",
-    "version": "6.6"
+    "rev": "2210454",
+    "sha256": "0zm2b2n4i1rm7cf8n44q71nhizb9mxpwsy90zc6dy3yim3vl0gy4",
+    "version": "7.0"
  }
 }
--- a/pkgs/servers/web-apps/wordpress/packages/plugins.json
+++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json
@@ -6,16 +6,16 @@
    "version": "2.5.3"
  },
  "akismet": {
-    "path": "akismet/tags/5.6",
-    "rev": "3394510",
-    "sha256": "15cmbbimwr1d3x7cadrzvish2m4js8hyyi9jd3ms2xffmhpxnm79",
-    "version": "5.6"
+    "path": "akismet/tags/5.7",
+    "rev": "3514187",
+    "sha256": "0b68w62wy0v7qi9q0hfyxhmqilznagq43f21r3ym53ga4nm5vp5i",
+    "version": "5.7"
  },
  "antispam-bee": {
-    "path": "antispam-bee/tags/2.11.8",
-    "rev": "3332199",
-    "sha256": "1hr9wd79v917xl1gg21pd7a10xhvckbzvcpl0hg5c1av157vdcac",
-    "version": "2.11.8"
+    "path": "antispam-bee/tags/2.11.11",
+    "rev": "3515277",
+    "sha256": "1hp7jhrhvrdqrdabkbd15b5paaycxqqqxjvzi23lcss9fcxh2rh4",
+    "version": "2.11.11"
  },
  "async-javascript": {
    "path": "async-javascript/tags/2.21.08.31",
@@ -24,16 +24,16 @@
    "version": "2.21.08.31"
  },
  "breeze": {
-    "path": "breeze/tags/2.2.24",
-    "rev": "3446924",
-    "sha256": "19zypbqjwsbabdwq31rlirfvqsqb33kx24h0y7jwz95j2q45rba6",
-    "version": "2.2.24"
+    "path": "breeze/tags/2.5.3",
+    "rev": "3541694",
+    "sha256": "1fbfypv8gajpk2rkds8g8ama1235m3vx5na42wyjlkbkag0mcdm4",
+    "version": "2.5.3"
  },
  "co-authors-plus": {
-    "path": "co-authors-plus/tags/3.7.0",
-    "rev": "3381038",
-    "sha256": "04p6adhv60ngn42vpxcncanwpridwkxpw91ipxgibvaaj2p72v01",
-    "version": "3.7.0"
+    "path": "co-authors-plus/tags/4.0.2",
+    "rev": "3518612",
+    "sha256": "0bmxpkwdm84zsy29wvzdki4ss06bgpviwgjn44fzmlbjnr09ffjm",
+    "version": "4.0.2"
  },
  "code-syntax-block": {
    "path": "code-syntax-block/tags/3.2.1",
@@ -42,10 +42,10 @@
    "version": "3.2.1"
  },
  "cookie-notice": {
-    "path": "cookie-notice/tags/2.5.11",
-    "rev": "3416491",
-    "sha256": "0g9xy3dgywnqv2v0wd34rixdqavkrp8zkv6bm8h6kh5q77n168a5",
-    "version": "2.5.11"
+    "path": "cookie-notice/tags/3.0.6",
+    "rev": "3539409",
+    "sha256": "0c5r0zi45nb62yb82ywd0532m41jgj2k218v8gbj285lmx9imly6",
+    "version": "3.0.6"
  },
  "disable-xml-rpc": {
    "path": "disable-xml-rpc/tags/1.0.1",
@@ -60,16 +60,16 @@
    "version": "1.4.0"
  },
  "gutenberg": {
-    "path": "gutenberg/tags/22.5.0",
-    "rev": "3453880",
-    "sha256": "164mxbn55kq4cfl0maj63y5slv7rq1krzd4b3schz94bd5zqf10s",
-    "version": "22.5.0"
+    "path": "gutenberg/tags/23.2.2",
+    "rev": "3542978",
+    "sha256": "0w71p6yng9k7lkg5lfys087xr9fkca96gyabh3c2mh5i1c5qa6wf",
+    "version": "23.2.2"
  },
  "hcaptcha-for-forms-and-more": {
-    "path": "hcaptcha-for-forms-and-more/tags/4.23.0",
-    "rev": "3456290",
-    "sha256": "222ae768d76ba2e447185619357e5adc0282f14451534b11dcd6a2358f0d212e",
-    "version": "4.23.0"
+    "path": "hcaptcha-for-forms-and-more/tags/4.26.0",
+    "rev": "3524788",
+    "sha256": "0l2942in25dpgpr7n57l9x99kbhlxlz1qfcg2j1lgp8fvjlv9xb8",
+    "version": "4.26.0"
  },
  "hello-dolly": {
    "path": "hello-dolly/tags/1.7.2",
@@ -84,10 +84,10 @@
    "version": "3.1.3"
  },
  "jetpack": {
-    "path": "jetpack/tags/15.5",
-    "rev": "3453646",
-    "sha256": "0z0zlpfba4jd42q6kxc964y6xg8jqy84j655143kl80zjq7jwdq3",
-    "version": "15.5"
+    "path": "jetpack/tags/15.8",
+    "rev": "3523625",
+    "sha256": "0cf9iqwcwh86vbqsh8863p6ph8bzf7n9a6vcqg73hzhkkzmpiv9j",
+    "version": "15.8"
  },
  "jetpack-lite": {
    "path": "jetpack-lite/tags/3.0.3",
@@ -96,22 +96,22 @@
    "version": "3.0.3"
  },
  "lightbox-photoswipe": {
-    "path": "lightbox-photoswipe/tags/5.8.2",
-    "rev": "3427659",
-    "sha256": "04cm39mdpx304qsf9l672b90qxv20mk1qsyxya53fvh8fbw6dlan",
-    "version": "5.8.2"
+    "path": "lightbox-photoswipe/tags/5.8.3",
+    "rev": "3470492",
+    "sha256": "003lbsx2jssvw7pbka96amfwqa3ir46jf40yly4h65xs2l588r58",
+    "version": "5.8.3"
  },
  "login-lockdown": {
-    "path": "login-lockdown/tags/2.15",
-    "rev": "3410032",
-    "sha256": "0v2qncagf67g5srjkcbnjq9d3j6vdvf7hnkihc39a6m7pbkcbb2n",
-    "version": "2.15"
+    "path": "login-lockdown/tags/2.16",
+    "rev": "3506152",
+    "sha256": "16xflxfsajkw8fvfllvnmnirks3x0i8dsr4k5p46swm810rjwm4y",
+    "version": "2.16"
  },
  "mailpoet": {
-    "path": "mailpoet/tags/5.20.0",
-    "rev": "3452849",
-    "sha256": "169a54lfmc2bkwvk757qc618ir87ld1nkpaqhiq4cc9sjf5vydhh",
-    "version": "5.20.0"
+    "path": "mailpoet/tags/5.27.0",
+    "rev": "3537320",
+    "sha256": "0x9kwi6ynk22pw2m5gh0229ff0r4k0n3k02dh3ii664l2y9hy35q",
+    "version": "5.27.0"
  },
  "merge-minify-refresh": {
    "path": "merge-minify-refresh/tags/2.15",
@@ -138,10 +138,10 @@
    "version": "2.0.3"
  },
  "sqlite-database-integration": {
-    "path": "sqlite-database-integration/tags/2.2.17",
-    "rev": "3451878",
-    "sha256": "0glgkscnyxgm6f7k2760wnaz9j5y0hrkgwwkwcbx26qlzlpgsb9r",
-    "version": "2.2.17"
+    "path": "sqlite-database-integration/tags/2.2.23",
+    "rev": "3503394",
+    "sha256": "1glrya18mpfbj3yjx4rlwcxz8zls1fcdlw9lfh27p6wmhc40qgx3",
+    "version": "2.2.23"
  },
  "static-mail-sender-configurator": {
    "path": "static-mail-sender-configurator/tags/0.10.0",
@@ -150,10 +150,10 @@
    "version": "0.10.0"
  },
  "surge": {
-    "path": "surge/tags/1.1.0",
-    "rev": "3370320",
-    "sha256": "1j7yc512317ljl50qls6pbhmcvwqlxbq6p2k8xaxnvzmxkb3358x",
-    "version": "1.1.0"
+    "path": "surge/tags/1.2.1",
+    "rev": "3524687",
+    "sha256": "0rrjvafyv5ljfc883x1h5z4vazfca7cf0vnizrxwwr95qai5rjjd",
+    "version": "1.2.1"
  },
  "tc-custom-javascript": {
    "path": "tc-custom-javascript/tags/1.2.3",
@@ -162,10 +162,10 @@
    "version": "1.2.3"
  },
  "webp-converter-for-media": {
-    "path": "webp-converter-for-media/tags/6.5.3",
-    "rev": "3445921",
-    "sha256": "1pni7cw8fa20zlv173618qj4whg2k7mpsn077kd47c8505flckyi",
-    "version": "6.5.3"
+    "path": "webp-converter-for-media/tags/6.6.0",
+    "rev": "3538008",
+    "sha256": "004x7xyzbmbqh9lwnb6bz2s8a1599kjqpg4prbccjmapz80l4jvk",
+    "version": "6.6.0"
  },
  "webp-express": {
    "path": "webp-express/tags/0.25.14",
@@ -174,22 +174,22 @@
    "version": "0.25.14"
  },
  "wordpress-seo": {
-    "path": "wordpress-seo/tags/26.9",
-    "rev": "3452706",
-    "sha256": "1inirysnpj4mrzk4k5h2wascmfzawk69i9z6mlwvzx4xg0as0asl",
-    "version": "26.9"
+    "path": "wordpress-seo/tags/27.6",
+    "rev": "3529588",
+    "sha256": "1cnvmzrrnf5f0z6c0drjv935yn43pnbmxmbj27sd0ffmmdv9c9r6",
+    "version": "27.6"
  },
  "worker": {
-    "path": "worker/tags/4.9.30",
-    "rev": "3453142",
-    "sha256": "12fb7p9aba1692gys5bx23x16s46n65vyn47lifagqyrmkq4k4g9",
-    "version": "4.9.30"
+    "path": "worker/tags/4.9.34",
+    "rev": "3528692",
+    "sha256": "1836v703qyk49r74ym1xc9wbwj1d0sdd7z4s5w4vv9zgng5jg0s5",
+    "version": "4.9.34"
  },
  "wp-change-email-sender": {
-    "path": "wp-change-email-sender/tags/3.2",
-    "rev": "3426289",
-    "sha256": "1bczsf95b6r8mb3rzfplsvjzlbwzahs421xzz7fcjz1jpxw1praw",
-    "version": "3.2"
+    "path": "wp-change-email-sender/tags/3.3.1",
+    "rev": "3532899",
+    "sha256": "031g6jp3irpm69hav8hsbmfr43g31rc2dzrryf7mixh728h5vbqg",
+    "version": "3.3.1"
  },
  "wp-fail2ban": {
    "path": "wp-fail2ban/tags/5.4.1",
@@ -204,10 +204,10 @@
    "version": "2.0.0"
  },
  "wp-fastest-cache": {
-    "path": "wp-fastest-cache/tags/1.4.6",
-    "rev": "3453207",
-    "sha256": "1gjf5r89j4zs5ddsf3z8f68y73kznmnl5hisa1pqhwdk5sjkiayc",
-    "version": "1.4.6"
+    "path": "wp-fastest-cache/tags/1.4.9",
+    "rev": "3540132",
+    "sha256": "1jd2sma8y3lzsqw36zzhal8xf3ksn9v7c6bzdpdimaz4ddhcwqsq",
+    "version": "1.4.9"
  },
  "wp-gdpr-compliance": {
    "path": "wp-gdpr-compliance/tags/2.0.22",
@@ -222,16 +222,16 @@
    "version": "3.9.30"
  },
  "wp-mail-smtp": {
-    "path": "wp-mail-smtp/tags/4.7.1",
-    "rev": "3403481",
-    "sha256": "1701c6ii4rvxi32fwlvdwmkw52x4k7x10hals5q32nml9i227jdn",
-    "version": "4.7.1"
+    "path": "wp-mail-smtp/tags/4.8.0",
+    "rev": "3508233",
+    "sha256": "1wm4vv303rapbw61hlb12h8y1vxs1sh7ak7xajq1vzlwyfkab3h8",
+    "version": "4.8.0"
  },
  "wp-statistics": {
-    "path": "wp-statistics/tags/14.16",
-    "rev": "3406504",
-    "sha256": "1cncnmvq9y4jzbl2rlzpncn12q6cfpwrsbgb68q5ynx64sjfkhrh",
-    "version": "14.16"
+    "path": "wp-statistics/tags/14.16.8",
+    "rev": "3537179",
+    "sha256": "19sv54i8r5v5lvq7mxfm2gqvy68pw95jx2zv3izls15zl868qcal",
+    "version": "14.16.8"
  },
  "wp-swiper": {
    "path": "wp-swiper/trunk",
@@ -240,15 +240,15 @@
    "version": "1.4.3"
  },
  "wp-user-avatars": {
-    "path": "wp-user-avatars/trunk",
-    "rev": "2540784",
+    "path": "wp-user-avatars/tags/1.4.1",
+    "rev": "3493554",
    "sha256": "1g21nl6xs9zyq0ainjwa06wl90975l8f9rj0fa20zkmw17w2mdgl",
    "version": "1.4.1"
  },
  "wpforms-lite": {
-    "path": "wpforms-lite/tags/1.9.9.2",
-    "rev": "3449730",
-    "sha256": "00xbq2ndxg82slxl7lc0nwxfp22v3zvamq8pcz3wif89n82nl49d",
-    "version": "1.9.9.2"
+    "path": "wpforms-lite/tags/1.10.0.5",
+    "rev": "3532389",
+    "sha256": "1gcglajl782mx8rr5196mlp42avlcqnw4riy4fnj0dcfvbi8jlmv",
+    "version": "1.10.0.5"
  }
 }
--- a/pkgs/servers/web-apps/wordpress/packages/themes.json
+++ b/pkgs/servers/web-apps/wordpress/packages/themes.json
@@ -1,33 +1,33 @@
 {
  "twentynineteen": {
-    "path": "twentynineteen/3.2",
-    "rev": "301643",
-    "sha256": "1xvyvkfzf0lzq55g24j5rx40jdv84jsbcf4bhc9y358cwcy4cvh4",
-    "version": "3.2"
+    "path": "twentynineteen/3.3",
+    "rev": "329585",
+    "sha256": "1h7a0w716spxhqf0pm21056s8z3pjxljhmx9by8lfxkhzsdpb5js",
+    "version": "3.3"
  },
  "twentytwenty": {
-    "path": "twentytwenty/3.0",
-    "rev": "301649",
-    "sha256": "02wqwxl6zdbs64j6zapmrxdfhai29mk6fq5sbdrmjy9yc26vyn3s",
-    "version": "3.0"
+    "path": "twentytwenty/3.1",
+    "rev": "329586",
+    "sha256": "1gibv7zhjn7jmdx3cpxg47kf6j93xdckgh3n3brq6gi6n2746ln4",
+    "version": "3.1"
  },
  "twentytwentyfive": {
-    "path": "twentytwentyfive/1.4",
-    "rev": "301650",
-    "sha256": "1knpjhql8ccczjclg2wcacjp5adhxafh4bnw5mrgf34wghna0j6w",
-    "version": "1.4"
+    "path": "twentytwentyfive/1.5",
+    "rev": "329589",
+    "sha256": "0vi6ing7d47qsdxgxvynwvq38dn8c7p0i8gd85hcik7bq82gjdzx",
+    "version": "1.5"
  },
  "twentytwentyfour": {
-    "path": "twentytwentyfour/1.4",
-    "rev": "301651",
-    "sha256": "1agfpdazn91win42k75gj8aznf4d86cmqk8kvv6md9z4zcxw5nzn",
-    "version": "1.4"
+    "path": "twentytwentyfour/1.5",
+    "rev": "329588",
+    "sha256": "0v91qmk5spn2zchyczpw8np1xam02wp3kg0q0h3p9rxn24hnbnlw",
+    "version": "1.5"
  },
  "twentytwentyone": {
-    "path": "twentytwentyone/2.7",
-    "rev": "301652",
-    "sha256": "14n3lsm698phfyp3mjkdz82s574zpnr8nijxfsbbxim136x4fmn8",
-    "version": "2.7"
+    "path": "twentytwentyone/2.8",
+    "rev": "329587",
+    "sha256": "1mi5gzjxkivjff4r21qikkmc7l2brlhjmdm2aada3g9ybplwjx6a",
+    "version": "2.8"
  },
  "twentytwentythree": {
    "path": "twentytwentythree/1.6",
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2006,6 +2006,10 @@ mapAliases {
  ssm-agent = throw "'ssm-agent' has been renamed to/replaced by 'amazon-ssm-agent'"; # Converted to throw 2025-10-27
  stacer = throw "'stacer' has been removed because it was abandoned upstream and relied upon vulnerable software"; # Added 2025-11-08
  stalwart-mail = warnAlias "'stalwart-mail' has been renamed to/replaced by 'stalwart'" stalwart; # Added 2026-01-19
+  stardust-xr-kiara = throw "" "'stardust-xr-kiara' has been removed as it is no longer compatible with the latest versions of the Stardust XR server"; # Added 2026-07-04
+  stardust-xr-magnetar = throw "" "'stardust-xr-magnetar' has been removed as it is no longer compatible with the latest versions of the Stardust XR server"; # Added 2026-07-04
+  stardust-xr-phobetor = throw "" "'stardust-xr-phobetor' has been removed as it is no longer compatible with the latest versions of the Stardust XR server"; # Added 2026-07-04
+  stardust-xr-sphereland = throw "" "'stardust-xr-sphereland' has been removed as it is no longer compatible with the latest versions of the Stardust XR server"; # Added 2026-07-04
  starpls-bin = throw "'starpls-bin' has been renamed to/replaced by 'starpls'"; # Converted to throw 2025-10-27
  station = throw "station has been removed from nixpkgs, as there were no committers among its maintainers to unblock security issues"; # Added 2025-06-16
  steam-run-native = throw "'steam-run-native' has been renamed to/replaced by 'steam-run'"; # Converted to throw 2025-10-27
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5139,10 +5139,7 @@ with pkgs;
      {
        electron_38 = electron_38-bin;
        electron_39 = electron_39-bin;
-        electron_40 = getElectronPkg {
-          src = electron-source.electron_40;
-          bin = electron_40-bin;
-        };
+        electron_40 = electron_40-bin;
        electron_41 = getElectronPkg {
          src = electron-source.electron_41;
          bin = electron_41-bin;
@@ -11514,6 +11511,7 @@ with pkgs;
    wordpress_6_7
    wordpress_6_8
    wordpress_6_9
+    wordpress_7_0
    ;

  wordpressPackages = recurseIntoAttrs (