From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id E06AC5399; Sat, 06 Dec 2025 18:31:30 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 35B8F538A; Sat, 06 Dec 2025 18:31:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) by atuin.qyliss.net (Postfix) with ESMTPS id 50B8E5388 for ; Sat, 06 Dec 2025 18:31:26 +0000 (UTC) Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4dNxf26sV6z9tWZ for ; Sat, 6 Dec 2025 19:31:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1765045883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=afYZ5QPXXH44t+tsIxc0JQxAxxBez8cbXm1f3WG8PTs=; b=SFssWjHeHIE21VOvc/Fqopzcj9knkjfQ74resEzJGMfwzSKIQAg/Th1YAi7OBLgyjS9cq/ cngpq08o88EEyNn6EAoXBbUXZ5C4ptnDV8nErxNnD5xcmE87Ms3iy0hBjML5vSaF9UFdsa 5ZnlRnzpkG+Vu4Qs+Wa5eC5utq9UrA/Ud7JByiOn2xe7S7pHg7xyFalOdiEEccTrkSUAMe AXPQLyw3Tx22/oUZPutT3NwjPe5mJ+l678fiwJGLpZHWqudSZIX7KGP5ipqK0rkijR8KxT Ulc98nrTNYg4MkvzMcAsk6ZuscuVmi0+zVLtBFZv+9XXIvlanJJ/wK+Cmi8PIQ== From: =?UTF-8?q?Johannes=20S=C3=BCllner?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1765045882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=afYZ5QPXXH44t+tsIxc0JQxAxxBez8cbXm1f3WG8PTs=; b=iU7vfh4iW0UiluannqwfXz2cDFgRi/LT9fu+/Iqp8ktJ2b2fkfbkCa6eI718y55BBtj0Vm kwQq3msthZrcmym8zxwoWxjG09DyzGd87gh24wrx/pSOKOhheez+uMqgswaIhXbDe/3OOm vqJsB4CEu4cBIHRiPymfhNrbdnYFb4bD1HiTYpo7D4UElov7C931yxZd+NTRTm3+p3ysZN cYKnUmUrPPquFDD2s53krgu29azDA0sdkO5S11vbZIu4d10bViDCd8IWJsTjhKGBUnI70Q Zcwdsg/socWQWmUBrCJFKEQ7w4yI2B7/QHntqf7r3EdY4kztzBGsgp6JTTW7GA== To: devel@spectrum-os.org Subject: [PATCH] release/live: fix a Makefile dependency being missing in Nix shell Date: Sat, 6 Dec 2025 19:30:33 +0100 Message-ID: <20251206183102.91691-2-johannes.suellner@mailbox.org> In-Reply-To: <87pl8rjyui.fsf@alyssa.is> References: <87pl8rjyui.fsf@alyssa.is> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Developer-Signature: v=1; a=openpgp-sha256; l=1233; i=johannes.suellner@mailbox.org; h=from:subject; bh=NyJOWdrop7/iVku8mOT6OGnyfU7uDJYlwq/tApb7Ia8=; b=owGbwMvMwCW2P/QNu5HhghDG02pJDJkmZWniLzwX9hkHHLp4V3T58Xfh/WGszDwtUfKfPDzNB c8rbcrtKGVhEONikBVTZHF4msK/4njyUoasWBGYOaxMIEMYuDgFYCJyLowMN0QvJ747KC9x5WIy hwrTlxsWOpPVNBl6ui/YnLl29vKTBob/hdcOegseXP/lJsf3XBGjtdKFcvMOzvLZ68Dx6XdSxD8 GBgA= X-Developer-Key: i=johannes.suellner@mailbox.org; a=openpgp; fpr=40E5640FA8C763A5006A5D14BF55EC073231A054 Content-Transfer-Encoding: 8bit X-MBO-RS-ID: 50f9296444da8ff8940 X-MBO-RS-META: jzzw1xetz1y6heia1wtsgxxuems5b58z Message-ID-Hash: KBFPVEQP7J3MYA6U4UD5K52YG7NBJ75G X-Message-ID-Hash: KBFPVEQP7J3MYA6U4UD5K52YG7NBJ75G X-MailFrom: johannes.suellner@mailbox.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: =?UTF-8?q?Johannes=20S=C3=BCllner?= X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: In commit a6d872ae, a Btrfs userdata partition was added to the live VM that can be startet with `make run`. The Makefile creates this partition and therefor requires `btrfs-progs`. Fixes: a6d872a ("release/live: allow writes in "make run"") Signed-off-by: Johannes Süllner --- release/live/shell.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/live/shell.nix b/release/live/shell.nix index e542793..a52c9b1 100644 --- a/release/live/shell.nix +++ b/release/live/shell.nix @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: 2021-2024 Alyssa Ross import ../../lib/call-package.nix ( -{ callSpectrumPackage, config, stdenv, qemu_kvm }: +{ callSpectrumPackage, config, stdenv, btrfs-progs, qemu_kvm }: let efi = callSpectrumPackage ../../host/efi.nix {}; @@ -11,7 +11,7 @@ in (callSpectrumPackage ./. {}).overrideAttrs ( { nativeBuildInputs ? [], env ? {}, ... }: { - nativeBuildInputs = nativeBuildInputs ++ [ qemu_kvm ]; + nativeBuildInputs = nativeBuildInputs ++ [ btrfs-progs qemu_kvm ]; env = env // { OVMF_CODE = "${qemu_kvm}/share/qemu/edk2-${stdenv.hostPlatform.qemuArch}-code.fd";