[bug#76098,2/4] etc: manifests/release: Adjust for changes in Guix.
Commit Message
* 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(-)
@@ -2,6 +2,7 @@
;;; Copyright © 2020-2022, 2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2023 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2025 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; 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
- ;; <https://bugs.gnu.org/48055> 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