diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-22 15:59:42 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-22 15:59:42 +0100 |
| commit | 3fe32b675e1605cbc830fa52c0593747fa4dd7e2 (patch) | |
| tree | e0b31e2df8f0734290232b1b0d61d0716731e296 /pkgs/os-specific | |
| parent | a903c60c627f42461d3e6f9780d26a80f8e51470 (diff) | |
| parent | b7d4a356be49501ea046b28db28dc2807f5fccdb (diff) | |
| download | nixpkgs-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar nixpkgs-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.gz nixpkgs-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.bz2 nixpkgs-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.lz nixpkgs-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.xz nixpkgs-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.tar.zst nixpkgs-3fe32b675e1605cbc830fa52c0593747fa4dd7e2.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/alsa-utils/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-testing.nix | 6 |
3 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index c9cf1291267..2ced9c6094e 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 1466b51b261..ddd1e9828d5 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"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 01e7e315393..c3f3d3ce0cb 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "5.0-rc2"; - modDirVersion = "5.0.0-rc2"; + version = "5.0-rc3"; + modDirVersion = "5.0.0-rc3"; extraMeta.branch = "5.0"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1204b15gkdb7hxaqx1x7kxn48p1gl8gl51vgifxn2saikzlzls7c"; + sha256 = "03xw2zfa6cxy5vdfrfh536mh3gcm8hvj69ggpqixm8d1gqg0nln6"; }; # Should the testing kernels ever be built on Hydra? |