commit
23eeb88baf
3 changed files with 53 additions and 17 deletions
|
@ -174,6 +174,15 @@ in {
|
|||
key = "attic/config.toml";
|
||||
path = "/var/lib/hydra/queue-runner/.config/attic/config.toml";
|
||||
};
|
||||
services.postgresql.ensureDatabases = [
|
||||
"hydra-queue-runner"
|
||||
];
|
||||
services.postgresql.ensureUsers = [
|
||||
{
|
||||
name = "hydra-queue-runner";
|
||||
ensureDBOwnership = true;
|
||||
}
|
||||
];
|
||||
|
||||
systemd.services."attic-queue" = {
|
||||
description = "Upload build results";
|
||||
|
@ -184,7 +193,7 @@ in {
|
|||
};
|
||||
script = ''
|
||||
export QUEUE_PATH=/var/lib/hydra/queue-runner/upload
|
||||
export DATABASE_PATH=/var/lib/hydra/queue-runner/queue.db
|
||||
export DATABASE_PATH=postgresql:///hydra-queue-runner
|
||||
export RUST_LOG=info
|
||||
exec ${attic.packages.${system}.attic-queue}/bin/attic-queue
|
||||
'';
|
||||
|
|
56
flake.lock
56
flake.lock
|
@ -87,31 +87,24 @@
|
|||
},
|
||||
"attic": {
|
||||
"inputs": {
|
||||
"cargo2nix": [
|
||||
"cargo2nix"
|
||||
],
|
||||
"crane": [
|
||||
"crane"
|
||||
],
|
||||
"flake-compat": [
|
||||
"flake-compat"
|
||||
],
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-overlay": [
|
||||
"rust-overlay"
|
||||
]
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1718545268,
|
||||
"narHash": "sha256-kYnM1kr1U/+mARR3kYd1Yh9atRofKnpNQF5wd4xf8Cc=",
|
||||
"lastModified": 1726060175,
|
||||
"narHash": "sha256-Iw13A9W1ud7qJlOS76jCRd8bdH8w5qSortgHQJ10xnU=",
|
||||
"owner": "DarkKirb",
|
||||
"repo": "attic",
|
||||
"rev": "7634b861f606cd21719e350da5c74475047a456d",
|
||||
"rev": "79a43f39e3f5f4ff7488b47f16fbe7ddbc1ca6f1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -265,6 +258,27 @@
|
|||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"attic",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725234343,
|
||||
"narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nixpkgs"
|
||||
|
@ -696,6 +710,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1725826545,
|
||||
"narHash": "sha256-L64N1rpLlXdc94H+F6scnrbuEu+utC03cDDVvvJGOME=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1725905123,
|
||||
|
@ -772,7 +802,7 @@
|
|||
"devshell": "devshell",
|
||||
"dns": "dns",
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"flake-utils": "flake-utils",
|
||||
"flakey-profile": "flakey-profile",
|
||||
"gitignore": "gitignore",
|
||||
|
|
|
@ -27,12 +27,9 @@ rec {
|
|||
};
|
||||
attic = {
|
||||
url = "github:DarkKirb/attic";
|
||||
inputs.cargo2nix.follows = "cargo2nix";
|
||||
inputs.crane.follows = "crane";
|
||||
inputs.flake-compat.follows = "flake-compat";
|
||||
inputs.flake-utils.follows = "flake-utils";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.rust-overlay.follows = "rust-overlay";
|
||||
};
|
||||
cargo2nix = {
|
||||
url = "github:DarkKirb/cargo2nix/master";
|
||||
|
|
Loading…
Reference in a new issue