diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-20 18:22:17 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-20 18:22:17 +0100 |
| commit | ca2edf79f75ad2a43a5af5c1283db9f0f843680a (patch) | |
| tree | f6f14fe59015d59bbf4405cc3e753c81415e832d /pkgs/os-specific/linux | |
| parent | 492f3c3faa081329d7a7667b39c53cf12811964e (diff) | |
| parent | 4457da9a99e32b2c9ab02a66f0383b35a671fe17 (diff) | |
| download | nixlib-ca2edf79f75ad2a43a5af5c1283db9f0f843680a.tar nixlib-ca2edf79f75ad2a43a5af5c1283db9f0f843680a.tar.gz nixlib-ca2edf79f75ad2a43a5af5c1283db9f0f843680a.tar.bz2 nixlib-ca2edf79f75ad2a43a5af5c1283db9f0f843680a.tar.lz nixlib-ca2edf79f75ad2a43a5af5c1283db9f0f843680a.tar.xz nixlib-ca2edf79f75ad2a43a5af5c1283db9f0f843680a.tar.zst nixlib-ca2edf79f75ad2a43a5af5c1283db9f0f843680a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/alsa-utils/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index c9cf12912670..2ced9c6094ec 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "alsa-utils-${version}"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { url = "mirror://alsa/utils/${name}.tar.bz2"; - sha256 = "02jlw6a22j2rr7inggfgk2hzx3w0fjhvhs0dn1afpzdp9aspzchx"; + sha256 = "1kx45yhrxai3k595yyqs4wj0p2n5b0c9mf0k36ljjf1bj8lgb6zx"; }; patchPhase = '' diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1466b51b2616..ddd1e9828d51 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -688,6 +688,14 @@ let HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { + # Enable memory hotplug support + # Allows you to dynamically add & remove memory to a VM client running NixOS without requiring a reboot + ACPI_HOTPLUG_MEMORY = yes; + MEMORY_HOTPLUG = yes; + MEMORY_HOTREMOVE = yes; + MIGRATION = yes; + SPARSEMEM = yes; + # Bump the maximum number of CPUs to support systems like EC2 x1.* # instances and Xeon Phi. NR_CPUS = "384"; |