Skip to content
This repository has been 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
base: 0e7a9f737057
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 5dc4d071ffec
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 11, 2020

  1. kernel: set POWERCAP and INTEL_RAPL 

    These enable some power management settings. They are needed for [s-tui
to show power readings](amanusk/s-tui#105).

The values chosen here match what Arch Linux has. In particular
the Intel specific code is loadable as a module rather than compiled in.

(cherry picked from commit 299e6f0)
    @michaelpj @mweinelt
    michaelpj authored and mweinelt committed Jan 11, 2020
    Copy the full SHA
    a347f0f View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2020

  1. Merge pull request #77531 from mweinelt/powercap-19.09 

    [19.09] kernel: set POWERCAP and INTEL_RAPL
    @andir
    andir committed Jan 12, 2020
    Copy the full SHA
    5dc4d07 View commit details
    Browse the repository at this point in the history