From 6df61db0600ca73ccd51e3e5bec5312a04e99da1 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 10 May 2019 20:59:39 -0400
Subject: diff hook: execute as the build user, and pass the temp dir

---
 src/libutil/util.hh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/libutil/util.hh')

diff --git a/src/libutil/util.hh b/src/libutil/util.hh
index 54936a5cb..824a35b98 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -265,6 +265,8 @@ string runProgram(Path program, bool searchPath = false,
     const Strings & args = Strings(),
     const std::optional<std::string> & input = {});
 
+pid_t doFork(bool allowVfork, std::function<void()> fun);
+
 struct RunOptions
 {
     Path program;
-- 
cgit v1.2.3


From b4a05edbfe49f87555fd284dfb0d6c56ed43217d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 11 May 2019 16:35:53 -0400
Subject: runProgram: support gid, uid, chdir

---
 src/libutil/util.hh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/libutil/util.hh')

diff --git a/src/libutil/util.hh b/src/libutil/util.hh
index 824a35b98..7c57d0afa 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -265,10 +265,11 @@ string runProgram(Path program, bool searchPath = false,
     const Strings & args = Strings(),
     const std::optional<std::string> & input = {});
 
-pid_t doFork(bool allowVfork, std::function<void()> fun);
-
 struct RunOptions
 {
+    std::optional<uid_t> uid;
+    std::optional<uid_t> gid;
+    std::optional<Path> chdir;
     Path program;
     bool searchPath = true;
     Strings args;
-- 
cgit v1.2.3


From 66b8a62101cb1dfe2e368346cf99efd32e9328ae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 15 May 2019 17:33:56 +0200
Subject: nix: Add --print-build-logs flag

This causes 'nix' to print build log output to stderr rather than
showing the last log line in the progress bar. Log lines are prefixed
by the name of the derivation (minus the version string), e.g.

  binutils> make[1]: Leaving directory '/build/binutils-2.31.1'
  binutils-wrapper> unpacking sources
  binutils-wrapper> patching sources
  ...
  binutils-wrapper> Using dynamic linker: '/nix/store/kr51dlsj9v5cr4n8700jliyz8v5b2q7q-bootstrap-stage0-glibc/lib/ld-linux-x86-64.so.2'
  bootstrap-stage2-gcc-wrapper> unpacking sources
  ...
  linux-headers> unpacking sources
  linux-headers> unpacking source archive /nix/store/8javli69jhj3bkql2c35gsj5vl91p382-linux-4.19.16.tar.xz
---
 src/libutil/util.hh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/libutil/util.hh')

diff --git a/src/libutil/util.hh b/src/libutil/util.hh
index 9f239bff3..23360de2e 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -401,6 +401,7 @@ void ignoreException();
 /* Some ANSI escape sequences. */
 #define ANSI_NORMAL "\e[0m"
 #define ANSI_BOLD "\e[1m"
+#define ANSI_FAINT "\e[2m"
 #define ANSI_RED "\e[31;1m"
 #define ANSI_GREEN "\e[32;1m"
 #define ANSI_BLUE "\e[34;1m"
-- 
cgit v1.2.3