diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-08 12:02:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-08 12:02:00 +0000 |
| commit | 45ea39aecaf1637de5464da7d1d8c4361f5d2039 (patch) | |
| tree | ac4a2e6f3aef4d4940577a5530042cc7f886515c /pkgs/os-specific | |
| parent | f56f2a7cbd79c8c92d24fd5eb39134c6be8165cc (diff) | |
| parent | 958dc88d65283b53c8123b205681aba88a11f635 (diff) | |
| download | nixpkgs-45ea39aecaf1637de5464da7d1d8c4361f5d2039.tar nixpkgs-45ea39aecaf1637de5464da7d1d8c4361f5d2039.tar.gz nixpkgs-45ea39aecaf1637de5464da7d1d8c4361f5d2039.tar.bz2 nixpkgs-45ea39aecaf1637de5464da7d1d8c4361f5d2039.tar.lz nixpkgs-45ea39aecaf1637de5464da7d1d8c4361f5d2039.tar.xz nixpkgs-45ea39aecaf1637de5464da7d1d8c4361f5d2039.tar.zst nixpkgs-45ea39aecaf1637de5464da7d1d8c4361f5d2039.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-xanmod.nix | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 26bb9f82063..355e653c8ea 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -844,6 +844,7 @@ let PREEMPT_VOLUNTARY = yes; X86_AMD_PLATFORM_DEVICE = yes; + X86_PLATFORM_DRIVERS_DELL = whenAtLeast "5.12" yes; } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enable CPU/memory hotplug support diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index fbb9bf93ed5..04c17eac255 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,8 +1,8 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.13.0"; - suffix = "xanmod2-cacule"; + version = "5.13.1"; + suffix = "xanmod1-cacule"; in buildLinux (args // rec { inherit version; @@ -12,7 +12,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-q+m1Ys/Gfr56cihoX8LS/w7icNcM3oefcXRtvzgx3cM="; + sha256 = "sha256-QC2BgsbytpKQs7TyuXt4aan8hUwd43pHj2ApYXv0HAA="; }; structuredExtraConfig = with lib.kernel; { |