nix/10.nixos-hardware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

treewide: drop 24.05 compat

Browse source
This commit is contained in:
Sandro Jäckel 2026-01-11 01:05:37 +01:00
parent b2101de0f8
commit 8781e10a1c
No known key found for this signature in database
GPG key ID: 236B6291555E8401
10 changed files with 1 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

1
apple/macbook-pro/10-1/default.nix
View file

@ -4,7 +4,6 @@
imports = [
../.
../../../common/pc/ssd
../../../common/gpu/24.05-compat.nix
../../../common/gpu/nvidia/kepler
];

1
apple/macmini/4/default.nix
View file

@ -8,7 +8,6 @@ in
{
imports = [
../.
../../../common/gpu/24.05-compat.nix
];
services.xserver.videoDrivers = mkDefault [ "nvidiaLegacy340" ];

24
common/gpu/24.05-compat.nix
View file

@ -1,24 +0,0 @@
{
lib,
...
}:
{
# Backward-compat for 24.05, can be removed after we drop 24.05 support
imports = lib.optionals (lib.versionOlder lib.version "24.11pre") [
(lib.mkAliasOptionModule [ "hardware" "graphics" "enable" ] [ "hardware" "opengl" "enable" ])
(lib.mkAliasOptionModule
[ "hardware" "graphics" "extraPackages" ]
[ "hardware" "opengl" "extraPackages" ]
)
(lib.mkAliasOptionModule
[ "hardware" "graphics" "extraPackages32" ]
[ "hardware" "opengl" "extraPackages32" ]
)
(lib.mkAliasOptionModule
[ "hardware" "graphics" "enable32Bit" ]
[ "hardware" "opengl" "driSupport32Bit" ]
)
(lib.mkAliasOptionModule [ "hardware" "graphics" "package" ] [ "hardware" "opengl" "package" ])
(lib.mkAliasOptionModule [ "hardware" "graphics" "package32" ] [ "hardware" "opengl" "package32" ])
];
}

1
common/gpu/amd/default.nix
View file

@ -1,7 +1,6 @@
{ lib, ... }:
{
imports = [ ../24.05-compat.nix ];
config = {
services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ];

2
common/gpu/intel/default.nix
View file

@ -5,8 +5,6 @@
...
}:
{
imports = [ ../24.05-compat.nix ];
options.hardware.intelgpu = {
driver = lib.mkOption {
description = "Intel GPU driver to use";

1
common/gpu/nvidia/default.nix
View file

@ -1,6 +1,5 @@
{ lib, ... }:
{
imports = [ ../24.05-compat.nix ];
services.xserver.videoDrivers = lib.mkDefault [ "nvidia" ];
}

3
gpd/pocket-3/default.nix
View file

@ -1,13 +1,12 @@
{ lib, pkgs, ... }:
let
inherit (lib) mkDefault mkIf;
inherit (lib) mkDefault;
in
{
imports = [
../../common/pc/laptop
../../common/pc/ssd
../../common/hidpi.nix
../../common/gpu/24.05-compat.nix
];
# Necessary kernel modules

3
lenovo/thinkpad/p1/3th-gen/nvidia.nix
View file

@ -1,8 +1,5 @@
{ lib, ... }:
{
imports = [
../../../../common/gpu/24.05-compat.nix
];
hardware = {
graphics = {
enable = lib.mkDefault true;

1
lenovo/thinkpad/p51/default.nix
View file

@ -1,7 +1,6 @@
{ config, lib, ... }:
{
imports = [
../../../common/gpu/24.05-compat.nix
../../../common/gpu/nvidia/prime.nix
../../../common/gpu/nvidia/maxwell
../../../common/cpu/intel/kaby-lake

1
lenovo/thinkpad/p52/default.nix
View file

@ -1,7 +1,6 @@
{ lib, config, ... }:
{
imports = [
../../../common/gpu/24.05-compat.nix
../../../common/gpu/nvidia/prime.nix
../../../common/gpu/nvidia/pascal
../../../common/cpu/intel