From 06471a7b349e663dad461be0224be1adc4a778b7 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Fri, 10 May 2024 13:09:50 -0700 Subject: [PATCH] fix(ci): disable kasen builds needs an aarch64-linux builder first! --- ci/packages.nix | 4 ++++ ci/systems.json | 10 ++++++++++ overlays/default.nix | 4 +++- packages/default.nix | 3 ++- systems/kasen/default.nix | 4 +++- 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ci/packages.nix b/ci/packages.nix index 8cbe873b..f259c6be 100644 --- a/ci/packages.nix +++ b/ci/packages.nix @@ -28,5 +28,9 @@ in { packages.x86_64-linux.krb5-ldap legacyPackages.x86_64-linux.pkgs._389-ds-base ]; + openwebrx.inputs = [ + packages.x86_64-linux.openwebrxplus + # TODO: packages.aarch64-linux.openwebrxplus + ]; }; } diff --git a/ci/systems.json b/ci/systems.json index 3398e5bc..3f0368a4 100644 --- a/ci/systems.json +++ b/ci/systems.json @@ -99,6 +99,16 @@ } } }, + "kasen": { + "network": { + "hostName": "kasen", + "networks": { + "int": null, + "local": null, + "tail": null + } + } + }, "keycloak": { "network": { "hostName": "keycloak", diff --git a/overlays/default.nix b/overlays/default.nix index 9e0a079b..fc88405d 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -6,10 +6,11 @@ in rec { default = nixlib.composeManyExtensions [ barcodebuddy - minecraft krb5 + minecraft nfs nginx + openwebrx samba ]; barcodebuddy = import ./barcodebuddy.nix; @@ -18,6 +19,7 @@ in rec { nfs = import ./nfs.nix; nginx = import ./nginx.nix; samba = import ./samba.nix; + openwebrx = import ./openwebrxplus.nix; deploy-rs = inputs.deploy-rs.overlays.default or inputs.deploy-rs.overlay; arc = inputs.arcexprs.overlays.default; } diff --git a/packages/default.nix b/packages/default.nix index 9ba878bd..8e76d32f 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -46,7 +46,8 @@ freeipa-ipasam samba-ldap samba-ipa krb5-ldap nfs-utils-ldap - barcodebuddy; + barcodebuddy + openwebrxplus; nf-setup-node = let reisen = ../systems/reisen; diff --git a/systems/kasen/default.nix b/systems/kasen/default.nix index c088828a..f4757105 100644 --- a/systems/kasen/default.nix +++ b/systems/kasen/default.nix @@ -2,6 +2,8 @@ _: { imports = [ ]; deploy.hostname = "10.1.1.139"; + # TODO: get an aarch64-linux builder on aya! + ci.enable = false; arch = "aarch64"; type = "NixOS"; modules = [ @@ -13,4 +15,4 @@ _: { sshd.enable = true; }; }; -} \ No newline at end of file +}