ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-04 14:21:02 +03:00
Code Issues Projects Releases Wiki Activity

nixos/sudo: update command options enum for newer sudo version

Browse Source 
The enum of allowed command options (NOPASSWD, NOEXEC etc) had not been updated when bumping sudo version.
MAIL/NOMAIL were added in [1.8.13](https://www.sudo.ws/releases/legacy/#1.8.13), FOLLOW/NOFOLLOW were added in [1.8.15](https://www.sudo.ws/releases/legacy/#1.8.15) and INTERCEPT/NOINTERCEPT in [1.9.8](https://www.sudo.ws/releases/stable/#1.9.8)
This commit is contained in:
Noah Santschi-Cooney 2024-04-02 15:15:53 +01:00
parent d8b8cc5a07
commit 1a5acce391
No known key found for this signature in database
GPG Key ID: 3B22282472C8AE48
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/security/sudo.nix
View File

@ -163,9 +163,9 @@ in
}; };
options = mkOption { 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 '' 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/).
''; '';
default = []; default = [];
}; };

2
pkgs/tools/security/sudo/default.nix
View File

@ -14,6 +14,8 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "sudo"; 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"; version = "1.9.15p5";
src = fetchurl { src = fetchurl {