Skip to content
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
base: bc471c14dba2
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b12aef05a454
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 4, 2019

  1. nixos/upower: Allow customization of UPower.conf 

    Documentation of options and default values taken from the upstream
UPower.conf. The documentation was modified slightly to make more sense
when displayed on https://nixos.org/nixos/options.html.

A copy of upstream UPower.conf can be found here:
https://cgit.freedesktop.org/upower/tree/etc/UPower.conf?id=28bd86c181e2510ef6a1dc7cfa26f97803698a79
    @mat8913
    mat8913 committed Dec 4, 2019
    Copy the full SHA
    aecfea0 View commit details
    Browse the repository at this point in the history

  2. upower: load config from /etc 

    In the process of making UPower.conf customizable (#73968), it came up
that UPower doesn't load its config from /etc by default.

The UPower derivation is modified to make it load its config from /etc
at runtime, but still install the default config to its nix store path
as before.

The UPower module is modified to put the config in /etc.
    @mat8913
    mat8913 committed Dec 4, 2019
    Copy the full SHA
    f83a83f View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2019

  1. Merge pull request #73968 from mat8913/upower-config-master 

    nixos/upower: Allow customization of UPower.conf
    @worldofpeace
    worldofpeace committed Dec 5, 2019
    Copy the full SHA
    b12aef0 View commit details
    Browse the repository at this point in the history