delroth/bagel-infra
1
0
Fork 0
Code Issues 10 Pull requests 3 Actions Packages Projects 1 Releases Wiki Activity

hydra: actually use version from flake

Browse source
This commit is contained in:
Pierre Bourdon 2024-06-24 20:59:37 +02:00
parent 73aecaef41
commit cb6e5b1652
Signed by: delroth
GPG key ID: 6FB80DCD84DA0F1C
3 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
flake.lock
View file

@ -144,11 +144,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718119663, "lastModified": 1719253535,
"narHash": "sha256-36+umLoMsx0ZHNcuTNAhmRTw3JoyaIS9vOy9NnKRPhQ=", "narHash": "sha256-HE0QHbOEfmmiFRBtWy+7pTlaDolxDfo5mgPcV20KOGA=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "cbe527a3ee6256de0c5bde5b10821f5095b60e22", "rev": "e9d0a3a754d5a477126ecb3c0bac3bf91a5bb189",
"revCount": 4170, "revCount": 4171,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/hydra.git" "url": "https://git.lix.systems/lix-project/hydra.git"
}, },
@ -169,11 +169,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1718081112, "lastModified": 1719211568,
"narHash": "sha256-3cpIVHuyo6yz9n7U/7U/p2Lmwjj1xHdTJR2RkT5JntY=", "narHash": "sha256-oIgmvhe3CV/36LC0KXgqWnKXma39wabks8U9JBMDfO4=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "8a3d063a494c4b8c767190a5ce3e4075a75f9d07", "rev": "4c3d93611f2848c56ebc69c85f2b1e18001ed3c7",
"revCount": 15756, "revCount": 15877,
"type": "git", "type": "git",
"url": "https://git@git.lix.systems/lix-project/lix" "url": "https://git@git.lix.systems/lix-project/lix"
}, },
@ -251,6 +251,10 @@
"agenix": "agenix", "agenix": "agenix",
"colmena": "colmena", "colmena": "colmena",
"hydra": "hydra", "hydra": "hydra",
"lix": [
"hydra",
"nix"
],
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
}, },

6
flake.nix
View file

@ -12,12 +12,18 @@
hydra.url = "git+https://git.lix.systems/lix-project/hydra.git"; hydra.url = "git+https://git.lix.systems/lix-project/hydra.git";
hydra.inputs.nixpkgs.follows = "nixpkgs"; hydra.inputs.nixpkgs.follows = "nixpkgs";
lix.follows = "hydra/nix";
}; };
outputs = { nixpkgs, ... } @ inputs: { outputs = { nixpkgs, ... } @ inputs: {
colmena = { colmena = {
meta.nixpkgs = import nixpkgs { meta.nixpkgs = import nixpkgs {
system = "x86_64-linux"; system = "x86_64-linux";
overlays = [
inputs.hydra.overlays.default
inputs.lix.overlays.default
];
}; };
meta.specialArgs.inputs = inputs; meta.specialArgs.inputs = inputs;

6
services/hydra/default.nix
View file

@ -1,4 +1,4 @@
{ config, lib, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.bagel.services.hydra; cfg = config.bagel.services.hydra;
@ -47,6 +47,10 @@ in {
notificationSender = "bagel@delroth.net"; notificationSender = "bagel@delroth.net";
# XXX: hydra overlay sets pkgs.hydra, but hydra's nixos module uses
# pkgs.hydra_unstable...
package = pkgs.hydra;
buildMachinesFiles = [ buildMachinesFiles = [
(pkgs.writeText "hydra-builders.conf" '' (pkgs.writeText "hydra-builders.conf" ''
ssh://bagel-builder@epyc.infra.newtype.fr x86_64-linux ${config.age.secrets.hydra-ssh-key-priv.path} 8 1 big-parallel,kvm,nixos-test - c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUJwcFBwKzhsdDFSTDNodW5aaGlXRUUvY1laaHJXYjFzaVhKVWpiU2l6Rzggcm9vdEBlcHljCg== ssh://bagel-builder@epyc.infra.newtype.fr x86_64-linux ${config.age.secrets.hydra-ssh-key-priv.path} 8 1 big-parallel,kvm,nixos-test - c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUJwcFBwKzhsdDFSTDNodW5aaGlXRUUvY1laaHJXYjFzaVhKVWpiU2l6Rzggcm9vdEBlcHljCg==