movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-11 12:15:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge #12357: nixos docs: show references to packages

Browse source
This commit is contained in:
Vladimír Čunát 2016-02-03 10:07:27 +01:00
commit b2a37ceeea
11 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/programs/ssh.nix
View file

@ -36,6 +36,7 @@ in
askPassword = mkOption {
type = types.str;
default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
description = ''Program used by SSH to ask for passwords.'';
};
@ -226,7 +227,5 @@ in
environment.variables.SSH_ASKPASS = optionalString config.services.xserver.enable askPassword;
programs.ssh.askPassword = mkDefault "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
};
}