From 206c619d347d741bb531ca46b0341509cb21b96e Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 4 Feb 2026 22:16:31 +0000 Subject: [PATCH 1/7] nixos-rebuild-ng: use sys.excepthook() to print CalledProcessError exceptions This will give a better error output (e.g., colorized). --- .../ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index aeae7b435523..e1a5de0ac21b 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -377,7 +377,7 @@ def main() -> None: try: execute(sys.argv) except CalledProcessError as ex: - _handle_called_process_error(ex) + sys.exit(_handle_called_process_error(ex)) except (Exception, KeyboardInterrupt) as ex: if logger.isEnabledFor(logging.DEBUG): raise @@ -385,11 +385,9 @@ def main() -> None: sys.exit(str(ex)) -def _handle_called_process_error(ex: CalledProcessError) -> None: +def _handle_called_process_error(ex: CalledProcessError) -> int: if logger.isEnabledFor(logging.DEBUG): - import traceback - - traceback.print_exception(ex) + sys.excepthook(*sys.exc_info()) else: import shlex @@ -410,4 +408,4 @@ def _handle_called_process_error(ex: CalledProcessError) -> None: print(str(ex), file=sys.stderr) # Exit with the error code of the process that failed - sys.exit(ex.returncode) + return ex.returncode From eb95d74011dfcf9f51cb934cefa8d2933defe918 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 4 Feb 2026 22:34:18 +0000 Subject: [PATCH 2/7] nixos-rebuild-ng: fix Ctrl+D exit code --- .../by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index e1a5de0ac21b..ad0f45b3971b 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -376,9 +376,11 @@ def main() -> None: try: execute(sys.argv) + except KeyboardInterrupt: + sys.exit(130) except CalledProcessError as ex: sys.exit(_handle_called_process_error(ex)) - except (Exception, KeyboardInterrupt) as ex: + except Exception as ex: if logger.isEnabledFor(logging.DEBUG): raise else: From 68f6eca98b645f4285e6ad6f8fee586a0aef2192 Mon Sep 17 00:00:00 2001 From: Ben Pye Date: Fri, 6 Feb 2026 21:02:29 -0800 Subject: [PATCH 3/7] linux/common-config: enable DSI output for RK3588 SoCs --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index d909526a5aef..5d45d4526774 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -591,6 +591,8 @@ let DRM_VC4_HDMI_CEC = yes; # Enable HDMI out on platforms using the RK3588 lineup of SoCs. ROCKCHIP_DW_HDMI_QP = whenAtLeast "6.13" yes; + # Enable DSI out on platforms using the RK3588 lineup of SoCs. + ROCKCHIP_DW_MIPI_DSI2 = whenAtLeast "6.16" yes; }; # Enable Rust and features that depend on it From ee05797c0c8c0f15fa8c9efeedb87373c3bef45b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 8 Feb 2026 14:57:15 +0200 Subject: [PATCH 4/7] mkpasswd: split man output --- pkgs/tools/security/mkpasswd/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index 59c9c411af81..9f2e36ed7bd0 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation { buildPhase = "make mkpasswd"; installPhase = "make install-mkpasswd"; + outputs = [ + "out" + "man" + ]; + meta = { homepage = "https://packages.qa.debian.org/w/whois.html"; description = "Overfeatured front-end to crypt, from the Debian whois package"; From c4a1ebe40935fb02a15362acaed48ddae653972e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 8 Feb 2026 15:26:43 +0200 Subject: [PATCH 5/7] sudo: split man, doc & dev outputs --- pkgs/by-name/su/sudo/package.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/by-name/su/sudo/package.nix b/pkgs/by-name/su/sudo/package.nix index f916f8d53377..781761698db3 100644 --- a/pkgs/by-name/su/sudo/package.nix +++ b/pkgs/by-name/su/sudo/package.nix @@ -54,6 +54,18 @@ stdenv.mkDerivation (finalAttrs: { "--with-sssd-lib=${sssd}/lib" ]; + outputs = [ + "out" + "man" + "doc" + "dev" + ]; + # The default stdenv ./configure flags for some reason cause the upstream's + # Makefile to `mkdir /var/db`, which fails in the sandbox. Since we split + # only trivial outputs - a single header and documentation, we can safely set + # the following: + setOutputFlags = false; + postConfigure = '' cat >> pathnames.h <<'EOF' #undef _PATH_MV From efcd42d1bd8755589b48d3b7c24cad5384230b34 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 31 Jan 2026 13:57:02 +1000 Subject: [PATCH 6/7] linuxPackages: 6.12 -> 6.18 --- nixos/doc/manual/release-notes/rl-2605.section.md | 2 +- nixos/modules/tasks/filesystems/bcachefs.nix | 3 --- pkgs/top-level/linux-kernels.nix | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 2396dcef6fa3..83e38523f57c 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -4,7 +4,7 @@ -- Create the first release note entry in this section! +- The default kernel package has been updated from 6.12 to 6.18. All supported kernels remain available. ## New Modules {#sec-release-26.05-new-modules} diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index d6d08f232738..481773991206 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -242,9 +242,6 @@ in } ]; - # Use LTS that bcachefs is compatible with. - boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_6_18; - # needed for systemd-remount-fs system.fsPackages = [ cfg.package ]; services.udev.packages = [ cfg.package ]; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 25903de56d17..553e76c88f98 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -812,7 +812,7 @@ in ); packageAliases = { - linux_default = packages.linux_6_12; + linux_default = packages.linux_6_18; # Update this when adding the newest kernel major version! linux_latest = packages.linux_6_19; linux_rt_default = packages.linux_rt_5_15; From c9ddb6dbcb69474e28cc80d14f057d00ef03ffb1 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 31 Jan 2026 14:10:20 +1000 Subject: [PATCH 7/7] linux_hardened: pin to linux_6_12_hardened --- pkgs/top-level/linux-kernels.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 553e76c88f98..ee208018b454 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -278,7 +278,7 @@ in linux_6_12_hardened = hardenedKernelFor kernels.linux_6_12 { }; - linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { }; + linux_hardened = linux_6_12_hardened; } // lib.optionalAttrs config.allowAliases { linux_libre = throw "linux_libre has been removed due to lack of maintenance";