Merge pull request #103866 from cole-h/doas

doas: 6.6.1 -> 6.8

Changed files
+14 -3
nixos
modules
security
pkgs
tools
security
+11
nixos/modules/security/doas.nix
···
mkOpts = rule: concatStringsSep " " [
(optionalString rule.noPass "nopass")
(optionalString rule.persist "persist")
(optionalString rule.keepEnv "keepenv")
"setenv { SSH_AUTH_SOCK ${concatStringsSep " " rule.setEnv} }"
···
description = ''
If <code>true</code>, the user is not required to enter a
password.
'';
};
···
mkOpts = rule: concatStringsSep " " [
(optionalString rule.noPass "nopass")
+
(optionalString rule.noLog "nolog")
(optionalString rule.persist "persist")
(optionalString rule.keepEnv "keepenv")
"setenv { SSH_AUTH_SOCK ${concatStringsSep " " rule.setEnv} }"
···
description = ''
If <code>true</code>, the user is not required to enter a
password.
+
'';
+
};
+
+
noLog = mkOption {
+
type = with types; bool;
+
default = false;
+
description = ''
+
If <code>true</code>, successful executions will not be logged
+
to
+
<citerefentry><refentrytitle>syslogd</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
'';
};
+3 -3
pkgs/tools/security/doas/default.nix
···
stdenv.mkDerivation rec {
pname = "doas";
-
version = "6.6.1";
src = fetchFromGitHub {
owner = "Duncaen";
repo = "OpenDoas";
rev = "v${version}";
-
sha256 = "07kkc5729p654jrgfsc8zyhiwicgmq38yacmwfvay2b3gmy728zn";
};
# otherwise confuses ./configure
···
];
postPatch = ''
-
sed -i '/\(chown\|chmod\)/d' bsd.prog.mk
'';
buildInputs = [ bison pam ];
···
stdenv.mkDerivation rec {
pname = "doas";
+
version = "6.8";
src = fetchFromGitHub {
owner = "Duncaen";
repo = "OpenDoas";
rev = "v${version}";
+
sha256 = "1dlwnvy8r6slxcy260gfkximp1ms510wdslpfq9y6xvd2qi5izcb";
};
# otherwise confuses ./configure
···
];
postPatch = ''
+
sed -i '/\(chown\|chmod\)/d' GNUmakefile
'';
buildInputs = [ bison pam ];