Compare commits

..

1 commit

Author SHA1 Message Date
chayleaf 79f4a6b907
bump nix version 2024-11-27 15:37:41 +07:00
3 changed files with 14 additions and 26 deletions

View file

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

View file

@ -1,26 +1,13 @@
diff --git a/src/libmain/plugin.cc b/src/libmain/plugin.cc
index ccfd7f900..c1b737ad6 100644
--- a/src/libmain/plugin.cc
+++ b/src/libmain/plugin.cc
@@ -40,7 +40,7 @@ struct PluginSettings : Config
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index dba7d78ef..f102f08f9 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -959,7 +959,7 @@ public:
"Number of seconds between checking free disk space."};
PluginFilesSetting pluginFiles{
this,
{},
- "plugin-files",
+ "plugin-files-2",
- this, {}, "plugin-files",
+ this, {}, "plugin-files-2",
R"(
A list of plugin files to be loaded by Nix. Each of these files will
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;
be dlopened by Nix, allowing them to affect execution through static

View file

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