Merge remote-tracking branch 'origin/master' into flakes

src/libutil/json.cc

@@ -171,4 +171,9 @@ JSONObject JSONPlaceholder::object()
     return JSONObject(state);
 }
 
+JSONPlaceholder::~JSONPlaceholder()
+{
+    assert(!first || std::uncaught_exception());
+}
+
 }

src/libutil/json.hh

@@ -168,10 +168,7 @@ public:
     {
     }
 
-    ~JSONPlaceholder()
-    {
-        assert(!first || std::uncaught_exception());
-    }
+    ~JSONPlaceholder();
 
     template<typename T>
     void write(const T & v)

src/libutil/util.cc

@@ -486,6 +486,16 @@ std::pair<AutoCloseFD, Path> createTempFile(const Path & prefix)
 }
 
 
+std::string getUserName()
+{
+    auto pw = getpwuid(geteuid());
+    std::string name = pw ? pw->pw_name : getEnv("USER", "");
+    if (name.empty())
+        throw Error("cannot figure out user name");
+    return name;
+}
+
+
 static Lazy<Path> getHome2([]() {
     Path homeDir = getEnv("HOME");
     if (homeDir.empty()) {

src/libutil/util.hh

@@ -122,6 +122,12 @@ void deletePath(const Path & path);
 
 void deletePath(const Path & path, unsigned long long & bytesFreed);
 
+/* Create a temporary directory. */
+Path createTempDir(const Path & tmpRoot = "", const Path & prefix = "nix",
+    bool includePid = true, bool useGlobalCounter = true, mode_t mode = 0755);
+
+std::string getUserName();
+
 /* Return $HOME or the user's home directory from /etc/passwd. */
 Path getHome();