Compare commits

..

2 commits

Author SHA1 Message Date
chayleaf d3d3580f81
TODO amend update inputs 2024-11-28 01:55:53 +07:00
chayleaf 09e9712488
bump nix version 2024-11-28 01:55:47 +07:00
3 changed files with 26 additions and 14 deletions

View file

@ -108,11 +108,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718998007, "lastModified": 1732733541,
"narHash": "sha256-2ByOTMmdtoD5CDVq5O/VFdz2u9xLtk5z3NpFsWOmIyA=", "narHash": "sha256-4kMy/AfcSqoDWGGWOPf2J7GxpXi2ikg9Z+WnPCsfpiA=",
"owner": "chayleaf", "owner": "chayleaf",
"repo": "coop-fd", "repo": "coop-fd",
"rev": "f71ac2a8a62cc53896a2c0d6649c1451e86f8135", "rev": "25ad04f7a813cb0f2c4edb349656065119b5cb4b",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,13 +1,26 @@
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh diff --git a/src/libmain/plugin.cc b/src/libmain/plugin.cc
index dba7d78ef..f102f08f9 100644 index ccfd7f900..c1b737ad6 100644
--- a/src/libstore/globals.hh --- a/src/libmain/plugin.cc
+++ b/src/libstore/globals.hh +++ b/src/libmain/plugin.cc
@@ -959,7 +959,7 @@ public: @@ -40,7 +40,7 @@ struct PluginSettings : Config
"Number of seconds between checking free disk space."};
PluginFilesSetting pluginFiles{ PluginFilesSetting pluginFiles{
- this, {}, "plugin-files", this,
+ this, {}, "plugin-files-2", {},
- "plugin-files",
+ "plugin-files-2",
R"( R"(
A list of plugin files to be loaded by Nix. Each of these files will A list of plugin files to be loaded by Nix. Each of these files will
be dlopened by Nix, allowing them to affect execution through static be dlopened by Nix. If they contain the symbol `nix_plugin_entry()`,
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 555936c18..26db2b7cb 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -134,7 +134,7 @@ void RemoteStore::setOptions(Connection & conn)
overrides.erase(settings.useSubstitutes.name);
overrides.erase(loggerSettings.showTrace.name);
overrides.erase(experimentalFeatureSettings.experimentalFeatures.name);
- overrides.erase("plugin-files");
+ overrides.erase("plugin-files-2");
conn.to << overrides.size();
for (auto & i : overrides)
conn.to << i.first << i.second.value;

View file

@ -59,7 +59,6 @@ in {
"flakes" "flakes"
"nix-command" "nix-command"
"no-url-literals" "no-url-literals"
"repl-flake"
]; ];
}; };
gc = { gc = {