forked from dan/liminix
make liminix-config a parameter with default
this is for hydra
This commit is contained in:
parent
38cc3315b9
commit
e6a173f71c
|
@ -4,7 +4,8 @@ let
|
|||
# jobset configuration.
|
||||
pkgs = (import <nixpkgs> {});
|
||||
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 {
|
||||
inherit (liminix.outputs) squashfs;
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
device ? (import devices/gl-ar750.nix)
|
||||
, liminix-config ? <liminix-config>
|
||||
, phram ? false
|
||||
}:
|
||||
|
||||
|
@ -11,7 +12,7 @@ let
|
|||
config = (import ./merge-modules.nix) [
|
||||
./modules/base.nix
|
||||
({ lib, ... } : { config = { inherit (device) kernel; }; })
|
||||
<liminix-config>
|
||||
liminix-config
|
||||
./modules/s6
|
||||
./modules/users.nix
|
||||
(if phram then ./modules/phram.nix else (args: {}))
|
||||
|
|
Loading…
Reference in New Issue