Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 01422520124a
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b4522d230ee7
Choose a head ref
  • 4 commits
  • 3 files changed
  • 4 contributors

Commits on Jul 19, 2019

  1. redo-apenwarr: init at unstable-2019-06-21

    @andrewchambers
    andrewchambers committed Jul 19, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    rickie Rick Ossendrijver
    GPG key ID: A2237828CE7F76B2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    386b7d8 View commit details

Commits on Jul 23, 2019

  1. linux/kernel: enable automatic cpu hotplug support

    @aanderse
    aanderse committed Jul 23, 2019
    Copy the full SHA
    3d1905e View commit details

  2. Merge pull request #65273 from aanderse/automatic-hotplug 

    linux/kernel: enable automatic cpu hotplug support
    @peterhoeg
    peterhoeg authored Jul 23, 2019
    Copy the full SHA
    94aea76 View commit details

  3. Merge pull request #58640 from andrewchambers/redo-apenwarr 

    redo-apenwarr: init at unstable-2019-06-21
    @joachifm
    joachifm authored Jul 23, 2019
    Copy the full SHA
    b4522d2 View commit details
Showing with 36 additions and 2 deletions.
  1. +30 −0 pkgs/development/tools/build-managers/redo-apenwarr/default.nix
  2. +4 −2 pkgs/os-specific/linux/kernel/common-config.nix
  3. +2 −0 pkgs/top-level/all-packages.nix
30 changes: 30 additions & 0 deletions pkgs/development/tools/build-managers/redo-apenwarr/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{stdenv, fetchFromGitHub, python2, which}:
stdenv.mkDerivation rec {
name = "redo-apenwarr-${version}";

version = "unstable-2019-06-21";

src = fetchFromGitHub {
owner = "apenwarr";
repo = "redo";
rev = "8924fa35fa7363b531f8e6b48a1328d2407ad5cf";
sha256 = "1dj20w29najqjyvk0jh5kqbcd10k32rad986q5mzv4v49qcwdc1q";
};

DESTDIR="";
PREFIX = placeholder "out";

patchPhase = ''
patchShebangs .
'';

buildInputs = [ python2 which ];

meta = with stdenv.lib; {
description = "Apenwarr version of the redo build tool.";
homepage = https://github.com/apenwarr/redo/;
license = stdenv.lib.licenses.asl20;
platforms = platforms.all;
maintainers = with stdenv.lib.maintainers; [ andrewchambers ];
};
}
6 changes: 4 additions & 2 deletions pkgs/os-specific/linux/kernel/common-config.nix
View file
Original file line number Diff line number Diff line change
@@ -699,11 +699,13 @@ let
PREEMPT_VOLUNTARY = yes;

} // 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
# Enable CPU/memory hotplug support
# Allows you to dynamically add & remove CPUs/memory to a VM client running NixOS without requiring a reboot
ACPI_HOTPLUG_CPU = yes;
ACPI_HOTPLUG_MEMORY = yes;
MEMORY_HOTPLUG = yes;
MEMORY_HOTREMOVE = yes;
HOTPLUG_CPU = yes;
MIGRATION = yes;
SPARSEMEM = yes;

2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -9687,6 +9687,8 @@ in

redo = callPackage ../development/tools/build-managers/redo { };

redo-apenwarr = callPackage ../development/tools/build-managers/redo-apenwarr { };

redo-sh = callPackage ../development/tools/build-managers/redo-sh { };

reno = callPackage ../development/tools/reno { };