* [bug#60497] [PATCH] services: unattended-upgrade: Add 'expression' field. @ 2023-01-02 17:04 goodoldpaul--- via Guix-patches via 2023-01-02 17:05 ` Giacomo Leidi via Guix-patches via 0 siblings, 1 reply; 3+ messages in thread From: goodoldpaul--- via Guix-patches via @ 2023-01-02 17:04 UTC (permalink / raw) To: 60497 Dear Guixers, I'm sending a patch to add an expression field to the unattended-upgrade-configuration record. The main point of this field is to be passed to guix system reconfigure -e . This change should not break any existing configurations but I may have missed something. Thank you for your time and efforts, giacomo ^ permalink raw reply [flat|nested] 3+ messages in thread
* [bug#60497] [PATCH] services: unattended-upgrade: Add 'expression' field. 2023-01-02 17:04 [bug#60497] [PATCH] services: unattended-upgrade: Add 'expression' field goodoldpaul--- via Guix-patches via @ 2023-01-02 17:05 ` Giacomo Leidi via Guix-patches via 2023-01-10 10:11 ` bug#60497: " Ludovic Courtès 0 siblings, 1 reply; 3+ messages in thread From: Giacomo Leidi via Guix-patches via @ 2023-01-02 17:05 UTC (permalink / raw) To: 60497; +Cc: Giacomo Leidi * gnu/services/admin.scm (<unattended-upgrade-configuration>)[expression]: New field. (unattended-upgrade-mcron-jobs): Honor it. * doc/guix.texi (Unattended Upgrades): Document it. --- doc/guix.texi | 12 ++++++++++++ gnu/services/admin.scm | 15 ++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 5c85680831..cf109cf3d6 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -109,6 +109,7 @@ Copyright @copyright{} 2022 Reily Siegel@* Copyright @copyright{} 2022 Simon Streit@* Copyright @copyright{} 2022 (@* Copyright @copyright{} 2022 John Kehayias@* +Copyright @copyright{} 2023 Giacomo Leidi@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -21270,6 +21271,17 @@ This gexp specifies the channels to use for the upgrade (@pxref{Channels}). By default, the tip of the official @code{guix} channel is used. +@item @code{expression} (default: @code{#f}) +This field specifies the Guile expression to use for the upgrade +(@pxref{Invoking guix system}) as a list of symbols. If no value is provided the +@code{operating-system-file} field value will be used. + +@lisp +(unattended-upgrade-configuration + (expression + '(@@ (guix system install) installation-os))) +@end lisp + @item @code{operating-system-file} (default: @code{"/run/current-system/configuration.scm"}) This field specifies the operating system configuration file to use. The default is to reuse the config file of the current configuration. diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm index 252bedb0bd..ff5ceae47e 100644 --- a/gnu/services/admin.scm +++ b/gnu/services/admin.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> +;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +31,7 @@ (define-module (gnu services admin) #:use-module (guix packages) #:use-module (guix records) #:use-module (srfi srfi-1) + #:use-module (ice-9 format) #:use-module (ice-9 vlist) #:export (%default-rotations %rotated-files @@ -57,6 +59,7 @@ (define-module (gnu services admin) unattended-upgrade-service-type unattended-upgrade-configuration unattended-upgrade-configuration? + unattended-upgrade-configuration-expression unattended-upgrade-configuration-operating-system-file unattended-upgrade-configuration-channels unattended-upgrade-configuration-schedule @@ -263,6 +266,8 @@ (define-record-type* <unattended-upgrade-configuration> unattended-upgrade-configuration? (operating-system-file unattended-upgrade-operating-system-file (default "/run/current-system/configuration.scm")) + (expression unattended-upgrade-expression + (default #f)) (schedule unattended-upgrade-configuration-schedule (default "30 01 * * 0")) (channels unattended-upgrade-configuration-channels @@ -296,6 +301,14 @@ (define expiration (define config-file (unattended-upgrade-operating-system-file config)) + (define expression + (unattended-upgrade-expression config)) + + (define reconfigure-args + (if expression + #~(list "-e" (format #t "~s" expression)) + #~(list config-file))) + (define code (with-imported-modules (source-module-closure '((guix build utils) (gnu services herd))) @@ -335,7 +348,7 @@ (define (alarm-handler . _) (report-invoke-error c))) (invoke #$(file-append guix "/bin/guix") "time-machine" "-C" #$channels - "--" "system" "reconfigure" #$config-file) + "--" "system" "reconfigure" #$@reconfigure-args) ;; 'guix system delete-generations' fails when there's no ;; matching generation. Thus, catch 'invoke-error?'. base-commit: 7efcf36e3b753a1dba6f8208f3c22d151007eaf0 -- 2.38.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#60497: [PATCH] services: unattended-upgrade: Add 'expression' field. 2023-01-02 17:05 ` Giacomo Leidi via Guix-patches via @ 2023-01-10 10:11 ` Ludovic Courtès 0 siblings, 0 replies; 3+ messages in thread From: Ludovic Courtès @ 2023-01-10 10:11 UTC (permalink / raw) To: Giacomo Leidi; +Cc: 60497-done [-- Attachment #1: Type: text/plain, Size: 538 bytes --] Hi, Giacomo Leidi <goodoldpaul@autistici.org> skribis: > * gnu/services/admin.scm (<unattended-upgrade-configuration>)[expression]: > New field. > (unattended-upgrade-mcron-jobs): Honor it. > * doc/guix.texi (Unattended Upgrades): Document it. Nice! I made the cosmetic changes below to improve consistency. BTW, previously it had: (if expression #~(list "-e" (format #t "~s" expression)) …) but ‘expression’ is unbound within that gexp (missing #$ somewhere). Thanks, Ludo’. [-- Attachment #2: Type: text/x-patch, Size: 4816 bytes --] diff --git a/doc/guix.texi b/doc/guix.texi index 78d1dd8b2a..cda940b1fa 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -22,7 +22,7 @@ @set SUBSTITUTE-URLS https://@value{SUBSTITUTE-SERVER-1} https://@value{SUBSTITUTE-SERVER-2} @copying -Copyright @copyright{} 2012-2022 Ludovic Courtès@* +Copyright @copyright{} 2012-2023 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* @@ -21340,17 +21340,6 @@ This gexp specifies the channels to use for the upgrade (@pxref{Channels}). By default, the tip of the official @code{guix} channel is used. -@item @code{expression} (default: @code{#f}) -This field specifies the Guile expression to use for the upgrade -(@pxref{Invoking guix system}) as a list of symbols. If no value is provided the -@code{operating-system-file} field value will be used. - -@lisp -(unattended-upgrade-configuration - (expression - '(@@ (guix system install) installation-os))) -@end lisp - @item @code{operating-system-file} (default: @code{"/run/current-system/configuration.scm"}) This field specifies the operating system configuration file to use. The default is to reuse the config file of the current configuration. @@ -21374,6 +21363,17 @@ Therefore, uses of @code{local-file} within @file{config.scm} will work as expected. @xref{G-Expressions}, for information about @code{local-file} and @code{file-append}. +@item @code{operating-system-expression} (default: @code{#f}) +This field specifies an expression that evaluates to the operating +system to use for the upgrade. If no value is provided the +@code{operating-system-file} field value is used. + +@lisp +(unattended-upgrade-configuration + (operating-system-expression + #~(@@ (guix system install) installation-os))) +@end lisp + @item @code{services-to-restart} (default: @code{'(mcron)}) This field specifies the Shepherd services to restart when the upgrade completes. diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm index ff5ceae47e..a864da25e9 100644 --- a/gnu/services/admin.scm +++ b/gnu/services/admin.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> -;;; Copyright © 2016-2022 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016-2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org> ;;; @@ -59,8 +59,8 @@ (define-module (gnu services admin) unattended-upgrade-service-type unattended-upgrade-configuration unattended-upgrade-configuration? - unattended-upgrade-configuration-expression unattended-upgrade-configuration-operating-system-file + unattended-upgrade-configuration-operating-system-expression unattended-upgrade-configuration-channels unattended-upgrade-configuration-schedule unattended-upgrade-configuration-services-to-restart @@ -266,8 +266,8 @@ (define-record-type* <unattended-upgrade-configuration> unattended-upgrade-configuration? (operating-system-file unattended-upgrade-operating-system-file (default "/run/current-system/configuration.scm")) - (expression unattended-upgrade-expression - (default #f)) + (operating-system-expression unattended-upgrade-operating-system-expression + (default #f)) (schedule unattended-upgrade-configuration-schedule (default "30 01 * * 0")) (channels unattended-upgrade-configuration-channels @@ -302,11 +302,11 @@ (define config-file (unattended-upgrade-operating-system-file config)) (define expression - (unattended-upgrade-expression config)) + (unattended-upgrade-operating-system-expression config)) - (define reconfigure-args + (define arguments (if expression - #~(list "-e" (format #t "~s" expression)) + #~(list "-e" (object->string '#$expression)) #~(list config-file))) (define code @@ -348,7 +348,7 @@ (define (alarm-handler . _) (report-invoke-error c))) (invoke #$(file-append guix "/bin/guix") "time-machine" "-C" #$channels - "--" "system" "reconfigure" #$@reconfigure-args) + "--" "system" "reconfigure" #$@arguments) ;; 'guix system delete-generations' fails when there's no ;; matching generation. Thus, catch 'invoke-error?'. ^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-10 10:21 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2023-01-02 17:04 [bug#60497] [PATCH] services: unattended-upgrade: Add 'expression' field goodoldpaul--- via Guix-patches via 2023-01-02 17:05 ` Giacomo Leidi via Guix-patches via 2023-01-10 10:11 ` bug#60497: " Ludovic Courtès
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).