From patchwork Thu Feb 6 14:36:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 38323 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 05BF027BBEA; Thu, 6 Feb 2025 14:37:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4708C27BBE2 for ; Thu, 6 Feb 2025 14:37:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tg305-0001cu-VA; Thu, 06 Feb 2025 09:37:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tg303-0001cO-FX for guix-patches@gnu.org; Thu, 06 Feb 2025 09:37:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tg303-0003hr-72 for guix-patches@gnu.org; Thu, 06 Feb 2025 09:37:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=xNPusilf4pIxukM9UEIM6/SOVhzlFhpc/QMlVAkhKKg=; b=YiZ3SUp9U6wxhikpEzXr05ZPmM3a/eA3DbZTRG3oVZyHubY6C3Oa+EZIqXfisEa6m0DqUqKZi97wV5JlVrOmtog8L9REsod2T5NLgxzRH7onrH2aL+e5RHjpwT/M/kd+2/78K8iU8k+uh9ba0i1PUk4zAO8+rGqOQApoHiaPlu5mTNJY1VYhnJNY6vMljTzwUZwi6BX3upDYc5urdimIAZN1ycmqI9+jVnxns8WjtegSHmbzsNnJeqnn3r3FUyOlDpiZlBdyOeC7If+VlgMYUoZs48t6iyxYIH7V5lxcvbOrw31yGQbVJlWTdBQNMTtMqsP2R3U2sW+vxogJXx3xHA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tg303-0005xd-2l for guix-patches@gnu.org; Thu, 06 Feb 2025 09:37:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76098] [PATCH 2/4] etc: manifests/release: Adjust for changes in Guix. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 06 Feb 2025 14:37:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76098@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 76098-submit@debbugs.gnu.org id=B76098.173885262122893 (code B ref 76098); Thu, 06 Feb 2025 14:37:03 +0000 Received: (at 76098) by debbugs.gnu.org; 6 Feb 2025 14:37:01 +0000 Received: from localhost ([127.0.0.1]:55065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tg300-0005x9-6v for submit@debbugs.gnu.org; Thu, 06 Feb 2025 09:37:01 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:59791) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tg2zw-0005wZ-BZ for 76098@debbugs.gnu.org; Thu, 06 Feb 2025 09:36:57 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-38db0146117so453263f8f.3 for <76098@debbugs.gnu.org>; Thu, 06 Feb 2025 06:36:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738852610; x=1739457410; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=xNPusilf4pIxukM9UEIM6/SOVhzlFhpc/QMlVAkhKKg=; b=Ew/Wt1ly2COtCGu08S3HgeBC4AnE9OQUEJfbIx2S1gFVZcqt6AdTGT5j/1hLYtWS3e fEJPOP2qieZ17O0u0+eLKd8mto9XCrtDoVi2OAfaQLtmmTjogb8z6ZNkdHqo5twVgn8c VjwnFH9+fD0U3GzHiBs8y2Z5ytxHCR97GPJqzhbpy2+7QOQp+RcUsi416yreynBrI1Hk jQC0lL2l2RfwCPVS5c8ysz27BAtLIa6dKpL0XaRkbXulXQ2KEUk4agbO/N9GcPF3pjhk vzzOYkXyf2U5NE7ASdrakfaiu4xGqEjrObfVx7GK5H6fH4OgynTCPbdXwCiWnI2AMbOM xx1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738852610; x=1739457410; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=xNPusilf4pIxukM9UEIM6/SOVhzlFhpc/QMlVAkhKKg=; b=p8LVHablLkMOr7TdYoZfUZD2FzS5aVRc/zRXjHyLiIre/0pJ4vz2f3LTuixOMLg6P8 1fN3CjgSJZrhQSxk3QMHSYQckjK30TjdrLA/vNlo8ZISJRv2HYmPIcJzYX0aRw8nV6i1 tn3MT/PRHWgGDTDhPZMUy+MaPa8pvP0sndpfNWJUl65pl6cpRbRffEtS7NgmNQphHn+7 +URGHbGZo8rNjjKX7YiU9Zt9U1eDC7xcAIPPczIwzIbIS1WslFIU6tANoOF3JEZS23xr qJRFmh/gKuUiiERBZQLkxr+YgJPxe2FAQPog9pjqHoEHD/83Q45iKoEXB1uAvar+GRWp RSQA== X-Gm-Message-State: AOJu0YzsRlM7Y9bZfwRrB38gmHm+nhywbzae6BIyUYBTwbDvnYDSK1Ce viOegJ6Vv9TnGCKmX8SVeh4t6ZCZixWST/ja3rly5rzSTJ5NoBS7jHSKNcVF X-Gm-Gg: ASbGncv9HNIIr3LMNXLpDNdokchsxfvdwo7H004RQkl17BW2H9P50lHVRI2DN5RdCd9 RfzLEDjZ/SNBpbLdWE2HkWbjfXFKII12LdA5nGa3OBN5LHxbHGzjBJgXAkCYaUpDWs1NgyzcC8E F2s+dUWwXYjKth0p01AwAv3HGIKgJCM1Y6uS4h5i5VcjR79LItfWF7wsFsbhCxafunsmoIVuffa tJggnIp0yn2Bz0MXNvyPU0UPJWuxAVt508J9Mc/N/jQ5a5bGhTCGMr+nTseDMUjfHaf7Ack33Ej IeaME4KfyirXs9GHjSEV X-Google-Smtp-Source: AGHT+IG/6oufWDECBGQLQ31jLruTEo5Xc/1cpWPk/NIRrAGneb7a4fO6vulV0XPQLNLq9ti/QSK+ZA== X-Received: by 2002:a5d:47a8:0:b0:38a:88a0:2234 with SMTP id ffacd0b85a97d-38db4860dd7mr4378101f8f.4.1738852609832; Thu, 06 Feb 2025 06:36:49 -0800 (PST) Received: from localhost ([141.226.10.168]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dbde1dcc7sm1866405f8f.88.2025.02.06.06.36.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2025 06:36:49 -0800 (PST) From: Efraim Flashner Date: Thu, 6 Feb 2025 16:36:33 +0200 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * etc/manifests/release.scm (%base-packages): Replace with %base-packages from (gnu system). (%system-packages): Adjust the packages which are depended upon by the installer. Add a set of extra packages which we expect to have available. (%packages-to-cross-build): Add zstd and git-minimal. (%cross-manifest): Add riscv64-linux-gnu as a target. Change-Id: I5806fff6bc38d14859f6d7163719841620e28d09 --- etc/manifests/release.scm | 51 +++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/etc/manifests/release.scm b/etc/manifests/release.scm index b003f216fff..d5d86d273e7 100644 --- a/etc/manifests/release.scm +++ b/etc/manifests/release.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2020-2022, 2024 Ludovic Courtès ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2023 Andreas Enge +;;; Copyright © 2025 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ (guix profiles) ((guix platform) #:select (targets)) ((gnu services xorg) #:select (%default-xorg-modules)) + ((gnu system) #:prefix gnu-system: #:select (%base-packages)) (guix utils) (guix gexp) (srfi srfi-1) @@ -47,9 +49,9 @@ (define* (package->manifest-entry* package system (define %base-packages ;; Packages that must be substitutable on all the platforms Guix supports. - (map specification->package - '("bootstrap-tarballs" "gcc-toolchain" "nss-certs" - "openssh" "emacs" "vim" "python" "guile" "guix"))) + ;; Use the %base-packages from (gnu system) since they are included by default + ;; in the packages field of the operating system configuration. + gnu-system:%base-packages) (define %base-packages/armhf ;; The guix package doesn't build natively on armhf due to Guile memory @@ -67,14 +69,17 @@ (define %base-packages/hurd (define %system-packages ;; Key packages proposed by the Guix System installer. (append (map specification->package - '("xorg-server" "xfce" "gnome" "mate" "enlightenment" - "openbox" "awesome" "i3-wm" "ratpoison" + '("gnome" "xfce" "mate" "enlightenment" + "openbox" "awesome" + "i3-wm" "i3status" "dmenu" "st" + "ratpoison" "xterm" "emacs" "emacs-exwm" "emacs-desktop-environment" - "xlockmore" "slock" "libreoffice" - "connman" "network-manager" "network-manager-applet" - "openssh" "ntp" "tor" - "linux-libre" "grub-hybrid" - "icecat")) + "openssh" "tor" "ntp" "gpm" + "connman" "network-manager" "wpa-supplicant" "isc-dhcp" "cups" + "linux-libre" "grub-hybrid")) + ;; Additional key packages we want to make sure are available + (map specification->package + '("emacs" "icecat" "libreoffice" "vim")) %default-xorg-modules)) (define %packages-to-cross-build @@ -84,11 +89,12 @@ (define %packages-to-cross-build (append (list (@ (gnu packages guile) guile-3.0/pinned)) (map specification->package '("coreutils" "grep" "sed" "findutils" "diffutils" "patch" - "gawk" "gettext" "gzip" "xz" + "gawk" "gettext" "gzip" "xz" "zstd" "git-minimal" "hello" "zlib")))) (define %packages-to-cross-build-for-mingw - ;; Many things don't build for MinGW. Restrict to what's known to work. + ;; Many things don't build for MinGW. Restrict to what's known to work + ;; to test that the cross-compiler itself works. (map specification->package '("hello"))) (define %cross-bootstrap-targets @@ -107,14 +113,10 @@ (define %base-manifest (manifest (append-map (lambda (system) (map (cut package->manifest-entry* <> system) - (cond ((string=? system "i586-gnu") + (cond ((target-hurd? system) %base-packages/hurd) - ((string=? system "armhf-linux") + ((target-arm32? system) %base-packages/armhf) - ((string=? system "powerpc64le-linux") - ;; FIXME: Drop 'bootstrap-tarballs' until - ;; is fixed. - (drop %base-packages 1)) (else %base-packages)))) %cuirass-supported-systems))) @@ -123,7 +125,7 @@ (define %system-manifest (manifest (append-map (lambda (system) ;; Some of %SYSTEM-PACKAGES are currently unsupported on some - ;; systems--e.g., GNOME on non-x86_64, due to Rust. Filter + ;; systems--e.g., GNOME on 32-bit, due to Rust. Filter ;; them out. (filter-map (lambda (package) (and (supported-package? package system) @@ -131,6 +133,8 @@ (define %system-manifest %system-packages)) '("x86_64-linux" "i686-linux")))) ;Guix System +;; As per the Guix Survey of 2024 we only worry about cross compiling from +;; x86_64-linux (98% of users) and not from others (aarch64 with 19%). (define %cross-manifest (manifest (append-map (lambda (target) @@ -153,12 +157,7 @@ (define %cross-manifest ;; Ignore bare-metal targets. "avr" "or1k-elf" - "xtensa-ath9k-elf" - - ;; XXX: Important bits like libsigsegv and libffi don't - ;; support RISCV at the moment, so don't require RISCV - ;; support. - "riscv64-linux-gnu"))))) + "xtensa-ath9k-elf"))))) (define %cross-bootstrap-manifest (manifest @@ -168,7 +167,7 @@ (define %cross-bootstrap-manifest "x86_64-linux" #:target target)) %cross-bootstrap-targets))) -;; Return the union of all three manifests. +;; Return the union of all four manifests. (concatenate-manifests (list %base-manifest %system-manifest %cross-manifest