diff options
| author | Alexandre Acebedo <alexandre@acebedo.fr> | 2023-03-10 21:15:17 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-03-12 13:42:10 +0000 |
| commit | 28065039e66e874c9380821c85ee01ceb5f2469f (patch) | |
| tree | 1a9bf0c3f83580b45ad3ca89d932ae45f7afa926 /pkgs/os-specific | |
| parent | 90829d50341bd17af3884f381cf220c065e51c9e (diff) | |
| download | nixpkgs-28065039e66e874c9380821c85ee01ceb5f2469f.tar nixpkgs-28065039e66e874c9380821c85ee01ceb5f2469f.tar.gz nixpkgs-28065039e66e874c9380821c85ee01ceb5f2469f.tar.bz2 nixpkgs-28065039e66e874c9380821c85ee01ceb5f2469f.tar.lz nixpkgs-28065039e66e874c9380821c85ee01ceb5f2469f.tar.xz nixpkgs-28065039e66e874c9380821c85ee01ceb5f2469f.tar.zst nixpkgs-28065039e66e874c9380821c85ee01ceb5f2469f.zip | |
linux_testing: 6.2-rc6 -> 6.3-rc1
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index bbd743b4dfc..4b1318d9115 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -285,7 +285,7 @@ let video = { DRM_LEGACY = no; - NOUVEAU_LEGACY_CTX_SUPPORT = whenAtLeast "5.2" no; + NOUVEAU_LEGACY_CTX_SUPPORT = whenBetween "5.2" "6.3" no; # Allow specifying custom EDID on the kernel command line DRM_LOAD_EDID_FIRMWARE = yes; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index cef442ad20c..356f811974f 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.2-rc6"; + version = "6.3-rc1"; extraMeta.branch = lib.versions.majorMinor version; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-rEpJYw5O6OHSwNY8LxlCsw0p9+u9BUjTQ8FsB6+fLbc="; + hash = "sha256-oZhG9dYlRthT4TbRNuJ+/Kw/mRuGTIu2E9Dw5ge+xCo="; }; # Should the testing kernels ever be built on Hydra? |