diff options
author | eldritch horrors <pennae@lix.systems> | 2024-03-08 03:05:47 +0100 |
---|---|---|
committer | eldritch horrors <pennae@lix.systems> | 2024-03-09 03:50:06 +0100 |
commit | 512c1f05c37c612347dd1fda4771a09744a1a3cd (patch) | |
tree | 9ae77da1a45060b12520326b426efc5014a51c0b /src/nix-env | |
parent | 0e8f505f666d9b0714840e4fe878e6aece918908 (diff) |
Unify and refactor value printing
Previously, there were two mostly-identical value printers -- one in
`libexpr/eval.cc` (which didn't force values) and one in
`libcmd/repl.cc` (which did force values and also printed ANSI color
codes).
This PR unifies both of these printers into `print.cc` and provides a
`PrintOptions` struct for controlling the output, which allows for
toggling whether values are forced, whether repeated values are tracked,
and whether ANSI color codes are displayed.
Additionally, `PrintOptions` allows tuning the maximum number of
attributes, list items, and bytes in a string that will be displayed;
this makes it ideal for contexts where printing too much output (e.g.
all of Nixpkgs) is distracting. (As requested by @roberth in
https://github.com/NixOS/nix/pull/9554#issuecomment-1845095735)
Please read the tests for example output.
Future work:
- It would be nice to provide this function as a builtin, perhaps
`builtins.toStringDebug` -- a printing function that never fails would
be useful when debugging Nix code.
- It would be nice to support customizing `PrintOptions` members on the
command line, e.g. `--option to-string-max-attrs 1000`.
(cherry picked from commit 0fa08b451682fb3311fe58112ff05c4fe5bee3a4, )
===
Restore ambiguous value printer for `nix-instantiate`
The Nix team has requested that this output format remain unchanged.
I've added a warning to the man page explaining that `nix-instantiate
--eval` output will not parse correctly in many situations.
(cherry picked from commit df84dd4d8dd3fd6381ac2ca3064432ab31a16b79)
Change-Id: I7cca6b4b53cd0642f2d49af657d5676a8554c9f8
Diffstat (limited to 'src/nix-env')
-rw-r--r-- | src/nix-env/user-env.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nix-env/user-env.cc b/src/nix-env/user-env.cc index d2b917095..757938914 100644 --- a/src/nix-env/user-env.cc +++ b/src/nix-env/user-env.cc @@ -9,6 +9,8 @@ #include "eval.hh" #include "eval-inline.hh" #include "profiles.hh" +#include "print-ambiguous.hh" +#include <limits> namespace nix { @@ -106,7 +108,7 @@ bool createUserEnv(EvalState & state, DrvInfos & elems, the store; we need it for future modifications of the environment. */ std::ostringstream str; - manifest.print(state.symbols, str, true); + printAmbiguous(manifest, state.symbols, str, nullptr, std::numeric_limits<int>::max()); auto manifestFile = state.store->addTextToStore("env-manifest.nix", str.str(), references); |