use upstream equivalent of linux-6.17-11 declaration

This commit is contained in:
Sean Kovacs 2025-12-14 13:09:51 -05:00
commit 94930a13b8
Signed by: sckova
GPG key ID: 00F325187C68651A
4 changed files with 5 additions and 69 deletions

View file

@ -1,63 +0,0 @@
{
lib,
callPackage,
linuxPackagesFor,
_kernelPatches ? [ ],
}:
let
linux-asahi-pkg =
{
stdenv,
lib,
fetchFromGitHub,
buildLinux,
...
}:
buildLinux rec {
inherit stdenv lib;
pname = "linux-asahi";
version = "6.17.11";
modDirVersion = version;
extraMeta.branch = "6.17";
src = fetchFromGitHub {
owner = "AsahiLinux";
repo = "linux";
tag = "asahi-6.17.11-1";
hash = "sha256-bTptFNR7ehMdW3M05c0S6GZ4H19GCYvplso8zOkEnmQ=";
};
kernelPatches = [
{
name = "Asahi config";
patch = null;
structuredExtraConfig = with lib.kernel; {
# Needed for GPU
ARM64_16K_PAGES = yes;
ARM64_MEMORY_MODEL_CONTROL = yes;
ARM64_ACTLR_STATE = yes;
# Might lead to the machine rebooting if not loaded soon enough
APPLE_WATCHDOG = yes;
# Can not be built as a module, defaults to no
APPLE_M1_CPU_PMU = yes;
# Defaults to 'y', but we want to allow the user to set options in modprobe.d
HID_APPLE = module;
APPLE_PMGR_MISC = yes;
APPLE_PMGR_PWRSTATE = yes;
};
features.rust = true;
}
]
++ _kernelPatches;
};
linux-asahi = callPackage linux-asahi-pkg { };
in
lib.recurseIntoAttrs (linuxPackagesFor linux-asahi)

View file

@ -24,8 +24,6 @@ final: prev: {
inherit helium-widevine;
};
linux-asahi = prev.callPackage (builtins.path { path = ./linux-asahi-bleeding/package.nix; }) { };
spotifyd = prev.callPackage (builtins.path { path = ./spotifyd/package.nix; }) { };
widevine-firefox = prev.callPackage (builtins.path { path = ./widevine-firefox/package.nix; }) { };