From f7b1e535a3c68991ac66768f456b28677152b2d7 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 6 Nov 2024 14:20:06 +0100
Subject: [PATCH 1/3] nix::readLine: Add eofOk parameter

---
 src/libutil/file-descriptor.hh      |  7 ++++++-
 src/libutil/unix/file-descriptor.cc | 10 +++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/libutil/file-descriptor.hh b/src/libutil/file-descriptor.hh
index b54bab83c..710efaf1d 100644
--- a/src/libutil/file-descriptor.hh
+++ b/src/libutil/file-descriptor.hh
@@ -77,8 +77,13 @@ void writeFull(Descriptor fd, std::string_view s, bool allowInterrupts = true);
 
 /**
  * Read a line from a file descriptor.
+ *
+ * @param fd The file descriptor to read from
+ * @param eofOk If true, return an unterminated line if EOF is reached. (e.g. the empty string)
+ *
+ * @return A line of text ending in `\n`, or a string without `\n` if `eofOk` is true and EOF is reached.
  */
-std::string readLine(Descriptor fd);
+std::string readLine(Descriptor fd, bool eofOk = false);
 
 /**
  * Write a line to a file descriptor.
diff --git a/src/libutil/unix/file-descriptor.cc b/src/libutil/unix/file-descriptor.cc
index 2c1126e09..ac7c086af 100644
--- a/src/libutil/unix/file-descriptor.cc
+++ b/src/libutil/unix/file-descriptor.cc
@@ -47,7 +47,7 @@ void writeFull(int fd, std::string_view s, bool allowInterrupts)
 }
 
 
-std::string readLine(int fd)
+std::string readLine(int fd, bool eofOk)
 {
     std::string s;
     while (1) {
@@ -58,8 +58,12 @@ std::string readLine(int fd)
         if (rd == -1) {
             if (errno != EINTR)
                 throw SysError("reading a line");
-        } else if (rd == 0)
-            throw EndOfFile("unexpected EOF reading a line");
+        } else if (rd == 0) {
+            if (eofOk)
+                return s;
+            else
+                throw EndOfFile("unexpected EOF reading a line");
+        }
         else {
             if (ch == '\n') return s;
             s += ch;

From 3112e59734de7de7470abb5c156847469fe720d9 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 6 Nov 2024 15:05:32 +0100
Subject: [PATCH 2/3] ProgressBar::ask: Accept EOF as a no

This may occur when stderr is a tty but stdin is empty.
E.g.

    $ nix build </dev/null
    error: unexpected EOF reading a line

These stdio handles are how some non-interactive sandboxes behave,
including the Nix build sandbox and Hercules CI Effects.
---
 src/libmain/progress-bar.cc       |  2 +-
 tests/functional/flakes/config.sh | 10 ++++++++++
 tests/functional/package.nix      |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/libmain/progress-bar.cc b/src/libmain/progress-bar.cc
index 22f890f7d..a3b86790b 100644
--- a/src/libmain/progress-bar.cc
+++ b/src/libmain/progress-bar.cc
@@ -543,7 +543,7 @@ public:
         auto state(state_.lock());
         if (!state->active) return {};
         std::cerr << fmt("\r\e[K%s ", msg);
-        auto s = trim(readLine(STDIN_FILENO));
+        auto s = trim(readLine(STDIN_FILENO, true));
         if (s.size() != 1) return {};
         draw(*state);
         return s[0];
diff --git a/tests/functional/flakes/config.sh b/tests/functional/flakes/config.sh
index 256a595bc..48f1c7a85 100755
--- a/tests/functional/flakes/config.sh
+++ b/tests/functional/flakes/config.sh
@@ -27,7 +27,17 @@ cat <<EOF > flake.nix
 EOF
 
 # Without --accept-flake-config, the post hook should not run.
+# To test variations in stderr tty-ness, we run the command in different ways,
+# none of which should block on stdin or accept the `nixConfig`s.
 nix build < /dev/null
+nix build < /dev/null 2>&1 | cat
+# EOF counts as no, even when interactive (throw EOF error before)
+if type -p script >/dev/null && script -q -c true /dev/null; then
+    echo "script is available and GNU-like, so we can ensure a tty"
+    script -q -c 'nix build < /dev/null' /dev/null
+else
+    echo "script is not available or not GNU-like, so we skip testing with an added tty"
+fi
 (! [[ -f post-hook-ran ]])
 TODO_NixOS
 clearStore
diff --git a/tests/functional/package.nix b/tests/functional/package.nix
index 71029146b..2f5bf9bc2 100644
--- a/tests/functional/package.nix
+++ b/tests/functional/package.nix
@@ -60,6 +60,7 @@ mkMesonDerivation (finalAttrs: {
     # etc.
     busybox-sandbox-shell
     # For Overlay FS tests need `mount`, `umount`, and `unshare`.
+    # For `script` command (ensuring a TTY)
     # TODO use `unixtools` to be precise over which executables instead?
     util-linux
   ];

From c6c8d2af659fbc87bd8abc6310635da5d7e136f3 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 6 Nov 2024 19:44:50 +0100
Subject: [PATCH 3/3] refact: Remove unused arguments

---
 tests/functional/package.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/functional/package.nix b/tests/functional/package.nix
index 2f5bf9bc2..d1582b05d 100644
--- a/tests/functional/package.nix
+++ b/tests/functional/package.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , mkMesonDerivation
-, releaseTools
 
 , meson
 , ninja
@@ -16,10 +15,6 @@
 , nix-expr
 , nix-cli
 
-, rapidcheck
-, gtest
-, runCommand
-
 , busybox-sandbox-shell ? null
 
 # Configuration Options