diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-13 11:48:11 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 14:47:14 +0100 |
commit | 4fede53c0996938979d2966a69f108782a8c1c12 (patch) | |
tree | 6f15d992897ef0ef0b26636c6cb769e4868d86d5 /nixos/modules/programs | |
parent | e0feace5cde328a8f7478b2cf762991316d4c07c (diff) | |
download | nixlib-4fede53c0996938979d2966a69f108782a8c1c12.tar nixlib-4fede53c0996938979d2966a69f108782a8c1c12.tar.gz nixlib-4fede53c0996938979d2966a69f108782a8c1c12.tar.bz2 nixlib-4fede53c0996938979d2966a69f108782a8c1c12.tar.lz nixlib-4fede53c0996938979d2966a69f108782a8c1c12.tar.xz nixlib-4fede53c0996938979d2966a69f108782a8c1c12.tar.zst nixlib-4fede53c0996938979d2966a69f108782a8c1c12.zip |
nixos manuals: bring back package references
This reverts most of 89e983786a, as those references are sanitized now. Fixes #10039, at least most of it. The `sane` case wasn't fixed, as it calls a *function* in pkgs to get the default value.
Diffstat (limited to 'nixos/modules/programs')
-rw-r--r-- | nixos/modules/programs/ssh.nix | 3 | ||||
-rw-r--r-- | nixos/modules/programs/venus.nix | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 169c6a38e75b..1ad45f468030 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -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"; - }; } diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix index c3756b4838c7..5c322c5589fc 100644 --- a/nixos/modules/programs/venus.nix +++ b/nixos/modules/programs/venus.nix @@ -99,6 +99,7 @@ in }; outputTheme = mkOption { + default = "${pkgs.venus}/themes/classic_fancy"; type = types.path; description = '' Directory containing a config.ini file which is merged with this one. @@ -169,7 +170,5 @@ in startAt = cfg.dates; }; - services.venus.outputTheme = mkDefault "${pkgs.venus}/themes/classic_fancy"; - }; } |