.github: Bump korthout/backport-action from 4.6.1 to 4.7.0

Bumps [korthout/backport-action](https://github.com/korthout/backport-action) from 4.6.1 to 4.7.0.
- [Release notes](https://github.com/korthout/backport-action/releases)
- [Commits](6b65649031...8560fb503c)

---
updated-dependencies:
- dependency-name: korthout/backport-action
  dependency-version: 4.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/backport.yml

@@ -51,7 +51,7 @@ jobs:
 
       - name: Create backport PRs
         id: backport
-        uses: korthout/backport-action@6b65649031ac6d18ffdfd0c0820e9436f3fde22b # v4.6.1
+        uses: korthout/backport-action@8560fb503c275d433c56f05a2f64850093baa9f7 # v4.7.0
         with:
           # Config README: https://github.com/korthout/backport-action#backport-action
           add_author_as_reviewer: true

ci/README.md

@@ -48,7 +48,7 @@ To ensure security and a focused utility, the bot adheres to specific limitation
   - approved by a [committer][@NixOS/nixpkgs-committers].
   - backported via label.
   - opened by a [committer][@NixOS/nixpkgs-committers].
-  - opened by [@r-ryantm](https://nixos.github.io/nixpkgs-update/r-ryantm/).
+  - opened by [@r-ryantm](https://nix-community.github.io/nixpkgs-update/r-ryantm/).
 - The user attempting to merge is a member of [@NixOS/nixpkgs-maintainers].
 - The user attempting to merge is a maintainer of all packages touched by the PR.
 - No [committer][@NixOS/nixpkgs-committers] has an outstanding "changes requested" review.

ci/github-script/merge.js

@@ -71,7 +71,7 @@ function runChecklist({
         pull_request.head.ref.startsWith('backport-'),
       'Opened by a [committer](https://github.com/orgs/NixOS/teams/nixpkgs-committers).':
         committers.has(pull_request.user.id),
-      'Opened by [@r-ryantm](https://nixos.github.io/nixpkgs-update/r-ryantm/).':
+      'Opened by [@r-ryantm](https://nix-community.github.io/nixpkgs-update/r-ryantm/).':
         pull_request.user.login === 'r-ryantm',
     },
     'PR is not a draft': !pull_request.draft,

maintainers/maintainer-list.nix

@@ -20256,11 +20256,6 @@
     matrix = "@neoney:matrix.org";
     keys = [ { fingerprint = "9E6A 25F2 C1F2 9D76 ED00  1932 1261 173A 01E1 0298"; } ];
   };
-  n3tcat = {
-    name = "Sophie Cat";
-    github = "scd31";
-    githubId = 57571338;
-  };
   n3tshift = {
     email = "n3tshift@tilde.pink";
     github = "n3tshift";
@@ -26116,6 +26111,11 @@
     githubId = 13556969;
     name = "Scandiravian";
   };
+  scd31 = {
+    name = "scd31";
+    github = "scd31";
+    githubId = 57571338;
+  };
   SchahinRohani = {
     email = "schahin@rouhanizadeh.de";
     github = "SchahinRohani";

nixos/tests/zoom-us.nix

@@ -10,38 +10,11 @@
     };
 
   testScript = ''
-    import time
-
     machine.succeed("which zoom")  # fail early if this is missing
     machine.wait_for_x()
-    machine.execute("zoom > /tmp/zoom-us.log 2>&1 & echo $! > /tmp/zoom-us.pid")
-
-    def has_zoom_window():
-        return any("Zoom Workplace" in name for name in machine.get_window_names())
-
-    # Zoom should open its main window shortly after startup. Poll for it, but
-    # stop as soon as the launcher process exits (for example because of a
-    # missing shared library) instead of waiting for the whole window timeout.
-    deadline = time.time() + 120
-    while not has_zoom_window():
-        if machine.execute("kill -0 $(cat /tmp/zoom-us.pid)")[0] != 0:
-            raise Exception(
-                "zoom exited before opening its main window:\n"
-                + machine.execute("cat /tmp/zoom-us.log")[1]
-            )
-        if time.time() > deadline:
-            raise Exception(
-                "timed out waiting for the Zoom Workplace window:\n"
-                + machine.execute("cat /tmp/zoom-us.log")[1]
-            )
-        time.sleep(1)
-
-    # The window should stay open for a while instead of crashing on startup.
+    machine.execute("zoom >&2 &")
+    machine.wait_for_window("Zoom Workplace")
     machine.sleep(20)
-    if not has_zoom_window():
-        raise Exception(
-            "the Zoom Workplace window disappeared shortly after startup:\n"
-            + machine.execute("cat /tmp/zoom-us.log")[1]
-        )
+    machine.wait_for_window("Zoom Workplace")
   '';
 }

pkgs/README.md

@@ -912,9 +912,9 @@ stdenv.mkDerivation {
 ## Automatic package updates
 [automatic-package-updates]: #automatic-package-updates
 
-The [community bot `r-ryantm`](https://github.com/NixOS/infra/blob/main/non-critical-infra/modules/nixpkgs-update/README.md), periodically tries to update all packages in Nixpkgs.
-It runs the program [`nixpkgs-update`](https://nixos.github.io/nixpkgs-update/) which finds new versions of packages, modifies the relevant files, and opens a Nixpkgs PR.
-`nixpkgs-update` has a specific set of capabilities of finding new versions for a package, and updating Nix files accordingly (see their [FAQ](https://nixos.github.io/nixpkgs-update/nixpkgs-maintainer-faq/)).
+The [community bot `r-ryantm`](https://nix-community.org/update-bot/), periodically tries to update all packages in Nixpkgs.
+It runs the program [`nixpkgs-update`](https://nix-community.github.io/nixpkgs-update/) which finds new versions of packages, modifies the relevant files, and opens a Nixpkgs PR.
+`nixpkgs-update` has a specific set of capabilities of finding new versions for a package, and updating Nix files accordingly (see their [FAQ](https://nix-community.github.io/nixpkgs-update/nixpkgs-maintainer-faq/)).
 However, setting a `passthru.updateScript` for a package, sets an explicit update procedure for `nixpkgs-update`, that can find the latest version more reliably than `nixpkgs-update`, and modify the necessary files more correctly.
 
 ### Valid `passthru.updateScript` values

pkgs/applications/editors/eclipse/default.nix

@@ -21,7 +21,8 @@
 }:
 
 # ./update.sh fully automates updating for each quarterly release.  you can run
-# it manually, or wait for nixpkgs-update to do so.
+# it manually, or wait for https://nix-community.github.io/nixpkgs-update/ to do
+# so.
 #
 # then, to test (on x86_64):
 # for e in $(cat pkgs/applications/editors/eclipse/eclipses.json | jq '.eclipses | keys | .[] | ascii_downcase' -r); do for s in pkgs pkgsCross.aarch64-multiplatform; do echo; echo $s $e; nix-build -A ${s}.eclipses.eclipse-${e} -o eclipse-${s}-${e}; done; done

pkgs/by-name/cl/claude-powerline/package.nix

@@ -7,13 +7,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "claude-powerline";
-  version = "1.32.1";
+  version = "1.31.0";
 
   src = fetchFromGitHub {
     owner = "Owloops";
     repo = "claude-powerline";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PBlqi48219NuicdWDaYVdqBxc3kwcTfk89WMCRM1Gew=";
+    hash = "sha256-W1DoOJ6w/9bU3nnrQBwGWeQbVjvuB38kEd67R4Kvufg=";
   };
 
   npmDepsHash = "sha256-D3Z5tb4phZUMPQaXvfYiIWuwaX5YGI8ubgyV7sSJqQk=";

pkgs/by-name/cl/cline/package.nix

@@ -1,200 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  bun,
-  fetchFromGitHub,
-  inetutils,
-  makeBinaryWrapper,
-  nodejs,
-  nix-update-script,
-  ripgrep,
-  gitMinimal,
-  xdg-utils,
-  versionCheckHook,
-  writableTmpDirAsHomeHook,
-}:
-let
-
-  nodeModules =
-    finalAttrs:
-    stdenvNoCC.mkDerivation {
-      pname = "${finalAttrs.pname}-node_modules";
-      inherit (finalAttrs) version src;
-
-      __structuredAttrs = true;
-      strictDeps = true;
-
-      nativeBuildInputs = [
-        bun
-        writableTmpDirAsHomeHook
-      ];
-
-      dontConfigure = true;
-
-      impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
-        "GIT_PROXY_COMMAND"
-        "SOCKS_SERVER"
-      ];
-
-      buildPhase = ''
-        runHook preBuild
-
-        export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
-
-        # Only fetch the cline CLI deps
-        bun install \
-          --frozen-lockfile \
-          --ignore-scripts \
-          --no-progress \
-          --os="*" \
-          --cpu="*" \
-          --filter ./ \
-          --filter './sdk/packages/*' \
-          --filter ./apps/cli \
-          --filter ./apps/cline-hub \
-          --filter ./apps/cline-hub/src/webview
-
-        runHook postBuild
-      '';
-
-      installPhase = ''
-        runHook preInstall
-
-        mkdir -p $out
-        find . -type d -name node_modules -exec cp -R --parents {} $out \;
-
-        runHook postInstall
-      '';
-
-      # Required, else the fixed-output derivation ends up referencing store
-      # paths from the source it was built from.
-      dontFixup = true;
-
-      outputHash = "sha256-cDZ7Ad87n/IlVqOqRTrZjaPUMilHiP7g4M0/K5tRoyM=";
-      outputHashAlgo = "sha256";
-      outputHashMode = "recursive";
-    };
-
-  # Upstream's build script names its output directory after the platform it
-  # compiled for, which with --single is always the build host.
-  targetDirName =
-    (if stdenvNoCC.hostPlatform.isDarwin then "cli-darwin-" else "cli-linux-")
-    + (if stdenvNoCC.hostPlatform.isx86_64 then "x64" else "arm64");
-in
-stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "cline";
-  version = "3.0.65";
-
-  __structuredAttrs = true;
-  strictDeps = true;
-
-  src = fetchFromGitHub {
-    owner = "cline";
-    repo = "cline";
-    tag = "cli-v${finalAttrs.version}";
-    hash = "sha256-9Mw9hFPVaAE833vfwqYDIHDa8bjIu+xUwQ5p7l7Fdm8=";
-  };
-
-  node_modules = nodeModules finalAttrs;
-
-  nativeBuildInputs = [
-    bun
-    makeBinaryWrapper
-    # tsc has a `#!/usr/bin/env node` shebang in its shims
-    nodejs
-  ];
-
-  configurePhase = ''
-    runHook preConfigure
-
-    cp -R ${finalAttrs.node_modules}/. .
-
-    # The store hands over a read-only tree, but the build writes into it:
-    # `tsc -b` emits .tsbuildinfo files under node_modules/.tmp, and Vite
-    # caches next to the packages it resolves.
-    find . -type d -name node_modules -prune -exec chmod -R u+w {} +
-
-    patchShebangs node_modules apps sdk
-
-    runHook postConfigure
-  '';
-
-  buildPhase = ''
-    runHook preBuild
-
-    # Bundle everything into a standalone executable
-    pushd apps/cli > /dev/null
-    bun script/build.ts --single
-    popd > /dev/null
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    dist="apps/cli/dist/${targetDirName}"
-
-    mkdir -p $out/libexec/cline
-    cp -R "$dist/." $out/libexec/cline/
-
-    makeBinaryWrapper $out/libexec/cline/bin/cline $out/bin/cline \
-      --set CLINE_NO_AUTO_UPDATE 1 \
-      --prefix PATH : ${
-        lib.makeBinPath (
-          [
-            # agent's file search tool is backed by rg
-            ripgrep
-            # Checkpoints, worktrees, repo status and plugin installs all
-            # call out to git
-            gitMinimal
-          ]
-          ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [
-            # xdg-open, to put the dashboard in a browser.
-            xdg-utils
-          ]
-        )
-      }
-
-    runHook postInstall
-  '';
-
-  # Bun-compiled executables do not survive stripping.
-  dontStrip = true;
-
-  doInstallCheck = true;
-  nativeInstallCheckInputs = [
-    versionCheckHook
-    writableTmpDirAsHomeHook
-    inetutils
-  ];
-  versionCheckProgramArg = "--version";
-  versionCheckKeepEnvironment = "HOME PATH";
-
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      # CLI releases are tagged with `cli-v` prefix, e.g. `cli-v1.2.3`
-      "--version-regex"
-      "^cli-v"
-      # Recompute FOD hash of the node_modules derivation as well
-      "--subpackage"
-      "node_modules"
-    ];
-  };
-
-  meta = {
-    description = "Autonomous coding agent CLI for the terminal";
-    longDescription = ''
-      Cline is an open-source autonomous AI coding agent that runs inside
-      your editor or terminal. It reads files, writes code, runs terminal
-      commands, and fixes errors while keeping you in control through structured
-      plan-and-act steps.
-    '';
-    homepage = "https://cline.bot";
-    changelog = "https://github.com/cline/cline/blob/main/apps/cli/CHANGELOG.md";
-    license = lib.licenses.asl20;
-    mainProgram = "cline";
-    maintainers = with lib.maintainers; [ johnrtitor ];
-    inherit (bun.meta) platforms;
-  };
-})

pkgs/by-name/de/degit/package.nix

@@ -1,138 +1,28 @@
 {
   lib,
-  stdenv,
+  buildNpmPackage,
   fetchFromGitHub,
-  bun,
-  makeWrapper,
-  nodejs,
-  writableTmpDirAsHomeHook,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+buildNpmPackage rec {
   pname = "degit";
-  version = "3.10.0";
-  __structuredAttrs = true;
-  strictDeps = true;
+  version = "2.8.4";
 
   src = fetchFromGitHub {
     owner = "Rich-Harris";
     repo = "degit";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-Oilw6PWxWTBTcTFeMAfLUsixMmZtJ6S3cjR/if0uCtc=";
+    rev = "v${version}";
+    hash = "sha256-Vw/gtmKywi5faSCs7Wek80nmnqcPHXlQarD5qMwlsQE=";
   };
 
-  nativeBuildInputs = [
-    bun
-    makeWrapper
-    nodejs
-    writableTmpDirAsHomeHook
-  ];
-
-  configurePhase = ''
-    runHook preConfigure
-
-    cp -R ${finalAttrs.passthru.node_modules}/. .
-    patchShebangs node_modules
-
-    runHook postConfigure
-  '';
-
-  buildPhase = ''
-    runHook preBuild
-
-    bun run build
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/{bin,lib/degit}
-    cp -r assets degit dist node_modules package.json LICENSE.md $out/lib/degit/
-
-    # NOTE:
-    # We're silencing warnings because of DEP0169 in `degit`, which is present
-    # both in the main project and its dependencies, namely `isomorphic-git`,
-    # which in turn depends on `simple-get`, which uses the deprecated API.
-    #
-    # For now, let's just silence the warning so it doesn't annoy users.
-    #
-    # Also see:
-    # - https://nodejs.org/api/deprecations.html#dep0169-insecure-urlparse
-    # - https://nodejs.org/api/url.html#the-whatwg-url-api
-    makeWrapper ${nodejs}/bin/node $out/bin/degit \
-      --add-flags "--no-deprecation" \
-      --add-flags "$out/lib/degit/degit"
-
-    runHook postInstall
-  '';
-
-  passthru = {
-    # Adapted from: pkgs/by-name/an/anytype/package.nix
-    node_modules = stdenv.mkDerivation {
-      pname = "${finalAttrs.pname}-node_modules";
-      inherit (finalAttrs) version src;
-
-      __structuredAttrs = true;
-      strictDeps = true;
-
-      impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
-        "GIT_PROXY_COMMAND"
-        "SOCKS_SERVER"
-      ];
-
-      nativeBuildInputs = [
-        bun
-        writableTmpDirAsHomeHook
-      ];
-
-      dontConfigure = true;
-
-      buildPhase = ''
-        runHook preBuild
-
-        export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
-        # https://bun.com/docs/pm/cli/install#configuring-with-environment-variables
-
-        # Bun always tries to use the fastest available installation method for the target platform. On macOS, that’s clonefile and on Linux, that’s hardlink.
-        bun install \
-          --backend=copyfile \
-          --cpu="*" \
-          --frozen-lockfile \
-          --ignore-scripts \
-          --no-progress \
-          --os="*"
-
-        runHook postBuild
-      '';
-
-      installPhase = ''
-        runHook preInstall
-
-        mkdir -p $out
-        find . -type d -name node_modules -exec cp -R --parents {} $out \;
-
-        runHook postInstall
-      '';
-
-      dontFixup = true;
-
-      outputHash = "sha256-jUFea7eSY0AYtwPGUUXxoZQb6zZpmiaowqeVibck884=";
-      outputHashAlgo = "sha256";
-      outputHashMode = "recursive";
-    };
-  };
+  npmDepsHash = "sha256-42cM31C2c1Gr7HWOowMUTEUEyL0mGnyl5fyQECcz1Sw=";
 
   meta = {
-    changelog = "https://github.com/Rich-Harris/degit/blob/${finalAttrs.src.rev}/docs/CHANGELOG.md";
+    changelog = "https://github.com/Rich-Harris/degit/blob/${src.rev}/CHANGELOG.md";
     description = "Make copies of git repositories";
     homepage = "https://github.com/Rich-Harris/degit";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      eljamm
-      kidonng
-    ];
+    maintainers = with lib.maintainers; [ kidonng ];
     mainProgram = "degit";
   };
-})
+}

pkgs/by-name/do/dotacat/package.nix

@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage {
 
   src = fetchFromGitLab {
     domain = "gitlab.scd31.com";
-    owner = "sophie";
+    owner = "stephen";
     repo = "dotacat";
     rev = "f3b7e7816bed6b84123e066c57cf4003d77a85f1";
     hash = "sha256-y+u9PO01W+IzBatGHZpgOD7cRKjdeuy4/VX7/V9cu3Q=";
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
 
   meta = {
     description = "Like lolcat, but fast";
-    homepage = "https://gitlab.scd31.com/sophie/dotacat";
+    homepage = "https://gitlab.scd31.com/stephen/dotacat";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ traxys ];
     mainProgram = "dotacat";

pkgs/by-name/ej/ejabberd/package.nix

@@ -144,7 +144,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ejabberd";
-  version = "26.09";
+  version = "26.07";
 
   nativeBuildInputs = [
     makeWrapper
@@ -184,7 +184,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "processone";
     repo = "ejabberd";
     tag = finalAttrs.version;
-    hash = "sha256-wSrzb+UOqCFp/vk+Q8spukKBzRqquIPt6fkmyVFAz0w=";
+    hash = "sha256-YCcRXbhlIYV0cP4RLTknYnfSpkknLenvWOYs9kt7m3c=";
   };
 
   passthru.tests = {

pkgs/by-name/ej/ejabberd/rebar-deps.nix

@@ -24,11 +24,11 @@ let
     };
     xmpp = builder {
       name = "xmpp";
-      version = "1.13.5";
+      version = "1.13.4";
       src = fetchHex {
         pkg = "xmpp";
-        version = "1.13.5";
-        sha256 = "sha256-qpYyd7qpa3dZ4JUt2TfxC8LUT+EEPKAz3oATFMr6vF0=";
+        version = "1.13.4";
+        sha256 = "sha256-SzH/TjBtpKkwzgZ1/tTzw6+D9rOalgnootR0ffvq4NQ=";
       };
       beamDeps = [
         ezlib
@@ -41,11 +41,11 @@ let
     };
     stun = builder {
       name = "stun";
-      version = "1.2.23";
+      version = "1.2.22";
       src = fetchHex {
         pkg = "stun";
-        version = "1.2.23";
-        sha256 = "sha256-2KGp8/ZUvFEwRoQDtmyqXcJJ6oWEiB3FQELrwib84kk=";
+        version = "1.2.22";
+        sha256 = "sha256-NAi0sR1SN6CI9TsmCgaUDDCxb0pICUiS1qkgThZDGIo=";
       };
       beamDeps = [
         fast_tls
@@ -188,11 +188,11 @@ let
     };
     fast_xml = builder {
       name = "fast_xml";
-      version = "1.1.61";
+      version = "1.1.60";
       src = fetchHex {
         pkg = "fast_xml";
-        version = "1.1.61";
-        sha256 = "sha256-C9GFUP0dJRYFlkJNnAHAM6znSVviWZZ5ELxTNiIrVJk=";
+        version = "1.1.60";
+        sha256 = "sha256-z54nSd1HIEcCy3oEq1BFZC+gCW/fyc/y6cptPyq9N8U=";
       };
       beamDeps = [ p1_utils ];
     };
@@ -218,11 +218,11 @@ let
     };
     esip = builder {
       name = "esip";
-      version = "1.0.61";
+      version = "1.0.60";
       src = fetchHex {
         pkg = "esip";
-        version = "1.0.61";
-        sha256 = "sha256-9SBZWihyCUNDYQGL9DBED6FAMY0o2aC7JVol2NJr87k=";
+        version = "1.0.60";
+        sha256 = "sha256-BgTL1LvI2hWSwAgwz+MGIM5PZlurEZnRSjtF+v0DFE8=";
       };
       beamDeps = [
         fast_tls

pkgs/by-name/ej/ejabberd/update.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts "rebar3WithPlugins {globalPlugins = [beamMinimalPackages.rebar3-nix];}" beamMinimalPackages.erlang autoconf automake nixfmt
+#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts "rebar3WithPlugins {globalPlugins = [beamPackages.rebar3-nix];}" erlang autoconf automake nixfmt
 #shellcheck shell=bash
 
 set -eu -o pipefail

pkgs/by-name/kf/kftray/package.nix

@@ -26,7 +26,7 @@ in
 stdenv.mkDerivation (
   finalAttrs:
   let
-    cargoHash = finalAttrs.cargoDeps.hash or "sha256-NGGeUQUN8+2IZD6F5//G6E2XKG/zeqADr5ek75r7Puk=";
+    cargoHash = finalAttrs.cargoDeps.hash or "sha256-cbNTUQ7HkpEjWYGyzrcFXtwzEc+uAMWxzxEhqlXuCUs=";
     kftrayBinaries = rustPlatform.buildRustPackage {
       pname = "kftray-binaries";
       cargoBuildFlags = [
@@ -55,13 +55,13 @@ stdenv.mkDerivation (
   in
   {
     pname = "kftray";
-    version = "0.29.1";
+    version = "0.27.33";
 
     src = fetchFromGitHub {
       owner = "hcavarsan";
       repo = "kftray";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-s8FRd6JiJXfIYy2PpHOFO6t1CTHFHGI4sLmq2loXxpo=";
+      hash = "sha256-1lVTrtiM/P27GlU5jQ7GcLOUEmXU2T/O7grx4c0MJNY=";
     };
 
     cargoRoot = "./";
@@ -79,7 +79,7 @@ stdenv.mkDerivation (
       inherit (finalAttrs) pname version src;
       inherit pnpm;
       fetcherVersion = 4;
-      hash = "sha256-efs6j56aIb5ze/CbuwFumklwK1FeQ2Y1qmmdC55BnM4=";
+      hash = "sha256-FIfQZ5OknSFvaDZ3MbW8+36aAsjJrU+5irN2vaLpS54=";
     };
 
     buildInputs = [

pkgs/by-name/ph/phpstan/package.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "phpstan";
-  version = "2.2.16";
+  version = "2.2.14";
 
   src = fetchFromGitHub {
     owner = "phpstan";
     repo = "phpstan";
     tag = finalAttrs.version;
-    hash = "sha256-tM++queSVxe/K8Qkoh3bpsgMbjqdAKd0fXOyGbUfvXk=";
+    hash = "sha256-cxDHp8jN0aA0OQuDOpttIzFlp4JmUfKdxBxAPO9y/AM=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/se/seednaut/package.nix

@@ -1,39 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-}:
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "seednaut";
-  version = "0.1.1";
-
-  src = fetchFromGitHub {
-    owner = "Baltram";
-    repo = "seednaut";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-wyMOZQPJPSqLl4tzC5NELoe81aJZSOurifi62v1+jcQ=";
-  };
-
-  cargoHash = "sha256-1GZ7ZoiGKEQGN2AQFcz/YXpcqg3iYLRSzl2GfTmGk8g=";
-
-  __structuredAttrs = true;
-
-  meta = {
-    description = "Inspect, verify and extract files from Seedvault Android backups";
-    longDescription = ''
-      A command-line and terminal UI utility for Seedvault, the backup
-      mechanism integrated by Android distributions such as CalyxOS,
-      GrapheneOS, iodéOS, LineageOS and /e/OS. It works fully offline and
-      supports the current backup formats (v2 app backup, v0 file backup),
-      allowing backups to be verified, explored and extracted off-device.
-    '';
-    homepage = "https://github.com/Baltram/seednaut";
-    changelog = "https://github.com/Baltram/seednaut/releases/tag/v${finalAttrs.version}";
-    license = with lib.licenses; [
-      mit
-      asl20
-    ];
-    mainProgram = "seednaut";
-    maintainers = with lib.maintainers; [ _6543 ];
-  };
-})

pkgs/by-name/se/serie/package.nix

@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "serie";
-  version = "0.9.2";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "lusingander";
     repo = "serie";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-xHIqyjaC7TrLGRof3uPiKZG67xBJK8zC21l2UG+8Mm0=";
+    hash = "sha256-mFR/Q1gxoyu82wOfS5qIHV1P6Lia0lqlg1+u/hicG1w=";
   };
 
-  cargoHash = "sha256-JjeHDFs8PY+1nqSxTeBAeVaskUSq9AD1jhMQeG/EpSo=";
+  cargoHash = "sha256-5V4QnTW92GTDP0jceFt7tnEW06cTr1NyM+XGz0OGN5A=";
 
   nativeCheckInputs = [ gitMinimal ];
 

pkgs/by-name/ti/tile-downloader/package.nix

@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   src = fetchFromGitLab {
     domain = "gitlab.scd31.com";
-    owner = "sophie";
+    owner = "stephen";
     repo = "tile-downloader";
     tag = "v${finalAttrs.version}";
     hash = "sha256-+FnLGMUGyuaN7uPRvuounDKwF6pV9NKv3r/ajdKtdCE=";
@@ -39,8 +39,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Multi-threaded raster tile downloader, primarily designed for downloading OSM tiles for usage offline";
     mainProgram = "tile-downloader";
-    homepage = "https://gitlab.scd31.com/sophie/tile-downloader";
+    homepage = "https://gitlab.scd31.com/stephen/tile-downloader";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ n3tcat ];
+    maintainers = with lib.maintainers; [ scd31 ];
   };
 })

pkgs/by-name/ws/wsjtz/package.nix

@@ -32,7 +32,7 @@ wsjtx.overrideAttrs (
       platforms = lib.platforms.linux;
       maintainers = with lib.maintainers; [
         Cryolitia
-        n3tcat
+        scd31
       ];
       mainProgram = "wsjtz";
     };

pkgs/by-name/zo/zoom-us/package.nix

@@ -54,20 +54,20 @@ let
   # Zoom versions are released at different times per platform and often with different versions.
   # We write them on three lines like this (rather than using {}) so that the updater script can
   # find where to edit them.
-  versions.aarch64-darwin = "7.2.2.88465";
+  versions.aarch64-darwin = "7.1.5.84650";
 
   # This is the fallback version so that evaluation can produce a meaningful result.
-  versions.x86_64-linux = "7.2.1.5760";
+  versions.x86_64-linux = "7.1.5.4332";
 
   srcs = {
     aarch64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
       name = "zoomusInstallerFull.pkg";
-      hash = "sha256-/xXZJu9acUxmg8wj7WKKfC/EPQgKiKxUr04gC6A6JFY=";
+      hash = "sha256-Sc9wr2dBdvNwi507UZ9YVCTEQsz3RP2WWTJ5Z5ccgnk=";
     };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
-      hash = "sha256-Nuh5j0L1bqinPHcqrFlKMPFqGqTRUdYVdrPcgufS5Qo=";
+      hash = "sha256-5znZNrySgRrs9I5zhqN5p5dPfXpEHXKf8o2dWeYTPso=";
     };
   };
 
@@ -181,9 +181,8 @@ let
       pkgs.pipewire
       pkgs.qt6.qtbase
       pkgs.qt6.qtdeclarative
-      pkgs.stdenv.cc.cc.lib # only libstdc++, libatomic and libgomp are needed at runtime
+      pkgs.stdenv.cc.cc
       pkgs.udev
-      pkgs.util-linux.lib # provides libuuid.so.1, which Zoom 7.2 links against
       pkgs.wayland
       pkgs.libx11
       pkgs.libxcomposite

pkgs/development/interpreters/lua-5/default.nix

@@ -113,8 +113,8 @@ in
 rec {
   lua5_5 = callPackage ./interpreter.nix {
     self = lua5_5;
-    version = "5.5.1";
-    hash = "sha256-HEtAaNZwYfKiIxrStUIud6zqFIfqmJD2Mgr2FPQ3Pc4=";
+    version = "5.5.0";
+    hash = "sha256-V8zDK7vQBcq3W8xSREBSU1r2kXiduiuQFtXFBkDWiz0=";
     makeWrapper = makeBinaryWrapper;
     inherit passthruFun;
 

pkgs/servers/http/apache-httpd/2.4.nix

@@ -38,11 +38,11 @@
 
 stdenv.mkDerivation rec {
   pname = "apache-httpd";
-  version = "2.4.69";
+  version = "2.4.68";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    hash = "sha256-xebrxm40m4fX/GkWrnzCqAjtNIAD3hNM+enYnT4sxz0=";
+    hash = "sha256-aMdNTfOMJr7U372487rx61MvOHI1e+zBu6XRNva2PAY=";
   };
 
   patches = [

pkgs/servers/kanidm/1_10.nix

@@ -2,5 +2,5 @@ import ./generic.nix {
   version = "1.10.5";
   hash = "sha256-mNdG5iPtnhwvy9PABaRPV6KQfvD+/ZKH2hC6Hfo0y48=";
   cargoHash = "sha256-UE/jZaX/mEJUHBqsk2o0rBcocpoFg5XWAmVk4smm5mc=";
-  unsupported = true;
+  eolDate = "2026-08-31";
 }

pkgs/servers/kanidm/1_9.nix

@@ -2,5 +2,5 @@ import ./generic.nix {
   version = "1.9.4";
   hash = "sha256-sz4jbnaRU+mUCBwxODMGkKnk9DMAmD6cyPyCbYp6aOQ=";
   cargoHash = "sha256-1U262qRtYzRTQZLNF027LlCASCvbxmuBvZJpDPnI/vU=";
-  unsupported = true;
+  eolDate = "2026-05-31";
 }

pkgs/top-level/release.nix

@@ -46,10 +46,6 @@
         "olm-3.2.16" # see PR #347899
         "kanidm_1_8-1.8.6"
         "kanidmWithSecretProvisioning_1_8-1.8.6"
-        "kanidm_1_9-1.9.4"
-        "kanidmWithSecretProvisioning_1_9-1.9.4"
-        "kanidm_1_10-1.10.5"
-        "kanidmWithSecretProvisioning_1_10-1.10.5"
       ];
     };