Fix nix build.

SoftwareNetwork · Oct 17, 2023 · ad5ab37 · ad5ab37
1 parent e772dbb
commit ad5ab37
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/sw/client/common/command/service.cpp b/src/sw/client/common/command/service.cpp
@@ -9,8 +9,6 @@
 #include <nlohmann/json.hpp>
 #include <primitives/http.h>
 
-#include <format>
-
 #include <primitives/log.h>
 DECLARE_STATIC_LOGGER(logger, "service");
 
@@ -34,7 +32,7 @@ void update_packages(SwClientContext &swctx) {
     auto &pdb = rs.getPackagesDatabase();
     auto all_pkgs = pdb.getMatchingPackages("org.sw.demo.");
     for (int pkgid = 0; auto &&ppath : all_pkgs) {
-        std::cerr << std::format("\r[{}/{}] {}\n", ++pkgid, all_pkgs.size(), ppath.toString());
+        LOG_INFO(logger, "[" << ++pkgid << "/" << all_pkgs.size() << "] " << ppath.toString());
         auto versions = pdb.getVersionsForPackage(ppath);
         if (versions.empty() || versions.rbegin()->isBranch()) {
             continue;
@@ -170,7 +168,7 @@ void update_packages(SwClientContext &swctx) {
     for (auto &&[p, vp] : new_pkgs) {
         auto &&v = vp.first;
         auto &&prefix = vp.second;
-        LOG_INFO(logger, std::format("sw uri --silent sw:upload {} {} {}", p.toString(), v.toString(), prefix));
+        LOG_INFO(logger, "sw uri --silent sw:upload " << p.toString() << " " << v.toString() << " " << prefix);
     }
 }
 

diff --git a/src/sw/manager/database.h b/src/sw/manager/database.h
@@ -5,13 +5,13 @@
 
 #include <sw/support/filesystem.h>
 
+#include <sqlpp11/sqlite3/connection.h>
+
 #include <chrono>
 #include <memory>
 #include <optional>
 #include <vector>
 
-namespace sqlpp::sqlite3 { class connection; }
-
 namespace sw
 {