diff --git a/flake.nix b/flake.nix index a906796..d4b5920 100644 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,8 @@ colmena.url = "github:zhaofengli/colmena"; colmena.inputs.nixpkgs.follows = "nixpkgs"; + attic.url = "github:zhaofengli/attic"; + srvos.url = "github:numtide/srvos"; # actually not used when using the modules but than nothing ever will try to fetch this nixpkgs variant srvos.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/buildbot/default.nix b/modules/buildbot/default.nix index 3691eab..ae77a56 100644 --- a/modules/buildbot/default.nix +++ b/modules/buildbot/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, pkgs, config, inputs, ... }: with lib; let cfg = config.luj.buildbot; @@ -12,6 +12,7 @@ in #buildbot worker nix.settings.allowed-users = [ "buildbot-worker" ]; + nix.settings.trusted-users = [ "buildbot-worker" ]; users.users.buildbot-worker = { description = "Buildbot Worker User."; isSystemUser = true; @@ -33,6 +34,7 @@ in pkgs.gh pkgs.nix pkgs.nix-output-monitor + inputs.attic.packages.x86_64-linux.attic ]; environment.PYTHONPATH = "${python.withPackages (_: [package])}/${python.sitePackages}"; environment.MASTER_URL = ''TCP:2a01\\:e34\\:ec2a\\:8e60\\:8ec7\\:b5d2\\:f663\\:a67a:9989''; diff --git a/modules/packages.nix b/modules/packages.nix index c396d63..5503b6e 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -1,10 +1,11 @@ -{ pkgs, ... }: { +{ pkgs, inputs, ... }: { # this extends the list from: # https://github.com/numtide/srvos/blob/master/server.nix#L10 environment.systemPackages = with pkgs; [ socat whois + inputs.attic.packages.x86_64-linux.attic jq psmisc libarchive