Merge master into staging-nixos

Author: nixpkgs-ci[bot]

doc/release-notes/rl-2605.section.md

@@ -94,6 +94,10 @@
 
 - `python3Packages.pygame` has been been renamed to `python3Packages.pygame-original`, the attribute `python3Packages.pygame` will from python 3.14 default to the more actively maintained `python3Packages.pygame-ce`
 
+- `peertube` has been updated from `7.3.0` to `8.0.2`, introducing several breaking changes.
+  Some notable new features include channel collaboration and video player redesign with a new theme.
+  For details on how to upgrade, see the `IMPORTANT NOTES` section of the [v8.0.0 CHANGELOG entry](https://docs.joinpeertube.org/CHANGELOG#v8-0-0).
+
 - `python3Packages.gradio` has been updated to version 6. See upstream's migration guide at https://www.gradio.app/main/guides/gradio-6-migration-guide.
 
 - `vicinae` has been updated to v0.17. Version 0.17 contains a complete overhaul of the configuration system. For update instructions, see the [release notes for v0.17.0](https://github.com/vicinaehq/vicinae/releases/tag/v0.17.0) and the [upstream configuration documentation](https://docs.vicinae.com/config).

maintainers/maintainer-list.nix

@@ -24779,6 +24779,14 @@
     githubId = 1505617;
     name = "Sean Lee";
   };
+  sleroq = {
+    name = "Sleroq";
+    email = "sleroq@cum.army";
+    github = "sleroq";
+    matrix = "@sleroq:sleroq.link";
+    githubId = 52239427;
+    keys = [ { fingerprint = "2502 640F 4254 7933 FEF1  7A33 3414 5C1D B76E 618F"; } ];
+  };
   SlothOfAnarchy = {
     email = "slothofanarchy1@gmail.com";
     matrix = "@michel.weitbrecht:helsinki-systems.de";
@@ -27136,12 +27144,6 @@
     githubId = 5623227;
     name = "Quentin Boyer";
   };
-  TredwellGit = {
-    email = "tredwell@tutanota.com";
-    github = "TredwellGit";
-    githubId = 61860346;
-    name = "Tredwell";
-  };
   treemo = {
     email = "matthieu.chevrier@treemo.fr";
     github = "treemo";

nixos/modules/tasks/filesystems/bcachefs.nix

@@ -242,8 +242,8 @@ in
           }
         ];
 
-        # Bcachefs upstream recommends using the latest kernel
-        boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
+        # Use LTS that bcachefs is compatible with.
+        boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_6_18;
 
         # needed for systemd-remount-fs
         system.fsPackages = [ cfg.package ];

pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix

@@ -10,13 +10,13 @@
 }:
 vimUtils.buildVimPlugin rec {
   pname = "codediff.nvim";
-  version = "2.16.3";
+  version = "2.19.0";
 
   src = fetchFromGitHub {
     owner = "esmuellert";
     repo = "codediff.nvim";
     tag = "v${version}";
-    hash = "sha256-nIDjE5hf5kt3diEFgUEBz4dCxHatCYtdHY5Zc4YlHFg=";
+    hash = "sha256-l8bP8NNCoE7SLRMRh+Nq5OxUD+xdJ2qYyWbA140aFV0=";
   };
 
   dependencies = [ vimPlugins.nui-nvim ];

pkgs/applications/emulators/libretro/cores/fbneo.nix

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fbneo";
-  version = "0-unstable-2026-01-18";
+  version = "0-unstable-2026-02-08";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "fbneo";
-    rev = "3faea4f9c678bad8063f3a2774b051f42848c856";
-    hash = "sha256-tH9XMBfg3O2oKIUeKWi2hl4yQuHa9BMgvkWjIxv/KIo=";
+    rev = "e21e3f3c40eb4422b93b8984ef46fe04cdaee9db";
+    hash = "sha256-7hZ2TJwHtgyHd+CZahazXZnKhfNpWZqfev9jtTHlmag=";
   };
 
   makefile = "Makefile";

pkgs/applications/emulators/libretro/cores/mame.nix

@@ -9,13 +9,13 @@
 }:
 mkLibretroCore {
   core = "mame";
-  version = "0-unstable-2026-01-01";
+  version = "0-unstable-2026-01-31";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame";
-    rev = "b207f9c6fc93b9d21417a9e4424607840c71db6b";
-    hash = "sha256-n9vDYSzij01rRgUc8l763FCLXsFGHIsZxAIZ+N8IBGo=";
+    rev = "6cdc40fc53ba5574073d4009b531fda07156ff49";
+    hash = "sha256-4XmQsVuieIEcLTP1CJfNrJjXD2ENkh4MPLkTVjrx8dE=";
     fetchSubmodules = true;
   };
 

