diff options
| author | Alexander Bantyev <balsoft@balsoft.ru> | 2021-07-01 00:23:47 +0300 |
|---|---|---|
| committer | Alexander Bantyev <balsoft@balsoft.ru> | 2021-07-01 00:23:47 +0300 |
| commit | ef1e7ab840eaa50da29ddde7bf990a1ff6a8b185 (patch) | |
| tree | e659150f30acac40fea7d2a41f76a68631faa9b9 /src | |
| parent | 69eb65403ad3e877300a7c0c96411d9d9e27dc69 (diff) | |
flake.nixConfig: fix flake-registry config settings
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcmd/installables.cc | 2 | ||||
| -rw-r--r-- | src/libexpr/flake/flake.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc index fe52912cf..540e53eee 100644 --- a/src/libcmd/installables.cc +++ b/src/libcmd/installables.cc @@ -575,8 +575,6 @@ std::shared_ptr<flake::LockedFlake> InstallableFlake::getLockedFlake() const { if (!_lockedFlake) { _lockedFlake = std::make_shared<flake::LockedFlake>(lockFlake(*state, flakeRef, lockFlags)); - _lockedFlake->flake.config.apply(); - // FIXME: send new config to the daemon. } return _lockedFlake; } diff --git a/src/libexpr/flake/flake.cc b/src/libexpr/flake/flake.cc index 8e6f06949..b57679d3b 100644 --- a/src/libexpr/flake/flake.cc +++ b/src/libexpr/flake/flake.cc @@ -298,6 +298,9 @@ LockedFlake lockFlake( auto flake = getFlake(state, topRef, lockFlags.useRegistries, flakeCache); + flake.config.apply(); + // FIXME: send new config to the daemon. + try { // FIXME: symlink attack |