From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HTML_MESSAGE,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 59ABA5EAA0; Thu, 8 Sep 2022 11:40:54 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 509395EA89; Thu, 8 Sep 2022 11:40:52 +0000 (UTC) Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by atuin.qyliss.net (Postfix) with ESMTPS id 61E4B5EA51 for ; Thu, 8 Sep 2022 11:40:48 +0000 (UTC) Received: by mail-ej1-x62d.google.com with SMTP id fy31so37409515ejc.6 for ; Thu, 08 Sep 2022 04:40:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unikie.com; s=google; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=FcbVIxd4MqDdyX8ZJq5vnQkUB9NFQiiST2PAiVvm8Rc=; b=OiknqNbVSYSxi9QVcanpLZs+2Qu9c3k9r6+zfTXXYv4l/4BkSoS0WN9DV9RpImYt43 Z/gEPuGHa0HZEOQGmeNHcHU8Z4t+RooFw4h4B3Y5uW1SMdZzUTd2c/qwwl/Rk3bBwgBA XPkuKjgR7oHnyVLbdDCn50lMIXqXVCWfuDkZWOG4Ewatfi319LoJSlnLqGttaDFX0GGn U3tBB8XIlTmuSGm41/vrTwuAR7EwOER98MucH5pdzjsTGpuUHrIqx5HS7v4dFN/GzLqp Q8CUjzhcvAm7u8DtQpiSqGdTd/nmkdpFfts07t34Pv3LO9AS8enbIaAZlbs80UFPwA+k BRPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=FcbVIxd4MqDdyX8ZJq5vnQkUB9NFQiiST2PAiVvm8Rc=; b=KZjRJfytk7YntYWP0lHCaer/xHxR2iDtSO6xUKSlLCZFYRDIeb8lb17WtQosVUlzhW ehSLq6zVafeIpFliXo60m1rrcwEmtqFvKxUspE2lp8RQaXgFeL1jMrmVJ7aCnoYsDscB 2SZoACWfuOCyxDRQo9JDsunMjnPo9qLqDNpb6vf7faDc7VoQN+P2bgdU5JMmPT9T9RoE YN3gt5ubzyS+yk3K8guzqA2OV7e1gYE8K58apjDADEC3pX44juiJc5lV+cZhl+Sxyde1 ol5tA2nJ+CPMg+jaCJ1KtcHXfbJGjDWo5S2BxtFgwgcOY4SrzfwJqHTFZtddLnF0ZLNk tvEQ== X-Gm-Message-State: ACgBeo277qWwPm78YPjCqHFdKFt6mPkRjU6yvzY4Zkt3AeITkpvzFwqo FBMKujDMAKkKRck97WAWaXUVYK5CslNuoR9DGmz+bN0Xe97//k4RMNamhw== X-Google-Smtp-Source: AA6agR4ydMD/vDA1+UEQISgoNmhk3e4fXKRcBoHcIF9Wo3ENhOZrPmiU3lkl/NflJj33QrQhRhvb5XbET3OoYE3vvSI= X-Received: by 2002:a17:907:94c5:b0:74f:25e3:5f86 with SMTP id dn5-20020a17090794c500b0074f25e35f86mr5670399ejc.304.1662637247828; Thu, 08 Sep 2022 04:40:47 -0700 (PDT) MIME-Version: 1.0 References: <20220831093727.282797-1-hi@alyssa.is> <20220831093727.282797-2-hi@alyssa.is> In-Reply-To: <20220831093727.282797-2-hi@alyssa.is> From: =?UTF-8?Q?Jos=C3=A9_Pekkarinen?= Date: Thu, 8 Sep 2022 14:40:12 +0300 Message-ID: Subject: Re: [PATCH 2/4] nix: prefer build configs from To: Alyssa Ross Content-Type: multipart/alternative; boundary="0000000000008c2f4205e828e696" Message-ID-Hash: ID2VLHIC7EF2UWMAEPBTDUK2KFJTEZ3F X-Message-ID-Hash: ID2VLHIC7EF2UWMAEPBTDUK2KFJTEZ3F X-MailFrom: jose.pekkarinen@unikie.com X-Mailman-Rule-Hits: header-match-devel.spectrum-os.org-0 X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1 CC: devel@spectrum-os.org, Ivan Nikolaenko X-Mailman-Version: 3.3.5 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: --0000000000008c2f4205e828e696 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Aug 31, 2022 at 12:38 PM Alyssa Ross wrote: > This will make it easier to use multiple configs, e.g. for different > boards. > > Signed-off-by: Alyssa Ross > Tested-by: Jos=C3=A9 Pekkarinen > --- > nix/eval-config.nix | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/nix/eval-config.nix b/nix/eval-config.nix > index 9265df7..467f877 100644 > --- a/nix/eval-config.nix > +++ b/nix/eval-config.nix > @@ -2,7 +2,10 @@ > # SPDX-FileCopyrightText: 2022 Unikie > > { config ? > - if builtins.pathExists ../config.nix then import ../config.nix else {} > + let customPath =3D builtins.tryEval ; in > + if customPath.success then import customPath.value > + else if builtins.pathExists ../config.nix then import ../config.nix > + else {} > }: > > ({ pkgs ? import {} }: { > -- > 2.37.1 > > --=20 Jos=C3=A9. --0000000000008c2f4205e828e696 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Aug 31, 2022 at 12:38 PM Alys= sa Ross <hi@alyssa.is> wrote:
=
This will make it e= asier to use multiple configs, e.g. for different
boards.

Signed-off-by: Alyssa Ross <hi@alyssa.is>
= =C2=A0
Tested-by: Jos=C3=A9 Pekkarinen <jose.pekkarinen@unikie.com>=C2= =A0
=C2=A0
---
=C2=A0nix/eval-config.nix | 5 ++++-
=C2=A01 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nix/eval-config.nix b/nix/eval-config.nix
index 9265df7..467f877 100644
--- a/nix/eval-config.nix
+++ b/nix/eval-config.nix
@@ -2,7 +2,10 @@
=C2=A0# SPDX-FileCopyrightText: 2022 Unikie

=C2=A0{ config ?
-=C2=A0 if builtins.pathExists ../config.nix then import ../config.nix else= {}
+=C2=A0 let customPath =3D builtins.tryEval <spectrum-config>; in
+=C2=A0 if customPath.success then import customPath.value
+=C2=A0 else if builtins.pathExists ../config.nix then import ../config.nix=
+=C2=A0 else {}
=C2=A0}:

=C2=A0({ pkgs ? import <nixpkgs> {} }: {
--
2.37.1



--
Jos=C3=A9.
<= /div> --0000000000008c2f4205e828e696--