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

staging-nixos merge for 2025-10-24 (#455209)

parents 7e51aa48 c790656c
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@

- `hardware.amdgpu.amdvlk` and the `amdvlk` package have been removed, as they have been deprecated by AMD. These have been replaced with the RADV driver from Mesa, which is enabled by default.

- Linux 5.4 and all its variants have been removed since mainline will reach its end of life within the support-span of 25.11.

- The `services.polipo` module has been removed as `polipo` is unmaintained and archived upstream.

- `boot.enableContainers` is only turned on when a declarative NixOS container is defined in `containers`.
+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ let
  kernels = patchedPkgs.linuxKernel.vanillaPackages // {
    inherit (patchedPkgs.linuxKernel.packages)
      linux_6_12_hardened
      linux_rt_5_4
      linux_rt_5_10
      linux_rt_5_15
      linux_rt_6_1
+2 −2
Original line number Diff line number Diff line
@@ -146,11 +146,11 @@ stdenv.mkDerivation (finalAttrs: {
    + lib.optionalString nixosTestRunner "-for-vm-tests"
    + lib.optionalString toolsOnly "-utils"
    + lib.optionalString userOnly "-user";
  version = "10.1.0";
  version = "10.1.2";

  src = fetchurl {
    url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz";
    hash = "sha256-4FFzSbUMpz6+wvqFsGBQ1cRjymXHOIM72PwfFfGAvlE=";
    hash = "sha256-nXXzMcGly5tuuP2fZPVj7C6rNGyCLLl/izXNgtPxFHk=";
  };

  depsBuildBuild = [
+2 −2
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "bind";
  version = "9.20.13";
  version = "9.20.15";

  src = fetchurl {
    url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/bind-${finalAttrs.version}.tar.xz";
    hash = "sha256-FR+TdurTF+ZGpdDJ8BwGA4bYkRGNdDen+Cm7lyfHs0w=";
    hash = "sha256-1is4+uSLqD/KYYERLQxxAY2LDyzihdx53GoDZ3Isyrs=";
  };

  outputs = [
+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ let
in
python3Packages.buildPythonApplication rec {
  pname = "nixos-rebuild-ng";
  version = "0.0.0";
  version = lib.trivial.release;
  src = ./src;
  pyproject = true;

Loading