guix_mirror_bot pushed a commit to branch master
in repository guix.

commit 772bf4137c7af2dbb3641ddd8d0fdfaf38def3c2
Author: Daniel Littlewood <[email protected]>
AuthorDate: Fri Oct 23 19:17:32 2026 +0100

    teams: release: Automate more manual steps of manifest generation.
    
    Extends the existing os-manifest-generator script to include some steps that
    were previously manual, including:
    
    - removing duplicate packages.
    - deleting packages from the desktop manifest which already belong to the
      minimal manifest.
    - deleting service comments which do not require packages in the manifest.
    - detecting and fixing ambiguous package specifications.
    
    The script also now includes a help message that indicates how to use it.
    
    * etc/teams/release/os-manifest-generator.scm: Update script.
    
    Signed-off-by: Jelle Licht <[email protected]>
---
 etc/teams/release/os-manifest-generator.scm | 190 ++++++++++++++++++++++++----
 1 file changed, 163 insertions(+), 27 deletions(-)

diff --git a/etc/teams/release/os-manifest-generator.scm 
b/etc/teams/release/os-manifest-generator.scm
old mode 100644
new mode 100755
index 949097ea2b0..285a177831a
--- a/etc/teams/release/os-manifest-generator.scm
+++ b/etc/teams/release/os-manifest-generator.scm
@@ -1,3 +1,7 @@
+#!/bin/sh
+exec guile -e main -s "$0" "$@"
+!#
+
 ;;; GNU Guix --- Functional package management for GNU
 ;;;
 ;;; This file is part of GNU Guix.
