Merge "libcmd: use correct stream for ANSI testing for markdown" into main

lix/libcmd/markdown.cc

@@ -8,7 +8,7 @@
 
 namespace nix {
 
-std::string renderMarkdownToTerminal(std::string_view markdown)
+std::string renderMarkdownToTerminal(std::string_view markdown, StandardOutputStream fileno)
 {
     int windowWidth = getWindowSize().second;
 
@@ -21,7 +21,7 @@ std::string renderMarkdownToTerminal(std::string_view markdown)
         .feat = LOWDOWN_COMMONMARK | LOWDOWN_FENCED | LOWDOWN_DEFLIST | LOWDOWN_TABLES,
         .oflags = LOWDOWN_TERM_NOLINK,
     };
-    if (!shouldANSI()) {
+    if (!shouldANSI(fileno)) {
         opts.oflags |= LOWDOWN_TERM_NOANSI;
     }
 

lix/libcmd/markdown.hh

@@ -1,10 +1,11 @@
 #pragma once
 ///@file
 
+#include "lix/libutil/terminal.hh"
 #include "lix/libutil/types.hh"
 
 namespace nix {
 
-std::string renderMarkdownToTerminal(std::string_view markdown);
+std::string renderMarkdownToTerminal(std::string_view markdown, StandardOutputStream fileno = StandardOutputStream::Stdout);
 
 }

lix/nix/flake.cc

@@ -927,7 +927,7 @@ struct CmdFlakeInitCommon : virtual Args, EvalCommand
         auto welcomeText = cursor->maybeGetAttr(*evalState, "welcomeText");
         if (welcomeText) {
             notice("\n");
-            notice(renderMarkdownToTerminal(welcomeText->getString(*evalState)));
+            notice(renderMarkdownToTerminal(welcomeText->getString(*evalState), StandardOutputStream::Stderr));
         }
 
         if (!conflictedFiles.empty())