wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-24 22:11:15 +02:00
Code Activity

Merge remote-tracking branch 'origin/master' into finish-value

Browse source
This commit is contained in:
Eelco Dolstra 2024-04-17 16:02:44 +02:00
commit 6a3ecdaa39
271 changed files with 7672 additions and 1195 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/nix-env/nix-env.cc
View file

@ -16,6 +16,7 @@
#include "xml-writer.hh"
#include "legacy.hh"
#include "eval-settings.hh" // for defexpr
#include "terminal.hh"
#include <cerrno>
#include <ctime>
@ -108,7 +109,7 @@ static void getAllExprs(EvalState & state,
const SourcePath & path, StringSet & seen, BindingsBuilder & attrs)
{
StringSet namesSorted;
for (auto & [name, _] : path.readDirectory()) namesSorted.insert(name);
for (auto & [name, _] : path.resolveSymlinks().readDirectory()) namesSorted.insert(name);
for (auto & i : namesSorted) {
/* Ignore the manifest.nix used by profiles. This is
@ -1089,7 +1090,7 @@ static void opQuery(Globals & globals, Strings opFlags, Strings opArgs)
return;
}
bool tty = isatty(STDOUT_FILENO);
bool tty = isTTY();
RunPager pager;
Table table;
@ -1411,7 +1412,7 @@ static int main_nix_env(int argc, char * * argv)
replaceSymlink(
defaultChannelsDir(),
nixExprPath + "/channels");
if (getuid() != 0)
if (!isRootUser())
replaceSymlink(
rootChannelsDir(),
nixExprPath + "/channels_root");