mirror of
https://github.com/NixOS/nix
synced 2025-06-27 12:41:15 +02:00
0c67777396
For example, instead of doing
#include "nix/store-config.hh"
#include "nix/derived-path.hh"
Now do
#include "nix/store/config.hh"
#include "nix/store/derived-path.hh"
This was originally planned in the issue, and also recent requested by
Eelco.
Most of the change is purely mechanical. There is just one small
additional issue. See how, in the example above, we took this
opportunity to also turn `<comp>-config.hh` into `<comp>/config.hh`.
Well, there was already a `nix/util/config.{cc,hh}`. Even though there
is not a public configuration header for libutil (which also would be
called `nix/util/config.{cc,hh}`) that's still confusing, To avoid any
such confusion, we renamed that to `nix/util/configuration.{cc,hh}`.
Finally, note that the libflake headers already did this, so we didn't
need to do anything to them. We wouldn't want to mistakenly get
`nix/flake/flake/flake.hh`!
Progress on #7876
(cherry picked from commit cc24766fa6)
50 lines
1.3 KiB
C++
50 lines
1.3 KiB
C++
#include "nix/cmd/network-proxy.hh"
|
|
|
|
#include <algorithm>
|
|
|
|
#include "nix/util/environment-variables.hh"
|
|
|
|
namespace nix {
|
|
|
|
static const StringSet lowercaseVariables{"http_proxy", "https_proxy", "ftp_proxy", "all_proxy", "no_proxy"};
|
|
|
|
static StringSet getAllVariables()
|
|
{
|
|
StringSet variables = lowercaseVariables;
|
|
for (const auto & variable : lowercaseVariables) {
|
|
std::string upperVariable;
|
|
std::transform(
|
|
variable.begin(), variable.end(), upperVariable.begin(), [](unsigned char c) { return std::toupper(c); });
|
|
variables.insert(std::move(upperVariable));
|
|
}
|
|
return variables;
|
|
}
|
|
|
|
const StringSet networkProxyVariables = getAllVariables();
|
|
|
|
static StringSet getExcludingNoProxyVariables()
|
|
{
|
|
static const StringSet excludeVariables{"no_proxy", "NO_PROXY"};
|
|
StringSet variables;
|
|
std::set_difference(
|
|
networkProxyVariables.begin(),
|
|
networkProxyVariables.end(),
|
|
excludeVariables.begin(),
|
|
excludeVariables.end(),
|
|
std::inserter(variables, variables.begin()));
|
|
return variables;
|
|
}
|
|
|
|
static const StringSet excludingNoProxyVariables = getExcludingNoProxyVariables();
|
|
|
|
bool haveNetworkProxyConnection()
|
|
{
|
|
for (const auto & variable : excludingNoProxyVariables) {
|
|
if (getEnv(variable).has_value()) {
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
}
|