pkgs/applications/networking/cluster/k3s/default.nix

@@ -12,51 +12,15 @@ let
   extraArgs = removeAttrs args [ "callPackage" ];
 in
 {
-  k3s_1_32 = common (
-    (import ./1_32/versions.nix)
-    // {
-      updateScript = [
-        ./update-script.sh
-        "32"
-      ];
-    }
-  ) extraArgs;
+  k3s_1_32 = common (import ./1_32/versions.nix) extraArgs;
 
-  k3s_1_33 = common (
-    (import ./1_33/versions.nix)
-    // {
-      updateScript = [
-        ./update-script.sh
-        "33"
-      ];
-    }
-  ) extraArgs;
+  k3s_1_33 = common (import ./1_33/versions.nix) extraArgs;
 
-  k3s_1_34 =
-    (common (
-      (import ./1_34/versions.nix)
-      // {
-        updateScript = [
-          ./update-script.sh
-          "34"
-        ];
-      }
-    ) extraArgs).overrideAttrs
-      {
-        patches = [ ./go_runc_require.patch ];
-      };
+  k3s_1_34 = (common (import ./1_34/versions.nix) extraArgs).overrideAttrs {
+    patches = [ ./go_runc_require.patch ];
+  };
 
-  k3s_1_35 =
-    (common (
-      (import ./1_35/versions.nix)
-      // {
-        updateScript = [
-          ./update-script.sh
-          "35"
-        ];
-      }
-    ) extraArgs).overrideAttrs
-      {
-        patches = [ ./go_runc_require.patch ];
-      };
+  k3s_1_35 = (common (import ./1_35/versions.nix) extraArgs).overrideAttrs {
+    patches = [ ./go_runc_require.patch ];
+  };
 }

pkgs/applications/networking/cluster/rke2/README.md

@@ -108,19 +108,9 @@ respective package block.
 
 ```nix
 {
-  rke2_1_34 =
-    (common (
-      (import ./1_34/versions.nix)
-      // {
-        updateScript = [
-          ./update-script.sh
-          "34"
-        ];
-      }
-    ) extraArgs).overrideAttrs
-      {
-        meta.knownVulnerabilities = [ "rke2_1_34 has reached end-of-life on 2026-10-27" ];
-      };
+  rke2_1_34 = (common (import ./1_34/versions.nix) extraArgs).overrideAttrs {
+    meta.knownVulnerabilities = [ "rke2_1_34 has reached end-of-life on 2026-10-27" ];
+  };
 }
 ```
 

pkgs/applications/networking/cluster/rke2/builder.nix

@@ -4,7 +4,7 @@ lib:
   rke2Commit,
   rke2TarballHash,
   rke2VendorHash,
-  updateScript,
+  updateScript ? null,
   k8sImageTag,
   etcdVersion,
   pauseVersion,

pkgs/applications/networking/cluster/rke2/default.nix

@@ -5,45 +5,13 @@ let
   extraArgs = removeAttrs args [ "callPackage" ];
 in
 rec {
-  rke2_1_32 = common (
-    (import ./1_32/versions.nix)
-    // {
-      updateScript = [
-        ./update-script.sh
-        "32"
-      ];
-    }
-  ) extraArgs;
+  rke2_1_32 = common (import ./1_32/versions.nix) extraArgs;
 
-  rke2_1_33 = common (
-    (import ./1_33/versions.nix)
-    // {
-      updateScript = [
-        ./update-script.sh
-        "33"
-      ];
-    }
-  ) extraArgs;
+  rke2_1_33 = common (import ./1_33/versions.nix) extraArgs;
 
-  rke2_1_34 = common (
-    (import ./1_34/versions.nix)
-    // {
-      updateScript = [
-        ./update-script.sh
-        "34"
-      ];
-    }
-  ) extraArgs;
+  rke2_1_34 = common (import ./1_34/versions.nix) extraArgs;
 
-  rke2_1_35 = common (
-    (import ./1_35/versions.nix)
-    // {
-      updateScript = [
-        ./update-script.sh
-        "35"
-      ];
-    }
-  ) extraArgs;
+  rke2_1_35 = common (import ./1_35/versions.nix) extraArgs;
 
   # Automatically set by update script, changes shouldn't be backported
   rke2_stable = rke2_1_34;