summary refs log tree commit diff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2022-01-09 01:00:00 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2022-01-09 01:00:00 +0100
commit360379200dd15ddaa63141fb46908dd9f7e2ed17 (patch)
tree748d30f6565daead43760d8c3aad04ab963539e2 /gnu/packages/patches
parent43990c6a292b5958c2002a189fbf3b2ee782ba09 (diff)
downloadguix-360379200dd15ddaa63141fb46908dd9f7e2ed17.tar.gz
Revert "gnu: tree: Fix problem with no output when fd3 is present."
This reverts commit bd4f314bbacaaa56751be3a4769f2082be747d24.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/tree-disable-stddata.patch16
1 files changed, 0 insertions, 16 deletions
diff --git a/gnu/packages/patches/tree-disable-stddata.patch b/gnu/packages/patches/tree-disable-stddata.patch
deleted file mode 100644
index 52ca6e25f4..0000000000
--- a/gnu/packages/patches/tree-disable-stddata.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Tree 2.0.0 and later will write its output in JSON format on fd3 if
-present, instead of the requested output on fd1, which breaks e.g.
-'password-store' tests.  Disable for now; upstream has been notified.
-
-diff --git a/tree.c b/tree.c
---- a/tree.c
-+++ b/tree.c
-@@ -133,7 +133,7 @@ int main(int argc, char **argv)
-   mb_cur_max = 1;
- #endif
- 
--#ifdef __linux__
-+#if 0
-   // Output JSON automatically to "stddata" if present:
-   if (fcntl(STDDATA_FILENO, F_GETFD) >= 0) {
-     Jflag = noindent = TRUE;