diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2023-02-02 12:35:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-02 12:35:51 +0100 |
| commit | b574c70ccbc0c22fa3c5df12c6246a10eff1a5bf (patch) | |
| tree | 1f11868aacde8ed7ae55235f137bcdc3ef126d02 /src/libstore/daemon.cc | |
| parent | cde2e2a4040dbf3b8649c463e547f8bcc9631fdc (diff) | |
| parent | 895c525d04901022b7e0c4586ee12774fb4f8c6f (diff) | |
Merge pull request #7736 from shlevy/plugin-files-daemon
Don't send plugin-files to the daemon.
Diffstat (limited to 'src/libstore/daemon.cc')
| -rw-r--r-- | src/libstore/daemon.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc index e2a7dab35..d6621ec0b 100644 --- a/src/libstore/daemon.cc +++ b/src/libstore/daemon.cc @@ -236,6 +236,10 @@ struct ClientSettings // the daemon, as that could cause some pretty weird stuff if (parseFeatures(tokenizeString<StringSet>(value)) != settings.experimentalFeatures.get()) debug("Ignoring the client-specified experimental features"); + } else if (name == settings.pluginFiles.name) { + if (tokenizeString<Paths>(value) != settings.pluginFiles.get()) + warn("Ignoring the client-specified plugin-files.\n" + "The client specifying plugins to the daemon never made sense, and was removed in Nix >=2.14."); } else if (trusted || name == settings.buildTimeout.name |