Merge master into staging-next

2026-07-24 17:40:37 +00:00 · 2026-07-24 12:31:11 +00:00 · 2026-07-24 06:51:50 +00:00 · 2026-07-24 00:29:28 +00:00 · 2026-07-23 18:27:29 +00:00 · 2026-07-23 12:33:47 +00:00
64 changed files with 265 additions and 381 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3423,6 +3423,13 @@
    githubId = 32903896;
    keys = [ { fingerprint = "CB5C 7B3C 3E6F 2A59 A583  A90A 8A60 0376 7BE9 5976"; } ];
  };
+  benesim = {
+    name = "Benjamin Isbarn";
+    email = "benjamin.isbarn@gmail.com";
+    github = "BeneSim";
+    githubId = 29384538;
+    keys = [ { fingerprint = "D35E C9CE E631 638F F1D8  B401 6F0E 410D C3EE D02"; } ];
+  };
  bengsparks = {
    email = "benjamin.sparks@protonmail.com";
    github = "bengsparks";
@@ -29692,13 +29699,6 @@
    githubId = 116078858;
    keys = [ { fingerprint = "CDEA 7E04 69E3 0885 A754  4B05 0104 BC05 F41B 77B8"; } ];
  };
-  vherrmann = {
-    name = "Valentin Herrmann";
-    email = "me@valentin-herrmann.de";
-    github = "vherrmann";
-    githubId = 50072577;
-    keys = [ { fingerprint = "309D A29B 4070 FDFD C01A  3AB4 9E60 CB44 5C4B BC4C"; } ];
-  };
  videl = {
    email = "thibaut.smith@mailbox.org";
    github = "videl";
--- a/nixos/README-modular-services.md
+++ b/nixos/README-modular-services.md
@@ -43,7 +43,7 @@ When reviewing a modular service, you should check the following. Details and ra
 ### NixOS VM test

 See the initial [Modular Services PR](https://github.com/NixOS/nixpkgs/pull/372170) for an [example](https://github.com/NixOS/nixpkgs/pull/372170/files#diff-e7fe16489cf3cd08ecc22b2c7896039d407a329b75691c046c95447423b3153f) of a NixOS VM test.
-Best practices: keep tests minimal and focused (boot a VM, enable the service, and assert a basic request succeeds). For general guidance, see the [NixOS Tests chapter](https://nixos.org/manual/nixos/unstable/#sec-nixos-tests).
+TBD: describe best practices here.

 ### `_class = "service"`

--- a/nixos/lib/test-driver/src/test_driver/init.py
+++ b/nixos/lib/test-driver/src/test_driver/init.py
@@ -89,11 +89,6 @@ def main() -> None:
        type=Path,
        required=True,
    )
-    arg_parser.add_argument(
-        "--test-script",
-        help="path to a test script to run, taking precedence over the one defined in the config file",
-        type=Path,
-    )
    arg_parser.add_argument(
        "--keep-vm-state",
        help=argparse.SUPPRESS,
@@ -168,12 +163,8 @@ def main() -> None:
    if args.debug_hook_attach is not None:
        debugger = Debug(logger, args.debug_hook_attach)

-    config = load_driver_configuration(args.config)
-    if args.test_script is not None:
-        config.test_script = args.test_script
-
    with Driver(
-        config=config,
+        config=load_driver_configuration(args.config),
        out_dir=output_directory,
        logger=logger,
        keep_machine_state=args.keep_machine_state,
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -1422,6 +1422,7 @@ let
                modulePath = config.security.pam.pam_unixModulePath;
                settings = {
                  nullok = true;
+                  yescrypt = lib.mkIf config.security.pam.enableLegacySettings true;
                };
              }
              {
--- a/nixos/modules/services/display-managers/gdm.nix
+++ b/nixos/modules/services/display-managers/gdm.nix
@@ -577,6 +577,7 @@ in
              control = "requisite";
              modulePath = config.security.pam.pam_unixModulePath;
              settings.nullok = true;
+              settings.yescrypt = true;
            }
          ];

--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -458,6 +458,7 @@ in
            control = "requisite";
            modulePath = config.security.pam.pam_unixModulePath;
            settings.nullok = true;
+            settings.yescrypt = true;
          }
        ];

--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -153,7 +153,6 @@ in
    console-log = runTest ./nixos-test-driver/console-log.nix;
    containers = runTest ./nixos-test-driver/containers.nix;
    nspawn-daemon-reexec-dbus = runTest ./nspawn-daemon-reexec-dbus.nix;
-    multi-arch-test = runTest ./nixos-test-driver/multi-arch-test.nix;
    skip-typecheck = runTest ./nixos-test-driver/skip-typecheck.nix;
    console-timeout = runTest ./nixos-test-driver/console-timeout.nix;
    options-doc-regression = import ./nixos-test-driver/options-doc-regression.nix { inherit pkgs; };
--- a/nixos/tests/login-nosuid.nix
+++ b/nixos/tests/login-nosuid.nix
@@ -57,7 +57,6 @@
    with subtest("create user"):
        machine.succeed("useradd -m alice")
        machine.succeed("(echo foobar; echo foobar) | passwd alice")
-        machine.succeed("grep -F 'alice:$y$' /etc/shadow")

    with subtest("Check whether switching VTs works"):
        machine.fail("pgrep -f 'agetty.*tty2'")
--- a/nixos/tests/login.nix
+++ b/nixos/tests/login.nix
@@ -28,7 +28,6 @@
    with subtest("create user"):
        machine.succeed("useradd -m alice")
        machine.succeed("(echo foobar; echo foobar) | passwd alice")
-        machine.succeed("grep -F 'alice:$y$' /etc/shadow")

    with subtest("Check whether switching VTs works"):
        machine.fail("pgrep -f 'agetty.*tty2'")
