diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-03-01 18:01:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-01 18:01:48 +0000 |
| commit | 736c488efeeed48ee0b81d73a6c8a6e7c35ead72 (patch) | |
| tree | 5d51aee9380715f6ee5f79fd40cff7758a9c9f4b /nixos | |
| parent | c291b8a8ab1a4a77bc2762550e52304caff8a0c6 (diff) | |
| parent | 904a60778b32196bb1d517340fd2912d4fe27b5e (diff) | |
| download | nixlib-736c488efeeed48ee0b81d73a6c8a6e7c35ead72.tar nixlib-736c488efeeed48ee0b81d73a6c8a6e7c35ead72.tar.gz nixlib-736c488efeeed48ee0b81d73a6c8a6e7c35ead72.tar.bz2 nixlib-736c488efeeed48ee0b81d73a6c8a6e7c35ead72.tar.lz nixlib-736c488efeeed48ee0b81d73a6c8a6e7c35ead72.tar.xz nixlib-736c488efeeed48ee0b81d73a6c8a6e7c35ead72.tar.zst nixlib-736c488efeeed48ee0b81d73a6c8a6e7c35ead72.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2305.section.md | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index f6a37b92a098..f7637ac89d23 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -136,6 +136,8 @@ In addition to numerous new and upgraded packages, this release has the followin [upstream's release notes](https://github.com/iputils/iputils/releases/tag/20221126) for more details and available replacements. +- [services.xserver.videoDrivers](options.html#opt-services.xserver.videoDrivers) now defaults to the `modesetting` driver over device-specific ones. The `radeon`, `amdgpu` and `nouveau` drivers are still available, but effectively unmaintained and not recommended for use. + ## Other Notable Changes {#sec-release-23.05-notable-changes} <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 83a71dcf23e0..adb079c87a8b 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -256,7 +256,7 @@ in videoDrivers = mkOption { type = types.listOf types.str; - default = [ "amdgpu" "radeon" "nouveau" "modesetting" "fbdev" ]; + default = [ "modesetting" "fbdev" ]; example = [ "nvidia" "nvidiaLegacy390" "nvidiaLegacy340" "nvidiaLegacy304" "amdgpu-pro" |