diff options
author | William A. Kennington III <william@wkennington.com> | 2015-06-26 17:09:58 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-06-26 17:09:58 -0700 |
commit | fee9ef865900beb626e4317d39154bd666b722bd (patch) | |
tree | 917ce9bce77fb40ad6d2d9f06811cdd073f9834c /nixos/modules/virtualisation | |
parent | da4266afb617e3167d459ad6dbf69179934d936e (diff) |
nixos: Replace pkgs.openssh with config.programs.ssh.package
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r-- | nixos/modules/virtualisation/ec2-data.nix | 2 | ||||
-rw-r--r-- | nixos/modules/virtualisation/nova.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix index fd062237bb074..0b2479c104627 100644 --- a/nixos/modules/virtualisation/ec2-data.nix +++ b/nixos/modules/virtualisation/ec2-data.nix @@ -91,7 +91,7 @@ with lib; # can obtain it securely by parsing the output of # ec2-get-console-output. echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" > /dev/console - ${pkgs.openssh}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub > /dev/console + ${config.programs.ssh.package}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub > /dev/console echo "-----END SSH HOST KEY FINGERPRINTS-----" > /dev/console ''; serviceConfig.Type = "oneshot"; diff --git a/nixos/modules/virtualisation/nova.nix b/nixos/modules/virtualisation/nova.nix index 21e060cf26636..f356445abe46c 100644 --- a/nixos/modules/virtualisation/nova.nix +++ b/nixos/modules/virtualisation/nova.nix @@ -100,7 +100,7 @@ in # `openssl' is required to generate the CA. `openssh' is # required to generate key pairs. - path = [ pkgs.openssl pkgs.openssh pkgs.bash ]; + path = [ pkgs.openssl config.programs.ssh.package pkgs.bash ]; respawn = false; |