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: dcc61da97c72
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: dc87b5587e3f
Choose a head ref
  • 2 commits
  • 6 files changed
  • 1 contributor

Commits on Apr 23, 2017

  1. nixos/slim: Implement logging to journal 

    The main change here is a patch of SLiM to tread a log file of
/dev/stderr specially in that it now uses std::cerr instead of a file
for logging.

This allows us to set the logfile to stderr in NixOS for the generated
SLiM configuration file and we now get logging to the systemd journal.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
    @aszlig
    aszlig committed Apr 23, 2017
    Configuration menu
    Copy the full SHA
    83e1400 View commit details
    Browse the repository at this point in the history

  2. nixos: Add a VM test for the SLiM display manager 

    This is currently our default display manager, so I'm adding this to the
"tested" job as well to ensure we don't ship broken revisions where X is
most likely not working.

The test uses a custom SLiM theme that's specifically tailored for good
OCR results (mainly white background and black fonts without anything
else), because our default NixOS theme has a very small contrast between
background and fonts in some places.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
    @aszlig
    aszlig committed Apr 23, 2017
    Configuration menu
    Copy the full SHA
    dc87b55 View commit details
    Browse the repository at this point in the history