Merge changes I3ab84cc5,Iba34ad42 into main

* changes:
  nix3: always use the same verbosity default (info)
  libfetchers: log fetches by URL just before they happen

2 files changed, 4 insertions, 5 deletions

diff --git a/src/libfetchers/fetchers.cc b/src/libfetchers/fetchers.cc
index dc8df2217..210912cb6 100644
--- a/src/libfetchers/fetchers.cc
+++ b/src/libfetchers/fetchers.cc
@@ -133,6 +133,10 @@ std::pair<Tree, Input> Input::fetch(ref<Store> store) const
     }
 
     auto [storePath, input] = [&]() -> std::pair<StorePath, Input> {
+        // *sighs*, we print the base URL, rather than the full URL because the Nixpkgs
+        // fileset lib tests assume that fetching shallow and non-shallow prints exactly the
+        // same stderr...
+        printInfo("fetching %s input '%s'", this->getType(), this->toURL().base);
         try {
             return scheme->fetch(store, *this);
         } catch (Error & e) {
diff --git a/src/nix/main.cc b/src/nix/main.cc
index 64755d445..83d697326 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -363,11 +363,6 @@ void mainWrapped(int argc, char * * argv)
 
     setLogFormat("bar");
     settings.verboseBuild = false;
-    if (isatty(STDERR_FILENO)) {
-        verbosity = lvlNotice;
-    } else {
-        verbosity = lvlInfo;
-    }
 
     NixArgs args;