@@ -18,11 +22,15 @@
 (use-modules (guix packages)
              (guix gexp)
              (gnu services)
+             (gnu packages)
+             ((gnu services xorg) #:select (%default-xorg-modules))
+             ((gnu system) #:select (%base-packages %base-firmware))
              (gnu tests install)
              (ice-9 match)
              (guix utils)
              (srfi srfi-26)
-             (srfi srfi-1))
+             (srfi srfi-1)
+             (ice-9 receive))
 
 ;; TODO find a better way to check for thunked fields
 (define* (thunked-field? field obj)
@@ -35,60 +43,188 @@
    (string-suffix? "(x)>"
                    (format #f "~a" obj))))
 
-;; Prints names of all packages, prepending the service they
-;; come from.
-(define* (print-all-packages obj #:optional (pred package?))
+;; Returns a heterogenous list of packages or services.
+;; Each service is followed by the list of packages it depends on.
+(define* (all-packages obj #:optional (pred package?))
   (match obj
     ((? pred)
-     (format #t "\"~a\"~%" (package-name obj))
      (list obj))
     ((? gexp?)
      (list))
     ((a . b)
-     (append (print-all-packages a pred)
-           (print-all-packages b pred)))
+     (append (all-packages a pred)
+           (all-packages b pred)))
     ((_ ...)
      (apply append
-            (map (cut print-all-packages <> pred)
+            (map (cut all-packages <> pred)
                  obj)))
     (#(_ ...)
-     (print-all-packages (vector->list obj) proc))
+     (all-packages (vector->list obj) pred))
     ((or (? service-type?)
          (? origin?))
      (list))
     ((? record?)
       (let* ((record-type (record-type-descriptor obj))
-             (record-fields (record-type-fields record-type)))
-        (when (service? obj)
-          (format #t ";; ~a-service~%" (service-type-name (service-kind obj))))
-        (apply append
+             (record-fields (record-type-fields record-type))
+             (child-pkgs (apply append
                (map (lambda (field)
                       (let* ((accessor (record-accessor record-type field))
                              (field-obj (accessor obj)))
                         (if (thunked-field? field field-obj)
-                            (print-all-packages (field-obj obj) pred)
-                            (print-all-packages field-obj pred))))
+                            (all-packages (field-obj obj) pred)
+                            (all-packages field-obj pred))))
                     record-fields))))
+        (if (service? obj)
+            (cons obj child-pkgs)
+            child-pkgs)))
     ((? parameter?)
      (list))
     (_
      (list))))
 
+;; Remove from pkgs-or-services all packages which do not need to be named
+;; explicitly because they are pulled in by another listed package.
+(define (without-dependent-packages pkgs-or-services)
+  (define all-inputs
+    (apply append
+           (map
+            (lambda (pkg-or-service)
+              (if (package? pkg-or-service)
+                  ;; package-propagated-inputs returns a label as well as the 
package.
+                  ;; second gives us just the package
+                  (map second (package-propagated-inputs pkg-or-service))
+                  (list)))
+            pkgs-or-services)))
+  (filter
+   (lambda (pkg) (not (member pkg all-inputs)))
+   pkgs-or-services))
+
+(define (without-duplicates pkgs-or-services)
+  (delete-duplicates pkgs-or-services))
+
+(define (without-minimal-packages pkgs-or-services)
+  (filter
+   (lambda (pkg-or-service)
+     (not (and (package? pkg-or-service)
+               (member pkg-or-service (all-packages minimal-installer-os)))))
+   pkgs-or-services))
+
+;; Removes all services which, as a result of previous cleaning, no longer 
require any packages.
+(define (without-redundant-services pkgs-or-services)
+  (define (without-tail-services pkgs-or-services)
+    (reverse (drop-while service? (reverse pkgs-or-services))))
+  (without-tail-services
+   (fold-right (lambda (pkg-or-service result)
+                 (if (and (service? pkg-or-service) (service? (first result)))
+                     result
+                     (cons pkg-or-service result)))
+               (list (last pkgs-or-services))
+               pkgs-or-services)))
+
+;; Packages not attributed to any service by all-packages.
+(define (lone-packages pkgs-or-services)
+  (take-while package? pkgs-or-services))
+
+(define (without-lone-packages pkgs-or-services)
+  (drop-while package? pkgs-or-services))
+
+;; Many inputs are implied by gnome, so including it makes the list easier to 
review.
+(define (with-gnome pkgs-or-services)
+  (receive (head tail)
+      (break (lambda (pkg-or-service)
+               (and (service? pkg-or-service)
+                    (equal? (service-type-name (service-kind pkg-or-service)) 
'gnome-desktop)))
+             pkgs-or-services)
+    (append
+     head
+     (list (car tail) ; gnome-desktop-service
+           (specification->package "gnome"))
+     (cdr tail))))    ; the remaining packages, most of which will be cleaned 
out as redundant inputs
+
+; %default-xorg-modules is added separately to keep the list of copied 
packages short.
+(define (without-xorg-modules pkgs-or-services)
+  (filter (lambda (pkg-or-service)
+            (not (member pkg-or-service %default-xorg-modules)))
+          pkgs-or-services))
+
+; %base-packages is added separately to keep the list of copied packages short.
+(define (without-base pkgs-or-services)
+  (filter (lambda (pkg-or-service)
+            (and (not (member pkg-or-service %base-firmware))
+                 (not (member pkg-or-service %base-packages))))
+          pkgs-or-services))
+
+;; Returns the shortest specification string which will uniquely identify pkg
+;; via specification->package. Errors if there is no public specification for
+;; pkg.
+(define (minimal-specification pkg)
+  (define (build-specification name version-parts)
+    (if (null? version-parts)
+        name
+        (format #f "~a@~a" name (string-join version-parts "."))))
+
+  (define (sufficient-spec? name version-parts)
+    (equal? pkg (specification->package (build-specification name 
version-parts))))
+
+  (define (generate-spec name versions-used versions-remaining)
+    (if (sufficient-spec? name versions-used)
+        (build-specification name versions-used)
+        ; recursion will error if no package spec is found
+        (generate-spec name
+                       (append versions-used (list (car versions-remaining)))
+                       (cdr versions-remaining))))
+
+  (generate-spec (package-name pkg) '() (string-split (package-version pkg) 
#\.)))
+
+(define (print-pkg-service-list pkgs-or-services)
+  (define (print pkg-or-service)
+         (match pkg-or-service
+           ((? package?) (format #t "\"~a\"~%" (minimal-specification 
pkg-or-service)))
+           ((? service?) (format #t ";; ~a-service~%" (service-type-name 
(service-kind pkg-or-service))))))
+  (map print (without-lone-packages pkgs-or-services))
+  (format #t ";; packages~%")
+  (map print (lone-packages pkgs-or-services)))
+
+(define (cleaned-packages-full pkgs-or-services)
+  ((compose without-redundant-services
+           without-duplicates
+           without-dependent-packages
+           without-minimal-packages
+           without-xorg-modules
+           with-gnome) pkgs-or-services))
+
+(define (cleaned-packages-minimal pkgs-or-services)
+  ((compose without-redundant-services
+            without-duplicates
+            without-dependent-packages
+            without-base) pkgs-or-services))
+
+(define (print-all-packages obj)
+  (print-pkg-service-list (all-packages obj)))
+
 (define full-installer-os
   ((@@ (gnu tests install) installation-target-desktop-os-for-gui-tests)))
 
 (define minimal-installer-os
   ((@@ (gnu tests install) installation-target-os-for-gui-tests)))
 
-(display "Full os packages:")
-(print-all-packages full-installer-os)
-(display "Minimal os packages:")
-(print-all-packages minimal-installer-os)
-
-;; Note that the printed packages will contain duplicates.
-;; I recommend to first put packages out of the profile service
-;; and out of packages field (they will be above service packages)
-;; at the bottom of the list and then filtering only unique lines, ie.
-;; with `awk '!a[$0]++'`. And lastly removing services that no longer
-;; have packages and also the packages that are already in minimal manifest
-;; (in case of desktop manifest)
+(define (print-desktop-manifest-packages)
+  (print-pkg-service-list (cleaned-packages-full (all-packages 
full-installer-os))))
+
+(define (print-minimal-manifest-packages)
+  (print-pkg-service-list (cleaned-packages-minimal (all-packages 
minimal-installer-os))))
+
+(define (print-usage)
+  (format (current-error-port) "Usage: os-manifest-generator.scm 
MANIFEST_TO_PRINT
+
+This script can be used to generate the minimal and desktop release manifests.
+MANIFEST_TO_PRINT may equal `desktop`, to print the desktop manifest, or 
`minimal`, to print the minimal manifest.
+
+Refer to the files etc/release/release-manifest.scm and 
etc/release/release-desktop.scm to see what to do with the output.
+"))
+
+(define (main . args)
+  (match (cdar args)
+    (("desktop") (print-desktop-manifest-packages))
+    (("minimal") (print-minimal-manifest-packages))
+    (anything (print-usage))))

Reply via email to