Merge master into staging-next

pkgs/by-name/fe/feishin/package.nix

@@ -16,13 +16,13 @@
 }:
 let
   pname = "feishin";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "jeffvli";
     repo = "feishin";
     tag = "v${version}";
-    hash = "sha256-pQCcj0YBytmDQnOxWpErU8xApE0hGQA39G5XivR82Co=";
+    hash = "sha256-TSjgjNHhPSZ4k7zZTH5e3FCkl6d7B/2w2WCt0S5OW0g=";
   };
 
   electron = electron_39;

pkgs/by-name/ni/nix-user-chroot/package.nix

@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   passthru.updateScript = nix-update-script { };
 
-  NIX_USER_CHROOT_TEST_BUSYBOX = "${pkgsStatic.busybox}/bin/busybox";
+  env.NIX_USER_CHROOT_TEST_BUSYBOX = "${pkgsStatic.busybox}/bin/busybox";
   checkFlags = [
     "--skip=run_nix_install" # Test requires network
   ];

pkgs/by-name/oc/octodns/providers/gandi/package.nix

@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "octodns-gandi";
-  version = "1.1.0";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "octodns";
     repo = "octodns-gandi";
     tag = "v${version}";
-    hash = "sha256-0wtG/W5pkatLQ0rXTnbHDoycWOUzOK3fcDQzt93opCc=";
+    hash = "sha256-HUAWGJ4/v1YxaCskgIqh53M4nH9AlK9xHyGQhe5P6UE=";
   };
 
   build-system = [

pkgs/by-name/u-/u-root/package.nix

@@ -5,7 +5,7 @@
   coreutils,
   bash,
   nix-update-script,
-  fetchpatch,
+  u-root-cmds,
 
   linuxManualConfig,
   fetchurl,
@@ -14,22 +14,15 @@
 
 buildGoModule (finalAttrs: {
   pname = "u-root";
-  version = "0.15.0-unstable-2026-02-12";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "u-root";
     repo = "u-root";
-    rev = "0f23b8374acf4f00b457c69c13c3fe73dd5bab86";
-    hash = "sha256-RwEegwzBpw0r0fPyNhB35hyaAcqSt8dUmYf2N5WrpQQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-QHLVkQJkgTSB9a/QLgl4SKrWje0OhtBpa56zGQK8m+o=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/u-root/u-root/commit/aeeb2aafd6a35416d5941b496e44a94594021424.patch";
-      hash = "sha256-h+b/s9NkreQfFWezEup1DpQjfyiJpHQGTD/RyKmkF8s=";
-    })
-  ];
-
   vendorHash = null;
 
   subPackages = [ "." ];
@@ -62,6 +55,7 @@ buildGoModule (finalAttrs: {
       allowImportFromDerivation = true;
     };
     updateScript = nix-update-script { };
+    tests.u-root-cmds = u-root-cmds;
   };
 
   meta = {
@@ -70,6 +64,8 @@ buildGoModule (finalAttrs: {
       u-root can create a one-binary root file system (initramfs) containing a busybox-like set of tools written in Go.
 
       The package exposes `u-root.kernel-amd64` passthru for a minimal and pre-configured kernel to be used locally with QEMU.
+
+      The u-root commands are available as `u-root-cmds`.
     '';
     homepage = "https://u-root.org/";
     downloadPage = "https://github.com/u-root/u-root";

pkgs/by-name/we/webcord-vencord/package.nix

@@ -1,6 +1,6 @@
 {
   # allow overriding electron
-  electron_39,
+  electron_41,
   webcord,
   replaceVars,
   lib,
@@ -8,7 +8,7 @@
 }:
 
 # nixpkgs-update: no auto update
-(webcord.override { inherit electron_39; }).overrideAttrs (old: {
+(webcord.override { inherit electron_41; }).overrideAttrs (old: {
   pname = "webcord-vencord";
 
   patches = (old.patches or [ ]) ++ [

pkgs/by-name/we/webcord/package.nix

@@ -5,23 +5,23 @@
   copyDesktopItems,
   python3,
   xdg-utils,
-  electron_39,
+  electron_41,
   makeDesktopItem,
   nodejs_22,
 }:
 
 buildNpmPackage.override { nodejs = nodejs_22; } rec {
   pname = "webcord";
-  version = "4.12.1";
+  version = "4.13.0";
 
   src = fetchFromGitHub {
     owner = "SpacingBat3";
     repo = "WebCord";
     tag = "v${version}";
-    hash = "sha256-wUlraWv23BRXag3MNqjQy9Ntwz9UO2jNsNt758+GUXo=";
+    hash = "sha256-XUhaGZkHTLZlOuzh7aN9tIk7uBayiEID4MbmADhwvLs=";
   };
 
-  npmDepsHash = "sha256-quBWEO9mi/dYQDap6ivN8oxDfGcxedqS1E45ExmceE0=";
+  npmDepsHash = "sha256-KJMHQlCW/2AYG2Z0oshyMEvFiKsZgG4NKmsHMYrnyUE=";
 
   makeCacheWritable = true;
 
@@ -56,7 +56,7 @@ buildNpmPackage.override { nodejs = nodejs_22; } rec {
       install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png
 
       # Add xdg-utils to path via suffix, per PR #181171
-      makeWrapper '${lib.getExe electron_39}' $out/bin/webcord \
+      makeWrapper '${lib.getExe electron_41}' $out/bin/webcord \
         --suffix PATH : "${binPath}" \
         --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
         --add-flags $out/lib/node_modules/webcord/

pkgs/development/ocaml-modules/httpcats/default.nix

@@ -19,13 +19,13 @@
 
 buildDunePackage (finalAttrs: {
   pname = "httpcats";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "robur-coop";
     repo = "httpcats";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-19WV5pabmeuYmcW3AbnVpT30Sx6TVAPH+ayEeJgRS0Q=";
+    hash = "sha256-I7u/n49WOnpc0EaagsjC4Ts/kz0Xj6YHZv6+QZKLrC4=";
   };
 
   propagatedBuildInputs = [
@@ -48,7 +48,7 @@ buildDunePackage (finalAttrs: {
   ];
 
   meta = {
-    inherit (finalAttrs.src.meta) homepage;
+    homepage = "https://github.com/robur-coop/httpcats/";
     description = "A simple HTTP client / server using h1, h2, and miou";
     changelog = "https://github.com/robur-coop/httpcats/blob/${finalAttrs.src.tag}/CHANGES.md";
     license = lib.licenses.bsd3;

pkgs/kde/misc/klevernotes/default.nix

@@ -9,11 +9,11 @@
 }:
 mkKdeDerivation rec {
   pname = "klevernotes";
-  version = "1.2.5";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/klevernotes/${version}/klevernotes-${version}.tar.xz";
-    hash = "sha256-47iWAcW1IMC50ty0dF900rZvswhgoc78uvUlQate1ko=";
+    hash = "sha256-UK0LwCmAh93TR3/n4IEyTfMKMFhoy7IuVCoI2mk13e0=";
   };
 
   extraBuildInputs = [