diff options
| author | lassulus <lassulus@lassul.us> | 2020-11-17 21:42:50 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2020-11-17 21:42:50 +0100 |
| commit | b55c1126c291ca546da6ef2068a9e8413f814018 (patch) | |
| tree | e99cc8d1b3049ba9b67ef7f19332e3122b38fe0d /makefu | |
| parent | 155beb7f7e073f959f2a0c5d17b4ae789989ab16 (diff) | |
| parent | 064d51001d2daa17408fdf0311c763e05e0fe9c4 (diff) | |
Merge remote-tracking branch 'gum/20.09' into 20.09
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/1systems/gum/config.nix | 6 | ||||
| -rw-r--r-- | makefu/2configs/hw/tp-x2x0.nix | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index d0ba1a3c6..f65c6672b 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -82,8 +82,12 @@ in { # ci # <stockholm/makefu/2configs/exim-retiolum.nix> <stockholm/makefu/2configs/git/cgit-retiolum.nix> + + ###### Shack ##### # <stockholm/makefu/2configs/shack/events-publisher> - <stockholm/makefu/2configs/shack/gitlab-runner> + # <stockholm/makefu/2configs/shack/gitlab-runner> + + <stockholm/makefu/2configs/remote-build/slave.nix> <stockholm/makefu/2configs/remote-build/aarch64-community.nix> <stockholm/makefu/2configs/taskd.nix> diff --git a/makefu/2configs/hw/tp-x2x0.nix b/makefu/2configs/hw/tp-x2x0.nix index f4578bf77..b997a9eec 100644 --- a/makefu/2configs/hw/tp-x2x0.nix +++ b/makefu/2configs/hw/tp-x2x0.nix @@ -54,6 +54,6 @@ powerManagement.resumeCommands = '' - ${pkgs.rfkill}/bin/rfkill unblock all + ${pkgs.utillinux}/bin/rfkill unblock all ''; } |