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 7E468F750; Thu, 06 Nov 2025 01:04:29 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id CB2B7F742; Thu, 06 Nov 2025 01:04: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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail-yw1-x112d.google.com (mail-yw1-x112d.google.com [IPv6:2607:f8b0:4864:20::112d]) by atuin.qyliss.net (Postfix) with ESMTPS id 1C4BAF740 for ; Thu, 06 Nov 2025 01:04:27 +0000 (UTC) Received: by mail-yw1-x112d.google.com with SMTP id 00721157ae682-78763d5c65cso4110517b3.2 for ; Wed, 05 Nov 2025 17:04:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762391064; x=1762995864; darn=spectrum-os.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=+zjAIK8ikxiGiNM1A2aIlNqxzB+R7rITI85vUaDKYzI=; b=jL2oyGbxdE5G81BHoix1C6BgEQenY9G658WRt6wOHzCQ/sIjp3uRQ8SJl2X20SJOSE rUTpJbl0EyY5lKD3D8ieB/qdmqfos4vc06rRdTn3pTvdeRgtc/KeIghljkfUFYHRyVBK USXQHYkcVgrRteHpg8v/5dF7vOBcPn5Uxasyl1+PI+UrFFoNs8yz1/85vLSCocc/CvxD 0FCplmzhHGdkC8l5DiWHSY1MUpzww3jZIrg0BKaIahz1M6RFJ4nsZsohTxt9yUCxtCNl wMTxtIxEWJC74hhf8aOn18yTGg7XCOaE+QtVZ9+6Kx2M05V6vkTTOSNYRcRnpL12K/Sw HTKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762391064; x=1762995864; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+zjAIK8ikxiGiNM1A2aIlNqxzB+R7rITI85vUaDKYzI=; b=jxRr4+kP6K8EK67GnX7TlqzurV0fG3+8w+Q8o5zbkORnfZa7o76Ie0EFvEREJC7JtX RtXtb9+5aafBy3k+LQn4ULzOF+sux9gHD+VJf+LH2an2FjgdkxWkOkCcChGqxYZfOQ5W HuUgEzDzsEB542+F86X4XC9q856AMnVS0Bv335UyaLBjHXOEJ9VgjVz6b4MppVR2Zcue 8+xR+aE4eQ30IuGOJOZIVbcLBRbigbjEo+J3QBSFcldHyLjDJB9Kq2YV6M7D9u04wh3h FTeT1vJcdLoZH4HTaUwQfowgdjDzq8iU91HisXBj5YhgAQMpY1CzDLy0eBSjYJJmCich sLOA== X-Gm-Message-State: AOJu0Yxss9x9kEr0LrrlRqrZhmOmbrdZNk7xk7An24Sw47sKKfK+SaDq ds9TAxDdXoARwzZdAK5UQjOuETZQwlR7B1RwpIlCOzELldiZ1AQ1rNgmvTN50ETx X-Gm-Gg: ASbGncs3pG2Y+fd/FBXp+xsjmDzwogz5KkvLAlwPHp/9h/dsOSY1uk/+89xh3hRPpF1 6hEVZw0e43SQBNMAlbx7lY6HMsAvzLt+w1O3WfPEaNzM1q884278Yjs0vXv0dDmN8XTVcgznSuM wFUmjtaECToR64ZoKRmhY1PdyvAVTiywjAyh7wMkfTq1RIDKG3teWZssDmSQ5fgIynnIxqQrQYg 5ftRXy9vaJKo0Xw16HakNWGquJ+EnAm0xT1guUxPQeVRC1UKCvkfupvkv+Ud7+zv+T6oWGdWt1H FuAuuJ4/QGr8J/XkCHbP97MzI7/VKlG9lqqZ1CIUG7ajeYZCB5soq5aiW+1FXyz/Yj1DFIm2AKV Od9pD7uyVnWbofAyx10w+9+ExKsLUxIv8RmRuRllfLFYN6Xoigq3qZuQ+EjyXuHmaK/Pvx8ldwi zXspYxrj0xteH5kenxAJ/ULIn9IRNFQ04IwNnYVrtmPUJ8CrOWP7RYeUNaCfXe7qi/Jb8NawYdI JTc0hvausaPGRTalKJI2olfuTd3TzmzyBY= X-Google-Smtp-Source: AGHT+IFcRT7pk6QrvP9YImSdnNw5BDCm9qw+Ehegz4hIBJpTBIHsrYpOjH5TVxUGdO/XYKGbwMYnOg== X-Received: by 2002:a05:690c:dcc:b0:786:393c:5f17 with SMTP id 00721157ae682-786a41accc2mr54740447b3.50.1762391063566; Wed, 05 Nov 2025 17:04:23 -0800 (PST) Received: from localhost.localdomain (h96-60-249-169.cncrtn.broadband.dynamic.tds.net. [96.60.249.169]) by smtp.gmail.com with UTF8SMTPSA id 00721157ae682-787b15f93besm3625457b3.51.2025.11.05.17.04.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Nov 2025 17:04:22 -0800 (PST) From: Demi Marie Obenour Date: Wed, 05 Nov 2025 20:03:35 -0500 Subject: [PATCH] host/initramfs: Fix 'nix-shell --pure --run "make run"' MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251105-fix-nix-shell-initramfs-v1-1-6f4632232bb4@gmail.com> X-B4-Tracking: v=1; b=H4sIAObzC2kC/x2MOwqAQAwFryKpDezPQq8iFosbNaCrbEQE8e4Gi ykG5r0HhAqTQFc9UOhi4T2r2LqCcYl5JuSkDs64xlrT4MQ3ZkUWWlfkzGeJ2yToQvDOm+Bjm0D XRyFN/+d+eN8P+qaFVmkAAAA= X-Change-ID: 20251105-fix-nix-shell-initramfs-244323043a9d To: Spectrum OS Development X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1762391014; l=1085; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=UbPf1+NLhq3U9NXixp2FxVj68shDTLQdrKbnj7FIuAI=; b=knC0Vht3Hd5oBEdElb5DWvmUT3/fKfbbxXkQMZkoMao0jqJDDNxGWKfd8afU4z8cN2wAzHHyw SatkLu9waq7Cnuf7/4wVduowjNAXU8Ji93nwTl6YsKp9Dz9mQhdQBy1 X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: BVH5VLVRKHKS6C26D7HBRZK4D7HVKD6W X-Message-ID-Hash: BVH5VLVRKHKS6C26D7HBRZK4D7HVKD6W X-MailFrom: demiobenour@gmail.com 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: Alyssa Ross , Demi Marie Obenour 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: Add the needed build-dependency on jq. Signed-off-by: Demi Marie Obenour --- host/initramfs/shell.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/host/initramfs/shell.nix b/host/initramfs/shell.nix index eeba865e3ac793f67ae1808a92cf5eb1b37d57af..8b47aa53bc19a818ebf563e281f22e82202a8ea5 100644 --- a/host/initramfs/shell.nix +++ b/host/initramfs/shell.nix @@ -3,7 +3,7 @@ import ../../lib/call-package.nix ( { callSpectrumPackage, rootfs, pkgsStatic, stdenv -, cryptsetup, qemu_kvm, tar2ext4, util-linux +, cryptsetup, jq, qemu_kvm, tar2ext4, util-linux }: let @@ -12,7 +12,7 @@ in initramfs.overrideAttrs ({ nativeBuildInputs ? [], env ? {}, ... }: { nativeBuildInputs = nativeBuildInputs ++ [ - cryptsetup qemu_kvm tar2ext4 util-linux + cryptsetup jq qemu_kvm tar2ext4 util-linux ]; env = env // { --- base-commit: 1d666582892fbdf812662b4490caf7821078eaf9 change-id: 20251105-fix-nix-shell-initramfs-244323043a9d -- Sincerely, Demi Marie Obenour (she/her/hers)