guix_mirror_bot pushed a commit to branch master
in repository guix.
commit dab3b8f64cd1b5255aa29150ace86610a13e1097
Author: Congcong Kuo <[email protected]>
AuthorDate: Thu Jan 29 22:39:30 2026 +0800
daemon: Remove unused entities in globals.{hh, cc}.
All these entities are not been used anywhere.
* nix/libstore/globals.hh (Settings): Remove 'overrides' member
and 'getOverrides' method declaration.
(nixVersion): Removed.
* nix/libstore/globals.cc (Settings::set): Do not update the 'overrides'
map.
(Settings::getOverrides): Remove function definition.
Change-Id: If7dbb6df79178d2569cda21e1fe5e0ea3d8e59ba
Signed-off-by: Ludovic Courtès <[email protected]>
Merges: #6009
---
nix/libstore/globals.cc | 7 -------
nix/libstore/globals.hh | 7 +------
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/nix/libstore/globals.cc b/nix/libstore/globals.cc
index 885ba4eafc..eb7e7dac41 100644
--- a/nix/libstore/globals.cc
+++ b/nix/libstore/globals.cc
@@ -72,7 +72,6 @@ void Settings::processEnvironment()
void Settings::set(const string & name, const string & value)
{
settings[name] = value;
- overrides[name] = value;
}
@@ -196,10 +195,4 @@ string Settings::pack()
}
-Settings::SettingsMap Settings::getOverrides()
-{
- return overrides;
-}
-
-
}
diff --git a/nix/libstore/globals.hh b/nix/libstore/globals.hh
index d68993f280..8ce8aa665a 100644
--- a/nix/libstore/globals.hh
+++ b/nix/libstore/globals.hh
@@ -40,8 +40,6 @@ struct Settings {
string pack();
- SettingsMap getOverrides();
-
/* The directory where we store sources and derived files. */
Path nixStore;
@@ -216,7 +214,7 @@ struct Settings {
Path slirp4netns;
private:
- SettingsMap settings, overrides;
+ SettingsMap settings;
void _get(string & res, const string & name);
void _get(bool & res, const string & name);
@@ -230,7 +228,4 @@ private:
inline Settings settings;
-inline const string nixVersion {PACKAGE_VERSION};
-
-
}