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 38F136177; Sun, 11 Apr 2021 12:00:40 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 169F15DB3; Sun, 11 Apr 2021 11:58:37 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 1FD705CE0; Sun, 11 Apr 2021 11:58:35 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id 74DC25B33 for ; Sun, 11 Apr 2021 11:57:58 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id E04995C00D1 for ; Sun, 11 Apr 2021 07:57:57 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sun, 11 Apr 2021 07:57:57 -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=bi3KB/ffVCuK/ IddwZaldKdSkIwYsvhIPLWHIDd3rDA=; b=vHWuZz0qt+hckcplNdV/89aJ7pT7R sdosepTuqIMQo/W+a0oN2EqTIHTjeDZ7u4gOxxlvlPXCc5lgpIXf7XJemRP4bELs R/6qfjdzJwbbHFvfDwcesvgrmkeW4FGex0E34oKj6iXjjTKKZlbtGNBBROGa7YQ3 od7xr70+3IypRDtTtIMThrmDxPR8JGq74767QGvphm+poCK0wl5fvFjkWKXFOzCE iIEalQr8noeocV5UUPHvb0jZHgbCgOD4gOk5r/k/Sjm27Dwk+V01YnYdZ9sexp1r 030rj5U/IcIRG+jx+zzDw3TDrgvHxhFvgK8IoJZdjz62sOGvHX0h40sNA== 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=bi3KB/ffVCuK/IddwZaldKdSkIwYsvhIPLWHIDd3rDA=; b=DjowAi+j QjwTJFC32eov9euFKVGUiRqqG8efCkcJEwpBhW3qMpQICjVTfexIbtC2lQYOHcG0 KNK9g884dM7brbXWlg1UAfrSRcrFOFa2Yl6PQGeOtGgfzszwmOVG06YvT3EnTTmi NAOg1xLnt6sdoqi3SC7MX1myP/qQVd1xhqAKdDZKj1wIuYyT9YypTUxQQ093xXwh ZUIO1HK0qoYT9uDD8bfGP89KRrDmvIPRy3Ofy5q4tiTXtjfOcuLQQ1lDn94zjfGI 5WrNshyJfLxLGRqpqrC/VB5SQR8wNb5ANKnSM8qQE8pjc8Ub88NXF5E2BrxzbSzI Jbnid1oOVjWC8g== 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 AD2DE24005E for ; Sun, 11 Apr 2021 07:57:57 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 386211A44; Sun, 11 Apr 2021 11:57:56 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs 13/16] spectrumPackages.makeRootfs: move to default.nix Date: Sun, 11 Apr 2021 11:57:37 +0000 Message-Id: <20210411115740.29615-14-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: RMUNWSU4RWGXLBWYFGI7XZ3BB3JEUPKK X-Message-ID-Hash: RMUNWSU4RWGXLBWYFGI7XZ3BB3JEUPKK 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: There is no default rootfs any more, so we might as well repurpose the blessed filename. --- pkgs/os-specific/linux/spectrum/default.nix | 2 +- .../linux/spectrum/rootfs/{generic.nix => default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/os-specific/linux/spectrum/rootfs/{generic.nix => default.nix} (100%) diff --git a/pkgs/os-specific/linux/spectrum/default.nix b/pkgs/os-specific/linux/spectrum/default.nix index f8a9813d16a..7e07ee60f43 100644 --- a/pkgs/os-specific/linux/spectrum/default.nix +++ b/pkgs/os-specific/linux/spectrum/default.nix @@ -10,7 +10,7 @@ let linux_vm = callPackage ./linux/vm.nix { linux = linux_cros; }; - makeRootfs = callPackage ./rootfs/generic.nix { }; + makeRootfs = callPackage ./rootfs { }; }; in self diff --git a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix b/pkgs/os-specific/linux/spectrum/rootfs/default.nix similarity index 100% rename from pkgs/os-specific/linux/spectrum/rootfs/generic.nix rename to pkgs/os-specific/linux/spectrum/rootfs/default.nix -- 2.30.0