From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.5 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 autolearn=unavailable autolearn_force=no version=3.4.4 Received: by atuin.qyliss.net (Postfix, from userid 496) id 27A7D5F7F; Sun, 11 Apr 2021 11:59:21 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id B89C65C68; Sun, 11 Apr 2021 11:58:23 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id C82225B79; Sun, 11 Apr 2021 11:58:20 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id 7EE1A5B8E for ; Sun, 11 Apr 2021 11:57:57 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id E6CB75C0056 for ; Sun, 11 Apr 2021 07:57:56 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sun, 11 Apr 2021 07:57:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=+HcpHl3nUfF2T sYAv0xdYP2VIIYcWhfK9musaOmbRvQ=; b=Lnrl+WPC0+7Rl44FdEYVG71pVDqBr I/YkTAZEIz6OnpXZGljSAh+0JHw+XtZJRcJukaS3pMLKMc6VGSKJZ0MYlH9b3uM7 duB1BP9fJzH0T7iGymat/p7GJiASpAgIWd+nRduF6urIBMEqxMXY4c6wDUDWqNqW V8mbQZzXA9n3PzMbGCy++kgi1A2TpRzjRrwRul8qnFS7tUnlh0rA2IFZqvocJlMJ guJp3+CcT4rU/eYQ9Fc9UXB4q/fQoJiKEzj4W5nzgCCogYJUP8dT4WMhwd8xACgT /MpXJj7zrMYvxF/dw71K+gIt6VrPI6Tw6IIYY7tYP1xslhej4QSJ3l85Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=+HcpHl3nUfF2TsYAv0xdYP2VIIYcWhfK9musaOmbRvQ=; b=APdyzQIM uBNWosnPPpTeZD9smVXw23XzlNQAJjMYBYN2QQaCmbbTdRAFsygxqusBwM3lGtJI mL/YpS4YI8o9g28SaMKHqzb9Q4qHZWNUt6n+BGpj9OjKzcvDfToyRgdYKh0g0UDH 5UPULHNbD2ipikUK0t7YfkgpI/1xaUYdiQrCyQyNGBpuxkPftZpw2++mW6AMDSLk Rlg/PY0ciMaQ6+nX/VXmiR0+mwMK9CylYBLXESLWhvzZTucsYmsDUnXUeTL4UsHt xkgBNM6dPw5l3cJBqmRwAx3+mjfTzZlsP93pfW9rW4WJuwcN2PBNbCy8i+Hrh98B x/Wwao9/+T6Y4A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudekgedgudejhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpeetlhihshhsrgcutfhoshhsuceohhhisegrlhihshhsrgdr ihhsqeenucggtffrrghtthgvrhhnpefgfedukedvleeileeludefveehgeelgfegvdduje dvtdffueeuveffheeljeekvdenucfkphepjeelrddvfeehrdduudelrddutdejnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepqhihlhhishhsse igvddvtddrqhihlhhishhsrdhnvght X-ME-Proxy: Received: from x220.qyliss.net (p4feb776b.dip0.t-ipconnect.de [79.235.119.107]) by mail.messagingengine.com (Postfix) with ESMTPA id AAD6724005D for ; Sun, 11 Apr 2021 07:57:56 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 92AB318F8; Sun, 11 Apr 2021 11:57:55 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs 05/16] spectrumPackages.linux_vm: allow config overrides Date: Sun, 11 Apr 2021 11:57:29 +0000 Message-Id: <20210411115740.29615-6-hi@alyssa.is> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210411115740.29615-1-hi@alyssa.is> References: <20210411115740.29615-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: UDAP5L42K7JLX6R2J3QAS76YJHNTTEDB X-Message-ID-Hash: UDAP5L42K7JLX6R2J3QAS76YJHNTTEDB 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; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.3.1 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: This way, linux_vm's configuration can be overridden further when it's used, for example for VM-specific configuration. --- pkgs/os-specific/linux/spectrum/linux/vm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/spectrum/linux/vm.nix b/pkgs/os-specific/linux/spectrum/linux/vm.nix index f456053dc99..d6911cf4a81 100644 --- a/pkgs/os-specific/linux/spectrum/linux/vm.nix +++ b/pkgs/os-specific/linux/spectrum/linux/vm.nix @@ -1,4 +1,4 @@ -{ lib, linux, kernelPatches }: +{ lib, linux, kernelPatches, structuredExtraConfig ? {} }: with lib.kernel; @@ -24,5 +24,5 @@ linux.override { NET_9P = yes; NET_9P_VIRTIO = yes; "9P_FS" = yes; - }; + } // structuredExtraConfig; } -- 2.30.0