From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 7E60E576C2; Mon, 13 Jun 2022 10:37:23 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id 1FBB657732; Mon, 13 Jun 2022 10:37:22 +0000 (UTC) Received: from wout2-smtp.messagingengine.com (wout2-smtp.messagingengine.com [64.147.123.25]) by atuin.qyliss.net (Postfix) with ESMTPS id 138A457729 for ; Mon, 13 Jun 2022 10:37:18 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 5175B320093F for ; Mon, 13 Jun 2022 06:37:15 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 13 Jun 2022 06:37:15 -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 :message-id:mime-version:reply-to:sender:subject:subject:to:to; s=fm1; t=1655116634; x=1655203034; bh=47ToVI/GsN6BhkqLyrBc60d6V UyVXhpCJOEOYYhav4o=; b=hG6NNV3niF0qYT8TmBUatPBukYTHnK3nsnPdKBSgb ZBMj9Bh92W+Vx98M9gOBsFq9U1Aar+Y1yMDNiXDZlKDpuPaJNfVzniJHUgqoz2bz 9E1tjFoqD1n6Uqi9IWNt1NzrN0me+/8JsUkudA1+aYtAD4VwSg8OxyEUHxSiKBwY IsLJodNCEYi4VBie5Zhr94fFPghOLx+NNxnGj6khb6m2BmnkTsn+4klLLzU5KKiq ybvrIupUAmI6NoXQIVa3NMW8ebUiRrjDFftvW/gGiU4bUkTvZvTDMeuw7MJdPL/c 2kzGnJloi+u9mT+XJeIeXpOsaQ2IisvMMRmByd6Z91YvQ== 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:message-id :mime-version:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1655116634; x=1655203034; bh=47ToVI/GsN6BhkqLyrBc60d6VUyVXhpCJOE OYYhav4o=; b=SeFJKRDphO8Wfjb1n7YBvrA5+PsmApke7UcHn3ny6seOvOKAmA+ bhTp4wGEWpBjIuiq7bCNzV2ZzZL6KVQBH32lHUo/iS4j/RTaAuO6vX1HumOKuTLY PHTdOfYrf/R/cwMzzgC23ISnOxnfEQcuVbzwHVmGYAGC/Bv5ismXCz7gmOfnRivb kTEUaMPFpFLrYK61ahaR+5SO0a9kAgy/XlhDWqvzRBdXp4/QetqtlITVfYJ13+A4 HKVaSxj+GuAXFMyTaNAqQKfITsavKatEc3pWO3uYuOEmv394xpJpLEA1dV6qQk9D 6W4bq9Nuy3GvfH0gfSI6bYu+w9CfaPZWAFw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedruddujedgvdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhisheq necuggftrfgrthhtvghrnhephffgjeelueefffefkeeuvdffgfffkeeiffefkeehhedvge efheejfeetffdvtdfhnecuffhomhgrihhnpehsphgvtghtrhhumhdqohhsrdhorhhgpdif ughtiidrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfh hrohhmpehqhihlihhsshesvghvvgdrqhihlhhishhsrdhnvght X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Mon, 13 Jun 2022 06:37:14 -0400 (EDT) Received: by eve.qyliss.net (Postfix, from userid 1000) id C36D1277; Mon, 13 Jun 2022 10:37:11 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs] stdenv: update aarch64 musl bootstrap tools Date: Mon, 13 Jun 2022 10:36:53 +0000 Message-Id: <20220613103653.164187-1-hi@alyssa.is> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: RCPISQBLGQKF6KYI5RPFVX52UXONUWZ3 X-Message-ID-Hash: RCPISQBLGQKF6KYI5RPFVX52UXONUWZ3 X-MailFrom: qyliss@eve.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; 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 will allow removing some workarounds (661dfd83478 and the preceding commits) that I had to do to get aarch64 musl to bootstrap, and hopefully will also fix some of the bootstrapping failures we've been seeing since then on newer aarch64 hardware. This approach unfortunately requires users to have the Spectrum binary cache set up, but it's the best we can do for now. When it's stabilized, we could use builtins.fetchClosure, which would avoid that requirement. But hopefully by that point we can have the bootstrap tools updated upstream anyway. Signed-off-by: Alyssa Ross --- .../linux/bootstrap-files/aarch64-musl.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix index 252783cce47..64c950529e9 100644 --- a/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix +++ b/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix @@ -1,11 +1,9 @@ +let + # This path is available on the Spectrum binary cache. + # See . + build = builtins.storePath /nix/store/bq9z1m3dvcsk522j9li43gm61caj5ybr-stdenv-bootstrap-tools-aarch64-unknown-linux-musl; +in { - busybox = import { - url = "https://wdtz.org/files/wjzsj9cmdkc70f78yh072483x8656nci-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/busybox"; - sha256 = "01s6bwq84wyrjh3rdsgxni9gkzp7ss8rghg0cmp8zd87l79y8y4g"; - executable = true; - }; - bootstrapTools = import { - url = "https://wdtz.org/files/wjzsj9cmdkc70f78yh072483x8656nci-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/bootstrap-tools.tar.xz"; - sha256 = "0pbqrw9z4ifkijpfpx15l2dzi00rq8c5zg9ghimz5qgr5dx7f7cl"; - }; + busybox = "${build}/on-server/busybox"; + bootstrapTools = "${build}/on-server/bootstrap-tools.tar.xz"; } -- 2.35.1