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.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 7EEFF686CA; Wed, 21 Sep 2022 13:34:04 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 5D12E686BB; Wed, 21 Sep 2022 13:34:01 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id 9C98A6871B for ; Wed, 21 Sep 2022 13:33:57 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 5B5C35C00E9; Wed, 21 Sep 2022 09:33:53 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 21 Sep 2022 09:33:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm1; t=1663767233; x=1663853633; bh=Va7ivBwRr+ J7kWL3R/WRz8na/GRe6vakNuEGdLXPKt0=; b=gKrck2rh8cLYiZIVprSElLhU7S ZHbiUYSxg4V02QbeIiGlTMAPeHlaUyydTZeukosDXYxToYo4+gqHO80oppcCkzGk Ltmou5MPUwiIZcxW9MmGnCLXAhsedPFlDs9qb9pEjjcYUFL9DLkoRFthrkHUMYTz T9vtfYWW/fGe4pT9QTsBuTH0mWTl7ggPIyRkJ3WB9I+oEya1ytcW1sYt9qLDsGKD mPfCrogF03PIjHhjrDnW3DqyOqk2rOVlZTYepHukSPJT/MJJTzNs0uF1XJk27N02 f1JFgJ/Rsm8ikCUnooSb+BIeOGkZIut9wdBEcNGach391ShRiKKDAsghwwzQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1663767233; x=1663853633; bh=Va7ivBwRr+J7k WL3R/WRz8na/GRe6vakNuEGdLXPKt0=; b=zjDlRXfCavjDhI7ZL3OmjgoQo8Y4P +YIFevl1QYbB/A0eF++o1WM+/SSbrCbdDJD9xAhYFIBGmuuQ6ebBBEXaAkQeGGOn XowyzioCcUzbJLKtWEKkXX92yCMCS8NzS2GFajou+qql6NAemopYONKrPZhaqD6e Ka2r8mghKse92QLQzYylum9CPJMRkbuMV0kgPIqDgredszcyEdRtwTl+glZO6rT/ KnvrvGiDQ3d6p0I5EqKJXzqmdzHIiX7FLYRcFCa077gIR/q4xgyPuDU2XMGUxCEU +DoyATcCfRFt/i1gW5h/KDwZuC22fzdaZLtcc4XMG4kXFSQzTTI1RbK0g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeefuddgieeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofggtgfgsehtkeertdertdejnecuhfhrohhmpeetlhihshhs rgcutfhoshhsuceohhhisegrlhihshhsrgdrihhsqeenucggtffrrghtthgvrhhnpeeiue ejjeeihefhvdevieehkeetudehkeegtefhiedutdduieetiedvveeutdeugfenucffohhm rghinhepnhhigihoshdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpehqhihlihhsshesgidvvddtrdhqhihlihhsshdrnhgvth X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 21 Sep 2022 09:33:52 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 1D7CE9953; Wed, 21 Sep 2022 13:33:49 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH] Documentation: clarify value of spectrum-config Date: Wed, 21 Sep 2022 13:33:41 +0000 Message-Id: <20220921133341.3120867-1-hi@alyssa.is> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID-Hash: FWLI2VED47G5RO57KSTP7XAXR7UPQCQH X-Message-ID-Hash: FWLI2VED47G5RO57KSTP7XAXR7UPQCQH 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: Ville Ilvonen 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: Before, it was not clear that spectrum-config should be set to a file path, rather than a directory — i.e. whether it override the root of the source tree, or the config.nix path within it. This change clarifies that spectrum-config should be set to a full configuration.nix file path, not the directory that contains it. Reported-by: Ville Ilvonen Signed-off-by: Alyssa Ross --- Documentation/build-configuration.adoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/build-configuration.adoc b/Documentation/build-configuration.adoc index db68c34..b89575f 100644 --- a/Documentation/build-configuration.adoc +++ b/Documentation/build-configuration.adoc @@ -8,8 +8,9 @@ Some aspects of a Spectrum build can be customised using a build configuration file. By default, this configuration file should be called config.nix and located in the root of the Spectrum source tree, -but this path can be overridden by setting `spectrum-config` in the -https://nixos.org/manual/nix/stable/command-ref/env-common.html#env-NIX_PATH[NIX_PATH]. +but this can be overridden by setting `spectrum-config` in the +https://nixos.org/manual/nix/stable/command-ref/env-common.html#env-NIX_PATH[NIX_PATH] +to the path of the configuration file. The configuration file should contain an attribute set. The only currently allowed attribute name is `pkgs`, which allows using a -- 2.37.1