Unverified Commit a1645330 authored by K900's avatar K900 Committed by GitHub
Browse files

staging-nixos merge for 2026-02-09 (#488714)

parents 23cef02b 9192c8ca
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

- 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}

+0 −3
Original line number Diff line number Diff line
@@ -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 ];
+7 −7
Original line number Diff line number Diff line
@@ -376,20 +376,20 @@ def main() -> None:

    try:
        execute(sys.argv)
    except KeyboardInterrupt:
        sys.exit(130)
    except CalledProcessError as ex:
        _handle_called_process_error(ex)
    except (Exception, KeyboardInterrupt) as ex:
        sys.exit(_handle_called_process_error(ex))
    except Exception as ex:
        if logger.isEnabledFor(logging.DEBUG):
            raise
        else:
            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 +410,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
+12 −0
Original line number Diff line number Diff line
@@ -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
+2 −0
Original line number Diff line number Diff line
@@ -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
Loading