public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos: Replace pkgs.openssh with config.programs.ssh.package

Browse Source
This commit is contained in:
William A. Kennington III 2015-06-26 17:09:58 -07:00
parent da4266afb6
commit fee9ef8659
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/config/system-path.nix
View File

@ -38,7 +38,7 @@ let
pkgs.nano pkgs.nano
pkgs.ncurses pkgs.ncurses
pkgs.netcat pkgs.netcat
pkgs.openssh config.programs.ssh.package
pkgs.perl pkgs.perl
pkgs.procps pkgs.procps
pkgs.rsync pkgs.rsync

2
nixos/modules/services/continuous-integration/jenkins/default.nix
View File

@ -57,7 +57,7 @@ in {
}; };
packages = mkOption { packages = mkOption {
default = [ pkgs.stdenv pkgs.git pkgs.jdk pkgs.openssh pkgs.nix ]; default = [ pkgs.stdenv pkgs.git pkgs.jdk config.programs.ssh.package pkgs.nix ];
type = types.listOf types.package; type = types.listOf types.package;
description = '' description = ''
Packages to add to PATH for the jenkins process. Packages to add to PATH for the jenkins process.

2
nixos/modules/services/misc/gitolite.nix
View File

@ -75,7 +75,7 @@ in
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true; serviceConfig.RemainAfterExit = true;
path = [ pkgs.gitolite pkgs.git pkgs.perl pkgs.bash pkgs.openssh ]; path = [ pkgs.gitolite pkgs.git pkgs.perl pkgs.bash config.programs.ssh.package ];
script = '' script = ''
cd ${cfg.dataDir} cd ${cfg.dataDir}
mkdir -p .gitolite/logs mkdir -p .gitolite/logs

2
nixos/modules/services/misc/nix-daemon.nix
View File

@ -345,7 +345,7 @@ in
systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ]; systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ];
systemd.services.nix-daemon = systemd.services.nix-daemon =
{ path = [ nix pkgs.openssl pkgs.utillinux pkgs.openssh ] { path = [ nix pkgs.openssl pkgs.utillinux config.programs.ssh.package ]
++ optionals cfg.distributedBuilds [ pkgs.gzip ]; ++ optionals cfg.distributedBuilds [ pkgs.gzip ];
environment = cfg.envVars environment = cfg.envVars

2
nixos/modules/virtualisation/ec2-data.nix
View File

@ -91,7 +91,7 @@ with lib;
# can obtain it securely by parsing the output of # can obtain it securely by parsing the output of
# ec2-get-console-output. # ec2-get-console-output.
echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" > /dev/console 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 echo "-----END SSH HOST KEY FINGERPRINTS-----" > /dev/console
''; '';
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";

2
nixos/modules/virtualisation/nova.nix
View File

@ -100,7 +100,7 @@ in
# `openssl' is required to generate the CA. `openssh' is # `openssl' is required to generate the CA. `openssh' is
# required to generate key pairs. # required to generate key pairs.
path = [ pkgs.openssl pkgs.openssh pkgs.bash ]; path = [ pkgs.openssl config.programs.ssh.package pkgs.bash ];
respawn = false; respawn = false;