diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-03 18:00:51 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-03 18:00:51 +0000 |
commit | 5a036cc96a94a0c9377f4927abc19004bad80a0b (patch) | |
tree | 5a0ff3e316e47bf1cd9928e41ec8d7226bfb6dc7 /pkgs/os-specific | |
parent | bcb6afc76e742aaa6642e216125b04da408e3a88 (diff) | |
parent | 144fcada81a35097b15aa5dedd1ba87c7a94bfce (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 24 | ||||
-rw-r--r-- | pkgs/os-specific/linux/power-calibrate/default.nix | 4 |
2 files changed, 22 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 01fe26e08bb8f..f0c6ce6c3f8b7 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -16,6 +16,12 @@ let selectHighestVersion = a: b: if lib.versionOlder a.version b.version then b else a; + + # https://forums.developer.nvidia.com/t/linux-6-7-3-545-29-06-550-40-07-error-modpost-gpl-incompatible-module-nvidia-ko-uses-gpl-only-symbol-rcu-read-lock/280908/19 + rcu_patch = fetchpatch { + url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch"; + hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg="; + }; in rec { mkDriver = generic; @@ -33,6 +39,8 @@ rec { openSha256 = "sha256-wvRdHguGLxS0mR06P5Qi++pDJBCF8pJ8hr4T8O6TJIo="; settingsSha256 = "sha256-9wqoDEWY4I7weWW05F4igj1Gj9wjHsREFMztfEmqm10="; persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE="; + + patches = [ rcu_patch ]; }; latest = selectHighestVersion production (generic { @@ -43,8 +51,7 @@ rec { settingsSha256 = "sha256-YBaKpRQWSdXG8Usev8s3GYHCPqL8PpJeF6gpa2droWY="; persistencedSha256 = "sha256-AiYrrOgMagIixu3Ss2rePdoL24CKORFvzgZY3jlNbwM="; - patchFlags = [ "-p1" "-d" "kernel" ]; - patches = []; + patches = [ rcu_patch ]; brokenOpen = kernel.kernelAtLeast "6.7"; }); @@ -56,6 +63,8 @@ rec { openSha256 = "sha256-mRUTEWVsbjq+psVe+kAT6MjyZuLkG2yRDxCMvDJRL1I="; settingsSha256 = "sha256-c30AQa4g4a1EHmaEu1yc05oqY01y+IusbBuq+P6rMCs="; persistencedSha256 = "sha256-11tLSY8uUIl4X/roNnxf5yS2PQvHvoNjnd2CB67e870="; + + patches = [ rcu_patch ]; }); # Vulkan developer beta driver @@ -69,6 +78,8 @@ rec { settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s="; persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; + + patches = [ rcu_patch ]; }; # data center driver compatible with current default cudaPackages @@ -81,6 +92,10 @@ rec { useSettings = false; usePersistenced = false; useFabricmanager = true; + + patches = [ rcu_patch ]; + + broken = kernel.kernelAtLeast "6.5"; }; dc_535 = generic rec { @@ -92,6 +107,8 @@ rec { useSettings = false; usePersistenced = true; useFabricmanager = true; + + patches = [ rcu_patch ]; }; # Update note: @@ -106,8 +123,7 @@ rec { settingsSha256 = "sha256-r6DuIH/rnsCm/y51iRgPNi5/kz+EFMVABREdTjBneZ0="; persistencedSha256 = "sha256-e71fpPBBv8S/aoeXxBXkzKy5bsMMbv8y024cSLc8DYc="; - patchFlags = [ "-p1" "-d" "kernel" ]; - patches = []; + patches = [ rcu_patch ]; }; # Last one supporting x86 diff --git a/pkgs/os-specific/linux/power-calibrate/default.nix b/pkgs/os-specific/linux/power-calibrate/default.nix index 7b8b4683cbd79..d4ae90cddd7cd 100644 --- a/pkgs/os-specific/linux/power-calibrate/default.nix +++ b/pkgs/os-specific/linux/power-calibrate/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "power-calibrate"; - version = "0.01.35"; + version = "0.01.36"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-6ggxerWWBfjVgkgwLmIv/kPb04JIsJxPcVBrRQAG/ZM="; + hash = "sha256-7NKR82waxooB62D59kRmJPqxoVHX9OIWKwLrmzsg9OQ="; }; installFlags = [ |