Merge branch 'master' into gnome-team

2 files changed, 87 insertions, 27 deletions

diff --git a/etc/disarchive-manifest.scm b/etc/disarchive-manifest.scm
index 93b5039eec..41f64eae4f 100644
--- a/etc/disarchive-manifest.scm
+++ b/etc/disarchive-manifest.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2021-2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021-2023 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -94,34 +94,41 @@ an empty directory if ORIGIN could not be disassembled."
                    (#f "anonymous-tarball.dis"))
                  build))
 
-(define (disarchive-collection origins)
-  "Return a directory containing all the Disarchive metadata for ORIGINS."
-  (directory-union "disarchive-collection"
-                   (filter-map (lambda (origin)
-                                 (and (tarball-origin? origin)
-
-                                      ;; Dismiss origins with (sha256 #f) such
-                                      ;; as that of IceCat.
-                                      (and=> (origin-hash origin)
-                                             content-hash-value)
-
-                                      ;; FIXME: Exclude the Chromium tarball
-                                      ;; because it's huge and "disarchive
-                                      ;; disassemble" exceeds the max-silent
-                                      ;; timeout.
-                                      (not (string-prefix?
-                                            "chromium-"
-                                            (origin-actual-file-name origin)))
-
-                                      (origin->disarchive origin)))
-                               origins)
-                   #:copy? #t))
-
 
 ;; The manifest containing Disarchive data.
-(let ((origins (all-origins)))
+(let* ((origins (all-origins))
+       (disarchives
+        (filter-map (lambda (origin)
+                      (and (tarball-origin? origin)
+
+                           ;; Dismiss origins with (sha256 #f) such as that of
+                           ;; IceCat.
+                           (and=> (origin-hash origin)
+                                  content-hash-value)
+
+                           ;; FIXME: Exclude the Chromium tarball because it's
+                           ;; huge and "disarchive disassemble" exceeds the
+                           ;; max-silent timeout.
+                           (not (string-prefix?
+                                 "chromium-"
+                                 (origin-actual-file-name origin)))
+
+                           (manifest-entry
+                             (name
+                              (string-append (origin-actual-file-name origin)
+                                             ".dis"))
+                             (version "0")
+                             (item (origin->disarchive origin)))))
+                    origins)))
   (manifest
-   (list (manifest-entry
+   (cons (manifest-entry
            (name "disarchive-collection")
            (version (number->string (length origins)))
-           (item (disarchive-collection origins))))))
+           (item (directory-union "disarchive-collection"
+                                  (map manifest-entry-item disarchives)
+                                  #:copy? #t)))
+
+         ;; Cuirass can distribute derivation builds to build machines if and
+         ;; only if it has one "job" per derivation.  Thus, add them here in
+         ;; addition to "disarchive-collection".
+         disarchives)))
diff --git a/etc/news.scm b/etc/news.scm
index 14ab06f5fb..848873d675 100644
--- a/etc/news.scm
+++ b/etc/news.scm
@@ -26,6 +26,59 @@
 (channel-news
  (version 0)
 
+ (entry (commit "953c65ffdd43c02c934518fb7a1c68542584b223")
+        (title
+         (en "Declarative offloading on Guix System and childhurds")
+         (de "Auslagern kann deklariert werden auf Guix System und Childhurds")
+         (fr "Déclaration du déchargement dans Guix System et childhurds"))
+        (body
+         (en "When configuring Guix System, it is now possible to declare
+build machines to offload to directly from the @code{operating-system}
+declaration by specifying the @code{build-machines} field of
+@code{guix-configuration}.  When you do this, @command{guix system} generates
+a @file{/etc/guix/machines.scm} file by concatenating the @code{(build-machine
+@dots{})} expressions you specified.
+
+This mechanism is used by @code{hurd-vm-service-type}, also known as
+``childhurd'', to create virtual machines running the GNU/Hurd operating
+system one can offload to, without additional configuration steps.
+
+Run @command{info \"(guix) Daemon Offload Setup\"} for more info on
+offloading; run @command{info \"(guix) Virtualization Services\"} for info on
+@code{hurd-vm-service-type}.")
+         (de "In der Betriebssystemkonfiguration von Guix System können jetzt
+auch die Erstellungsmaschinen deklariert werden, an die Erstellungen ausgelagert
+werden.  Diese geben Sie im Feld @code{build-machines} einer
+@code{guix-configuration} an.  In diesem Fall wird @command{guix system} eine
+Datei @file{/etc/guix/machines.scm} anlegen, die der Aneinanderreihung der
+angegebenen @code{(build-machine @dots{})}-Ausdrücke entspricht.
+
+Der Mechanismus wird für @code{hurd-vm-service-type} eingesetzt, auch bekannt
+als „Childhurd“, um virtuelle Maschinen anzulegen, auf denen das
+GNU/Hurd-Betriebssystem läuft und auf die man auslagern kann, ohne weitere
+Einstellungen vorzunehmen.
+
+Führen Sie @command{info \"(guix.de) Auslagern des Daemons einrichten\"} aus, um
+mehr Informationen über das Auslagern zu bekommen; führen Sie
+@command{info \"(guix.de) Virtualisierungsdienste\"} aus für Informationen zu
+@code{hurd-vm-service-type}.")
+         (fr "Dans sa configuration Guix System, il est désormais possible de
+déclarer les machines de construction vers lesquelles se décharger directement
+dans la déclaration @code{operating-system} en spécifiant le champ
+@code{build-machines} de @code{guix-configuration}.  Quand on fait cela,
+@command{guix system} produit un fichier @file{/etc/guix/machines.scm} en
+concaténant les expressions @code{(build-machine @dots{})} fournies.
+
+Ce mécanisme est utilisé par @code{hurd-vm-service-type}, également appelé
+« childhurd », pour créer des machines virtuelles faisant tourner le système
+d'exploitation GNU/Hurd vers lesquelles se décharger, sans étape
+supplémentaire de configuration.
+
+Lancer @command{info \"(guix.fr) Réglages du déchargement du démon\"} pour
+plus d'informations sur le délestage ; lancer @command{info \"(guix.fr)
+Services de virtualisation\"} pour en apprendre sur
+@code{hurd-vm-service-type}.")))
+
  (entry (commit "db775e7367e8deffb513aad94f4afb875d796d0b")
         (title
           (en "Linux-libre 6.3 removed due to end of upstream support")