nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 03:56:01 +01:00
Code Activity

Factor out --no-check-sigs

Browse source
This commit is contained in:
Eelco Dolstra 2025-10-16 12:42:53 +02:00
parent 0503a862ef
commit 139df77440
3 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libcmd/include/nix/cmd/command.hh
View file

@ -350,6 +350,20 @@ struct MixEnvironment : virtual Args
void setEnviron(); void setEnviron();
}; };
struct MixNoCheckSigs : virtual Args
{
CheckSigsFlag checkSigs = CheckSigs;
MixNoCheckSigs()
{
addFlag({
.longName = "no-check-sigs",
.description = "Do not require that paths are signed by trusted keys.",
.handler = {&checkSigs, NoCheckSigs},
});
}
};
void completeFlakeInputAttrPath( void completeFlakeInputAttrPath(
AddCompletions & completions, AddCompletions & completions,
ref<EvalState> evalState, ref<EvalState> evalState,

10
src/nix/copy.cc
View file

@ -5,10 +5,9 @@
using namespace nix; using namespace nix;
struct CmdCopy : virtual CopyCommand, virtual BuiltPathsCommand, MixProfile struct CmdCopy : virtual CopyCommand, virtual BuiltPathsCommand, MixProfile, MixNoCheckSigs
{ {
std::optional<std::filesystem::path> outLink; std::optional<std::filesystem::path> outLink;
CheckSigsFlag checkSigs = CheckSigs;
SubstituteFlag substitute = NoSubstitute; SubstituteFlag substitute = NoSubstitute;
@ -24,13 +23,6 @@ struct CmdCopy : virtual CopyCommand, virtual BuiltPathsCommand, MixProfile
.handler = {&outLink}, .handler = {&outLink},
.completer = completePath, .completer = completePath,
}); });
addFlag({
.longName = "no-check-sigs",
.description = "Do not require that paths are signed by trusted keys.",
.handler = {&checkSigs, NoCheckSigs},
});
addFlag({ addFlag({
.longName = "substitute-on-destination", .longName = "substitute-on-destination",
.shortName = 's', .shortName = 's',

9
src/nix/flake.cc
View file

@ -1032,12 +1032,10 @@ struct CmdFlakeClone : FlakeCommand
} }
}; };
struct CmdFlakeArchive : FlakeCommand, MixJSON, MixDryRun struct CmdFlakeArchive : FlakeCommand, MixJSON, MixDryRun, MixNoCheckSigs
{ {
std::string dstUri; std::string dstUri;
CheckSigsFlag checkSigs = CheckSigs;
SubstituteFlag substitute = NoSubstitute; SubstituteFlag substitute = NoSubstitute;
CmdFlakeArchive() CmdFlakeArchive()
@ -1048,11 +1046,6 @@ struct CmdFlakeArchive : FlakeCommand, MixJSON, MixDryRun
.labels = {"store-uri"}, .labels = {"store-uri"},
.handler = {&dstUri}, .handler = {&dstUri},
}); });
addFlag({
.longName = "no-check-sigs",
.description = "Do not require that paths are signed by trusted keys.",
.handler = {&checkSigs, NoCheckSigs},
});
} }
std::string description() override std::string description() override