Move progress-bar.cc to libmain

Needed so that we can include it as a logger in loggers.cc without
adding a dependency on nix

This also requires moving names.hh to libutil to prevent a circular
dependency between libmain and libexpr

6 files changed, 2 insertions, 2 deletions

diff --git a/src/libmain/loggers.cc b/src/libmain/loggers.cc
index ee3836382..41f0b35fb 100644
--- a/src/libmain/loggers.cc
+++ b/src/libmain/loggers.cc
@@ -1,5 +1,5 @@
 #include "loggers.hh"
-#include "../nix/progress-bar.hh"
+#include "progress-bar.hh"
 
 namespace nix {
 
diff --git a/src/nix/progress-bar.cc b/src/libmain/progress-bar.cc
index c9ba89714..c9ba89714 100644
--- a/src/nix/progress-bar.cc
+++ b/src/libmain/progress-bar.cc
diff --git a/src/nix/progress-bar.hh b/src/libmain/progress-bar.hh
index 60d0a2076..60d0a2076 100644
--- a/src/nix/progress-bar.hh
+++ b/src/libmain/progress-bar.hh
diff --git a/src/libexpr/names.cc b/src/libutil/names.cc
index d1c8a6101..d1c8a6101 100644
--- a/src/libexpr/names.cc
+++ b/src/libutil/names.cc
diff --git a/src/libexpr/names.hh b/src/libutil/names.hh
index 00e14b8c7..00e14b8c7 100644
--- a/src/libexpr/names.hh
+++ b/src/libutil/names.hh
diff --git a/src/nix-prefetch-url/nix-prefetch-url.cc b/src/nix-prefetch-url/nix-prefetch-url.cc
index 5a686c8cd..b645bdc1b 100644
--- a/src/nix-prefetch-url/nix-prefetch-url.cc
+++ b/src/nix-prefetch-url/nix-prefetch-url.cc
@@ -8,7 +8,7 @@
 #include "attr-path.hh"
 #include "finally.hh"
 #include "../nix/legacy.hh"
-#include "../nix/progress-bar.hh"
+#include "progress-bar.hh"
 #include "tarfile.hh"
 
 #include <iostream>