Added seccureUser to default environment (it is the encryption tool I hope to use for configuration files), made checkConfigurationOptions on by default, added nixos-gen-seccure-keys to nixosTools
svn path=/nixos/trunk/; revision=10935
This commit is contained in:
parent
c0dd88a973
commit
6d07b2a545
|
@ -2129,8 +2129,8 @@ root ALL=(ALL) SETENV: ALL
|
||||||
};
|
};
|
||||||
|
|
||||||
checkConfigurationOptions = mkOption {
|
checkConfigurationOptions = mkOption {
|
||||||
default = false;
|
default = true;
|
||||||
example = true;
|
example = false;
|
||||||
description = "
|
description = "
|
||||||
If all configuration options must be checked. Non-existing options fail build.
|
If all configuration options must be checked. Non-existing options fail build.
|
||||||
";
|
";
|
||||||
|
|
|
@ -208,6 +208,7 @@ rec {
|
||||||
nixosTools.nixosRebuild
|
nixosTools.nixosRebuild
|
||||||
nixosTools.nixosCheckout
|
nixosTools.nixosCheckout
|
||||||
nixosTools.nixosHardwareScan
|
nixosTools.nixosHardwareScan
|
||||||
|
nixosTools.nixosGenSeccureKeys
|
||||||
setuidWrapper
|
setuidWrapper
|
||||||
]
|
]
|
||||||
++ pkgs.lib.optionals (!config.environment.cleanStart) [
|
++ pkgs.lib.optionals (!config.environment.cleanStart) [
|
||||||
|
@ -242,6 +243,7 @@ rec {
|
||||||
pkgs.pwdutils
|
pkgs.pwdutils
|
||||||
pkgs.reiserfsprogs
|
pkgs.reiserfsprogs
|
||||||
pkgs.rsync
|
pkgs.rsync
|
||||||
|
pkgs.seccureUser
|
||||||
pkgs.strace
|
pkgs.strace
|
||||||
pkgs.su
|
pkgs.su
|
||||||
pkgs.sysklogd
|
pkgs.sysklogd
|
||||||
|
|
Loading…
Reference in a new issue