Merge pull request #300993 from Strum355/sudoers-options-enum

nixos/sudo: update command options enum for newer sudo version
This commit is contained in:
Aleksana 2024-04-04 22:29:21 +08:00 committed by GitHub
commit 52257144db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions

View File

@ -163,9 +163,9 @@ in
};
options = mkOption {
type = with types; listOf (enum [ "NOPASSWD" "PASSWD" "NOEXEC" "EXEC" "SETENV" "NOSETENV" "LOG_INPUT" "NOLOG_INPUT" "LOG_OUTPUT" "NOLOG_OUTPUT" ]);
type = with types; listOf (enum [ "NOPASSWD" "PASSWD" "NOEXEC" "EXEC" "SETENV" "NOSETENV" "LOG_INPUT" "NOLOG_INPUT" "LOG_OUTPUT" "NOLOG_OUTPUT" "MAIL" "NOMAIL" "FOLLOW" "NOFLLOW" "INTERCEPT" "NOINTERCEPT"]);
description = mdDoc ''
Options for running the command. Refer to the [sudo manual](https://www.sudo.ws/man/1.7.10/sudoers.man.html).
Options for running the command. Refer to the [sudo manual](https://www.sudo.ws/docs/man/1.9.15/sudoers.man/#Tag_Spec).
'';
default = [];
};

View File

@ -14,6 +14,8 @@
stdenv.mkDerivation (finalAttrs: {
pname = "sudo";
# be sure to check if nixos/modules/security/sudo.nix needs updating when bumping
# e.g. links to man pages, value constraints etc.
version = "1.9.15p5";
src = fetchurl {