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 2B6EC10CF6; Sat, 25 Oct 2025 18:07:03 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 4085B10CD3; Sat, 25 Oct 2025 18:07:00 +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-x1132.google.com (mail-yw1-x1132.google.com [IPv6:2607:f8b0:4864:20::1132]) by atuin.qyliss.net (Postfix) with ESMTPS id 181A310CD1 for ; Sat, 25 Oct 2025 18:06:59 +0000 (UTC) Received: by mail-yw1-x1132.google.com with SMTP id 00721157ae682-784807fa38dso37707837b3.2 for ; Sat, 25 Oct 2025 11:06:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761415613; x=1762020413; 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=GUlnIN7S7KrEt/2nF59iQYQruWMgGQf8kaTtywRAYgQ=; b=cpbR9z+JnzZWUlAOPojpSivsaa2OmM3MffEUuBwtHzlmwlRkWInXVTEdH3kwIBcTa4 Fad2jkjVccOTDz1a3azCw+kkFsp16UPnlZ0lAvkdsIgSNtk70VXQkN2iwM7AlMHfBv1l 7FA7b7dfgsC5vhaenDTEtX3busf0tE+G7dlmdCbbPm/G5qAAJ0/SnR/6HCkFRbNHhjtp lkbrwcjnwl+ubMfGjTecDfYWuhFkUZgHzvQyiYULa64zmbmJ9N/IwJfKn+8mnt+kLX1G MX8L47KO3NefJcsy+wkTmxpNHk4+ghYiYRXr5DsULWk+2LtLHvqg2rslis/1JfCKtcDI f9yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761415613; x=1762020413; 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=GUlnIN7S7KrEt/2nF59iQYQruWMgGQf8kaTtywRAYgQ=; b=A+LmzOOVzIIBbMQxif0wGZxp3B7iyXv8kz1zBzwEU9fZAPvgdHQnOywDeu0kSV8+kQ LheZASmiTJWFuEuKVrxneJJhb+XYYi6Wul+PbvR9C/kFUB97o/Vb4fTN9iMh7oql22pS C0cCfFerBNqIX+saq4QAiRLx8SH7c+YqQsgvUBIT7t5kz+EKdaINyPL5ydyfHuZkEo+q +v4qQncEWXjMgYtfsE6VW5J/7Gz9p+baac5b5pBrWvmb462yUbauv6uIYchshP0nUwi7 2NJ+6A5WRNAaRw+Gsfx9VPdmX4RHTCoFGNAENkTv/yBHswb2ppS0DD1bQMsYNp7iolQD pNqQ== X-Gm-Message-State: AOJu0YyF1zttoJ5J9OVzvd/vJIZaw0ebKY3S+mgx9RDWLDC/Zuf5P2jy DBso87OWmPD46dcNnyK1BvT9Hbq5O/ExkU4dBB3xgUEHBsT+L7QRj3ewHlZT42s6 X-Gm-Gg: ASbGnctyQt1AjsBX3At60tHvrRf9Di6s5aeMPQ9GEMWIYkJnU4guRbmUVJvaWSbkr4U uZVT82JrvFxpOlHbgKZBQgo5DrBuwhv4n7CA6DOQT8aIcWaC9EgdxYIfeolRG8v3j2hN/Vkvo3N IZav1E2xvfYUfbq8pJqucdfBDbYqZ1ap8KNZtCTcLRUDwiGlNiDkIkpZQ+dS8bgotprB0uVtpxf Nb/LVMUiusZLXDqWRBfZPwQ4t1eZY4AE3JjA0DoPAZtwp6Z0S4/9mYjy+x/itwCBKoWq0YFvXww XNKefVRg5W6gI6/Nop91BR7vaPDvl4GJbhLZTuw094Z8/8Yy1FIknIGB6uK2yiCBujEQI6Prk6I zziPewzTiQ5INfrAoJtigFplJD7urBrJXUGk/ewRm1s4VAZrH7NiPI/DSqNsBpeS+WOtAGnNuLL GvXw1MNXml8rHw7ptgC5wXy2/jvw4zkKANbCQDZA/PTqJcop77Y1yf2n1p+3GDel3BG7H7Iwapb KlvKmSaxThth26YPi8o62aLNyn6qYDlojQ= X-Google-Smtp-Source: AGHT+IHXPHtRNjjzAo2Ql0BYg7slpZZZPkAHXHAuxxNZQYqpgHSul39HyinzZCtr0UYSOK+dx3zR1Q== X-Received: by 2002:a05:690c:3207:b0:783:afee:fc46 with SMTP id 00721157ae682-785e01fb833mr52213087b3.37.1761415612667; Sat, 25 Oct 2025 11:06:52 -0700 (PDT) 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-785ed13e215sm6778577b3.10.2025.10.25.11.06.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Oct 2025 11:06:52 -0700 (PDT) From: Demi Marie Obenour Date: Sat, 25 Oct 2025 14:06:31 -0400 Subject: [PATCH] Add dontFixup=true to derivations that build images MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251025-dont-fixup-v1-1-9e10c24efbc3@gmail.com> X-B4-Tracking: v=1; b=H4sIAKYR/WgC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDI1NDINZNyc8r0U3LrCgt0DU1trBMSjRMMkgyT1MCaigoSgVKgA2Ljq2tBQC Xq+FgXAAAAA== X-Change-ID: 20251025-dont-fixup-5389ba1b0b7f To: Spectrum OS Development X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1761415590; l=6128; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=adWb1ZPnko1Yd1Jc68Rk5cgAaM4YKQZiJgxQBNJb11U=; b=D2x4SafBSF53V4k5Lrer5tdDztlqguep/FfVE8iWdNpwHsGXCs8615aUHN/gFOBOkgqP/sEyX I8aRqlEFRD8CEf+s1o44hPy6TBbRdBgo2Noy75MFmrUsRRscCBpS+s+ X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: 6672PYPC5OA7LBTOTDE4MCMW5NZBFIND X-Message-ID-Hash: 6672PYPC5OA7LBTOTDE4MCMW5NZBFIND 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: This prevents lengthy and pointless scans of large image files. dontFixup is added to the derivations that already used unsafeDiscardReferences. Both dontFixup and unsafeDiscardReferences are added to a derivation that builds an ext4 filesystem image. Signed-off-by: Demi Marie Obenour --- host/initramfs/default.nix | 3 +++ host/rootfs/default.nix | 1 + img/app/default.nix | 2 ++ release/checks/integration/default.nix | 2 ++ release/combined/default.nix | 3 +++ release/combined/eosimages.nix | 1 + release/live/default.nix | 2 ++ vm-lib/make-vm.nix | 1 + vm/sys/net/default.nix | 2 ++ 9 files changed, 17 insertions(+) diff --git a/host/initramfs/default.nix b/host/initramfs/default.nix index a3672bfeb7002f81bf67bfc13c0b757d46b93d66..51305a7da1645ca63f1c9b2f07a15aa0d5659ff2 100644 --- a/host/initramfs/default.nix +++ b/host/initramfs/default.nix @@ -63,6 +63,7 @@ let nativeBuildInputs = [ cpio ]; __structuredAttrs = true; unsafeDiscardReferences = { out = true; }; + dontFixup = true; } '' cpio -id < ${microcodeAmd}/amd-ucode.img cpio -id < ${microcodeIntel}/intel-ucode.img @@ -82,6 +83,7 @@ let __structuredAttrs = true; unsafeDiscardReferences = { out = true; }; + dontFixup = true; } '' cd ${packagesSysroot} (printf "%s\n" "''${storePrefixes[@]}" && find . $(< $storePaths)) | @@ -118,6 +120,7 @@ stdenvNoCC.mkDerivation { __structuredAttrs = true; unsafeDiscardReferences = { out = true; }; + dontFixup = true; passthru = { inherit packagesSysroot; }; } diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix index 484a43f372f934e6b3be0c383d12c9eabf2f7171..1673a83e9d70da6f22fa71c4a79e0eaeff309fc2 100644 --- a/host/rootfs/default.nix +++ b/host/rootfs/default.nix @@ -195,6 +195,7 @@ stdenvNoCC.mkDerivation { __structuredAttrs = true; unsafeDiscardReferences = { out = true; }; + dontFixup = true; passthru = { inherit appvm firmware kernel nixosAllHardware packagesSysroot pkgsGui; diff --git a/img/app/default.nix b/img/app/default.nix index 2863cbdfc067c8a6de018e5f0920d00878cf96ff..5cd381e837db3057590c075cf2b33a486cc188bc 100644 --- a/img/app/default.nix +++ b/img/app/default.nix @@ -134,6 +134,8 @@ stdenvNoCC.mkDerivation { unsafeDiscardReferences = { out = true; }; + dontFixup = true; + meta = with lib; { license = licenses.eupl12; platforms = platforms.linux; diff --git a/release/checks/integration/default.nix b/release/checks/integration/default.nix index 570918613e083b0c2d7c82486544b6405ae5ea89..582a4be8df3098ddaf318b7dac60690c2f8b2304 100644 --- a/release/checks/integration/default.nix +++ b/release/checks/integration/default.nix @@ -37,6 +37,8 @@ let userData = runCommand "user-data.img" { nativeBuildInputs = [ e2fsprogs tar2ext4 ]; + unsafeDiscardReferences = true; + dontFixup = true; } '' tar -Pcvf root.tar \ --transform=s,^${appimage},test.appimage, ${appimage} \ diff --git a/release/combined/default.nix b/release/combined/default.nix index 5c917951f845ee94871a0532f3145493f8ee06ba..cb64f34bef9c397014d7303da39497e1216a2a62 100644 --- a/release/combined/default.nix +++ b/release/combined/default.nix @@ -31,6 +31,7 @@ let nativeBuildInputs = [ squashfs-tools-ng ]; __structuredAttrs = true; unsafeDiscardReferences = { out = true; }; + dontFixup = true; } '' sed 's,^${storeDir}/,,' ${writeClosure [ installer.store ]} | tar -C ${storeDir} -c --verbatim-files-from -T - \ @@ -64,6 +65,7 @@ let __structuredAttrs = true; unsafeDiscardReferences = { out = true; }; + dontFixup = true; passthru = { inherit grubCfg; }; } '' @@ -91,6 +93,7 @@ runCommand "spectrum-installer" { nativeBuildInputs = [ grub jq util-linux systemdMinimal ]; __structuredAttrs = true; unsafeDiscardReferences = { out = true; }; + dontFixup = true; passthru = { inherit eosimages esp installer rootfs; }; } '' blockSize() { diff --git a/release/combined/eosimages.nix b/release/combined/eosimages.nix index 351265bbd54a04b1c1fd3aa6f4c23dad57bd4395..0ac4c48374e7098a2b91f61fc07cebb2042ffbdc 100644 --- a/release/combined/eosimages.nix +++ b/release/combined/eosimages.nix @@ -10,6 +10,7 @@ runCommand "eosimages.img" { image = callSpectrumPackage ../live {}; __structuredAttrs = true; unsafeDiscardReferences = { out = true; }; + dontFixup = true; } '' mkdir dir cd dir diff --git a/release/live/default.nix b/release/live/default.nix index 7a856149de4c736fd850fa37b9f09db9715007a0..5320ce0ecbd7e8912d91f725327a4cfd3d456a54 100644 --- a/release/live/default.nix +++ b/release/live/default.nix @@ -63,6 +63,8 @@ stdenv.mkDerivation { unsafeDiscardReferences = { out = true; }; + dontFixup = true; + passthru = { inherit initramfs rootfs; }; } ) (_: {}) diff --git a/vm-lib/make-vm.nix b/vm-lib/make-vm.nix index 0812b8ea53404c620829fc79bb61005e0bc75b8d..ea7ace99034029325405bd237b8fd50e071bb358 100644 --- a/vm-lib/make-vm.nix +++ b/vm-lib/make-vm.nix @@ -31,6 +31,7 @@ runCommand "spectrum-vm" { __structuredAttrs = true; unsafeDiscardReferences = { out = true; }; + dontFixup = true; } '' mkdir -p $out/{blk,fs,providers} pushd "$out" diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix index b8dc964dd75eccf230cac285dd2a32e7fd75dc9a..478545d2680025a99c2032689c6cc7011dc851c8 100644 --- a/vm/sys/net/default.nix +++ b/vm/sys/net/default.nix @@ -132,6 +132,8 @@ stdenvNoCC.mkDerivation { unsafeDiscardReferences = { out = true; }; + dontFixup = true; + passthru = { inherit firmware kernel packagesSysroot; }; meta = with lib; { --- base-commit: db54efac07deee32f39bdec4e4b8b73674df18c7 change-id: 20251025-dont-fixup-5389ba1b0b7f -- Sincerely, Demi Marie Obenour (she/her/hers)