DGNum/liminix
14
0
Fork 2
Code Issues 15 Pull requests 7 Projects Releases Packages Wiki Activity Actions

rm vanilla-configuration-hw.nix, no longer needed

Browse source
This commit is contained in:
Daniel Barlow 2023-12-11 19:01:07 +00:00
parent 6c8b2bbb83
commit 39c338d710
2 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ci.nix
View file

@ -8,21 +8,20 @@ let
pkgs = (import nixpkgs {}); pkgs = (import nixpkgs {});
borderVmConf = ./bordervm.conf-example.nix; borderVmConf = ./bordervm.conf-example.nix;
inherit (pkgs.lib.attrsets) genAttrs; inherit (pkgs.lib.attrsets) genAttrs;
devices = { devices = [
virt = [ "qemu" "qemu-aarch64" "qemu-armv7l" ]; "gl-ar750" "gl-mt300n-v2" "gl-mt300a"
hw = [ "gl-ar750" "gl-mt300n-v2" "gl-mt300a" ]; "qemu" "qemu-aarch64" "qemu-armv7l"
}; ];
vanilla = ./vanilla-configuration.nix; vanilla = ./vanilla-configuration.nix;
for-device = cfg: name: for-device = name:
(import liminix { (import liminix {
inherit nixpkgs borderVmConf; inherit nixpkgs borderVmConf;
device = import (liminix + "/devices/${name}"); device = import (liminix + "/devices/${name}");
liminix-config = cfg; liminix-config = vanilla;
}).outputs.default; }).outputs.default;
tests = import ./tests/ci.nix; tests = import ./tests/ci.nix;
jobs = jobs =
(genAttrs devices.hw (name: for-device ./vanilla-configuration-hw.nix name)) // (genAttrs devices for-device) //
(genAttrs devices.virt (name: for-device vanilla name)) //
tests // tests //
{ {
buildEnv = (import liminix { buildEnv = (import liminix {

6
vanilla-configuration-hw.nix
View file

@ -1,6 +0,0 @@
{ ... }:
{
imports = [
./vanilla-configuration.nix
];
}