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: e07ea4f38365
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 59b3ce28947b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 5, 2018

  1. nixos/autorandr: make default target in systemd service configurable 

    The `.service` file defining the `systemd` unit for `autorandr.service`
which is bundled with the package itself uses `--default default` in the
`ExecStart` section. This can be an issue when having multiple layouts
(e.g. `default` as workstation layout I mostly work on and `mobile` when
I go somewhere else).

When the service gets restarted and `--default` can't be applied,
however the current layout can't be detected (e.g. when working with an
unknown beamer) the service silently fails with a message like this:

```
Jun 22 18:44:46 hauptshuhle autorandr[3168]: /nix/store/h83b72ffm68nm8fyjnppljchp456a94r-xrandr-1.5.0/bin/xrandr: ca>
Jun 22 18:44:46 hauptshuhle autorandr[3168]: Failed to apply profile 'default' (line 718):
Jun 22 18:44:46 hauptshuhle autorandr[3168]:   Command failed: /nix/store/h83b72ffm68nm8fyjnppljchp456a94r-xrandr-1.>
```

As discussed in the IRC (see https://botbot.me/freenode/nixos/2018-07-05/?msg=101791455&page=6)
it's a bad long-term solution in terms of maintenance to manually patch
the service file bundled with the derivation, instead the service shall
be configured declaratively. Additionally this makes possible overrides
from the user-space way easier.

The `udev` rule (in `$out/etc/udev/rules.d`) won't' be affected, it
simply runs `systemctl start autorandr.service` when e.g. a new display
is added, so now `udev` communicates with the NixOS systemd unit.
    @Ma27
    Ma27 committed Jul 5, 2018
    Configuration menu
    Copy the full SHA
    8325996 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #42398 from Ma27/make-autorandr-target-configurable 

    nixos/autorandr: make default target in systemd service configurable
    @infinisil
    infinisil committed Jul 5, 2018
    Configuration menu
    Copy the full SHA
    59b3ce2 View commit details
    Browse the repository at this point in the history