From: "José Pekkarinen" <jose.pekkarinen@unikie.com>
To: devel@spectrum-os.org
Cc: "José Pekkarinen" <jose.pekkarinen@unikie.com>
Subject: [PATCH] Add image configuration option
Date: Thu, 15 Sep 2022 10:35:15 +0300 [thread overview]
Message-ID: <20220915073515.47855-1-jose.pekkarinen@unikie.com> (raw)
The following patch proposes to host nix configuration
files under nix folder that offers default configuration
for an image, defaulting to a release image, which would
be plain spectrum. A hardened default configuration will
be proposed in the near future. In case of configuration
collision between the default configuration and config.nix,
the latter will be taken into account.
Signed-off-by: José Pekkarinen <jose.pekkarinen@unikie.com>
---
nix/eval-config.nix | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/nix/eval-config.nix b/nix/eval-config.nix
index 467f877..09a7ada 100644
--- a/nix/eval-config.nix
+++ b/nix/eval-config.nix
@@ -10,4 +10,5 @@
({ pkgs ? import <nixpkgs> {} }: {
inherit pkgs;
-}) config
+}) (if config ? image && builtins.pathExists ./${config.image}.nix then
+ import ./${config.image}.nix else {}) // config
--
2.25.1
next reply other threads:[~2022-09-15 7:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-15 7:35 José Pekkarinen [this message]
2022-09-15 8:21 ` [PATCH] Add image configuration option Alyssa Ross
2022-09-15 10:42 ` José Pekkarinen
2022-09-15 11:31 ` Alyssa Ross
2022-09-15 12:31 ` José Pekkarinen
2022-09-15 13:22 ` Alyssa Ross
2022-09-15 13:48 ` Ville Ilvonen
2022-09-15 14:00 ` Alyssa Ross
2022-09-15 14:09 ` Ville Ilvonen
2022-09-15 14:47 ` Integrating Spectrum and platform firmware Alyssa Ross
2022-09-16 5:29 ` Ville Ilvonen
2022-09-16 4:59 ` [PATCH] Add image configuration option José Pekkarinen
2022-09-16 7:25 ` Alyssa Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220915073515.47855-1-jose.pekkarinen@unikie.com \
--to=jose.pekkarinen@unikie.com \
--cc=devel@spectrum-os.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).