added attic to buildbot

This commit is contained in:
Julien Malka 2023-08-07 14:46:46 +02:00
parent 88873083d5
commit 65c58a00bb
No known key found for this signature in database
GPG key ID: 6FC74C847011FD83
3 changed files with 7 additions and 2 deletions

View file

@ -25,6 +25,8 @@
colmena.url = "github:zhaofengli/colmena"; colmena.url = "github:zhaofengli/colmena";
colmena.inputs.nixpkgs.follows = "nixpkgs"; colmena.inputs.nixpkgs.follows = "nixpkgs";
attic.url = "github:zhaofengli/attic";
srvos.url = "github:numtide/srvos"; srvos.url = "github:numtide/srvos";
# actually not used when using the modules but than nothing ever will try to fetch this nixpkgs variant # actually not used when using the modules but than nothing ever will try to fetch this nixpkgs variant
srvos.inputs.nixpkgs.follows = "nixpkgs"; srvos.inputs.nixpkgs.follows = "nixpkgs";

View file

@ -1,4 +1,4 @@
{ lib, pkgs, config, ... }: { lib, pkgs, config, inputs, ... }:
with lib; with lib;
let let
cfg = config.luj.buildbot; cfg = config.luj.buildbot;
@ -12,6 +12,7 @@ in
#buildbot worker #buildbot worker
nix.settings.allowed-users = [ "buildbot-worker" ]; nix.settings.allowed-users = [ "buildbot-worker" ];
nix.settings.trusted-users = [ "buildbot-worker" ];
users.users.buildbot-worker = { users.users.buildbot-worker = {
description = "Buildbot Worker User."; description = "Buildbot Worker User.";
isSystemUser = true; isSystemUser = true;
@ -33,6 +34,7 @@ in
pkgs.gh pkgs.gh
pkgs.nix pkgs.nix
pkgs.nix-output-monitor pkgs.nix-output-monitor
inputs.attic.packages.x86_64-linux.attic
]; ];
environment.PYTHONPATH = "${python.withPackages (_: [package])}/${python.sitePackages}"; environment.PYTHONPATH = "${python.withPackages (_: [package])}/${python.sitePackages}";
environment.MASTER_URL = ''TCP:2a01\\:e34\\:ec2a\\:8e60\\:8ec7\\:b5d2\\:f663\\:a67a:9989''; environment.MASTER_URL = ''TCP:2a01\\:e34\\:ec2a\\:8e60\\:8ec7\\:b5d2\\:f663\\:a67a:9989'';

View file

@ -1,10 +1,11 @@
{ pkgs, ... }: { { pkgs, inputs, ... }: {
# this extends the list from: # this extends the list from:
# https://github.com/numtide/srvos/blob/master/server.nix#L10 # https://github.com/numtide/srvos/blob/master/server.nix#L10
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
socat socat
whois whois
inputs.attic.packages.x86_64-linux.attic
jq jq
psmisc psmisc
libarchive libarchive