From 1552a9f4513f3f0ceedcf90320e48d3d47165712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 20 Jun 2025 16:35:38 +0200 Subject: [PATCH 1/5] add community meetings to CONTRIBUTING.md --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index dce01f4a..50b78d58 100644 --- a/README.md +++ b/README.md @@ -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. +# Community Meetings + +The [NixOS hardware](https://nixos.org/community/teams/nix/) 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 See code for all available configurations. From dcbb69f9bc071826aeb05e95014cb607b88f0c9b Mon Sep 17 00:00:00 2001 From: Andre Date: Sun, 22 Jun 2025 11:55:13 -0400 Subject: [PATCH 2/5] feat: update Surface stable kernel to 6.15.3 --- microsoft/surface/common/default.nix | 9 +++++---- .../surface/common/kernel/{6.14 => 6.15}/patches.nix | 0 microsoft/surface/common/kernel/linux-package.nix | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) rename microsoft/surface/common/kernel/{6.14 => 6.15}/patches.nix (100%) diff --git a/microsoft/surface/common/default.nix b/microsoft/surface/common/default.nix index 5d9d7d98..286383d8 100644 --- a/microsoft/surface/common/default.nix +++ b/microsoft/surface/common/default.nix @@ -8,7 +8,7 @@ let if kernelVersion == "longterm" then "6.12.19" else if kernelVersion == "stable" then - "6.14.2" + "6.15.3" else abort "Invalid kernel version: ${kernelVersion}"; @@ -16,7 +16,7 @@ let if kernelVersion == "longterm" then "sha256-1zvwV77ARDSxadG2FkGTb30Ml865I6KB8y413U3MZTE=" else if kernelVersion == "stable" then - "sha256-xcaCo1TqMZATk1elfTSnnlw3IhrOgjqTjhARa1d6Lhs=" + "sha256-ErUMiZJUONnNc4WgyvycQz5lYqxd8AohiJ/On1SNZbA=" else abort "Invalid kernel version: ${kernelVersion}"; @@ -25,7 +25,7 @@ let if kernelVersion == "longterm" then "6.12.7" else if kernelVersion == "stable" then - "6.14.2" + "6.15.3" else abort "Invalid kernel version: ${kernelVersion}"; @@ -33,7 +33,7 @@ let if kernelVersion == "longterm" then "sha256-Pv7O8D8ma+MPLhYP3HSGQki+Yczp8b7d63qMb6l4+mY=" else if kernelVersion == "stable" then - "sha256-Pzn+C52TtDcqDVepM5z2cVNCsnRDy0Wwn+FLwgsuicQ=" + "sha256-ozvYrZDiVtMkdCcVnNEdlF2Kdw4jivW0aMJrDynN3Hk=" else abort "Invalid kernel version: ${kernelVersion}"; @@ -52,6 +52,7 @@ let kernelPatches = surfacePatches { version = pkgVersion; patchFn = ./kernel/${versions.majorMinor pkgVersion}/patches.nix; + patchSrc = (repos.linux-surface + "/patches/${versions.majorMinor pkgVersion}"); }; kernelPackages = linuxPackage { inherit kernelPatches; version = srcVersion; diff --git a/microsoft/surface/common/kernel/6.14/patches.nix b/microsoft/surface/common/kernel/6.15/patches.nix similarity index 100% rename from microsoft/surface/common/kernel/6.14/patches.nix rename to microsoft/surface/common/kernel/6.15/patches.nix diff --git a/microsoft/surface/common/kernel/linux-package.nix b/microsoft/surface/common/kernel/linux-package.nix index 28e3e0e7..a44c4f24 100644 --- a/microsoft/surface/common/kernel/linux-package.nix +++ b/microsoft/surface/common/kernel/linux-package.nix @@ -29,7 +29,7 @@ let in linuxPackages'; surfacePatches = - { patchSrc ? (repos.linux-surface + "/patches/${versions.majorMinor version}"), + { patchSrc, version, patchFn, }: pkgs.callPackage patchFn { From 3a17771215396a208131f3217ef8fb48c395d06d Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 23 Jun 2025 01:51:09 +0200 Subject: [PATCH 3/5] README: fix team url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 50b78d58..7f084e64 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ For questions and discussions, come join us in the [nixos-anywhere matrix](https # Community Meetings -The [NixOS hardware](https://nixos.org/community/teams/nix/) team meets regularly to discuss hardware profiles and maintenance: +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) From 42dedc05793c842ab7afbfd0cf5a8ee4007d7ea5 Mon Sep 17 00:00:00 2001 From: Cassie Cheung Date: Wed, 25 Jun 2025 17:43:58 +0800 Subject: [PATCH 4/5] apple/t2: kernel 6.14 -> 6.15; sync patches --- apple/t2/pkgs/linux-t2/latest.json | 54 ++++++++++++++++++------------ apple/t2/pkgs/linux-t2/latest.nix | 4 +-- apple/t2/pkgs/linux-t2/stable.json | 34 +++++++++++++------ 3 files changed, 58 insertions(+), 34 deletions(-) diff --git a/apple/t2/pkgs/linux-t2/latest.json b/apple/t2/pkgs/linux-t2/latest.json index d02a40eb..629d74d2 100644 --- a/apple/t2/pkgs/linux-t2/latest.json +++ b/apple/t2/pkgs/linux-t2/latest.json @@ -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": [ { "name": "1001-Add-apple-bce-driver.patch", - "hash": "sha256-e3RPvWPj2QASGOS4kieO8YFekrXsBCJtfF82OPlOn2E=" + "hash": "sha256-00K3LmId2Ag6s5K76p7mB2a0oEXp815yRd+U5wxWPMc=" }, { "name": "1002-Put-apple-bce-in-drivers-staging.patch", "hash": "sha256-wkveNo1qwAwXWDGTFed4ZDbuBnJbwKgWLmTHK9qq0oM=" }, { - "name": "1005-HID-hid-appletb-bl-add-driver-for-the-backlight-of-A.patch", - "hash": "sha256-kEscS1FAyDxLZPOPInYTXFEf4fouBEa4zGctX14hSu8=" + "name": "1003-Fix-sparse-errors.patch", + "hash": "sha256-nuCOPWa4Hp+HCCBe6Y++M4g1k4plOWzy2hqHXlJbp9g=" }, { - "name": "1006-HID-hid-appletb-kbd-add-driver-for-the-keyboard-mode.patch", - "hash": "sha256-eVEuvnoRItaDjwWu41nn9bTkgHgY+1SL/hFAvUR2IlY=" + "name": "1004-Fix-freezing-on-turning-off-camera.patch", + "hash": "sha256-rFrSUhiNXgQbfgKjryJktYxYcchXE1PI49Q1gW001+0=" }, { - "name": "1007-HID-multitouch-support-getting-the-contact-ID-from.patch", - "hash": "sha256-A4tExJafroVAv/Hbdt7farJM6RYl/DU5KwSbzqcdEVY=" + "name": "1007-HID-multitouch-Get-the-contact-ID-from-HID_DG_TRANSD.patch", + "hash": "sha256-JF5PjByo4S1Rd/B5luAzOXDv+iakCnJfmujIQuUiT1A=" }, { "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", - "hash": "sha256-fywzHnCQ657UFye1ckiufral3pBwBGtKdxWqWqaFHM0=" + "hash": "sha256-h6jk9yw/4txd8PATpMxB9mIzik9+X1zP6p4K35AqdXw=" }, { - "name": "1010-HID-multitouch-allow-specifying-if-a-device-is-direc.patch", - "hash": "sha256-87SOnLgeG60Svu2Z9QUyP9P6cZ1Gznt6ZYLFImfx+vY=" + "name": "1010-HID-multitouch-specify-that-Apple-Touch-Bar-is-direc.patch", + "hash": "sha256-5PbLynVnQqlJKPTWhcmwXCkYDEopLBQWnxWvZUt0EN4=" }, { - "name": "1011-HID-multitouch-add-device-ID-for-Apple-Touch-Bars.patch", - "hash": "sha256-TJjXAlQ4WEROnq/xd6/4JHTuEJjqT7dLLcE4etKdzc0=" + "name": "1011-HID-multitouch-add-device-ID-for-Apple-Touch-Bar.patch", + "hash": "sha256-dIzEOj89D2rIEc2/mjq3TkIfI3ZHzu0VRDQQOzp+Snc=" }, { - "name": "1014-drm-format-helper-Add-conversion-from-XRGB8888-to-BG.patch", - "hash": "sha256-Ky19+cCiYDaHBh2o5IhZO8J1ExDT7o8K9cgPz+AL8Cg=" + "name": "1013-lib-vsprintf-Add-support-for-generic-FourCCs-by-exte.patch", + "hash": "sha256-g8M3j1ZPND10/LtPD/txaSoJGV9Lp+g5bgn+vQc56p4=" }, { - "name": "1015-drm-tiny-add-driver-for-Apple-Touch-Bars-in-x86-Macs.patch", - "hash": "sha256-Ga0LlaS1jWTXSKh1ClcETPJctAymC6jYBQK9wwDU4Xs=" + "name": "1014-printf-add-tests-for-generic-FourCCs.patch", + "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", @@ -51,7 +63,7 @@ }, { "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", @@ -91,7 +103,7 @@ }, { "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", @@ -119,7 +131,7 @@ }, { "name": "8001-Add-APFS-driver.patch", - "hash": "sha256-py4DNKBsUWvw6o730ApmNdUlSyabOFnFDoAPrF40DNE=" + "hash": "sha256-io17Kk6FDscDoDshddK9TqSPuXVFTzjvRUwOGTl5cjM=" }, { "name": "8002-Necessary-modifications-to-build-APFS-with-the-kerne.patch", diff --git a/apple/t2/pkgs/linux-t2/latest.nix b/apple/t2/pkgs/linux-t2/latest.nix index 70145fdb..747db71e 100644 --- a/apple/t2/pkgs/linux-t2/latest.nix +++ b/apple/t2/pkgs/linux-t2/latest.nix @@ -1,6 +1,6 @@ -{ callPackage, linux_6_14, ... }@args: +{ callPackage, linux_6_15, ... }@args: callPackage ./generic.nix args { - kernel = linux_6_14; + kernel = linux_6_15; patchesFile = ./latest.json; } diff --git a/apple/t2/pkgs/linux-t2/stable.json b/apple/t2/pkgs/linux-t2/stable.json index 3a788c72..325f42e4 100644 --- a/apple/t2/pkgs/linux-t2/stable.json +++ b/apple/t2/pkgs/linux-t2/stable.json @@ -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": [ { "name": "1001-Add-apple-bce-driver.patch", @@ -9,6 +9,14 @@ "name": "1002-Put-apple-bce-in-drivers-staging.patch", "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", "hash": "sha256-kEscS1FAyDxLZPOPInYTXFEf4fouBEa4zGctX14hSu8=" @@ -18,24 +26,28 @@ "hash": "sha256-eVEuvnoRItaDjwWu41nn9bTkgHgY+1SL/hFAvUR2IlY=" }, { - "name": "1007-HID-multitouch-support-getting-the-contact-ID-from.patch", - "hash": "sha256-A4tExJafroVAv/Hbdt7farJM6RYl/DU5KwSbzqcdEVY=" + "name": "1007-HID-multitouch-Get-the-contact-ID-from-HID_DG_TRANSD.patch", + "hash": "sha256-JF5PjByo4S1Rd/B5luAzOXDv+iakCnJfmujIQuUiT1A=" }, { "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", - "hash": "sha256-fywzHnCQ657UFye1ckiufral3pBwBGtKdxWqWqaFHM0=" + "hash": "sha256-h6jk9yw/4txd8PATpMxB9mIzik9+X1zP6p4K35AqdXw=" }, { - "name": "1010-HID-multitouch-allow-specifying-if-a-device-is-direc.patch", - "hash": "sha256-87SOnLgeG60Svu2Z9QUyP9P6cZ1Gznt6ZYLFImfx+vY=" + "name": "1010-HID-multitouch-specify-that-Apple-Touch-Bar-is-direc.patch", + "hash": "sha256-5PbLynVnQqlJKPTWhcmwXCkYDEopLBQWnxWvZUt0EN4=" }, { - "name": "1011-HID-multitouch-add-device-ID-for-Apple-Touch-Bars.patch", - "hash": "sha256-TJjXAlQ4WEROnq/xd6/4JHTuEJjqT7dLLcE4etKdzc0=" + "name": "1011-HID-multitouch-add-device-ID-for-Apple-Touch-Bar.patch", + "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", @@ -43,7 +55,7 @@ }, { "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", @@ -119,7 +131,7 @@ }, { "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", From d4b603125e98ce2da1340e0a67bc430d7384b344 Mon Sep 17 00:00:00 2001 From: QuietSeeker <123584613+QuietSeeker@users.noreply.github.com> Date: Thu, 26 Jun 2025 19:49:43 +0100 Subject: [PATCH 5/5] Updated nvidia offload mode to include amd drivers --- lenovo/legion/16arh7h/hybrid/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lenovo/legion/16arh7h/hybrid/default.nix b/lenovo/legion/16arh7h/hybrid/default.nix index 1654e23c..9d47b58a 100644 --- a/lenovo/legion/16arh7h/hybrid/default.nix +++ b/lenovo/legion/16arh7h/hybrid/default.nix @@ -13,7 +13,7 @@ ]; boot.kernelModules = ["amdgpu"]; - services.xserver.videoDrivers = ["nvidia"]; + services.xserver.videoDrivers = ["amdgpu" "nvidia"]; hardware = { amdgpu.initrd.enable = false;