Skip to content

Commit c6c9088

Browse files
Mic92Mic92
committed
drop acpi_call from nixos-hardware
fixes #1114 and tlp also no longer recommands it.
1 parent fe01780 commit c6c9088

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+5
-68
lines changed

‎apple/imac/18-2/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
../../../common/gpu/amd
1111
../../../common/hidpi.nix
1212
../../../common/pc/laptop/ssd
13-
../../../common/pc/laptop/acpi_call.nix
1413
];
1514

1615
# apple smc (TODO: check spi)

‎apple/macbook-pro/14-1/default.nix

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
../../../common/cpu/intel/kaby-lake
1010
../../../common/hidpi.nix
1111
../../../common/pc/laptop/ssd
12-
../../../common/pc/laptop/acpi_call.nix
1312
];
1413

1514
# Make the keyboard work in stage1, enable iommu
@@ -41,9 +40,9 @@
4140
AttrKeyboardIntegration=internal
4241
'';
4342

44-
# Wifi, CPU Microcode FW updates
43+
# Wifi, CPU Microcode FW updates
4544
networking.enableB43Firmware = lib.mkDefault true;
46-
hardware = {
45+
hardware = {
4746
enableRedistributableFirmware = lib.mkDefault true;
4847
cpu.intel.updateMicrocode = lib.mkDefault true;
4948
};

‎asus/zephyrus/ga402x/shared.nix

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ in {
1616
../../../common/cpu/amd/pstate.nix
1717
../../../common/gpu/amd
1818
../../../common/pc/laptop
19-
../../../common/pc/laptop/acpi_call.nix
2019
../../../common/pc/ssd
2120
];
2221

‎common/pc/laptop/acpi_call.nix

-10
This file was deleted.

‎dell/xps/13-9300/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ in {
77
imports = [
88
../../../common/cpu/intel
99
../../../common/pc/laptop
10-
../../../common/pc/laptop/acpi_call.nix
1110
../../../common/pc/ssd
1211
../sleep-resume/i2c-designware
1312
];

‎dell/xps/13-9370/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
imports = [
55
../../../common/cpu/intel/kaby-lake
66
../../../common/pc/laptop
7-
../../../common/pc/laptop/acpi_call.nix
87
];
98

109
# Force S3 sleep mode. See README.wiki for details.

‎dell/xps/13-9380/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
imports = [
33
../../../common/cpu/intel
44
../../../common/pc/laptop
5-
../../../common/pc/laptop/acpi_call.nix
65
];
76

87
# Force S3 sleep mode. See README.wiki for details.

‎flake.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@
330330
common-pc = import ./common/pc;
331331
common-pc-hdd = import ./common/pc/hdd;
332332
common-pc-laptop = import ./common/pc/laptop;
333-
common-pc-laptop-acpi_call = import ./common/pc/laptop/acpi_call.nix;
333+
common-pc-laptop-acpi_call = throw "common-pc-laptop-acpi_call has been removed because it is obsolete: https://github.com/NixOS/nixos-hardware/issues/1114";
334334
common-pc-laptop-hdd = import ./common/pc/laptop/hdd;
335335
common-pc-laptop-ssd = import ./common/pc/ssd;
336336
common-pc-ssd = import ./common/pc/ssd;

‎focus/m2/gen1/default.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
../../../common/gpu/nvidia/prime.nix
77
../../../common/gpu/nvidia/turing
88
../../../common/pc/laptop
9-
../../../common/pc/laptop/acpi_call.nix
9+
gc
1010
../../../common/pc/laptop/ssd
1111
];
1212

‎hp/elitebook/830/g6/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
imports = [
44
../../../../common/cpu/intel
55
../../../../common/pc/laptop
6-
../../../../common/pc/laptop/acpi_call.nix
76
../../../../common/pc/laptop/ssd
87
];
98

‎hp/elitebook/845/g7/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
../../../../common/cpu/amd/pstate.nix
88
../../../../common/gpu/amd
99
../../../../common/pc/laptop
10-
../../../../common/pc/laptop/acpi_call.nix
1110
../../../../common/pc/laptop/ssd
1211
];
1312

‎hp/elitebook/845/g8/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
../../../../common/cpu/amd/pstate.nix
88
../../../../common/gpu/amd
99
../../../../common/pc/laptop
10-
../../../../common/pc/laptop/acpi_call.nix
1110
../../../../common/pc/laptop/ssd
1211
];
1312

