diff --git a/flake.lock b/flake.lock index 8c56e383b..71361d4e2 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1742165831, - "narHash": "sha256-/ssmsf50UERQNlOcUuyfvigcnCNckAhAPZMo0+Y3mdY=", + "lastModified": 1743065774, + "narHash": "sha256-aC1lwnqwHbYRsPfx+lRi32fHRcln0xhIzf0Q7/Lg+vQ=", "ref": "refs/heads/main", - "rev": "2a336813ad2a4d64d027830507276da32927d215", - "revCount": 17664, + "rev": "b918f1c307b314daa44407bac60046630f13ed48", + "revCount": 17742, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -59,11 +59,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742136038, - "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", + "lastModified": 1742937945, + "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", + "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", "type": "github" }, "original": { diff --git a/src/hydra-queue-runner/hydra-queue-runner.cc b/src/hydra-queue-runner/hydra-queue-runner.cc index b71655391..070561020 100644 --- a/src/hydra-queue-runner/hydra-queue-runner.cc +++ b/src/hydra-queue-runner/hydra-queue-runner.cc @@ -24,7 +24,6 @@ #include "lix/libutil/async.hh" using namespace nix; -using nlohmann::json; std::string getEnvOrDie(const std::string & key) @@ -602,7 +601,7 @@ std::optional State::acquireGlobalLock() void State::dumpStatus(Connection & conn, AsyncIoRoot & aio) { time_t now = time(nullptr); - json statusJson = { + nlohmann::json statusJson = { {"status", "up"}, {"time", time(nullptr)}, {"uptime", now - startedAt}, @@ -660,7 +659,7 @@ void State::dumpStatus(Connection & conn, AsyncIoRoot & aio) auto & s(m->state); auto info(m->state->connectInfo.lock()); - json machine = { + nlohmann::json machine = { {"enabled", m->enabled}, {"systemTypes", m->systemTypesSet}, {"supportedFeatures", m->supportedFeatures}, @@ -685,7 +684,7 @@ void State::dumpStatus(Connection & conn, AsyncIoRoot & aio) } { - auto jobsets_json = json::object(); + auto jobsets_json = nlohmann::json::object(); auto jobsets_(jobsets.lock()); for (auto & jobset : *jobsets_) { jobsets_json[jobset.first.first + ":" + jobset.first.second] = { @@ -697,7 +696,7 @@ void State::dumpStatus(Connection & conn, AsyncIoRoot & aio) } { - auto machineTypesJson = json::object(); + auto machineTypesJson = nlohmann::json::object(); auto machineTypes_(machineTypes.lock()); for (auto & i : *machineTypes_) { auto machineTypeJson = machineTypesJson[i.first] = {