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

make liminix-config a parameter with default

Browse source 
this is for hydra
This commit is contained in:
Daniel Barlow 2023-01-29 09:23:09 +00:00
parent 38cc3315b9
commit e6a173f71c
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ci/basic.nix
View file

@ -4,7 +4,8 @@ let
# jobset configuration. # jobset configuration.
pkgs = (import <nixpkgs> {}); pkgs = (import <nixpkgs> {});
device = import <liminix/devices/qemu>; device = import <liminix/devices/qemu>;
liminix = import <liminix> { inherit device; }; liminix-config = import <liminix/tests/smoke/configuration.nix>;
liminix = import <liminix> { inherit device liminix-config; };
in { in {
inherit (liminix.outputs) squashfs; inherit (liminix.outputs) squashfs;
} }

3
default.nix
View file

@ -1,5 +1,6 @@
{ {
device ? (import devices/gl-ar750.nix) device ? (import devices/gl-ar750.nix)
, liminix-config ? <liminix-config>
, phram ? false , phram ? false
}: }:
@ -11,7 +12,7 @@ let
config = (import ./merge-modules.nix) [ config = (import ./merge-modules.nix) [
./modules/base.nix ./modules/base.nix
({ lib, ... } : { config = { inherit (device) kernel; }; }) ({ lib, ... } : { config = { inherit (device) kernel; }; })
<liminix-config> liminix-config
./modules/s6 ./modules/s6
./modules/users.nix ./modules/users.nix
(if phram then ./modules/phram.nix else (args: {})) (if phram then ./modules/phram.nix else (args: {}))