This is an automated email from the git hooks/post-receive script. civodul pushed a commit to branch master in repository maintenance.
The following commit(s) were added to refs/heads/master by this push: new ebb5972d hydra: Adjust to new manifest file names in Guix. ebb5972d is described below commit ebb5972d07c934e72ec3da72fa487887f8b87e06 Author: Ludovic Courtès <l...@gnu.org> AuthorDate: Thu Dec 12 23:32:48 2024 +0100 hydra: Adjust to new manifest file names in Guix. * hydra/build-package-metadata.scm, hydra/modules/sysadmin/services.scm, hydra/sync-disarchive-db.scm: Update manifest file names, following Guix commit 12d00767f036029f1f5738de644d4972db374f4f. --- hydra/build-package-metadata.scm | 4 ++-- hydra/modules/sysadmin/services.scm | 6 +++--- hydra/sync-disarchive-db.scm | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hydra/build-package-metadata.scm b/hydra/build-package-metadata.scm index a99ac574..2900ad83 100755 --- a/hydra/build-package-metadata.scm +++ b/hydra/build-package-metadata.scm @@ -48,7 +48,7 @@ (srfi srfi-1) (srfi srfi-26)) -(define (all-packages) ;XXX: copied form 'etc/source-manifest.scm' +(define (all-packages) ;XXX: copied form 'etc/manifests/source.scm' "Return the list of all the packages, public or private, omitting only superseded packages." (fold-packages (lambda (package lst) @@ -59,7 +59,7 @@ superseded packages." '() #:select? (negate package-superseded))) -(define (all-origins) ;XXX: copied form 'etc/source-manifest.scm' +(define (all-origins) ;XXX: copied form 'etc/manifests/source.scm' "Return the list of origins referred to by all the packages." (let loop ((packages (all-packages)) (origins '()) diff --git a/hydra/modules/sysadmin/services.scm b/hydra/modules/sysadmin/services.scm index fa67d59f..37c22f7d 100644 --- a/hydra/modules/sysadmin/services.scm +++ b/hydra/modules/sysadmin/services.scm @@ -296,13 +296,13 @@ collection instead." (systems '("x86_64-linux"))) (specification (name "source") - (build '(manifests "etc/source-manifest.scm")) + (build '(manifests "etc/manifests/source.scm")) (period 7200) (priority 3) (systems '("x86_64-linux"))) (specification (name "disarchive") - (build '(manifests "etc/disarchive-manifest.scm")) + (build '(manifests "etc/manifests/disarchive.scm")) (build-outputs (list (build-output (job "disarchive-collection") @@ -330,7 +330,7 @@ collection instead." #$@(if (member "kernel-updates" branches) #~((specification (name "kernel-updates") - (build '(manifests "etc/kernels-manifest.scm")) + (build '(manifests "etc/manifests/kernels.scm")) (channels (list (channel (inherit %default-guix-channel) diff --git a/hydra/sync-disarchive-db.scm b/hydra/sync-disarchive-db.scm index 08cd4e01..d53a05fa 100755 --- a/hydra/sync-disarchive-db.scm +++ b/hydra/sync-disarchive-db.scm @@ -2,7 +2,7 @@ !# ;;; Synchronizing a copy of the Disarchive database. ;;; -;;; Copyright © 2021 Ludovic Courtès <l...@gnu.org> +;;; Copyright © 2021, 2024 Ludovic Courtès <l...@gnu.org> ;;; ;;; This program is free software: you can redistribute it and/or modify ;;; it under the terms of the GNU General Public License as published by @@ -63,7 +63,7 @@ successfully built, or the store file name of its derivation." ;; Note: In both cases, the build farm at *CUIRASS-URL* is trusted to ;; provide a valid database. If the build farm is compromised, it could ;; give something that does not correspond to 'guix build -m - ;; etc/disarchive-manifest.scm'. Such malicious changes to the database + ;; etc/manifests/disarchive.scm'. Such malicious changes to the database ;; would be detected since the database is content-addressed; the only risk ;; is denial of service, if the database lacks entries or if it contains ;; bogus entries.