quickdudley/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

flake.nixConfig: fix flake-registry config settings

Browse source 
Before this commit, nixConfig.flake-registry didn't have any real effect
on the evaluation, since config was applied after inputs were evaluated.
Change this behavior: apply the config in the beginning of flake::lockFile.
This commit is contained in:
Alexander Bantyev 2021-07-01 00:23:47 +03:00
parent 69eb65403a
commit ef1e7ab840
No known key found for this signature in database
GPG key ID: E081FF12ADCB4AD5
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libcmd/installables.cc
View file

@ -575,8 +575,6 @@ std::shared_ptr<flake::LockedFlake> InstallableFlake::getLockedFlake() const
{ {
if (!_lockedFlake) { if (!_lockedFlake) {
_lockedFlake = std::make_shared<flake::LockedFlake>(lockFlake(*state, flakeRef, lockFlags)); _lockedFlake = std::make_shared<flake::LockedFlake>(lockFlake(*state, flakeRef, lockFlags));
_lockedFlake->flake.config.apply();
// FIXME: send new config to the daemon.
} }
return _lockedFlake; return _lockedFlake;
} }

3
src/libexpr/flake/flake.cc
View file

@ -298,6 +298,9 @@ LockedFlake lockFlake(
auto flake = getFlake(state, topRef, lockFlags.useRegistries, flakeCache); auto flake = getFlake(state, topRef, lockFlags.useRegistries, flakeCache);
flake.config.apply();
// FIXME: send new config to the daemon.
try { try {
// FIXME: symlink attack // FIXME: symlink attack