wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 01:51:47 +02:00
Code Activity

nix-testing -> daemon-trust-override

Browse source 
And only enable in the tests that need it. This makes it less of a
sledgehammer.
This commit is contained in:
John Ericson 2023-04-17 09:35:43 -04:00
parent b1343e8ad1
commit e95db8f2b9
7 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libutil/experimental-features.cc
View file

@ -190,12 +190,13 @@ constexpr std::array<ExperimentalFeatureDetails, 12> xpFeatureDetails = {{
)",
},
{
.tag = Xp::NixTesting,
.name = "nix-testing",
.tag = Xp::DaemonTrustOverride,
.name = "daemon-trust-override",
.description = R"(
A "permanent" experimental feature for extra features we just need
for testing. Not actually an "experiment" in the sense of being
prospective functionality for regular users.
Allow forcing trusting or not trusting clients with
`nix-daemon`. This is useful for testing, but possibly also
useful for various experiments with `nix-daemon --stdio`
networking.
)",
},
}};

2
src/libutil/experimental-features.hh
View file

@ -28,7 +28,7 @@ enum struct ExperimentalFeature
AutoAllocateUids,
Cgroups,
DiscardReferences,
NixTesting,
DaemonTrustOverride,
};
/**

6
src/nix/daemon.cc
View file

@ -472,13 +472,13 @@ static int main_nix_daemon(int argc, char * * argv)
else if (*arg == "--stdio")
stdio = true;
else if (*arg == "--force-trusted") {
experimentalFeatureSettings.require(Xp::NixTesting);
experimentalFeatureSettings.require(Xp::DaemonTrustOverride);
isTrustedOpt = Trusted;
} else if (*arg == "--force-untrusted") {
experimentalFeatureSettings.require(Xp::NixTesting);
experimentalFeatureSettings.require(Xp::DaemonTrustOverride);
isTrustedOpt = NotTrusted;
} else if (*arg == "--default-trust") {
experimentalFeatureSettings.require(Xp::NixTesting);
experimentalFeatureSettings.require(Xp::DaemonTrustOverride);
isTrustedOpt = std::nullopt;
} else return false;
return true;