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 E2B8490430; Mon, 10 Oct 2022 23:32:46 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id E94AC901AB; Mon, 10 Oct 2022 23:32:29 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id 7BBD6900CE for ; Mon, 10 Oct 2022 23:32:13 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 300425C01B3 for ; Mon, 10 Oct 2022 19:32:10 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Mon, 10 Oct 2022 19:32:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=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=fm2; t=1665444730; x=1665531130; bh=rF oqVNO+xgfd5LdONuk1Z22xts6c3pwOUyPxpIUBorw=; b=fhpPCejv3wP9F/kIX5 wfHDotLB6a5NsB2rT2T4vsYWWvHVmZ3G60o9tsPUBLNa29/9NnCKo7vPnNr9+1aE z9VGyAU3e52q5PMjln7+cb+AlY97aRA8qluaMiGLKrSXUoyWM6qC008SereGGH/s LiAWJcD1n+xK5HvJ+vNORNyd/jjuF4Dx+8lk4p2iy85KkxpXdEK5+rB35e0z4Zjn kGFlDIUs4qyMh1ocu7Y4vx4UTVhvMdGNMdbENHputCR74Zgsrw+zQf6SiZbcbnUG nP6vCEL4VXAY7tGFR5NZ4KgBqRz2O/EWmlA/g9F8C84RXxFPHFuN0+OpfJf5eVbp p7FQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=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=fm3; t=1665444730; x=1665531130; bh=rFoqVNO+xgfd5 LdONuk1Z22xts6c3pwOUyPxpIUBorw=; b=TLGZ5rE18NMmgNzlCMNXK1ZuzVV1w C/9X0ne5ftXHw/XOyRNtVGIEMB4/TRkbnbibDYzzK6WP0EQ3Cf1J5awu+7zor8+g ogmVLPadsHHrloyxsnjxksS/nhAy7YwZomKOnfzdbS2Vw7hL536C38c4pZoqRO5+ a4b2uyDgamb5gByvA6gH8h6wdmDbdRnK0ufHP2aqaQIWvuAitoOJds3fYfKzUIyv p2mhkxV+N/HWT9Do2yR8zzjOmKLyPRVievjtUorVj4jRGkBBGT1vg/ZOf8fI/PFK f8IBM3MT7GXHobub5KZY5ThVpQYYh/Fk3d+BpDEC5jEC/gH9YEz/jS9Xw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeejhedgvdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhi sheqnecuggftrfgrthhtvghrnhepgfefudekvdelieelledufeevheeglefggedvudejvd dtffeuueevffehleejkedvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehm rghilhhfrhhomhepqhihlhhishhsseigvddvtddrqhihlhhishhsrdhnvght X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 10 Oct 2022 19:32:09 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 14B1FB73; Mon, 10 Oct 2022 23:32:07 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH 20/22] vm-lib/make-vms.nix: add Date: Mon, 10 Oct 2022 23:29:00 +0000 Message-Id: <20221010232909.1953738-21-hi@alyssa.is> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221010232909.1953738-1-hi@alyssa.is> References: <20221010232909.1953738-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 4XGIWYZDBI67AZPX5F6FDKD54FM3MFZA X-Message-ID-Hash: 4XGIWYZDBI67AZPX5F6FDKD54FM3MFZA 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 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 just makes it slightly nicer to have a vms.nix file that defines multiple Spectrum VMs. For example, import {} ({ makeVm, pkgs }: { vm1 = makeVm { /* ... */ }; vm2 = makeVm { /* ... */ }; }) Signed-off-by: Alyssa Ross --- vm-lib/make-vms.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 vm-lib/make-vms.nix diff --git a/vm-lib/make-vms.nix b/vm-lib/make-vms.nix new file mode 100644 index 0000000..e269cfd --- /dev/null +++ b/vm-lib/make-vms.nix @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: 2022 Alyssa Ross + +{ pkgs ? import {} }: + +let + makeVm = import ./make-vm.nix { inherit pkgs; }; +in + +pkgs.callPackage ( +{ lib, linkFarm }: + +defineVms: + +linkFarm "spectrum-vms" + (lib.mapAttrsToList (name: path: { inherit name path; }) + (defineVms { inherit makeVm pkgs; })) + +) {} -- 2.37.1