From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,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 A389256405; Wed, 31 Aug 2022 09:38:15 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 4A7355634D; Wed, 31 Aug 2022 09:38:12 +0000 (UTC) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by atuin.qyliss.net (Postfix) with ESMTPS id C7335563E0 for ; Wed, 31 Aug 2022 09:38:08 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 8834A5C01B7; Wed, 31 Aug 2022 05:38:07 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 31 Aug 2022 05:38:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm3; t=1661938687; x=1662025087; bh=o2 r1jGohMINmVIS/6jxcbvFDwsFSMW0tJAmHgGolR6g=; b=OuSWObULxl0g8aEBG6 aPGub0ksjy9yzUcN+iDmSVpDGm/w6wX4lfXcQ9LuLK7KHbWcR8LhU3EMAFylk1TE AVef1ElOJ/hQadnclaXqBcYZ3b7N5fqTTppja5HgalCa8BEMkiPedU9mOzzN+45z 2+Am7QoCr+lE/OQQO2ByMatdph+r6XcGCezX7i1u8R+qCj0Yl0Ml3v+GSEGrBEeq O6MEOFgUqPe5DvFHwx/aQ7iJ9OeqCtCgziJ4lmE8aLzFo6eCqO2WaCuIR142vCDZ 67sOoF/Achc6DCGRTIMATonveNaxH672T3i0S47ffZGzkbtjz9+GaEBWEkk4VBZ6 sZJg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1661938687; x=1662025087; bh=o2r1jGohMINmV IS/6jxcbvFDwsFSMW0tJAmHgGolR6g=; b=0sb6yavnULtq4pQfTLCcl29xQ1tJ/ vUrWLXGxQ08AmTW1CsuSOCOkUMHP9lvAB+aWpxicHxepf6Mri7oShAHVdmwwqeG9 SAmeXTMlZrTObOWqij9roEB7KW40xIr0Hd6Coh+kfWgGFbTH+yHa/QmAKVqJD/na MAEr5zYU3UMN0pP87MY6Z0yDi78NjOQvyBL9neKOaW8c+sgcHyExoC+QRKCyKU3x S1w3IEqeeoZGrfs3fRvG5z3LN3b3qzyj+uGEMSo4MBP2D0St/aC9Qx/9Y37fuW65 K+Ic4F/d59mdwrOozHXIM1zdmS7JuVvHQ0awCE5oBasBnVhD2jGMOTGFw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdekhedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptehlhihs shgrucftohhsshcuoehhihesrghlhihsshgrrdhisheqnecuggftrfgrthhtvghrnhepge euieduueekkeeivdetffegkeduhfduvedvledvkefhfeeiteekuddujefffeegnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepqhihlhhishhsse igvddvtddrqhihlhhishhsrdhnvght X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 31 Aug 2022 05:38:06 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id CC5FF66D; Wed, 31 Aug 2022 09:37:54 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH 2/4] nix: prefer build configs from Date: Wed, 31 Aug 2022 09:37:25 +0000 Message-Id: <20220831093727.282797-2-hi@alyssa.is> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220831093727.282797-1-hi@alyssa.is> References: <20220831093727.282797-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 6YLSRHSP6F2Z6FQCOZUEJJNGNLVHA5JS X-Message-ID-Hash: 6YLSRHSP6F2Z6FQCOZUEJJNGNLVHA5JS X-MailFrom: qyliss@x220.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= , 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: This will make it easier to use multiple configs, e.g. for different boards. Signed-off-by: Alyssa Ross --- 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 = 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