--- a/nixos/tests/nixos-test-driver/multi-arch-test.nix
+++ b/nixos/tests/nixos-test-driver/multi-arch-test.nix
@@ -1,55 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  name = "multi-arch-test";
-  meta.maintainers = with pkgs.lib.maintainers; [ tfc ];
-
-  node.pkgsReadOnly = false;
-
-  nodes = {
-    # Setting build = host platform because such standard VM setups
-    # are well-cached by the multi-arch build infrastructure of the
-    # project.
-    vmIntel = {
-      nixpkgs.buildPlatform = "x86_64-linux";
-      nixpkgs.hostPlatform = "x86_64-linux";
-    };
-    vmArm = {
-      nixpkgs.buildPlatform = "aarch64-linux";
-      nixpkgs.hostPlatform = "aarch64-linux";
-    };
-  };
-
-  defaults = {
-    # not needed for this test and shrinks the closure
-    # because we dont' need qemu for all architectures
-    virtualisation.qemu.guestAgent.enable = false;
-
-    # the test is already very slow but we don't need DHCP anyway
-    networking.dhcpcd.enable = false;
-
-    # fix the network-online target, otherwise it doesn't work
-    # properly as a synchronization mechanism.
-    systemd.network.wait-online.enable = true;
-    systemd.network.wait-online.anyInterface = true;
-  };
-
-  # slow due to SW emulation but shouldn't be slower than that
-  globalTimeout = 5 * 60;
-
-  testScript = { nodes, ... }: /* python */ ''
-    start_all()
-
-    vmIntel.systemctl("start network-online.target")
-    vmArm.systemctl("start network-online.target")
-    vmIntel.wait_for_unit("network-online.target")
-    vmArm.wait_for_unit("network-online.target")
-
-    vmIntel.succeed("ping -c 1 vmArm")
-    vmArm.succeed("ping -c 1 vmIntel")
-
-    archIntel = vmIntel.succeed("uname -m")
-    t.assertIn("${nodes.vmIntel.nixpkgs.hostPlatform.qemuArch}", archIntel, "machine1 is an intel VM")
-    archArm = vmArm.succeed("uname -m")
-    t.assertIn("${nodes.vmArm.nixpkgs.hostPlatform.qemuArch}", archArm, "machine1 is an ARM VM")
-  '';
-}
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -16,9 +16,9 @@ let
      inherit tiling_wm;
    };
  stableVersion = {
-    version = "2026.1.2.11"; # "Android Studio Quail 2 | 2026.1.2 Patch 1"
-    sha256Hash = "sha256-HMnNVPQA27DQeITw98DKtSTbXOCl73CyOu1v3TzURbk=";
-    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.11/android-studio-quail2-patch1-linux.tar.gz";
+    version = "2026.1.2.10"; # "Android Studio Quail 2 | 2026.1.2"
+    sha256Hash = "sha256-ZERaVAkucFbG638aia0RbQ/uwu9flluOWU1iq9tYWQ8=";
+    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.10/android-studio-quail2-linux.tar.gz";
  };
  betaVersion = {
    version = "2026.1.3.5"; # "Android Studio Quail 3 | 2026.1.3 RC 1"
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix
@@ -12,46 +12,6 @@
 let
  zig = zig_0_15;

-  mkModule =
-    {
-      pname,
-      version,
-      src,
-      zigDeps,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      inherit
-        pname
-        version
-        src
-        zigDeps
-        ;
-
-      nativeBuildInputs = [ zig ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
-
-      env.EMACS_INCLUDE_DIR = "${emacs}/include";
-
-      dontSetZigDefaultFlags = true;
-
-      doCheck = true;
-
-      zigCheckFlags = [
-        "-Dcpu=baseline"
-        # See https://github.com/ghostty-org/ghostty/blob/main/PACKAGING.md#build-options
-        "-Doptimize=ReleaseFast"
-      ];
-
-      zigBuildFlags = finalAttrs.zigCheckFlags;
-
-      postConfigure = ''
-        cp -rLT ${finalAttrs.zigDeps} "$ZIG_GLOBAL_CACHE_DIR/p"
-        chmod -R u+w "$ZIG_GLOBAL_CACHE_DIR/p"
-      '';
-    });
-
-  libExt = stdenv.hostPlatform.extensions.sharedLibrary;
-in
-melpaBuild (finalAttrs: {
  pname = "ghostel";

  version = "0.44.0";
@@ -59,37 +19,59 @@ melpaBuild (finalAttrs: {
  src = fetchFromGitHub {
    owner = "dakra";
    repo = "ghostel";
-    tag = "v${finalAttrs.version}";
+    tag = "v${version}";
    hash = "sha256-vRGZoQtjsL42ga07fOfEjccKRidAhqgwHBoKs++62Ls=";
  };

-  # this can be put into mkModule, but we put it here to ease user overrideAttrs
-  zigDeps = zig.fetchDeps {
-    inherit (finalAttrs) src pname version;
-    fetchAll = true;
-    hash = "sha256-yrVgiofdmVjTGJ+PGPGRCc8gb/JcEca1uAzIoPgHHqU=";
-  };
+  module = stdenv.mkDerivation (finalAttrs: {
+    inherit pname version src;
+
+    deps = zig.fetchDeps {
+      inherit (finalAttrs) src pname version;
+      fetchAll = true;
+      hash = "sha256-yrVgiofdmVjTGJ+PGPGRCc8gb/JcEca1uAzIoPgHHqU=";
+    };
+
+    nativeBuildInputs = [ zig ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
+
+    env.EMACS_INCLUDE_DIR = "${emacs}/include";
+
+    dontSetZigDefaultFlags = true;
+
+    doCheck = true;
+
+    zigCheckFlags = [
+      "-Dcpu=baseline"
+      # See https://github.com/ghostty-org/ghostty/blob/main/PACKAGING.md#build-options
+      "-Doptimize=ReleaseFast"
+    ];
+
+    zigBuildFlags = finalAttrs.zigCheckFlags;
+
+    postConfigure = ''
+      cp -rLT ${finalAttrs.deps} "$ZIG_GLOBAL_CACHE_DIR/p"
+      chmod -R u+w "$ZIG_GLOBAL_CACHE_DIR/p"
+    '';
+  });
+
+  libExt = stdenv.hostPlatform.extensions.sharedLibrary;
+in
+melpaBuild {
+  inherit pname version src;

  files = ''
    (:defaults "etc" "ghostel-module${libExt}" "ghostel-module.version")
  '';

  preBuild = ''
-    install ${finalAttrs.finalPackage.module}/ghostel-module${libExt} ghostel-module${libExt}
-    install --mode=444 ${finalAttrs.finalPackage.module}/ghostel-module.version ghostel-module.version
+    install ${module}/ghostel-module${libExt} ghostel-module${libExt}
+    install --mode=444 ${module}/ghostel-module.version ghostel-module.version
  '';

  passthru = {
    updateScript = nix-update-script { };

-    module = mkModule {
-      pname = "${finalAttrs.pname}-module";
-      inherit (finalAttrs)
-        version
-        src
-        zigDeps
-        ;
-    };
+    inherit module;
  };

  meta = {
@@ -101,4 +83,4 @@ melpaBuild (finalAttrs: {
    ];
    license = lib.licenses.gpl3Plus;
  };
-})
+}
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -107,10 +107,10 @@ in
 {
  emacs31 = import ./make-emacs.nix (mkArgs {
    pname = "emacs";
-    version = "31.0.91";
+    version = "31.0.90";
    variant = "mainline";
-    rev = "emacs-31.0.91";
-    hash = "sha256-3nvCiLiEtII1C57CLfDIbVqhiwadYViF9Nv32yDtLIQ=";
+    rev = "emacs-31.0.90";
+    hash = "sha256-Rzlnn+NKQ+jICXLNop27RnVInq79myn4hueJieDO2Ck=";
  });

  emacs30 = import ./make-emacs.nix (mkArgs {
--- a/pkgs/build-support/replace-vars/replace-vars-with.nix
+++ b/pkgs/build-support/replace-vars/replace-vars-with.nix
@@ -122,8 +122,7 @@ in

 stdenvNoCC.mkDerivation (
  {
-    name =
-      if (attrs ? pname && attrs ? version) then "${attrs.pname}-${attrs.version}" else baseNameOf src;
+    name = baseNameOf src;
  }
  // optionalAttrs
  // forcedAttrs
--- a/pkgs/by-name/al/all-the-package-names/package.nix
+++ b/pkgs/by-name/al/all-the-package-names/package.nix
@@ -7,16 +7,16 @@

 buildNpmPackage rec {
  pname = "all-the-package-names";
-  version = "2.0.2511";
+  version = "2.0.2503";

  src = fetchFromGitHub {
    owner = "nice-registry";
    repo = "all-the-package-names";
    tag = "v${version}";
-    hash = "sha256-KnEvFnPXQZ+XhNyweWIE0mjM4vqcqXcJKuus/dFq5f0=";
+    hash = "sha256-UtwbQXhX8dmmA6dVuVFcMQkM98kOt/U//OAVMGBImDU=";
  };

-  npmDepsHash = "sha256-Xw/SXRpQkPd+EcemeHO89tC9amDiVV/RD/1H0H8rax0=";
+  npmDepsHash = "sha256-V7MWSEJT2RtYE1iYJHj2ltrfzke+GO1PfT/wo+MqlZk=";

  passthru.updateScript = nix-update-script { };

--- a/pkgs/by-name/an/anubis/package.nix
+++ b/pkgs/by-name/an/anubis/package.nix
@@ -15,21 +15,21 @@

 buildGoModule (finalAttrs: {
  pname = "anubis";
-  version = "1.26.0";
+  version = "1.25.0";

  src = fetchFromGitHub {
    owner = "TecharoHQ";
    repo = "anubis";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-0ceF4Te0H5edBhvGJgGc/NLJxEAcDVGnnKlqHKnpW60=";
+    hash = "sha256-9/XIwSMEmnS3L/Wzg6ABso7R6W3TYkJomC8aFMycxZo=";
  };

-  vendorHash = "sha256-+NPwL4p0p/s74m1Ld0z2GEcsWk5FqhcLbHrTNP3yEzk=";
+  vendorHash = "sha256-9CMD8Rn4q8b+hyrph+BqqS32ijZyJRNsop6ML7z5Zuk=";

  npmDeps = fetchNpmDeps {
    name = "anubis-npm-deps";
    inherit (finalAttrs) src;
-    hash = "sha256-6sj9C8GHm+RzFl/X5HIPhIDl5l8muBzDSXSRCHumGBs=";
+    hash = "sha256-2U91Dt+ymspjYgTtgCjahCNr6fIs85TT/k+I8M2aC9s=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/bt/btrfs-progs/package.nix
+++ b/pkgs/by-name/bt/btrfs-progs/package.nix
@@ -21,11 +21,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "btrfs-progs";
-  version = "7.1";
+  version = "7.0";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${finalAttrs.version}.tar.xz";
-    hash = "sha256-0fVcwpcTmMkULqp50gPmPVhqO0uGf5VmZKHWgyLNTjQ=";
+    hash = "sha256-wobWh2y81yMnoLQX5M/SgDU+wj43tUn9vNeACoMtmpk=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ca/cargo-feature-combinations/package.nix
+++ b/pkgs/by-name/ca/cargo-feature-combinations/package.nix
@@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
  __structuredAttrs = true;

  pname = "cargo-feature-combinations";
-  version = "0.4.1";
+  version = "0.3.0";

  src = fetchFromGitHub {
    owner = "romnn";
    repo = "cargo-feature-combinations";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-0aPe0YmEpLHt3aZHDuNlov/TiRbLLpR7TLt0ULkjsVU=";
+    hash = "sha256-PneHMWX7IRoX4oSm8iePeI+pEPs8n3F2PW06ZWKDFcc=";
  };

-  cargoHash = "sha256-r09otRStFli5Bx0pfDOMu1LGDonDyCVGPEdY/KnjkmY=";
+  cargoHash = "sha256-DCfO2N6ml1a1P2hFs3gxRE9k+WYv8eqMzwL+cionwYE=";

  passthru.updateScript = nix-update-script { };

--- a/pkgs/by-name/ca/caribou/package.nix
+++ b/pkgs/by-name/ca/caribou/package.nix
@@ -13,6 +13,7 @@
  libxml2,
  libxklavier,
  libxtst,
+  gtk2,
  intltool,
  libxslt,
  at-spi2-core,
@@ -81,6 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
    pythonEnv
    python3.pkgs.pygobject3
    libxtst
+    gtk2
  ];

  propagatedBuildInputs = [
@@ -88,8 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
    libxklavier
  ];

-  configureFlags = [ "--enable-gtk2-module=no" ];
-
  postPatch = ''
    patchShebangs .
    substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0"
--- a/pkgs/by-name/ci/cinnamon/package.nix
+++ b/pkgs/by-name/ci/cinnamon/package.nix
@@ -75,13 +75,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "cinnamon";
-  version = "6.6.9";
+  version = "6.6.8";

  src = fetchFromGitHub {
    owner = "linuxmint";
    repo = "cinnamon";
    tag = finalAttrs.version;
-    hash = "sha256-RQsgfPvdt1xe7HhZamynAvATVlBeLLElatjpN1Tgt2M=";
+    hash = "sha256-ByPn2VV40y+3/FW/KPIsLt43FhVxQAQldCK26KNKdjw=";
  };

  patches = [
@@ -93,6 +93,12 @@ stdenv.mkDerivation (finalAttrs: {
      url = "https://github.com/linuxmint/cinnamon/commit/3a2d558aa575f0ea364c5b4e30d2eb3ee604ee58.patch";
      hash = "sha256-+uAGuQJ0VsIvMvPFafyoXmU4MiHfbbRXLzeW/n62ucw=";
    })
+
+    # cinnamon-calendar-server.py: Allow ICal 4.0
+    (fetchpatch {
+      url = "https://github.com/linuxmint/cinnamon/commit/dcf2d986c1ec167b0a8005ef2ca427317438c8d7.patch";
+      hash = "sha256-4sCZShUOXPaJoumiuEG558e0l8CIehH0P+C9OouG3vI=";
+    })
  ];

  buildInputs = [
--- a/pkgs/by-name/cl/clouddrive2/package.nix
+++ b/pkgs/by-name/cl/clouddrive2/package.nix
@@ -11,15 +11,15 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "clouddrive2";
-  version = "1.0.12";
+  version = "1.0.11";

  src = fetchurl {
    url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
    hash =
      {
-        x86_64-linux = "sha256-Z1xAFMXlajdAAZGY7R7UJrOSLPzyMLXC6wbJnrOXtsc=";
-        aarch64-linux = "sha256-rgRBFCbH3QS/6Db2urDItj825QDFakknAvoIOWv9r0o=";
-        aarch64-darwin = "sha256-9E9xp4f6mFe+otFaAbetjk5agAH9IXLPkuRa669+AgY=";
+        x86_64-linux = "sha256-X5WAnHyXdAkWrN/AbkDE0eNH4mwdPcZ0Cs5Q21KB6/w=";
+        aarch64-linux = "sha256-somHyDBG94pGQB+IZd404H1tX0X2qC8LeIcXeihU6yA=";
+        aarch64-darwin = "sha256-GaL2bCwQdtI3bq2wkwza1OEHFvhppdZpUIq3QRQ0vN8=";
      }
      .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
  };
--- a/pkgs/by-name/de/devmem2/package.nix
+++ b/pkgs/by-name/de/devmem2/package.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+}:
+
+stdenv.mkDerivation {
+  pname = "devmem2";
+  version = "unstable-2004-08-05";
+
+  src = fetchurl {
+    urls = [
+      "http://lartmaker.nl/lartware/port/devmem2.c"
+      "https://raw.githubusercontent.com/hackndev/tools/7ed212230f8fbb1da3424a15ee88de3279bf96ec/devmem2.c"
+    ];
+    sha256 = "14f1k7v6i1yaxg4xcaaf5i4aqn0yabba857zjnbg9wiymy82qf7c";
+  };
+
+  hardeningDisable = [ "format" ]; # fix compile error
+
+  buildCommand = ''
+    $CC "$src" -o devmem2
+    install -D devmem2 "$out/bin/devmem2"
+  '';
+
+  meta = {
+    description = "Simple program to read/write from/to any location in memory";
+    mainProgram = "devmem2";
+    homepage = "http://lartmaker.nl/lartware/port/";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ bjornfor ];
+  };
+}
--- a/pkgs/by-name/di/diffnav/package.nix
+++ b/pkgs/by-name/di/diffnav/package.nix
@@ -10,21 +10,20 @@

 buildGoModule (finalAttrs: {
  pname = "diffnav";
-  version = "0.12.0";
+  version = "0.11.0";

  src = fetchFromGitHub {
    owner = "dlvhdr";
    repo = "diffnav";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-DrEbo9YYg4FCXQXuIkbPxO5Z3ZOPZJYeGoLoP/vT0Y0=";
+    hash = "sha256-6VtAQzZNLQrf8QYVXxLUgb3F6xguFDbwaE9kahPhbSE=";
  };

-  vendorHash = "sha256-2OzHyBPsylQVXhPlqk2owEhiibFi3H1UENvGGDdzGss=";
+  vendorHash = "sha256-gmmckzR0D1oFuTG5TAb6gLMoNbcZl9EsjbFjhPfJqnQ=";

  ldflags = [
    "-s"
    "-w"
-    "-X github.com/dlvhdr/diffnav/pkg/version.Version=${finalAttrs.version}"
  ];

  nativeBuildInputs = [
--- a/pkgs/by-name/ea/easyeffects/package.nix
+++ b/pkgs/by-name/ea/easyeffects/package.nix
@@ -61,13 +61,13 @@ in

 stdenv.mkDerivation (finalAttrs: {
  pname = "easyeffects";
-  version = "8.2.8";
+  version = "8.2.7";

  src = fetchFromGitHub {
    owner = "wwmm";
    repo = "easyeffects";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-gkUJxEmFfUAKUnr+Gs65y9l0bdNXXd0f8ql0keM2bVs=";
+    hash = "sha256-YYwVoqCRVAZVu8vCTN3ZSicy1Fzw3l+hQbooGAE/AEI=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/i2/i2p/package.nix
+++ b/pkgs/by-name/i2/i2p/package.nix
@@ -32,7 +32,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "i2p";
-  version = "2.13.0";
+  version = "2.12.0";

  src = fetchzip {
    urls = [
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
      "https://files.i2p-projekt.de/"
      "https://download.i2p2.no/releases/"
    ]);
-    hash = "sha256-fCtjCKbvad8Uk+1ir1suJ0MqV8JjAcmOKXJicbUtKls=";
+    hash = "sha256-gpxmCNtatF6wVvBBB5/LWzgL5e7i8c145dQ/yzldwwQ=";
  };

  strictDeps = true;
--- a/pkgs/by-name/in/intel-compute-runtime/package.nix
+++ b/pkgs/by-name/in/intel-compute-runtime/package.nix
@@ -12,13 +12,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "intel-compute-runtime";
-  version = "26.27.39122.11";
+  version = "26.22.38646.4";

  src = fetchFromGitHub {
    owner = "intel";
    repo = "compute-runtime";
    tag = finalAttrs.version;
-    hash = "sha256-CbOtBgYlvn5r15gB7skmmZ+ZvRwq7FFtouICakku0ls=";
+    hash = "sha256-YjCRbYsq44U+pwdTnyA5lffJtSHVK2u3R2XRRNb6l9c=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ja/jan/package.nix
+++ b/pkgs/by-name/ja/jan/package.nix
@@ -12,16 +12,16 @@

 let
  pname = "Jan";
-  version = "0.8.4";
+  version = "0.8.3";

  darwin-src = fetchzip {
    url = "https://github.com/janhq/jan/releases/download/v${version}/jan-mac-universal-${version}.zip";
-    hash = "sha256-hK9cu9c2kJRCJ3iy0CucRP0whgDgF5K29JgR4AIKXVg=";
+    hash = "sha256-h2v71DzXez/+wlEp8IMVBk33LlXPhNPJ1UPNLYPShoE=";
  };

  linux-src = fetchurl {
    url = "https://github.com/janhq/jan/releases/download/v${version}/Jan_${version}_amd64.AppImage";
-    hash = "sha256-NNTIq02kisIjINS2TCh0Rb2UyRMSlJLR2+uzZmWxSVo=";
+    hash = "sha256-vEmioWQ4ic/FrtNFMKaLOcEy2BTRdouPc4PYWk90ZBI=";
  };

  appimageContents = appimageTools.extractType2 {
--- a/pkgs/by-name/ke/ketesa/package.nix
+++ b/pkgs/by-name/ke/ketesa/package.nix
@@ -17,18 +17,18 @@ assert lib.asserts.assertMsg (

 stdenv.mkDerivation (finalAttrs: {
  pname = "ketesa";
-  version = "1.4.0";
+  version = "1.3.0";

  src = fetchFromGitHub {
    owner = "etkecc";
    repo = "ketesa";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-tW7lOYl/TNQgvsMFMDQKXzqzzfnxNIUQ8Iqld8M5Hjc=";
+    hash = "sha256-0YNCPOkWIzXMfs6Jptn+PBRHxuees6zVh7RpTXZKywQ=";
  };

  yarnOfflineCache = fetchYarnDeps {
    yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-+xWyq/jGJke4HQ6p37y+fJJ73wxNmNMKA3zrP6ANh8E=";
+    hash = "sha256-NJGAchoEVgIOjQyH9mNh7h4BZmq4HV2FjHOBhL88ZWw=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/le/level-zero/package.nix
+++ b/pkgs/by-name/le/level-zero/package.nix
@@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "level-zero";
-  version = "1.32.0";
+  version = "1.31.0";

  src = fetchFromGitHub {
    owner = "oneapi-src";
    repo = "level-zero";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-u8q8VOuJKUCFNJ8aLR/BrVx9lU5vD+hwkHRmy77vFe8=";
+    hash = "sha256-/3HVvivHKSwvrrFEU7LHP2H/6bHDBDyI1SVr/3A6Ie0=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/nf/nfs-ganesha/package.nix
+++ b/pkgs/by-name/nf/nfs-ganesha/package.nix
@@ -27,7 +27,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "nfs-ganesha";
-  version = "12.0";
+  version = "11.1";

  outputs = [
    "out"
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "nfs-ganesha";
    repo = "nfs-ganesha";
    tag = "V${finalAttrs.version}";
-    hash = "sha256-a0Hv5smtGgVQCGxMZU/lafNlnRM1w0HgkUIQJ/L+0r0=";
+    hash = "sha256-1l1l8wkGp0N0bYXzhF6IqGm8oGVh6523Jfpq8VucHQs=";
    fetchSubmodules = true;
  };

--- a/pkgs/by-name/oh/oh-my-posh/package.nix
+++ b/pkgs/by-name/oh/oh-my-posh/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule (finalAttrs: {
  pname = "oh-my-posh";
-  version = "29.35.2";
+  version = "29.34.0";

  src = fetchFromGitHub {
    owner = "jandedobbeleer";
    repo = "oh-my-posh";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-/LKJNYR9cmZ7QwC4uVWHUSg10dbk9J846JCWaedYoto=";
+    hash = "sha256-phT2Bupc340jq9nm36UC2eNUYyu6L/K4f38qnKgsqKI=";
  };

-  vendorHash = "sha256-BRJvQwLeqXS30d5ZRSpc1as7DxMDq6ob4VgbP60Y94Q=";
+  vendorHash = "sha256-6DX/x9uWUbwXy9ccB6NIVRKsOc1nJXtctItONAI7zPQ=";

  sourceRoot = "${finalAttrs.src.name}/src";

--- a/pkgs/by-name/op/openresolv/package.nix
+++ b/pkgs/by-name/op/openresolv/package.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "NetworkConfiguration";
    repo = "openresolv";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-I86BHiSI3G4xlYRJC99elHw8RyUd3eHdkV5kiEGRXNE=";
+    rev = "v${finalAttrs.version}";
+    sha256 = "sha256-I86BHiSI3G4xlYRJC99elHw8RyUd3eHdkV5kiEGRXNE=";
  };

  nativeBuildInputs = [ makeWrapper ];
@@ -38,7 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
  '';

  meta = {
-    changelog = "https://github.com/NetworkConfiguration/openresolv/releases/tag/${finalAttrs.src.tag}";
    description = "Program to manage /etc/resolv.conf";
    mainProgram = "resolvconf";
    homepage = "https://roy.marples.name/projects/openresolv";
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -114,7 +114,6 @@ pythonPackages.buildPythonApplication (finalAttrs: {
    "django-allauth"
    "django-auditlog"
    "django-cachalot"
-    "django-filter"
    "django-guardian"
    "drf-spectacular-sidecar"
    "python-dotenv"
--- a/pkgs/by-name/ph/photoprism/backend.nix
+++ b/pkgs/by-name/ph/photoprism/backend.nix
@@ -62,6 +62,7 @@ buildGoModule {
    description = "Photoprism's backend";
    license = lib.licenses.agpl3Only;
    maintainers = with lib.maintainers; [
+      benesim
      ipetkov
    ];
  };
--- a/pkgs/by-name/ph/photoprism/frontend.nix
+++ b/pkgs/by-name/ph/photoprism/frontend.nix
@@ -27,6 +27,7 @@ buildNpmPackage {
    description = "Photoprism's frontend";
    license = lib.licenses.agpl3Only;
    maintainers = with lib.maintainers; [
+      benesim
      ipetkov
    ];
  };
--- a/pkgs/by-name/ph/photoprism/package.nix
+++ b/pkgs/by-name/ph/photoprism/package.nix
@@ -104,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
    description = "Personal Photo Management powered by Go and Google TensorFlow";
    license = lib.licenses.agpl3Only;
    maintainers = with lib.maintainers; [
+      benesim
      ipetkov
    ];
    mainProgram = "photoprism";
--- a/pkgs/by-name/pt/pt2-clone/package.nix
+++ b/pkgs/by-name/pt/pt2-clone/package.nix
@@ -10,13 +10,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "pt2-clone";
-  version = "1.92";
+  version = "1.91";

  src = fetchFromGitHub {
    owner = "8bitbubsy";
    repo = "pt2-clone";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-gEcaE7Tyr6WoP8trxC9FgLbomZWnjferNSBxaZavR5E=";
+    sha256 = "sha256-Kti3oWkgpdZu3w0FjW3pjYSSkda56Ht/a/oaC3JDHIM=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/by-name/py/pymol/package.nix
+++ b/pkgs/by-name/py/pymol/package.nix
@@ -3,7 +3,6 @@
  lib,
  fetchFromGitHub,
  fetchpatch,
-  fetchpatch2,
  makeDesktopItem,
  cmake,
  python3Packages,
@@ -76,11 +75,6 @@ python3Packages.buildPythonApplication rec {
      url = "https://github.com/schrodinger/pymol-open-source/commit/17c6cbd96d52e9692fd298daec6c9bda273a8aad.patch";
      hash = "sha256-dcYRzUhiaGlR3CjQ0BktA5L+8lFyVdw0+hIz3Li7gDQ=";
    })
-    # Fixes `set` command with int/float arguments, i.e. `set transparency, 0.5`
-    (fetchpatch2 {
-      url = "https://github.com/schrodinger/pymol-open-source/commit/71246845f77ecfa2e14f01887abd180c18ebfb55.patch";
-      hash = "sha256-ES7v38daaDXgbHqtxJ6Pt6Xa3ggKwXcx1txWJWkkLgI=";
-    })
  ];

  postPatch = ''
--- a/pkgs/by-name/rs/rsrpc/package.nix
+++ b/pkgs/by-name/rs/rsrpc/package.nix
@@ -8,16 +8,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "rsrpc";
-  version = "0.28.0";
+  version = "0.27.1";

  src = fetchFromGitHub {
    owner = "SpikeHD";
    repo = "rsRPC";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-L07x93mgTbo+v0Wg91XjCNbRYAltHns8WyrsIrr7pZE=";
+    hash = "sha256-QzPFhdnZXiJZ4g+J9kB2v8duM2PgShptNRHliTYW3AU=";
  };

-  cargoHash = "sha256-YTkOneMUTVLv3SWgeRdYpxGB9PIr+C9NHR1SCHOvDUY=";
+  cargoHash = "sha256-6Krtsj9hm8NqkFQMQ0MAPrFAjnzcTt4q5C1Fs5mx2SM=";

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/by-name/vi/vicinae/package.nix
+++ b/pkgs/by-name/vi/vicinae/package.nix
@@ -21,18 +21,18 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "vicinae";
-  version = "0.23.2";
+  version = "0.23.1";

  src = fetchFromGitHub {
    owner = "vicinaehq";
    repo = "vicinae";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-/5fGvMWlLlyd5ibK7y1dqIK1MTpLABj3v1M0r/VArww=";
+    hash = "sha256-qFDb6I9w9F/KfRVHmwezykv7y/Tb8BjJQD2v5AxlEfU=";
  };

  apiDeps = fetchNpmDeps {
    src = "${finalAttrs.src}/src/typescript/api";
-    hash = "sha256-4FEaBDJK9abcgz+vptuL4wQ8zhp+wpLbbR4Y79BVhEg=";
+    hash = "sha256-Im8fSG9sbaSynrN5gLsWVaPgH5g4Zp+x+FUPIBXrKjg=";
  };

  extensionManagerDeps = fetchNpmDeps {
--- a/pkgs/by-name/ya/yaookctl/package.nix
+++ b/pkgs/by-name/ya/yaookctl/package.nix
@@ -6,13 +6,13 @@
 }:
 python3.pkgs.buildPythonApplication {
  pname = "yaookctl";
-  version = "0-unstable-2026-07-16";
+  version = "0-unstable-2026-07-02";

  src = fetchFromGitLab {
    owner = "yaook";
    repo = "yaookctl";
-    rev = "2082bdb4da0f927372e2c7fdb3c27bc9970e0747";
-    hash = "sha256-/SXBwHO3Tf3YaefgFrvH0oc6+mYHjE9RySt7vLQuoiQ=";
+    rev = "d444a887e0350a62b8b23d761a849ec7db46ad65";
+    hash = "sha256-EWKKwPnR15qkRuhuGRyj5otwUVX+sOmRei4WfN3aRpQ=";
  };

  pyproject = true;
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -301,7 +301,6 @@ final: prev: {

      meta = {
        homepage = "https://lunarmodules.github.io/busted/";
-        maintainers = with lib.maintainers; [ alerque ];
        license = lib.licenses.mit;
        description = "Elegant Lua unit testing";
        longDescription = ''
@@ -518,10 +517,7 @@ final: prev: {

      meta = {
        homepage = "https://github.com/lunarmodules/lua-compat-5.3";
-        maintainers = with lib.maintainers; [
-          vcunat
-          alerque
-        ];
+        maintainers = with lib.maintainers; [ vcunat ];
        license = lib.licenses.mit;
        description = "Compatibility module providing Lua-5.3-style APIs for Lua 5.2 and 5.1";
        longDescription = ''
@@ -1105,15 +1101,15 @@ final: prev: {
    }:
    buildLuarocksPackage {
      pname = "fzf-lua";
-      version = "0.0.2686-1";
+      version = "0.0.2682-1";
      knownRockspec =
        (fetchurl {
-          url = "mirror://luarocks/fzf-lua-0.0.2686-1.rockspec";
-          sha256 = "05n93jkdb3djv8xdanbrcn3nymy1srmx0vgjvk7pjfy1zxxqpiv4";
+          url = "mirror://luarocks/fzf-lua-0.0.2682-1.rockspec";
+          sha256 = "1kqpacp8ycywvdazcychl18xzdiw1bd1ga0780hffig3wgh190ys";
        }).outPath;
      src = fetchzip {
-        url = "https://github.com/ibhagwan/fzf-lua/archive/eced685813841391087fd65f896fc6ce6339a809.zip";
-        sha256 = "0py1ddpsvgb2989y0r4db6i55xffkwn4mwjkxsvx63mfq4nahf8q";
+        url = "https://github.com/ibhagwan/fzf-lua/archive/532d463f5c83595192fe740572d8fd6902b2217a.zip";
+        sha256 = "1wy69gn4fx34jn5l7f8a9x4plbl1axv2aj7dw5q944ni71bwl8h1";
      };

      disabled = luaOlder "5.1";
@@ -1202,15 +1198,15 @@ final: prev: {
    }:
    buildLuarocksPackage {
      pname = "grug-far.nvim";
-      version = "1.6.75-1";
+      version = "1.6.74-1";
      knownRockspec =
        (fetchurl {
-          url = "mirror://luarocks/grug-far.nvim-1.6.75-1.rockspec";
-          sha256 = "08sqp2ibcsc8dn4d4vm4wzp9k8mpi9mzifqb7kaf2hzgza4ddvim";
+          url = "mirror://luarocks/grug-far.nvim-1.6.74-1.rockspec";
+          sha256 = "0g8nb4w6l6bwnpy54xy5qncwn3hp0dcay1gfqrjfsf9j5pm3ysmg";
        }).outPath;
      src = fetchzip {
-        url = "https://github.com/MagicDuck/grug-far.nvim/archive/0f6a5d0d7a70659b11bbcd6b3673ee0fe61b6024.zip";
-        sha256 = "0c77zzmbvddldjmw68fd6czj6w5m42mg5yrrzs73hs9h7ipd9s6s";
+        url = "https://github.com/MagicDuck/grug-far.nvim/archive/1cc080f55706b38aabfa97d40acb6adf59ac4a5a.zip";
+        sha256 = "0aybgj5h8d6ydm304ybgw506rrrvmcdis3pclyjv9adi4z61a9fn";
      };

      disabled = luaOlder "5.1";
@@ -1387,15 +1383,15 @@ final: prev: {
    }:
    buildLuarocksPackage {
      pname = "kulala.nvim";
-      version = "6.21.2-1";
+      version = "6.21.0-1";
      knownRockspec =
        (fetchurl {
-          url = "mirror://luarocks/kulala.nvim-6.21.2-1.rockspec";
-          sha256 = "0w34k8676l7gavnv99v3c2d9m59926ykj509qbri0g927442pcrw";
+          url = "mirror://luarocks/kulala.nvim-6.21.0-1.rockspec";
+          sha256 = "11g9k9gi1cl9bmrcd70p6gy874nql6z0l3wfhiskjwac8385lqj3";
        }).outPath;
      src = fetchzip {
-        url = "https://github.com/mistweaverco/kulala.nvim/archive/v6.21.2.zip";
-        sha256 = "175m953v0v0k12246skdxm8kjagx2drxi2na9qgiak3vb5m5k3l0";
+        url = "https://github.com/mistweaverco/kulala.nvim/archive/v6.21.0.zip";
+        sha256 = "0zglgmxz1lcfzk7x4p6c78drpa60b9rf9bvsnmnbg2w0rypg91wm";
      };

      disabled = luaOlder "5.1";
@@ -1475,7 +1471,6 @@ final: prev: {

      meta = {
        homepage = "http://lunarmodules.github.io/ldoc";
-        maintainers = with lib.maintainers; [ alerque ];
        license = lib.licenses.mit;
        description = "A Lua Documentation Tool";
        longDescription = ''
@@ -2330,7 +2325,6 @@ final: prev: {

      meta = {
        homepage = "https://github.com/lunarmodules/lua-iconv/";
-        maintainers = with lib.maintainers; [ alerque ];
        license = lib.licenses.AND [
          lib.licenses.mit
          lib.licenses.x11
@@ -2920,7 +2914,6 @@ final: prev: {

      meta = {
        homepage = "https://github.com/lunarmodules/lua_cliargs.git";
-        maintainers = with lib.maintainers; [ alerque ];
        license = lib.licenses.mit;
        description = "A command-line argument parsing module for Lua";
        longDescription = ''
@@ -3000,7 +2993,6 @@ final: prev: {

      meta = {
        homepage = "https://github.com/lunarmodules/luacheck";
-        maintainers = with lib.maintainers; [ alerque ];
        license = lib.licenses.mit;
        description = "A static analyzer and a linter for Lua";
        longDescription = ''
@@ -3040,7 +3032,6 @@ final: prev: {

      meta = {
        homepage = "https://lunarmodules.github.ioluacov/";
-        maintainers = with lib.maintainers; [ alerque ];
        license = lib.licenses.mit;
        description = "Coverage analysis tool for Lua scripts";
        longDescription = ''
@@ -3451,10 +3442,7 @@ final: prev: {

      meta = {
        homepage = "https://github.com/lunarmodules/luafilesystem";
-        maintainers = with lib.maintainers; [
-          flosse
-          alerque
-        ];
+        maintainers = with lib.maintainers; [ flosse ];
        license = lib.licenses.AND [
          lib.licenses.mit
          lib.licenses.x11
@@ -3952,10 +3940,7 @@ final: prev: {

      meta = {
        homepage = "https://github.com/brunoos/luasec/wiki";
-        maintainers = with lib.maintainers; [
-          flosse
-          alerque
-        ];
+        maintainers = with lib.maintainers; [ flosse ];
        license = lib.licenses.mit;
        description = "A binding for OpenSSL library to provide TLS/SSL communication over LuaSocket.";
        longDescription = "This version delegates to LuaSocket the TCP connection establishment between the client and server. Then LuaSec uses this connection to start a secure TLS/SSL session.";
@@ -4021,7 +4006,6 @@ final: prev: {

      meta = {
        homepage = "https://github.com/lunarmodules/luasocket";
-        maintainers = with lib.maintainers; [ alerque ];
        license = lib.licenses.mit;
        description = "Network support for the Lua language";
        longDescription = ''
@@ -4102,7 +4086,6 @@ final: prev: {

      meta = {
        homepage = "https://lunarmodules.github.io/busted/";
-        maintainers = with lib.maintainers; [ alerque ];
        license = lib.licenses.mit;
        description = "Lua assertions extension";
        longDescription = ''
@@ -4139,7 +4122,6 @@ final: prev: {

      meta = {
        homepage = "https://github.com/lunarmodules/luasystem";
-        maintainers = with lib.maintainers; [ alerque ];
        license = lib.licenses.mit;
        description = "Platform independent system calls for Lua.";
        longDescription = ''
@@ -5920,7 +5902,6 @@ final: prev: {

      meta = {
        homepage = "https://lunarmodules.github.io/say";
-        maintainers = with lib.maintainers; [ alerque ];
        license = lib.licenses.mit;
        description = "Lua string hashing/indexing library";
        longDescription = ''
--- a/pkgs/development/python-modules/azure-storage-queue/default.nix
+++ b/pkgs/development/python-modules/azure-storage-queue/default.nix
@@ -11,13 +11,13 @@

 buildPythonPackage rec {
  pname = "azure-storage-queue";
-  version = "12.17.0";
+  version = "12.15.0";
  pyproject = true;

  src = fetchPypi {
    pname = "azure_storage_queue";
    inherit version;
-    hash = "sha256-brEIqIVUvjcf6y66lxX6Dj97rKez8AwZ7EF/x85bODQ=";
+    hash = "sha256-TgHcrlrv0MRj97rlx1yKkflVyJPxTtdZD8DNRHrEZm0=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/cassandra-driver/default.nix
+++ b/pkgs/development/python-modules/cassandra-driver/default.nix
@@ -26,14 +26,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "cassandra-driver";
-  version = "3.30.1";
+  version = "3.30.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "apache";
    repo = "cassandra-python-driver";
    tag = finalAttrs.version;
-    hash = "sha256-8AfS9bdks4FLfqnlcDE4tjn5cWdD4g+v1ySLi/4hLV0=";
+    hash = "sha256-4ElOiADaldT/TyLqg/5ijFk9Ygb3GEF37P2d8WdAxkw=";
  };

  pythonRelaxDeps = [ "geomet" ];
--- a/pkgs/development/python-modules/clickhouse-driver/default.nix
+++ b/pkgs/development/python-modules/clickhouse-driver/default.nix
@@ -17,7 +17,7 @@

 buildPythonPackage (finalAttrs: {
  pname = "clickhouse-driver";
-  version = "0.2.11";
+  version = "0.2.10";
  pyproject = true;

  __structuredAttrs = true;
@@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: {
    owner = "mymarilyn";
    repo = "clickhouse-driver";
    tag = finalAttrs.version;
-    hash = "sha256-wXWKTmkzK2UDbNPPzO4yQdAGDILtddE/bQGxznqPANI=";
+    hash = "sha256-veFkmXAp8b6/Npt7f1EhMfM9OKlLugKtlXS+zMHWAro=";
  };

  build-system = [
--- a/pkgs/development/python-modules/django-filter/default.nix
+++ b/pkgs/development/python-modules/django-filter/default.nix
@@ -12,14 +12,14 @@

 buildPythonPackage rec {
  pname = "django-filter";
-  version = "26.1";
+  version = "25.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "carltongibson";
    repo = "django-filter";
    tag = version;
-    hash = "sha256-Sls/imzl2dzUfVcJTUqpCQTDRH9H09uxx27TnU0R0WI=";
+    hash = "sha256-hufqurodhd+cKs8UHvxbn62nfcZRg2Hcv2v/inkUoVg=";
  };

  build-system = [ flit-core ];
--- a/pkgs/development/python-modules/google-cloud-datastore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix
@@ -3,10 +3,8 @@
  buildPythonPackage,
  fetchPypi,
  google-api-core,
-  google-auth,
  google-cloud-core,
  google-cloud-testutils,
-  grpcio,
  libcst,
  mock,
  proto-plus,
@@ -18,13 +16,13 @@

 buildPythonPackage (finalAttrs: {
  pname = "google-cloud-datastore";
-  version = "2.26.0";
+  version = "2.25.0";
  pyproject = true;

  src = fetchPypi {
    pname = "google_cloud_datastore";
    inherit (finalAttrs) version;
-    hash = "sha256-GsSILwM/y5C9ddEXG0ZADs1d7yN2hZiEPZwEHgwLSmo=";
+    hash = "sha256-3WRqPY+ZwnULtfbg8Y7Oe+2V/XbgLayt2/o1orIjKP8=";
  };

  build-system = [ setuptools ];
@@ -33,9 +31,7 @@ buildPythonPackage (finalAttrs: {

  dependencies = [
    google-api-core
-    google-auth
    google-cloud-core
-    grpcio
    proto-plus
    protobuf
  ]
--- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -3,7 +3,6 @@
  buildPythonPackage,
  fetchPypi,
  google-api-core,
-  google-auth,
  google-cloud-testutils,
  grpc-google-iam-v1,
  grpcio-status,
@@ -33,10 +32,10 @@ buildPythonPackage rec {

  dependencies = [
    google-api-core
-    google-auth
    grpc-google-iam-v1
    grpcio
    grpcio-status
+    libcst
    opentelemetry-api
    opentelemetry-sdk
    proto-plus
@@ -70,8 +69,8 @@ buildPythonPackage rec {

  meta = {
    description = "Google Cloud Pub/Sub API client library";
-    homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-pubsub";
-    changelog = "https://github.com/googleapis/google-cloud-python/blob/v${version}/packages/google-cloud-pubsub/CHANGELOG.md";
+    homepage = "https://github.com/googleapis/python-pubsub";
+    changelog = "https://github.com/googleapis/python-pubsub/blob/v${version}/CHANGELOG.md";
    license = lib.licenses.asl20;
    maintainers = [ ];
    mainProgram = "fixup_pubsub_v1_keywords.py";
--- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix
@@ -3,9 +3,7 @@
  buildPythonPackage,
  fetchPypi,
  google-api-core,
-  google-auth,
  grpc-google-iam-v1,
-  grpcio,
  proto-plus,
  protobuf,
  pytest-asyncio,
@@ -15,13 +13,13 @@

 buildPythonPackage rec {
  pname = "google-cloud-secret-manager";
-  version = "2.30.0";
+  version = "2.29.0";
  pyproject = true;

  src = fetchPypi {
    pname = "google_cloud_secret_manager";
    inherit version;
-    hash = "sha256-JuyHc3cxtIP3+VwmqMereeIstmMXyVAG5/aYXbxDyKI=";
+    hash = "sha256-7mQTOvj9s3gK/7ZexszxCrFaARPY7eujiGZfS+h84b4=";
  };

  build-system = [ setuptools ];
@@ -32,9 +30,7 @@ buildPythonPackage rec {

  dependencies = [
    google-api-core
-    google-auth
    grpc-google-iam-v1
-    grpcio
    proto-plus
    protobuf
  ]
--- a/pkgs/development/python-modules/pyzhuyin/default.nix
+++ b/pkgs/development/python-modules/pyzhuyin/default.nix
@@ -1,44 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  wheel,
-  nix-update-script,
-  unittestCheckHook,
-}:
-
-buildPythonPackage (finalAttrs: {
-  pname = "pyzhuyin";
-  version = "0.0.3";
-  pyproject = true;
-  __structuredAttrs = true;
-
-  src = fetchFromGitHub {
-    owner = "rku1999";
-    repo = "python-zhuyin";
-    rev = "82c31bb89871e7567853406471c5849a9c2034f1";
-    hash = "sha256-xFY3Eww1i3n+4oCD2ZEVBCLcGNaX8bC0wS6ayXsPpcY=";
-  };
-
-  build-system = [
-    setuptools
-  ];
-
-  pythonImportsCheck = [
-    "pyzhuyin"
-  ];
-
-  nativeCheckInputs = [
-    unittestCheckHook
-  ];
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Phonetic and Pinyin conversion tool";
-    homepage = "https://pypi.org/project/pyzhuyin";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ vherrmann ];
-  };
-})
--- a/pkgs/development/python-modules/quart/default.nix
+++ b/pkgs/development/python-modules/quart/default.nix
@@ -30,14 +30,14 @@

 buildPythonPackage rec {
  pname = "quart";
-  version = "0.21.0";
+  version = "0.20.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pallets";
    repo = "quart";
    tag = version;
-    hash = "sha256-BrZtknO8Xne5r4CENF0Uz8NVc8Zc+Yu35spvPw7qZ/w=";
+    hash = "sha256-NApev3nRBS4QDMGq8++rSmK5YgeljkaVAsdezsTbZr4=";
  };

  build-system = [ flit-core ];
@@ -67,6 +67,11 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

+  disabledTests = [
+    # click 8.4 compat
+    "test_cli_blueprints"
+  ];
+
  meta = {
    description = "Async Python micro framework for building web applications";
    mainProgram = "quart";
--- a/pkgs/development/python-modules/stone/default.nix
+++ b/pkgs/development/python-modules/stone/default.nix
@@ -5,6 +5,7 @@
  jinja2,
  mock,
  packaging,
+  ply,
  pytestCheckHook,
  setuptools,
  setuptools-scm,
@@ -12,14 +13,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "stone";
-  version = "3.5.3";
+  version = "3.5.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "dropbox";
    repo = "stone";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-79CY4eJcsMrhJvRCdD3brwmPkl8kxLQbGIqxIA9UXPg=";
+    hash = "sha256-05sAhyQx3IalHqNkSrJgRDJz85M331hF5Crc/gtP6jE=";
  };

  postPatch = ''
@@ -37,6 +38,7 @@ buildPythonPackage (finalAttrs: {
  dependencies = [
    jinja2
    packaging
+    ply
  ];

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/swh-export/default.nix
+++ b/pkgs/development/python-modules/swh-export/default.nix
@@ -25,7 +25,7 @@

 buildPythonPackage (finalAttrs: {
  pname = "swh-export";
-  version = "1.11.8";
+  version = "1.11.7";
  pyproject = true;

  src = fetchFromGitLab {
@@ -34,7 +34,7 @@ buildPythonPackage (finalAttrs: {
    owner = "devel";
    repo = "swh-export";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-wqUcoQddN0FJV673u/xcwNuNz/BB9AFWNFEuQPHyVDw=";
+    hash = "sha256-aDIGbkyRMNoQOdlXwqfLyRqDfK6jNFMVFJv67OY1SCg=";
  };

  build-system = [
@@ -71,9 +71,6 @@ buildPythonPackage (finalAttrs: {
    pkgs.pv
  ];

-  # Kafka tests use librdkafka's mock broker bound to the loopback interface.
-  __darwinAllowLocalNetworking = true;
-
  disabledTests = [
    # I don't know how to fix the following error
    # E       fixture 'kafka_server' not found
--- a/pkgs/development/python-modules/tern/default.nix
+++ b/pkgs/development/python-modules/tern/default.nix
@@ -5,7 +5,6 @@
  docker,
  dockerfile-parse,
  fetchPypi,
-  setuptools,
  gitpython,
  idna,
  license-expression,
@@ -18,29 +17,23 @@
  stevedore,
 }:

-buildPythonPackage (finalAttrs: {
+buildPythonPackage rec {
  pname = "tern";
  version = "2.12.1";
-  pyproject = true;
-
-  __structuredAttrs = true;
+  format = "setuptools";

  src = fetchPypi {
-    pname = "tern";
-    inherit (finalAttrs) version;
+    inherit pname version;
    hash = "sha256-yMIvFiliEHrbZMqvX3ZAROWcqii5VmB54QEYHGRJocA=";
  };

-  build-system = [
-    setuptools
-    pbr
-  ];
-
  preBuild = ''
    cp requirements.{in,txt}
  '';

-  dependencies = [
+  nativeBuildInputs = [ pbr ];
+
+  propagatedBuildInputs = [
    pyyaml
    docker
    dockerfile-parse
@@ -64,8 +57,8 @@ buildPythonPackage (finalAttrs: {
    description = "Software composition analysis tool and Python library that generates a Software Bill of Materials for container images and Dockerfiles";
    mainProgram = "tern";
    homepage = "https://github.com/tern-tools/tern";
-    changelog = "https://github.com/tern-tools/tern/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/tern-tools/tern/releases/tag/v${version}";
    license = lib.licenses.bsd2;
    maintainers = [ ];
  };
-})
+}
--- a/pkgs/development/python-modules/textwrap3/default.nix
+++ b/pkgs/development/python-modules/textwrap3/default.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "textwrap3";
+  version = "0.9.2";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "5008eeebdb236f6303dcd68f18b856d355f6197511d952ba74bc75e40e0c3414";
+  };
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
+    description = "Textwrap from Python 3.6 backport plus a few tweaks";
+    homepage = "https://github.com/jonathaneunice/textwrap3";
+    license = lib.licenses.psfl;
+    maintainers = [ ];
+  };
+}
--- a/pkgs/development/python-modules/ueagle/default.nix
+++ b/pkgs/development/python-modules/ueagle/default.nix
@@ -2,27 +2,22 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
-  setuptools,
  requests,
 }:

-buildPythonPackage (finalAttrs: {
+buildPythonPackage rec {
  pname = "ueagle";
  version = "0.0.2";
-  pyproject = true;
-
-  __structuredAttrs = true;
+  format = "setuptools";

  src = fetchFromGitHub {
    owner = "jcalbert";
    repo = "uEagle";
-    tag = finalAttrs.version;
-    hash = "sha256-h4/cUxgBlTLEUDVPEVkPmMdldW8nJB8Gg3VTRVWZvMM=";
+    rev = version;
+    sha256 = "1hxwk5alalvmhc31y917dxsnbiwq1xci2krma3235581319xr3w7";
  };

-  build-system = [ setuptools ];
-
-  dependencies = [ requests ];
+  propagatedBuildInputs = [ requests ];

  # Project has no tests
  doCheck = false;
@@ -35,4 +30,4 @@ buildPythonPackage (finalAttrs: {
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ fab ];
  };
-})
+}
--- a/pkgs/development/python-modules/uwsgi-chunked/default.nix
+++ b/pkgs/development/python-modules/uwsgi-chunked/default.nix
@@ -17,11 +17,6 @@ buildPythonPackage rec {
    hash = "sha256-5TNCnQhnT1gAblgs+AAW62HoNDPM54hpxgCnYl07j3I=";
  };

-  postPatch = ''
-    substituteInPlace uwsgi_chunked/version.py \
-      --replace-fail "0.1" "${version}"
-  '';
-
  build-system = [ setuptools ];

  # requires running containers via docker
--- a/pkgs/development/tools/language-servers/nixd/default.nix
+++ b/pkgs/development/tools/language-servers/nixd/default.nix
@@ -18,20 +18,18 @@
  pkg-config,
  testers,
  python3,
-  libxml2,
-  zlib,
 }:

 let
  nixComponents = nixVersions.nixComponents_2_34;
  common = rec {
-    version = "2.9.2";
+    version = "2.9.1";

    src = fetchFromGitHub {
      owner = "nix-community";
      repo = "nixd";
      tag = version;
-      hash = "sha256-rjLF0nTRuPKVyxXjNlkHG6k4SdcSwjNOW26u/qlP8uA=";
+      hash = "sha256-S/E16Yf3Qh098qXxl0pimSy/5gkkd1n/Os6B9REWleg=";
    };

    nativeBuildInputs = [
@@ -146,16 +144,10 @@ in
        llvmPackages.llvm
        gtest
        boost
-        libxml2
-        zlib
      ];

      nativeBuildInputs = common.nativeBuildInputs ++ [ cmake ];

-      mesonFlags = [ (lib.mesonBool "llvm_static" true) ];
-
-      disallowedRequisites = [ (lib.getLib llvmPackages.llvm) ];
-
      # See https://github.com/nix-community/nixd/issues/519
      doCheck = false;

--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -61,8 +61,8 @@ let
      hash = "sha256-zLXEecqxsAYhMlv+fUyaioAx56Ul1ySeJ17L7IGwjbI=";
    };
    "11" = {
-      version = "11.16.0";
-      hash = "sha256-PyqEhUX4L85pZvPsqot9h7VWP5AaFw4r1XOwIpazgvo=";
+      version = "11.15.0";
+      hash = "sha256-dy+OAPcZr7viJQJxfPl0V4gEYw0C51frPeu8CKD4+Do=";
    };
  };

--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -5,38 +5,38 @@
        "lts": false
    },
    "6.1": {
-        "version": "6.1.178",
-        "hash": "sha256:03vjdk7lk9zgydzamhwvrg066f8748vrfjggqqd2n0vmr9kzm0vx",
+        "version": "6.1.177",
+        "hash": "sha256:0c0ayz4nygcmz4865r7mcgmh7hic4fi7zysnj6vdlyj53bz9nlpn",
        "lts": true
    },
    "5.15": {
-        "version": "5.15.212",
-        "hash": "sha256:1zk51f3pv7ghz68hxkxhds9cjwmk35651pxbyyvyqyhcr7msx5n3",
+        "version": "5.15.211",
+        "hash": "sha256:0qfry534wl5sbm6b4hf6fxqrr6mzf1k9pa2435sqp4hp6vjm9fdy",
        "lts": true
    },
    "5.10": {
-        "version": "5.10.261",
-        "hash": "sha256:1i6pzaib30r1nmyxsrhqmfsdxy1jvvlmzc9f8lxzv9a00q8a3751",
+        "version": "5.10.260",
+        "hash": "sha256:113bka32apz5pfqjfnv97k9hf9arkn5asfcd6cw7snsh65qjka27",
        "lts": true
    },
    "6.6": {
-        "version": "6.6.145",
-        "hash": "sha256:09h1pzcai0i10pdyyfbsmq03rgk1x5wv2d937m5nz2xdv0rhw46y",
+        "version": "6.6.144",
+        "hash": "sha256:1hzcax2ypzhrjzmq4b0jyqyc4al0ncyfcj9pq36phl29gcqbh6gc",
        "lts": true
    },
    "6.12": {
-        "version": "6.12.97",
-        "hash": "sha256:0vswyjh91x52ay99mqrdfhwnvd6nnzv4hpncywk908njpfixzgbc",
+        "version": "6.12.96",
+        "hash": "sha256:1hapz6xz7plq56jc0drbzcsfcm1amlnphwbfhl0klsxkb9finbkx",
        "lts": true
    },
    "6.18": {
-        "version": "6.18.40",
-        "hash": "sha256:0cd42fb4390x73jdzbhacm9g9s0ji58whxhik2ndmr1rr0ggq4ip",
+        "version": "6.18.39",
+        "hash": "sha256:1c4c3wf00pb8x4kxxrmn46n7mgpnnm78sfi2jx0yg5cxmv9f79x7",
        "lts": true
    },
    "7.1": {
-        "version": "7.1.5",
-        "hash": "sha256:1rs162gcf6hsafrrmp3y8k9myn20s3s62xdp4zf39pxw7imik812",
+        "version": "7.1.4",
+        "hash": "sha256:0blfl34vi6vlcdjxd7mbhskl2p7i0zpgdy707a7d6xcn24m94qqw",
        "lts": false
    }
 }
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -659,7 +659,6 @@ mapAliases {
  deltatouch = throw "'deltatouch' has been removed as it depended on qt5 webengine which reached EOL"; # Added 2026-04-25
  desktop-postflop = throw "'desktop-postflop' has been removed as it has been unmaintained upstream since October 2023 and depended on webkitgtk 4.0"; # Added 2026-06-07
  devdocs-desktop = throw "'devdocs-desktop' has been removed as it is unmaintained upstream and vendors insecure dependencies"; # Added 2025-06-11
-  devmem2 = throw "'devmem2' has been removed due to being broken and lack of maintenance. Consider using the devmem command from 'busybox' or 'toybox'."; # Added 2026-07-24
  dfilemanager = throw "'dfilemanager' has been dropped as it was unmaintained"; # Added 2025-06-03
  discord-screenaudio = throw "discord-screenaudio has been removed because it was archived upstream. Use vesktop instead."; # added 2025-11-29
  disk-inventory-x = throw "disk-inventory-x has been removed as it only supported x86_64-darwin"; # Added 2026-07-12
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7981,6 +7981,7 @@ with pkgs;

  qemu_test = lowPrio (
    qemu.override {
+      hostCpuOnly = true;
      nixosTestRunner = true;
    }
  );
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -667,7 +667,6 @@ mapAliases {
  tensorflow-tensorboard = throw "'tensorflow-tensorboard' has been renamed to/replaced by 'tensorboard'"; # Converted to throw 2025-10-29
  tensorflow-tensorboard_2 = throw "'tensorflow-tensorboard_2' has been renamed to/replaced by 'tensorflow-tensorboard'"; # Converted to throw 2025-10-29
  testing-postgresql = throw "testing-postgresql has been removed, since it is unmaintained since 2017"; # added 2025-05-25
-  textwrap3 = throw "'textwrap3' has been removed, since it had no consumers in nixpkgs"; # Added 2026-07-24
  tgcrypto = throw "'tgcrypto' has been removed as it was archived upstream"; # Added 2026-03-21
  Theano = throw "'Theano' has been renamed to/replaced by 'theano'"; # Converted to throw 2025-10-29
  TheanoWithCuda = throw "'TheanoWithCuda' has been renamed to/replaced by 'theanoWithCuda'"; # Converted to throw 2025-10-29
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17174,8 +17174,6 @@ self: super: with self; {

  pyzerproc = callPackage ../development/python-modules/pyzerproc { };

-  pyzhuyin = callPackage ../development/python-modules/pyzhuyin { };
-
  pyzipper = callPackage ../development/python-modules/pyzipper { };

  pyzmq = callPackage ../development/python-modules/pyzmq { };
@@ -20217,6 +20215,8 @@ self: super: with self; {

  textualeffects = callPackage ../development/python-modules/textualeffects { };

+  textwrap3 = callPackage ../development/python-modules/textwrap3 { };
+
  textx = callPackage ../development/python-modules/textx { };

  tf-keras = callPackage ../development/python-modules/tf-keras { };
Author	SHA1	Message	Date
nixpkgs-ci[bot]	1edc097bd2	Merge master into staging-next	2026-07-24 12:31:11 +00:00
nixpkgs-ci[bot]	a0f7233e07	Merge master into staging-next	2026-07-24 06:51:50 +00:00
nixpkgs-ci[bot]	391874228d	Merge master into staging-next	2026-07-24 00:29:28 +00:00
nixpkgs-ci[bot]	9ff109fb87	Merge master into staging-next	2026-07-23 18:27:29 +00:00
nixpkgs-ci[bot]	66c61c3c1e	Merge master into staging-next	2026-07-23 12:33:47 +00:00
nixpkgs-ci[bot]	10d1260d3a	Merge master into staging-next	2026-07-23 06:51:29 +00:00
nixpkgs-ci[bot]	7bd1ed1622	Merge master into staging-next	2026-07-23 00:32:16 +00:00
nixpkgs-ci[bot]	ffe6ce2a14	Merge master into staging-next	2026-07-22 18:26:08 +00:00
nixpkgs-ci[bot]	ea1d43ed8a	Merge master into staging-next	2026-07-22 12:33:42 +00:00
nixpkgs-ci[bot]	1f22863ccd	Merge master into staging-next	2026-07-22 06:53:00 +00:00
nixpkgs-ci[bot]	f412c70cf7	Merge master into staging-next	2026-07-22 00:30:23 +00:00