use upstream equivalent of linux-6.17-11 declaration
This commit is contained in:
parent
32ccf53258
commit
94930a13b8
4 changed files with 5 additions and 69 deletions
7
flake.lock
generated
7
flake.lock
generated
|
|
@ -8,15 +8,16 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765528634,
|
"lastModified": 1765530480,
|
||||||
"narHash": "sha256-uIavvJkDwTZD1QY/oSkDtPN9xwkLwQayoZ5xOni4SBY=",
|
"narHash": "sha256-JdEucq+zm6pAol40wB+7Cu464sn5SSKXjxBOe+XkWck=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixos-apple-silicon",
|
"repo": "nixos-apple-silicon",
|
||||||
"rev": "fc1440d6e6adb24d9b2650670744bae35654c867",
|
"rev": "e7c623629d0c1d2556b57e34edcc18f6d5d123cb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
|
"ref": "linux-6-17-11",
|
||||||
"repo": "nixos-apple-silicon",
|
"repo": "nixos-apple-silicon",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
apple-silicon = {
|
apple-silicon = {
|
||||||
url = "github:nix-community/nixos-apple-silicon";
|
url = "github:nix-community/nixos-apple-silicon/linux-6-17-11";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -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)
|
|
||||||
|
|
@ -24,8 +24,6 @@ final: prev: {
|
||||||
inherit helium-widevine;
|
inherit helium-widevine;
|
||||||
};
|
};
|
||||||
|
|
||||||
linux-asahi = prev.callPackage (builtins.path { path = ./linux-asahi-bleeding/package.nix; }) { };
|
|
||||||
|
|
||||||
spotifyd = prev.callPackage (builtins.path { path = ./spotifyd/package.nix; }) { };
|
spotifyd = prev.callPackage (builtins.path { path = ./spotifyd/package.nix; }) { };
|
||||||
|
|
||||||
widevine-firefox = prev.callPackage (builtins.path { path = ./widevine-firefox/package.nix; }) { };
|
widevine-firefox = prev.callPackage (builtins.path { path = ./widevine-firefox/package.nix; }) { };
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue