Merge master into staging-next

pkgs/by-name/bi/bitrise/package.nix

@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "bitrise";
-  version = "2.39.5";
+  version = "2.40.0";
 
   src = fetchFromGitHub {
     owner = "bitrise-io";
     repo = "bitrise";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2AT6coAJFXt0eZicXABojGOHay2oU7pe70IKJX/dyk8=";
+    hash = "sha256-jY1aJAk3O7jAfQAYPpQIgUD+CMxcBAggE0bvWeAEgDk=";
   };
 
   # many tests rely on writable $HOME/.bitrise and require network access

pkgs/by-name/ko/kord/package.nix

@@ -22,7 +22,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
     sha256 = "sha256-CeMh6yB4fGoxtGLbkQe4OMMvBM0jesyP+8JtU5kCP84=";
   };
 
-  cargoHash = "sha256-DpZsi2eIhuetHnLLYGAvv871mbPfAIUevqBLaV8ljGA=";
+  cargoHash = "sha256-ciam95rUUh9iKmhTadqWCy1rU4otuRiQkWg0lGRHzng=";
+
+  cargoPatches = [
+    # bump coreaudio-sys past 0.2.11; bindgen 0.61 panics on apple-sdk-14 anonymous enums
+    ./update-coreaudio-sys.patch
+  ];
 
   patches = [
     # Fixes build issues due to refactored Rust compiler feature annotations.
@@ -35,6 +40,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     })
   ];
 
+  # concat_idents feature gate was removed in rust 1.90; never invoked here.
+  postPatch = ''
+    substituteInPlace src/lib.rs --replace-fail '#![feature(concat_idents)]' ""
+  '';
+
   nativeBuildInputs =
     lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ];

pkgs/by-name/ko/kord/update-coreaudio-sys.patch

