From acd54bfbd6d55d7e9f0e76bc4bbce21b08ff106e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 23 Nov 2024 10:04:49 +0100 Subject: [PATCH] Update all flake inputs, fix build with latest Lix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'lix': 'git+https://git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=ed9b7f4f84fd60ad8618645cc1bae2d686ff0db6' (2024-10-05) → 'git+https://git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=66f6dbda32959dd5cf3a9aaba15af72d037ab7ff' (2024-11-20) • Updated input 'lix/nix2container': 'github:nlewo/nix2container/3853e5caf9ad24103b13aa6e0e8bcebb47649fe4' (2024-07-10) → 'github:nlewo/nix2container/fa6bb0a1159f55d071ba99331355955ae30b3401' (2024-08-30) • Updated input 'lix/pre-commit-hooks': 'github:cachix/git-hooks.nix/f451c19376071a90d8c58ab1a953c6e9840527fd' (2024-07-15) → 'github:cachix/git-hooks.nix/4e743a6920eab45e8ba0fbe49dc459f1423a4b74' (2024-09-19) • Updated input 'nix-eval-jobs': 'git+https://git.lix.systems/lix-project/nix-eval-jobs?ref=refs/heads/main&rev=42a160bce2fd9ffebc3809746bc80cc7208f9b08' (2024-08-13) → 'git+https://git.lix.systems/lix-project/nix-eval-jobs?ref=refs/heads/main&rev=912a9d63319e71ca131e16eea3348145a255db2e' (2024-11-18) • Updated input 'nix-eval-jobs/flake-parts': 'github:hercules-ci/flake-parts/8471fe90ad337a8074e957b69ca4d0089218391d' (2024-08-01) → 'github:hercules-ci/flake-parts/506278e768c2a08bec68eb62932193e341f55c90' (2024-11-01) • Updated input 'nix-eval-jobs/nix-github-actions': 'github:nix-community/nix-github-actions/622f829f5fe69310a866c8a6cd07e747c44ef820' (2024-07-04) → 'github:nix-community/nix-github-actions/e04df33f62cdcf93d73e9a04142464753a16db67' (2024-10-24) • Updated input 'nix-eval-jobs/treefmt-nix': 'github:numtide/treefmt-nix/349de7bc435bdff37785c2466f054ed1766173be' (2024-08-12) → 'github:numtide/treefmt-nix/746901bb8dba96d154b66492a29f5db0693dbfcc' (2024-10-30) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6' (2024-10-06) → 'github:NixOS/nixpkgs/e8c38b73aeb218e27163376a2d617e61a2ad9b59' (2024-11-16) --- flake.lock | 41 ++++++++++---------- flake.nix | 2 +- src/hydra-evaluator/hydra-evaluator.cc | 4 +- src/hydra-queue-runner/build-remote.cc | 3 +- src/hydra-queue-runner/hydra-queue-runner.cc | 7 ++-- src/hydra-queue-runner/queue-monitor.cc | 2 +- 6 files changed, 31 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index eefd760f..96a6db0d 100644 --- a/flake.lock +++ b/flake.lock @@ -48,11 +48,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1731683711, - "narHash": "sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE=", + "lastModified": 1732112222, + "narHash": "sha256-H7GN4++a4vE49SUNojZx+FSk4mmpb2ifJUtJMJHProI=", "ref": "refs/heads/main", - "rev": "c859d03013712b349d82ee6223948d6d03e63a8d", - "revCount": 16489, + "rev": "66f6dbda32959dd5cf3a9aaba15af72d037ab7ff", + "revCount": 16513, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -74,17 +74,18 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1731890968, - "narHash": "sha256-6xMxT2duVMO6fo1AXfTjqh7LW3ZmNiHw6kBaAhweLGo=", - "ref": "refs/heads/main", - "rev": "912a9d63319e71ca131e16eea3348145a255db2e", - "revCount": 616, + "lastModified": 1732351635, + "narHash": "sha256-H94CcQ3yamG5+RMxtxXllR02YIlxQ5WD/8PcolO9yEA=", + "ref": "update-lix", + "rev": "dfc286ca3dc49118c30d8d6205d6d6af76c62b7a", + "revCount": 617, "type": "git", - "url": "https://git.lix.systems/lix-project/nix-eval-jobs" + "url": "https://git.lix.systems/ma27/nix-eval-jobs" }, "original": { + "ref": "update-lix", "type": "git", - "url": "https://git.lix.systems/lix-project/nix-eval-jobs" + "url": "https://git.lix.systems/ma27/nix-eval-jobs" } }, "nix-github-actions": { @@ -95,11 +96,11 @@ ] }, "locked": { - "lastModified": 1729742964, - "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", + "lastModified": 1731952509, + "narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", + "rev": "7b5f051df789b6b20d259924d349a9ba3319b226", "type": "github" }, "original": { @@ -126,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728193676, - "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", + "lastModified": 1731797254, + "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", + "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "type": "github" }, "original": { @@ -187,11 +188,11 @@ ] }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1732292307, + "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "705df92694af7093dfbb27109ce16d828a79155f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b26c7b40..5e728f2c 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ inputs.lix.url = "git+https://git.lix.systems/lix-project/lix"; inputs.lix.inputs.nixpkgs.follows = "nixpkgs"; - inputs.nix-eval-jobs.url = "git+https://git.lix.systems/lix-project/nix-eval-jobs"; + inputs.nix-eval-jobs.url = "git+https://git.lix.systems/ma27/nix-eval-jobs?ref=update-lix"; inputs.nix-eval-jobs.inputs.nixpkgs.follows = "nixpkgs"; inputs.nix-eval-jobs.inputs.lix.follows = "lix"; diff --git a/src/hydra-evaluator/hydra-evaluator.cc b/src/hydra-evaluator/hydra-evaluator.cc index b48da7c9..85ded046 100644 --- a/src/hydra-evaluator/hydra-evaluator.cc +++ b/src/hydra-evaluator/hydra-evaluator.cc @@ -513,14 +513,14 @@ int main(int argc, char * * argv) std::vector args; - parseCmdLine(argc, argv, [&](Strings::iterator & arg, const Strings::iterator & end) { + LegacyArgs(argv[0], [&](Strings::iterator & arg, const Strings::iterator & end) { if (*arg == "--unlock") unlock = true; else if (arg->starts_with("-")) return false; args.push_back(*arg); return true; - }); + }).parseCmdline(Strings(argv + 1, argv + argc)); if (unlock) diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc index 2328be23..488baacc 100644 --- a/src/hydra-queue-runner/build-remote.cc +++ b/src/hydra-queue-runner/build-remote.cc @@ -14,10 +14,11 @@ #include "serve-protocol.hh" #include "serve-protocol-impl.hh" #include "ssh.hh" -#include "temporary-dir.hh" #include "finally.hh" #include "url.hh" +#include "temporary-dir.hh" + using namespace nix; diff --git a/src/hydra-queue-runner/hydra-queue-runner.cc b/src/hydra-queue-runner/hydra-queue-runner.cc index 3dfa611e..ba464c81 100644 --- a/src/hydra-queue-runner/hydra-queue-runner.cc +++ b/src/hydra-queue-runner/hydra-queue-runner.cc @@ -16,6 +16,7 @@ #include "hydra-build-result.hh" #include "store-api.hh" +#include "args.hh" #include "globals.hh" #include "hydra-config.hh" #include "s3-binary-cache-store.hh" @@ -868,7 +869,7 @@ void State::run(BuildID buildOne) << metricsAddr << "/metrics (port " << exposerPort << ")" << std::endl; - Store::Params localParams; + StoreConfig::Params localParams; localParams["max-connections"] = "16"; localParams["max-connection-age"] = "600"; localStore = openStore(getEnv("NIX_REMOTE").value_or(""), localParams); @@ -973,7 +974,7 @@ int main(int argc, char * * argv) BuildID buildOne = 0; std::optional metricsAddrOpt = std::nullopt; - parseCmdLine(argc, argv, [&](Strings::iterator & arg, const Strings::iterator & end) { + LegacyArgs(argv[0], [&](Strings::iterator & arg, const Strings::iterator & end) { if (*arg == "--unlock") unlock = true; else if (*arg == "--status") @@ -988,7 +989,7 @@ int main(int argc, char * * argv) } else return false; return true; - }); + }).parseCmdline(Strings(argv + 1, argv + argc)); settings.verboseBuild = true; diff --git a/src/hydra-queue-runner/queue-monitor.cc b/src/hydra-queue-runner/queue-monitor.cc index 202ebd61..cbc01f76 100644 --- a/src/hydra-queue-runner/queue-monitor.cc +++ b/src/hydra-queue-runner/queue-monitor.cc @@ -411,7 +411,7 @@ std::map> State::getMissingRemotePaths( const std::map> & paths) { Sync>> missing_; - ThreadPool tp; + ThreadPool tp("hydra-getMissingRemotePaths"); for (auto & [output, maybeOutputPath] : paths) { if (!maybeOutputPath) { -- 2.44.1