nixos/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware.git synced 2025-11-08 19:46:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into nixfmt

Browse source
This commit is contained in:
Andre 2025-07-01 11:24:22 -04:00
commit 6038f6ebd2
9 changed files with 82 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

11
README.md
View file

@ -69,6 +69,17 @@ See [CONTRIBUTING.md](./CONTRIBUTING.md).
For questions and discussions, come join us in the [nixos-anywhere matrix](https://matrix.to/#/#nixos-hardware:nixos.org) room. For questions and discussions, come join us in the [nixos-anywhere matrix](https://matrix.to/#/#nixos-hardware:nixos.org) room.
# Community Meetings
The [NixOS hardware](https://github.com/orgs/NixOS/teams/nixos-hardware) team meets regularly to discuss hardware profiles and maintenance:
- **When**: Every 3rd Friday of the month
- **Time**: 04:00 pm (UTC) / 16:00 (UTC)
- **Where**: https://jitsi.lassul.us/Hardware-team
- **Contact**: hardware@nixos.org
All contributors and users are welcome to join!
## List of Profiles ## List of Profiles
See code for all available configurations. See code for all available configurations.

54
apple/t2/pkgs/linux-t2/latest.json
View file

@ -1,49 +1,61 @@
{ {
"base_url": "https://raw.githubusercontent.com/t2linux/linux-t2-patches/60a2912ad2d05f8a2d6c68a94641d912c3a555fd/", "base_url": "https://raw.githubusercontent.com/t2linux/linux-t2-patches/8ec11f3aaa314d25e18842851a2124c0031e2e3f/",
"patches": [ "patches": [
{ {
"name": "1001-Add-apple-bce-driver.patch", "name": "1001-Add-apple-bce-driver.patch",
"hash": "sha256-e3RPvWPj2QASGOS4kieO8YFekrXsBCJtfF82OPlOn2E=" "hash": "sha256-00K3LmId2Ag6s5K76p7mB2a0oEXp815yRd+U5wxWPMc="
}, },
{ {
"name": "1002-Put-apple-bce-in-drivers-staging.patch", "name": "1002-Put-apple-bce-in-drivers-staging.patch",
"hash": "sha256-wkveNo1qwAwXWDGTFed4ZDbuBnJbwKgWLmTHK9qq0oM=" "hash": "sha256-wkveNo1qwAwXWDGTFed4ZDbuBnJbwKgWLmTHK9qq0oM="
}, },
{ {
"name": "1005-HID-hid-appletb-bl-add-driver-for-the-backlight-of-A.patch", "name": "1003-Fix-sparse-errors.patch",
"hash": "sha256-kEscS1FAyDxLZPOPInYTXFEf4fouBEa4zGctX14hSu8=" "hash": "sha256-nuCOPWa4Hp+HCCBe6Y++M4g1k4plOWzy2hqHXlJbp9g="
}, },
{ {
"name": "1006-HID-hid-appletb-kbd-add-driver-for-the-keyboard-mode.patch", "name": "1004-Fix-freezing-on-turning-off-camera.patch",
"hash": "sha256-eVEuvnoRItaDjwWu41nn9bTkgHgY+1SL/hFAvUR2IlY=" "hash": "sha256-rFrSUhiNXgQbfgKjryJktYxYcchXE1PI49Q1gW001+0="
}, },
{ {
"name": "1007-HID-multitouch-support-getting-the-contact-ID-from.patch", "name": "1007-HID-multitouch-Get-the-contact-ID-from-HID_DG_TRANSD.patch",
"hash": "sha256-A4tExJafroVAv/Hbdt7farJM6RYl/DU5KwSbzqcdEVY=" "hash": "sha256-JF5PjByo4S1Rd/B5luAzOXDv+iakCnJfmujIQuUiT1A="
}, },
{ {
"name": "1008-HID-multitouch-support-getting-the-tip-state-from-HI.patch", "name": "1008-HID-multitouch-support-getting-the-tip-state-from-HI.patch",
"hash": "sha256-GwK+d87p3UMy66037dzq6/Zearj8gnRHhqSdZczRadY=" "hash": "sha256-m/NAKoHRC/HwxG5fFZxFl6DtY4Xv8kPBWvdKdtadrrk="
}, },
{ {
"name": "1009-HID-multitouch-take-cls-maxcontacts-into-account-for.patch", "name": "1009-HID-multitouch-take-cls-maxcontacts-into-account-for.patch",
"hash": "sha256-fywzHnCQ657UFye1ckiufral3pBwBGtKdxWqWqaFHM0=" "hash": "sha256-h6jk9yw/4txd8PATpMxB9mIzik9+X1zP6p4K35AqdXw="
}, },
{ {
"name": "1010-HID-multitouch-allow-specifying-if-a-device-is-direc.patch", "name": "1010-HID-multitouch-specify-that-Apple-Touch-Bar-is-direc.patch",
"hash": "sha256-87SOnLgeG60Svu2Z9QUyP9P6cZ1Gznt6ZYLFImfx+vY=" "hash": "sha256-5PbLynVnQqlJKPTWhcmwXCkYDEopLBQWnxWvZUt0EN4="
}, },
{ {
"name": "1011-HID-multitouch-add-device-ID-for-Apple-Touch-Bars.patch", "name": "1011-HID-multitouch-add-device-ID-for-Apple-Touch-Bar.patch",
"hash": "sha256-TJjXAlQ4WEROnq/xd6/4JHTuEJjqT7dLLcE4etKdzc0=" "hash": "sha256-dIzEOj89D2rIEc2/mjq3TkIfI3ZHzu0VRDQQOzp+Snc="
}, },
{ {
"name": "1014-drm-format-helper-Add-conversion-from-XRGB8888-to-BG.patch", "name": "1013-lib-vsprintf-Add-support-for-generic-FourCCs-by-exte.patch",
"hash": "sha256-Ky19+cCiYDaHBh2o5IhZO8J1ExDT7o8K9cgPz+AL8Cg=" "hash": "sha256-g8M3j1ZPND10/LtPD/txaSoJGV9Lp+g5bgn+vQc56p4="
}, },
{ {
"name": "1015-drm-tiny-add-driver-for-Apple-Touch-Bars-in-x86-Macs.patch", "name": "1014-printf-add-tests-for-generic-FourCCs.patch",
"hash": "sha256-Ga0LlaS1jWTXSKh1ClcETPJctAymC6jYBQK9wwDU4Xs=" "hash": "sha256-5Z4cFBMAY695OEU/CxiGQkUz68zmKdxssD+yp1DCYgs="
},
{
"name": "1015-drm-appletbdrm-use-p4cl-instead-of-p4cc.patch",
"hash": "sha256-rZej0ZbpPv+8NROuYnf4Jpu9scCsmbKWyz7yf5A3G3s="
},
{
"name": "1016-vsprintf-Use-p4chR-instead-of-p4cn-for-reading-data-.patch",
"hash": "sha256-/Ork2CmYk6SG213Owk+nGsw7KTEVDLRzQTeWcKrPZGw="
},
{
"name": "1017-checkpatch-remove-p4cn.patch",
"hash": "sha256-lnMnjnMiR9WSNf/XYsiOwFdC9xKv8zSluWiR584xFPU="
}, },
{ {
"name": "2008-i915-4-lane-quirk-for-mbp15-1.patch", "name": "2008-i915-4-lane-quirk-for-mbp15-1.patch",
@ -51,7 +63,7 @@
}, },
{ {
"name": "2009-apple-gmux-allow-switching-to-igpu-at-probe.patch", "name": "2009-apple-gmux-allow-switching-to-igpu-at-probe.patch",
"hash": "sha256-XKwlyJZjJLQz39mc0/S7sPnRnwrqMsq9OKy+QCO+oho=" "hash": "sha256-aE+MEu/jRrZBa+3Q03quOHUsIseRED6A7N/K9kEVtbM="
}, },
{ {
"name": "3001-applesmc-convert-static-structures-to-drvdata.patch", "name": "3001-applesmc-convert-static-structures-to-drvdata.patch",
@ -91,7 +103,7 @@
}, },
{ {
"name": "4001-asahi-trackpad.patch", "name": "4001-asahi-trackpad.patch",
"hash": "sha256-yfkTKKokb/+JtTwE0Dzht14S0nrSIwLFAFND90P/Cis=" "hash": "sha256-QM/FtDft4N4imJBuEHg6cH3e8vEyMPLt0alDhugLPy8="
}, },
{ {
"name": "4002-HID-quirks-remove-T2-devices-from-hid_mouse_ignore_l.patch", "name": "4002-HID-quirks-remove-T2-devices-from-hid_mouse_ignore_l.patch",
@ -119,7 +131,7 @@
}, },
{ {
"name": "8001-Add-APFS-driver.patch", "name": "8001-Add-APFS-driver.patch",
"hash": "sha256-py4DNKBsUWvw6o730ApmNdUlSyabOFnFDoAPrF40DNE=" "hash": "sha256-io17Kk6FDscDoDshddK9TqSPuXVFTzjvRUwOGTl5cjM="
}, },
{ {
"name": "8002-Necessary-modifications-to-build-APFS-with-the-kerne.patch", "name": "8002-Necessary-modifications-to-build-APFS-with-the-kerne.patch",

4
apple/t2/pkgs/linux-t2/latest.nix
View file

@ -1,6 +1,6 @@
{ callPackage, linux_6_14, ... }@args: { callPackage, linux_6_15, ... }@args:
callPackage ./generic.nix args { callPackage ./generic.nix args {
kernel = linux_6_14; kernel = linux_6_15;
patchesFile = ./latest.json; patchesFile = ./latest.json;
} }

34
apple/t2/pkgs/linux-t2/stable.json
View file

@ -1,5 +1,5 @@
{ {
"base_url": "https://raw.githubusercontent.com/t2linux/linux-t2-patches/0543a832ecf1400798e8aef6727110ec21c3484a/", "base_url": "https://raw.githubusercontent.com/t2linux/linux-t2-patches/e08a76e1f1234885b9b68be6c843bf91833e8b0a/",
"patches": [ "patches": [
{ {
"name": "1001-Add-apple-bce-driver.patch", "name": "1001-Add-apple-bce-driver.patch",
@ -9,6 +9,14 @@
"name": "1002-Put-apple-bce-in-drivers-staging.patch", "name": "1002-Put-apple-bce-in-drivers-staging.patch",
"hash": "sha256-DXj4CmE7TKMGrAhQDOR5RVw9YHmyQMiXZsmxYfkKAEA=" "hash": "sha256-DXj4CmE7TKMGrAhQDOR5RVw9YHmyQMiXZsmxYfkKAEA="
}, },
{
"name": "1003-Fix-sparse-errors.patch",
"hash": "sha256-nuCOPWa4Hp+HCCBe6Y++M4g1k4plOWzy2hqHXlJbp9g="
},
{
"name": "1004-Fix-freezing-on-turning-off-camera.patch",
"hash": "sha256-rFrSUhiNXgQbfgKjryJktYxYcchXE1PI49Q1gW001+0="
},
{ {
"name": "1005-HID-hid-appletb-bl-add-driver-for-the-backlight-of-A.patch", "name": "1005-HID-hid-appletb-bl-add-driver-for-the-backlight-of-A.patch",
"hash": "sha256-kEscS1FAyDxLZPOPInYTXFEf4fouBEa4zGctX14hSu8=" "hash": "sha256-kEscS1FAyDxLZPOPInYTXFEf4fouBEa4zGctX14hSu8="
@ -18,24 +26,28 @@
"hash": "sha256-eVEuvnoRItaDjwWu41nn9bTkgHgY+1SL/hFAvUR2IlY=" "hash": "sha256-eVEuvnoRItaDjwWu41nn9bTkgHgY+1SL/hFAvUR2IlY="
}, },
{ {
"name": "1007-HID-multitouch-support-getting-the-contact-ID-from.patch", "name": "1007-HID-multitouch-Get-the-contact-ID-from-HID_DG_TRANSD.patch",
"hash": "sha256-A4tExJafroVAv/Hbdt7farJM6RYl/DU5KwSbzqcdEVY=" "hash": "sha256-JF5PjByo4S1Rd/B5luAzOXDv+iakCnJfmujIQuUiT1A="
}, },
{ {
"name": "1008-HID-multitouch-support-getting-the-tip-state-from-HI.patch", "name": "1008-HID-multitouch-support-getting-the-tip-state-from-HI.patch",
"hash": "sha256-GwK+d87p3UMy66037dzq6/Zearj8gnRHhqSdZczRadY=" "hash": "sha256-m/NAKoHRC/HwxG5fFZxFl6DtY4Xv8kPBWvdKdtadrrk="
}, },
{ {
"name": "1009-HID-multitouch-take-cls-maxcontacts-into-account-for.patch", "name": "1009-HID-multitouch-take-cls-maxcontacts-into-account-for.patch",
"hash": "sha256-fywzHnCQ657UFye1ckiufral3pBwBGtKdxWqWqaFHM0=" "hash": "sha256-h6jk9yw/4txd8PATpMxB9mIzik9+X1zP6p4K35AqdXw="
}, },
{ {
"name": "1010-HID-multitouch-allow-specifying-if-a-device-is-direc.patch", "name": "1010-HID-multitouch-specify-that-Apple-Touch-Bar-is-direc.patch",
"hash": "sha256-87SOnLgeG60Svu2Z9QUyP9P6cZ1Gznt6ZYLFImfx+vY=" "hash": "sha256-5PbLynVnQqlJKPTWhcmwXCkYDEopLBQWnxWvZUt0EN4="
}, },
{ {
"name": "1011-HID-multitouch-add-device-ID-for-Apple-Touch-Bars.patch", "name": "1011-HID-multitouch-add-device-ID-for-Apple-Touch-Bar.patch",
"hash": "sha256-TJjXAlQ4WEROnq/xd6/4JHTuEJjqT7dLLcE4etKdzc0=" "hash": "sha256-dIzEOj89D2rIEc2/mjq3TkIfI3ZHzu0VRDQQOzp+Snc="
},
{
"name": "1013-lib-vsprintf-Add-support-for-generic-FourCCs-by-exte.patch",
"hash": "sha256-h3gxaKtvdm/GSd+AP1sPC9avWHOsceUxTmoua/3rIf4="
}, },
{ {
"name": "1014-drm-format-helper-Add-conversion-from-XRGB8888-to-BG.patch", "name": "1014-drm-format-helper-Add-conversion-from-XRGB8888-to-BG.patch",
@ -43,7 +55,7 @@
}, },
{ {
"name": "1015-drm-tiny-add-driver-for-Apple-Touch-Bars-in-x86-Macs.patch", "name": "1015-drm-tiny-add-driver-for-Apple-Touch-Bars-in-x86-Macs.patch",
"hash": "sha256-zFeDJeoM/XS+Ds3DBLEcv4JbUhlEk9z4rHQ4t6XaghA=" "hash": "sha256-tDjK/VipVQbuNOURW38gssqeRLy3s8I+DVq0+4zGnHs="
}, },
{ {
"name": "2008-i915-4-lane-quirk-for-mbp15-1.patch", "name": "2008-i915-4-lane-quirk-for-mbp15-1.patch",
@ -119,7 +131,7 @@
}, },
{ {
"name": "8001-Add-APFS-driver.patch", "name": "8001-Add-APFS-driver.patch",
"hash": "sha256-1VHKrO2haBqXDCef2xt2fHfCCPv2q/AhFmmM4Xxu24E=" "hash": "sha256-O3RNtpeZQENPEfyYi/0ZTLhAWBAw6pmxMS30NUxOTdk="
}, },
{ {
"name": "8002-Necessary-modifications-to-build-APFS-with-the-kerne.patch", "name": "8002-Necessary-modifications-to-build-APFS-with-the-kerne.patch",

5
lenovo/legion/16arh7h/hybrid/default.nix
View file

@ -14,7 +14,10 @@
]; ];
boot.kernelModules = [ "amdgpu" ]; boot.kernelModules = [ "amdgpu" ];
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [
"amdgpu"
"nvidia"
];
hardware = { hardware = {
amdgpu.initrd.enable = false; amdgpu.initrd.enable = false;

5
lenovo/legion/16iah7h/default.nix
View file

@ -2,7 +2,8 @@
lib, lib,
config, config,
... ...
}: { }:
{
imports = [ imports = [
../../../common/cpu/intel ../../../common/cpu/intel
../../../common/gpu/nvidia/prime.nix ../../../common/gpu/nvidia/prime.nix
@ -12,7 +13,7 @@
../../../common/hidpi.nix ../../../common/hidpi.nix
]; ];
boot.extraModulePackages = [config.boot.kernelPackages.lenovo-legion-module]; boot.extraModulePackages = [ config.boot.kernelPackages.lenovo-legion-module ];
hardware = { hardware = {
nvidia = { nvidia = {

9
microsoft/surface/common/default.nix
View file

@ -19,7 +19,7 @@ let
if kernelVersion == "longterm" then if kernelVersion == "longterm" then
"6.12.19" "6.12.19"
else if kernelVersion == "stable" then else if kernelVersion == "stable" then
"6.14.2" "6.15.3"
else else
abort "Invalid kernel version: ${kernelVersion}"; abort "Invalid kernel version: ${kernelVersion}";
@ -28,7 +28,7 @@ let
if kernelVersion == "longterm" then if kernelVersion == "longterm" then
"sha256-1zvwV77ARDSxadG2FkGTb30Ml865I6KB8y413U3MZTE=" "sha256-1zvwV77ARDSxadG2FkGTb30Ml865I6KB8y413U3MZTE="
else if kernelVersion == "stable" then else if kernelVersion == "stable" then
"sha256-xcaCo1TqMZATk1elfTSnnlw3IhrOgjqTjhARa1d6Lhs=" "sha256-ErUMiZJUONnNc4WgyvycQz5lYqxd8AohiJ/On1SNZbA="
else else
abort "Invalid kernel version: ${kernelVersion}"; abort "Invalid kernel version: ${kernelVersion}";
@ -38,7 +38,7 @@ let
if kernelVersion == "longterm" then if kernelVersion == "longterm" then
"6.12.7" "6.12.7"
else if kernelVersion == "stable" then else if kernelVersion == "stable" then
"6.14.2" "6.15.3"
else else
abort "Invalid kernel version: ${kernelVersion}"; abort "Invalid kernel version: ${kernelVersion}";
@ -47,7 +47,7 @@ let
if kernelVersion == "longterm" then if kernelVersion == "longterm" then
"sha256-Pv7O8D8ma+MPLhYP3HSGQki+Yczp8b7d63qMb6l4+mY=" "sha256-Pv7O8D8ma+MPLhYP3HSGQki+Yczp8b7d63qMb6l4+mY="
else if kernelVersion == "stable" then else if kernelVersion == "stable" then
"sha256-Pzn+C52TtDcqDVepM5z2cVNCsnRDy0Wwn+FLwgsuicQ=" "sha256-ozvYrZDiVtMkdCcVnNEdlF2Kdw4jivW0aMJrDynN3Hk="
else else
abort "Invalid kernel version: ${kernelVersion}"; abort "Invalid kernel version: ${kernelVersion}";
@ -82,6 +82,7 @@ let
kernelPatches = surfacePatches { kernelPatches = surfacePatches {
version = pkgVersion; version = pkgVersion;
patchFn = ./kernel/${versions.majorMinor pkgVersion}/patches.nix; patchFn = ./kernel/${versions.majorMinor pkgVersion}/patches.nix;
patchSrc = (repos.linux-surface + "/patches/${versions.majorMinor pkgVersion}");
}; };
kernelPackages = linuxPackage { kernelPackages = linuxPackage {
inherit kernelPatches; inherit kernelPatches;

0
microsoft/surface/common/kernel/6.14/patches.nix → microsoft/surface/common/kernel/6.15/patches.nix
View file

2
microsoft/surface/common/kernel/linux-package.nix
View file

@ -44,7 +44,7 @@ let
surfacePatches = surfacePatches =
{ {
patchSrc ? (repos.linux-surface + "/patches/${versions.majorMinor version}"), patchSrc,
version, version,
patchFn, patchFn,
}: }: