diff options
| author | Ryan Lahfa <masterancpp@gmail.com> | 2023-07-30 18:58:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-30 18:58:17 +0200 |
| commit | a2a95950333746a1b1f18c6edcd72c50f3bcaa17 (patch) | |
| tree | 17951392f929332f4dcda520df2a0392618c4358 /pkgs | |
| parent | ff9296f93e39cfa2ec9b12268f2c280ab3c14b65 (diff) | |
| parent | 7fae0116199ee909c0f877619edd91f9bd32d9a3 (diff) | |
| download | nixpkgs-a2a95950333746a1b1f18c6edcd72c50f3bcaa17.tar nixpkgs-a2a95950333746a1b1f18c6edcd72c50f3bcaa17.tar.gz nixpkgs-a2a95950333746a1b1f18c6edcd72c50f3bcaa17.tar.bz2 nixpkgs-a2a95950333746a1b1f18c6edcd72c50f3bcaa17.tar.lz nixpkgs-a2a95950333746a1b1f18c6edcd72c50f3bcaa17.tar.xz nixpkgs-a2a95950333746a1b1f18c6edcd72c50f3bcaa17.tar.zst nixpkgs-a2a95950333746a1b1f18c6edcd72c50f3bcaa17.zip | |
Merge pull request #244345 from RaitoBezarius/update/kernel-testing
Diffstat (limited to 'pkgs')
| -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 042a9aa5a3b..3240fe93de1 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -715,7 +715,7 @@ let MEDIA_PCI_SUPPORT = yes; MEDIA_USB_SUPPORT = yes; MEDIA_ANALOG_TV_SUPPORT = yes; - VIDEO_STK1160_COMMON = module; + VIDEO_STK1160_COMMON = whenOlder "6.5" module; }; "9p" = { diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 4e1c34d6ae4..0851a72e010 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.4-rc7"; + version = "6.5-rc3"; 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 = fetchzip { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - hash = "sha256-UDhLrKe8yMvmWbS19Xt1G3SQpAUWyKrfV3v1MJ5Vep8="; + hash = "sha256-z4y4eNkY458rxebey3eCG0CUDLJP9oQETVlH8Av3Lhs="; }; # Should the testing kernels ever be built on Hydra? |