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

Compare commits

base: lix-project:3891ad77e35b31875c6fa5b44236f11e66b34448
Branches Tags
lix-project:main
lix-project:lix-update
..
compare: lix-project:ab6d81fad404af05dfeae7f74d1783a2f7367826
Branches Tags
lix-project:main
lix-project:lix-update

No commits in common. "3891ad77e35b31875c6fa5b44236f11e66b34448" and "ab6d81fad404af05dfeae7f74d1783a2f7367826" have entirely different histories.
3891ad77e3 ... ab6d81fad4

2 changed files with 2 additions and 17 deletions
Show stats Expand all files Collapse all files

15
flake.nix
View file

@ -73,21 +73,6 @@
default = pkgsBySystem.${system}.hydra;
});
devShells = forEachSystem (system: let
pkgs = pkgsBySystem.${system};
lib = pkgs.lib;
mkDevShell = stdenv: (pkgs.mkShell.override { inherit stdenv; }) {
inputsFrom = [ (self.packages.${system}.default.override { inherit stdenv; }) ];
packages =
lib.optional (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) pkgs.clang-tools;
};
in {
default = mkDevShell pkgs.stdenv;
clang = mkDevShell pkgs.clangStdenv;
});
nixosModules = import ./nixos-modules {
overlays = overlayList;
};

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

@ -173,7 +173,7 @@ void State::parseMachines(const std::string & contents)
using MaxJobs = std::remove_const<decltype(nix::Machine::maxJobs)>::type;
auto machine = std::make_shared<::Machine>(::Machine {{
auto machine = std::make_shared<::Machine>(nix::Machine {
// `storeUri`, not yet used
"",
// `systemTypes`, not yet used
@ -194,7 +194,7 @@ void State::parseMachines(const std::string & contents)
tokens[7] != "" && tokens[7] != "-"
? base64Decode(tokens[7])
: "",
}});
});
machine->sshName = tokens[0];
machine->systemTypesSet = tokenizeString<StringSet>(tokens[1], ",");