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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3ac9699ae2cc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d089f2339055
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 15, 2019

  1. nixos/sshd: fixes validation for cross-compilation 

    See #62853
    @samueldr
    samueldr committed Jun 15, 2019
    Copy the full SHA
    861bbbc View commit details

  2. Merge pull request #62853 from samueldr/fix/sshd-cross-compile-issue 

    nixos/sshd: fixes validation for cross-compilation
    @lukateras
    lukateras authored Jun 15, 2019
    Copy the full SHA
    d089f23 View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −1 nixos/modules/services/networking/ssh/sshd.nix
10 changes: 9 additions & 1 deletion nixos/modules/services/networking/ssh/sshd.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,15 @@ with lib;

let

sshconf = pkgs.runCommand "sshd.conf-validated" { nativeBuildInputs = [ cfgc.package ]; } ''
# The splicing information needed for nativeBuildInputs isn't available
# on the derivations likely to be used as `cfgc.package`.
# This middle-ground solution ensures *an* sshd can do their basic validation
# on the configuration.
validationPackage = if pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform
then [ cfgc.package ]
else [ pkgs.buildPackages.openssh ];

sshconf = pkgs.runCommand "sshd.conf-validated" { nativeBuildInputs = [ validationPackage ]; } ''
cat >$out <<EOL
${cfg.extraConfig}
EOL