From e6a173f71c0637962b911ca936013a7117b7e453 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Sun, 29 Jan 2023 09:23:09 +0000 Subject: [PATCH] make liminix-config a parameter with default this is for hydra --- ci/basic.nix | 3 ++- default.nix | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/basic.nix b/ci/basic.nix index 40c90d2..18a9676 100644 --- a/ci/basic.nix +++ b/ci/basic.nix @@ -4,7 +4,8 @@ let # jobset configuration. pkgs = (import {}); device = import ; - liminix = import { inherit device; }; + liminix-config = import ; + liminix = import { inherit device liminix-config; }; in { inherit (liminix.outputs) squashfs; } diff --git a/default.nix b/default.nix index dd99827..9c7af25 100644 --- a/default.nix +++ b/default.nix @@ -1,5 +1,6 @@ { device ? (import devices/gl-ar750.nix) +, liminix-config ? , phram ? false }: @@ -11,7 +12,7 @@ let config = (import ./merge-modules.nix) [ ./modules/base.nix ({ lib, ... } : { config = { inherit (device) kernel; }; }) - + liminix-config ./modules/s6 ./modules/users.nix (if phram then ./modules/phram.nix else (args: {}))