@@ -0,0 +1,455 @@
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1,6 +1,6 @@
+ # This file is automatically @generated by Cargo.
+ # It is not intended for manual editing.
+-version = 3
++version = 4
+ 
+ [[package]]
+ name = "adler"
+@@ -47,7 +47,7 @@
+ checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44"
+ dependencies = [
+  "alsa-sys",
+- "bitflags",
++ "bitflags 1.3.2",
+  "libc",
+  "nix",
+ ]
+@@ -106,7 +106,7 @@
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -148,22 +148,20 @@
+ 
+ [[package]]
+ name = "bindgen"
+-version = "0.61.0"
++version = "0.70.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8a022e58a142a46fea340d68012b9201c094e93ec3d033a944a24f8fd4a4f09a"
++checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
+ dependencies = [
+- "bitflags",
++ "bitflags 2.11.1",
+  "cexpr",
+  "clang-sys",
+- "lazy_static",
+- "lazycell",
+- "peeking_take_while",
++ "itertools",
+  "proc-macro2",
+  "quote",
+  "regex",
+  "rustc-hash",
+  "shlex",
+- "syn",
++ "syn 2.0.12",
+ ]
+ 
+ [[package]]
+@@ -173,6 +171,12 @@
+ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+ 
+ [[package]]
++name = "bitflags"
++version = "2.11.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
++
++[[package]]
+ name = "block-buffer"
+ version = "0.10.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -265,7 +269,7 @@
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -325,7 +329,7 @@
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -464,7 +468,7 @@
+ dependencies = [
+  "ansi_term",
+  "atty",
+- "bitflags",
++ "bitflags 1.3.2",
+  "strsim 0.8.0",
+  "textwrap",
+  "unicode-width",
+@@ -477,7 +481,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5"
+ dependencies = [
+- "bitflags",
++ "bitflags 1.3.2",
+  "clap_derive",
+  "clap_lex",
+  "is-terminal",
+@@ -496,7 +500,7 @@
+  "proc-macro-error",
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -639,7 +643,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
+ dependencies = [
+- "bitflags",
++ "bitflags 1.3.2",
+  "core-foundation",
+  "core-graphics-types",
+  "foreign-types",
+@@ -652,7 +656,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
+ dependencies = [
+- "bitflags",
++ "bitflags 1.3.2",
+  "core-foundation",
+  "foreign-types",
+  "libc",
+@@ -676,16 +680,16 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff"
+ dependencies = [
+- "bitflags",
++ "bitflags 1.3.2",
+  "core-foundation-sys 0.6.2",
+  "coreaudio-sys",
+ ]
+ 
+ [[package]]
+ name = "coreaudio-sys"
+-version = "0.2.11"
++version = "0.2.16"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1a9444b94b8024feecc29e01a9706c69c1e26bfee480221c90764200cfd778fb"
++checksum = "2ce857aa0b77d77287acc1ac3e37a05a8c95a2af3647d23b15f263bdaeb7562b"
+ dependencies = [
+  "bindgen",
+ ]
+@@ -800,7 +804,7 @@
+ checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
+ dependencies = [
+  "quote",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -827,7 +831,7 @@
+  "proc-macro2",
+  "quote",
+  "scratch",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -844,7 +848,7 @@
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -868,7 +872,7 @@
+  "proc-macro2",
+  "quote",
+  "strsim 0.9.3",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -879,7 +883,7 @@
+ dependencies = [
+  "darling_core",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -896,7 +900,7 @@
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -907,7 +911,7 @@
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -1075,7 +1079,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "21fe28504d371085fae9ac7a3450f0b289ab71e07c8e57baa3fb68b9e57d6ce5"
+ dependencies = [
+- "bitflags",
++ "bitflags 1.3.2",
+  "byteorder",
+  "core-foundation",
+  "core-graphics",
+@@ -1195,7 +1199,7 @@
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -1463,6 +1467,15 @@
+ ]
+ 
+ [[package]]
++name = "itertools"
++version = "0.13.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
++dependencies = [
++ "either",
++]
++
++[[package]]
+ name = "itoa"
+ version = "1.0.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -1570,12 +1583,6 @@
+ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+ 
+ [[package]]
+-name = "lazycell"
+-version = "1.3.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+-
+-[[package]]
+ name = "libc"
+ version = "0.2.140"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -1757,7 +1764,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
+ dependencies = [
+- "bitflags",
++ "bitflags 1.3.2",
+  "jni-sys",
+  "ndk-sys",
+  "num_enum",
+@@ -1786,7 +1793,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
+ dependencies = [
+- "bitflags",
++ "bitflags 1.3.2",
+  "cfg-if 1.0.0",
+  "libc",
+ ]
+@@ -1824,7 +1831,7 @@
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -1886,7 +1893,7 @@
+  "proc-macro-crate",
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -1901,7 +1908,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "288bd66a5a56d8c97b178412b328419b3fdec261c0cbc4628ddc49cc16db8fc6"
+ dependencies = [
+- "bitflags",
++ "bitflags 1.3.2",
+  "libloading",
+  "nvml-wrapper-sys",
+  "static_assertions",
+@@ -2059,12 +2066,6 @@
+ ]
+ 
+ [[package]]
+-name = "peeking_take_while"
+-version = "0.1.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+-
+-[[package]]
+ name = "percent-encoding"
+ version = "2.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -2100,7 +2101,7 @@
+  "pest_meta",
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -2184,7 +2185,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638"
+ dependencies = [
+- "bitflags",
++ "bitflags 1.3.2",
+  "crc32fast",
+  "flate2",
+  "miniz_oxide",
+@@ -2242,7 +2243,7 @@
+  "proc-macro-error-attr",
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+  "version_check",
+ ]
+ 
+@@ -2361,7 +2362,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+ dependencies = [
+- "bitflags",
++ "bitflags 1.3.2",
+ ]
+ 
+ [[package]]
+@@ -2462,7 +2463,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc"
+ dependencies = [
+- "bitflags",
++ "bitflags 1.3.2",
+  "errno",
+  "io-lifetimes",
+  "libc",
+@@ -2564,7 +2565,7 @@
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -2699,7 +2700,7 @@
+  "proc-macro-error",
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -2748,7 +2749,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "55a0846e7a2c9a8081ff799fc83a975170417ad2a143f644a77ec2e3e82a2b73"
+ dependencies = [
+- "bitflags",
++ "bitflags 1.3.2",
+  "lazy_static",
+  "log",
+  "symphonia-core",
+@@ -2814,7 +2815,7 @@
+ checksum = "6b9567e2d8a5f866b2f94f5d366d811e0c6826babcff6d37de9e1a6690d38869"
+ dependencies = [
+  "arrayvec",
+- "bitflags",
++ "bitflags 1.3.2",
+  "bytemuck",
+  "lazy_static",
+  "log",
+@@ -2903,6 +2904,17 @@
+ ]
+ 
+ [[package]]
++name = "syn"
++version = "2.0.12"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "unicode-ident",
++]
++
++[[package]]
+ name = "tch"
+ version = "0.11.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+@@ -2975,7 +2987,7 @@
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]
+@@ -3253,7 +3265,7 @@
+  "once_cell",
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+  "wasm-bindgen-shared",
+ ]
+ 
+@@ -3287,7 +3299,7 @@
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+  "wasm-bindgen-backend",
+  "wasm-bindgen-shared",
+ ]
+@@ -3493,7 +3505,7 @@
+  "darling",
+  "proc-macro2",
+  "quote",
+- "syn",
++ "syn 1.0.109",
+ ]
+ 
+ [[package]]

pkgs/by-name/li/lint-staged/package.nix

@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "lint-staged";
-  version = "17.0.2";
+  version = "17.0.4";
 
   src = fetchFromGitHub {
     owner = "okonet";
     repo = "lint-staged";
     rev = "v${version}";
-    hash = "sha256-6WlTa1QFQU3lzAv3y9GgJi4FtfFvpnSvDgzyy38TbeQ=";
+    hash = "sha256-E0qShnB3zVz7oL+qPzPzLhEJ9PQDlMc4+L4vpD2enI8=";
   };
 
-  npmDepsHash = "sha256-Ew4nR9G/YqIY5LpEajGyE+wmn+8gHiNPFV4woVkffr8=";
+  npmDepsHash = "sha256-KYltk2z/1nTnaLroTErIu6eTyofvWp/wC1awEf0Ryg0=";
 
   dontNpmBuild = true;
 

pkgs/os-specific/linux/nullfsvfs/default.nix

@@ -6,14 +6,14 @@
   kernelModuleMakeFlags,
 }:
 stdenv.mkDerivation rec {
-  pname = "nullfs";
-  version = "0.22";
+  pname = "nullfsvfs";
+  version = "0.26";
 
   src = fetchFromGitHub {
     owner = "abbbi";
     repo = "nullfsvfs";
     rev = "v${version}";
-    sha256 = "sha256-UJubWx5QfzLAiYTN1BPaziT3gKsTI0OVCmcuwKX3Gp0=";
+    sha256 = "sha256-gEvkl8IKekuiQjY+TVaC72vJ310k2A/kXfR5mxdvPpc=";
   };
 
   hardeningDisable = [ "pic" ];
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/fs/nullfs/"
-    install -p -m 644 nullfs.ko $out/lib/modules/${kernel.modDirVersion}/kernel/fs/nullfs/
+    mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/fs/nullfsvfs/"
+    install -p -m 644 nullfsvfs.ko $out/lib/modules/${kernel.modDirVersion}/kernel/fs/nullfsvfs/
     runHook postInstall
   '';
 

pkgs/top-level/linux-kernels.nix

@@ -621,7 +621,7 @@ in
 
         drbd = callPackage ../os-specific/linux/drbd/driver.nix { };
 
-        nullfs = callPackage ../os-specific/linux/nullfs { };
+        nullfsvfs = callPackage ../os-specific/linux/nullfsvfs { };
 
         msi-ec = callPackage ../os-specific/linux/msi-ec { };
 
@@ -647,6 +647,7 @@ in
         system76-power = lib.warnOnInstantiate "kernelPackages.system76-power is now pkgs.system76-power" pkgs.system76-power; # Added 2024-10-16
         system76-scheduler = lib.warnOnInstantiate "kernelPackages.system76-scheduler is now pkgs.system76-scheduler" pkgs.system76-scheduler; # Added 2024-10-16
         tuxedo-keyboard = self.tuxedo-drivers; # Added 2024-09-28
+        nullfs = self.nullfsvfs; # Added 2026-05-16
         phc-intel = throw "phc-intel drivers are no longer supported by any kernel >=4.17"; # added 2025-07-18
         prl-tools = throw "Parallel Tools no longer provide any kernel module, please use pkgs.prl-tools instead."; # added 2025-10-04
         nvidia_dc_565 = throw "nvidiaPackages.dc_565 has reached end of life, see https://endoflife.date/nvidia"; # added 2026-02-10