‎hp/elitebook/845/g9/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
../../../../common/cpu/amd/pstate.nix
88
../../../../common/gpu/amd
99
../../../../common/pc/laptop
10-
../../../../common/pc/laptop/acpi_call.nix
1110
../../../../common/pc/laptop/ssd
1211
];
1312

‎lenovo/ideapad/15alc6/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
../../../common/cpu/amd
66
../../../common/gpu/amd
77
../../../common/pc/laptop
8-
../../../common/pc/laptop/acpi_call.nix
98
../../../common/pc/laptop/ssd
109
];
1110
}

‎lenovo/ideapad/15arh05/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
../../../common/gpu/nvidia/prime.nix
77
../../../common/gpu/nvidia/turing
88
../../../common/pc/laptop
9-
../../../common/pc/laptop/acpi_call.nix
109
../../../common/pc/laptop/ssd
1110
];
1211

‎lenovo/ideapad/slim-5/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
../../../common/cpu/amd
44
../../../common/gpu/amd
55
../../../common/pc/laptop
6-
../../../common/pc/laptop/acpi_call.nix
76
../../../common/pc/laptop/ssd
87
];
98
}

‎lenovo/thinkpad/a475/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
../../../common/gpu/amd
55
../../../common/cpu/amd
66
../../../common/cpu/amd/pstate.nix
7-
../../../common/pc/laptop/acpi_call.nix
87
../../../common/pc/ssd
98
../../../common/pc/laptop/hdd
109
#../../../common/hidpi.nix #hidpi

‎lenovo/thinkpad/e14/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
imports = [
55
../.
66
../../../common/pc/laptop/ssd
7-
../../../common/pc/laptop/acpi_call.nix
87
];
98

109
boot.kernelParams = [

‎lenovo/thinkpad/l13/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
{
33
imports = [
44
../../../common/cpu/intel
5-
../../../common/pc/laptop/acpi_call.nix
65
../../../common/pc/laptop/ssd
76
../.
87
];

‎lenovo/thinkpad/l14/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
imports = [
33
../.
44
../../../common/pc/laptop/ssd
5-
../../../common/pc/laptop/acpi_call.nix
65
];
76

87
boot.kernelParams = [

‎lenovo/thinkpad/p1/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# might need nvidia module but we don't know the PCI ids:
55
# https://github.com/NixOS/nixos-hardware/pull/274#discussion_r650483740
66
#../../../common/gpu/nvidia/prime.nix
7-
../../../common/pc/laptop/acpi_call.nix
87
../../../common/pc/laptop/ssd
98
];
109

‎lenovo/thinkpad/p14s/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
imports = [
88
../.
9-
../../../common/pc/laptop/acpi_call.nix
109
../../../common/pc/laptop/ssd
1110
];
1211

‎lenovo/thinkpad/p50/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
../../../common/gpu/nvidia/prime.nix
44
../../../common/gpu/nvidia/maxwell
55
../../../common/cpu/intel
6-
../../../common/pc/laptop/acpi_call.nix
76
../.
87
];
98

‎lenovo/thinkpad/p51/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
../../../common/gpu/nvidia/prime.nix
55
../../../common/gpu/nvidia/maxwell
66
../../../common/cpu/intel/kaby-lake
7-
../../../common/pc/laptop/acpi_call.nix
87
../.
98
];
109

‎lenovo/thinkpad/p52/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
../../../common/gpu/nvidia/prime.nix
55
../../../common/gpu/nvidia/pascal
66
../../../common/cpu/intel
7-
../../../common/pc/laptop/acpi_call.nix
87
../.
98
];
109

