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: 95ca9c8b2831
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: eb0480ad6c5f
Choose a head ref
  • 3 commits
  • 3 files changed
  • 3 contributors

Commits on Jan 2, 2019

  1. shairport-sync service: fix default arguments 

    (cherry picked from commit 0ea65cd)
    @fpletz
    fpletz committed Jan 2, 2019
    Copy the full SHA
    9d608a6 View commit details

  2. sshd: Add restartTrigger for sshd_config 

    Co-Authored-By: Franz Pletz <fpletz@fnordicwalking.de>
(cherry picked from commit 325e314)
    @ajs124 @fpletz
    ajs124 authored and fpletz committed Jan 2, 2019
    Copy the full SHA
    8757b2c View commit details

  3. stdenv/native: add missing argument 

    (cherry picked from commit 8efe3df)
    @andrew-d @matthewbauer
    andrew-d authored and matthewbauer committed Jan 2, 2019
    Copy the full SHA
    eb0480a View commit details
Showing with 7 additions and 2 deletions.
  1. +1 −1 nixos/modules/services/networking/shairport-sync.nix
  2. +5 −0 nixos/modules/services/networking/ssh/sshd.nix
  3. +1 −1 pkgs/stdenv/native/default.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/networking/shairport-sync.nix
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ in
};

arguments = mkOption {
default = "-v -d pulse";
default = "-v -o pa";
description = ''
Arguments to pass to the daemon. Defaults to a local pulseaudio
server.
5 changes: 5 additions & 0 deletions nixos/modules/services/networking/ssh/sshd.nix
View file
Original file line number Diff line number Diff line change
@@ -352,6 +352,10 @@ in
path = [ cfgc.package pkgs.gawk ];
environment.LD_LIBRARY_PATH = nssModulesPath;

restartTriggers = optionals (!cfg.startWhenNeeded) [
config.environment.etc."ssh/sshd_config".source
];

preStart =
''
# Make sure we don't write to stdout, since in case of
@@ -387,6 +391,7 @@ in
Restart = "always";
Type = "simple";
});

};
in

2 changes: 1 addition & 1 deletion pkgs/stdenv/native/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib
, localSystem, crossSystem, config, overlays
, localSystem, crossSystem, config, overlays, crossOverlays ? []
}:

assert crossSystem == localSystem;