lix-project/hydra
4
0
Fork 6
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

Update all flake inputs, fix build with latest Lix #13

Merged
jade merged 1 commit from ma27/hydra:update-lix into main 2024-11-26 06:50:46 +00:00
Conversation 3 Commits 1 Files changed 6 +31 -28
6 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
flake.lock
View file

@ -48,11 +48,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1731683711, "lastModified": 1732112222,
"narHash": "sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE=", "narHash": "sha256-H7GN4++a4vE49SUNojZx+FSk4mmpb2ifJUtJMJHProI=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "c859d03013712b349d82ee6223948d6d03e63a8d", "rev": "66f6dbda32959dd5cf3a9aaba15af72d037ab7ff",
"revCount": 16489, "revCount": 16513,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/lix" "url": "https://git.lix.systems/lix-project/lix"
}, },
@ -74,17 +74,18 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1731890968, "lastModified": 1732351635,
"narHash": "sha256-6xMxT2duVMO6fo1AXfTjqh7LW3ZmNiHw6kBaAhweLGo=", "narHash": "sha256-H94CcQ3yamG5+RMxtxXllR02YIlxQ5WD/8PcolO9yEA=",
"ref": "refs/heads/main", "ref": "update-lix",
"rev": "912a9d63319e71ca131e16eea3348145a255db2e", "rev": "dfc286ca3dc49118c30d8d6205d6d6af76c62b7a",
"revCount": 616, "revCount": 617,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nix-eval-jobs" "url": "https://git.lix.systems/ma27/nix-eval-jobs"
}, },
"original": { "original": {
"ref": "update-lix",
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nix-eval-jobs" "url": "https://git.lix.systems/ma27/nix-eval-jobs"
} }
}, },
"nix-github-actions": { "nix-github-actions": {
@ -95,11 +96,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729742964, "lastModified": 1731952509,
"narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", "narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-github-actions", "repo": "nix-github-actions",
"rev": "e04df33f62cdcf93d73e9a04142464753a16db67", "rev": "7b5f051df789b6b20d259924d349a9ba3319b226",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -126,11 +127,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1728193676, "lastModified": 1731797254,
"narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -187,11 +188,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730321837, "lastModified": 1732292307,
"narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", "rev": "705df92694af7093dfbb27109ce16d828a79155f",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -6,7 +6,7 @@
inputs.lix.url = "git+https://git.lix.systems/lix-project/lix"; inputs.lix.url = "git+https://git.lix.systems/lix-project/lix";
inputs.lix.inputs.nixpkgs.follows = "nixpkgs"; 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.nixpkgs.follows = "nixpkgs";
inputs.nix-eval-jobs.inputs.lix.follows = "lix"; inputs.nix-eval-jobs.inputs.lix.follows = "lix";

4
src/hydra-evaluator/hydra-evaluator.cc
View file

@ -513,14 +513,14 @@ int main(int argc, char * * argv)
std::vector<std::string> args; std::vector<std::string> args;
parseCmdLine(argc, argv, [&](Strings::iterator & arg, const Strings::iterator & end) { LegacyArgs(argv[0], [&](Strings::iterator & arg, const Strings::iterator & end) {
if (*arg == "--unlock") if (*arg == "--unlock")
unlock = true; unlock = true;
else if (arg->starts_with("-")) else if (arg->starts_with("-"))
return false; return false;
args.push_back(*arg); args.push_back(*arg);
return true; return true;
}); }).parseCmdline(Strings(argv + 1, argv + argc));
if (unlock) if (unlock)

3
src/hydra-queue-runner/build-remote.cc
View file

@ -14,10 +14,11 @@
#include "serve-protocol.hh" #include "serve-protocol.hh"
#include "serve-protocol-impl.hh" #include "serve-protocol-impl.hh"
#include "ssh.hh" #include "ssh.hh"
#include "temporary-dir.hh"
#include "finally.hh" #include "finally.hh"
#include "url.hh" #include "url.hh"
#include "temporary-dir.hh"
using namespace nix; using namespace nix;

7
src/hydra-queue-runner/hydra-queue-runner.cc
View file

@ -16,6 +16,7 @@
#include "hydra-build-result.hh" #include "hydra-build-result.hh"
#include "store-api.hh" #include "store-api.hh"
#include "args.hh"
#include "globals.hh" #include "globals.hh"
#include "hydra-config.hh" #include "hydra-config.hh"
#include "s3-binary-cache-store.hh" #include "s3-binary-cache-store.hh"
@ -868,7 +869,7 @@ void State::run(BuildID buildOne)
<< metricsAddr << "/metrics (port " << exposerPort << ")" << metricsAddr << "/metrics (port " << exposerPort << ")"
<< std::endl; << std::endl;
Store::Params localParams; StoreConfig::Params localParams;
localParams["max-connections"] = "16"; localParams["max-connections"] = "16";
localParams["max-connection-age"] = "600"; localParams["max-connection-age"] = "600";
localStore = openStore(getEnv("NIX_REMOTE").value_or(""), localParams); localStore = openStore(getEnv("NIX_REMOTE").value_or(""), localParams);
@ -973,7 +974,7 @@ int main(int argc, char * * argv)
BuildID buildOne = 0; BuildID buildOne = 0;
std::optional<std::string> metricsAddrOpt = std::nullopt; std::optional<std::string> 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") if (*arg == "--unlock")
unlock = true; unlock = true;
else if (*arg == "--status") else if (*arg == "--status")
@ -988,7 +989,7 @@ int main(int argc, char * * argv)
} else } else
return false; return false;
return true; return true;
}); }).parseCmdline(Strings(argv + 1, argv + argc));
settings.verboseBuild = true; settings.verboseBuild = true;

2
src/hydra-queue-runner/queue-monitor.cc
View file

@ -411,7 +411,7 @@ std::map<DrvOutput, std::optional<StorePath>> State::getMissingRemotePaths(
const std::map<DrvOutput, std::optional<StorePath>> & paths) const std::map<DrvOutput, std::optional<StorePath>> & paths)
{ {
Sync<std::map<DrvOutput, std::optional<StorePath>>> missing_; Sync<std::map<DrvOutput, std::optional<StorePath>>> missing_;
ThreadPool tp; ThreadPool tp("hydra-getMissingRemotePaths");
for (auto & [output, maybeOutputPath] : paths) { for (auto & [output, maybeOutputPath] : paths) {
if (!maybeOutputPath) { if (!maybeOutputPath) {