‎lenovo/thinkpad/p53/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
{
33
imports = [
44
../../../common/cpu/intel
5-
../../../common/pc/laptop/acpi_call.nix
65
../.
76
];
87

‎lenovo/thinkpad/t14/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
{
44
imports = [
55
../.
6-
../../../common/pc/laptop/acpi_call.nix
76
../../../common/pc/laptop/ssd
87
];
98

‎lenovo/thinkpad/t14s/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
{
44
imports = [
55
../.
6-
../../../common/pc/laptop/acpi_call.nix
76
];
87

98
# For suspending to RAM to work, set Config -> Power -> Sleep State to "Linux" in EFI.

‎lenovo/thinkpad/t420/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
../.
44
../tp-smapi.nix
55
../../../common/cpu/intel/sandy-bridge
6-
../../../common/pc/laptop/acpi_call.nix
76
];
87
}

‎lenovo/thinkpad/t430/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
imports = [
33
../.
44
../../../common/cpu/intel
5-
../../../common/pc/laptop/acpi_call.nix
65
];
76

87
boot = {

‎lenovo/thinkpad/t440s/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
imports = [
33
../.
44
../../../common/cpu/intel
5-
../../../common/pc/laptop/acpi_call.nix
65
];
76

87
boot = {

‎lenovo/thinkpad/t450s/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
imports = [
33
../../../common/cpu/intel
4-
../../../common/pc/laptop/acpi_call.nix
54
../.
65
];
76
}

‎lenovo/thinkpad/t460/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
imports = [
33
../../../common/cpu/intel
4-
../../../common/pc/laptop/acpi_call.nix
54
../.
65
];
76
}

‎lenovo/thinkpad/t460p/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
imports = [
33
../../../common/cpu/intel
4-
../../../common/pc/laptop/acpi_call.nix
54
../.
65
];
76
}

‎lenovo/thinkpad/t460s/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
imports = [
33
../../../common/cpu/intel
4-
../../../common/pc/laptop/acpi_call.nix
54
../.
65
];
76
}

‎lenovo/thinkpad/t470s/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
imports = [
33
../../../common/cpu/intel
4-
../../../common/pc/laptop/acpi_call.nix
54
../.
65
];
76
}

‎lenovo/thinkpad/t480/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
{
44
imports = [
55
../../../common/cpu/intel
6-
../../../common/pc/laptop/acpi_call.nix
76
../../../common/pc/ssd
87
../.
98
];

‎lenovo/thinkpad/t480s/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
{
44
imports = [
55
../../../common/cpu/intel
6-
../../../common/pc/laptop/acpi_call.nix
76
../../../common/pc/ssd
87
../.
98
];

‎lenovo/thinkpad/t490/default.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
{
33
imports = [
44
../../../common/cpu/intel
5-
../../../common/pc/laptop/acpi_call.nix
65
../.
76
];
87

@@ -25,7 +24,7 @@
2524
2625
LABEL="pulseaudio_end"
2726
'';
28-
27+
2928
throttled.enable = lib.mkDefault true;
3029
};
3130
}

‎lenovo/thinkpad/t495/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
imports = [
55
../.
66
../../../common/cpu/amd
7-
../../../common/pc/laptop/acpi_call.nix
87
];
98

109
# Force use of the thinkpad_acpi driver for backlight control.

‎lenovo/thinkpad/t520/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
../.
44
../tp-smapi.nix
55
../../../common/cpu/intel/sandy-bridge
6-
../../../common/pc/laptop/acpi_call.nix
76
];
87
}

‎lenovo/thinkpad/t550/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
imports = [
33
../../../common/cpu/intel
4-
../../../common/pc/laptop/acpi_call.nix
54
../.
65
];
76
}

‎lenovo/thinkpad/t590/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
{
44
imports = [
55
../../../common/cpu/intel
6-
../../../common/pc/laptop/acpi_call.nix
76
../.
87
];
98

‎lenovo/thinkpad/w520/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
../.
44
../tp-smapi.nix
55
../../../common/cpu/intel/sandy-bridge
6-
../../../common/pc/laptop/acpi_call.nix
76
];
87
}

‎lenovo/thinkpad/x1-nano/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
imports = [
44
../.
55
../../../common/cpu/intel
6-
../../../common/pc/laptop/acpi_call.nix
76
../../../common/pc/laptop/ssd
87
];
98
}

‎lenovo/thinkpad/x1/6th-gen/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
imports = [
1111
../.
1212
../../../../common/cpu/intel/kaby-lake
13-
../../../../common/pc/laptop/acpi_call.nix
1413
../../../../common/pc/laptop/ssd
1514
];
1615

‎lenovo/thinkpad/x1/7th-gen/default.nix

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
{
33
imports = [
44
../.
5-
../../../../common/pc/laptop/acpi_call.nix
65
../../../../common/pc/laptop/ssd
76
];
87

0 commit comments

Comments
 (0)