liminix

commit e6a173f71c0637962b911ca936013a7117b7e453
parent 38cc3315b9e875d47539b6d417440ed2e5d03509
Author: Daniel Barlow <dan@telent.net>
Date:   Sun, 29 Jan 2023 09:23:09 +0000

make liminix-config a parameter with default

this is for hydra

Diffstat:
M
ci/basic.nix
 | 
3
++-
M
default.nix
 | 
3
++-

2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ci/basic.nix b/ci/basic.nix
@@ -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;
 }
diff --git a/default.nix b/default.nix
@@ -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: {}))