From 801112de1af8e519e29e1e1c678f97de45a8c49d Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Mon, 8 Jun 2020 17:16:52 +0200
Subject: [PATCH] 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
---
src/libmain/loggers.cc | 2 +-
src/{nix => libmain}/progress-bar.cc | 0
src/{nix => libmain}/progress-bar.hh | 0
src/{libexpr => libutil}/names.cc | 0
src/{libexpr => libutil}/names.hh | 0
src/nix-prefetch-url/nix-prefetch-url.cc | 2 +-
6 files changed, 2 insertions(+), 2 deletions(-)
rename src/{nix => libmain}/progress-bar.cc (100%)
rename src/{nix => libmain}/progress-bar.hh (100%)
rename src/{libexpr => libutil}/names.cc (100%)
rename src/{libexpr => libutil}/names.hh (100%)
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
similarity index 100%
rename from src/nix/progress-bar.cc
rename to src/libmain/progress-bar.cc
diff --git a/src/nix/progress-bar.hh b/src/libmain/progress-bar.hh
similarity index 100%
rename from src/nix/progress-bar.hh
rename to src/libmain/progress-bar.hh
diff --git a/src/libexpr/names.cc b/src/libutil/names.cc
similarity index 100%
rename from src/libexpr/names.cc
rename to src/libutil/names.cc
diff --git a/src/libexpr/names.hh b/src/libutil/names.hh
similarity index 100%
rename from src/libexpr/names.hh
rename to 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>