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

Revert "Merge #12357: nixos docs: show references to packages"

Browse source 
The PR wasn't good enough yet.
This reverts commit b2a37ceeea, reversing
changes made to 7fa9a1abce.
This commit is contained in:
Vladimír Čunát 2016-02-03 12:16:33 +01:00
parent 69ec09f38a
commit 889351af8b
11 changed files with 27 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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