diff options
| author | Marius Bakke <[email protected]> | 2022-08-11 22:15:22 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2022-08-11 22:15:22 +0200 |
| commit | b50eaa67642ebc25e9c896f2e700c08610e0a5da (patch) | |
| tree | e3358208e17a836c2e3cdb3125f815a2ab35c2b8 /gnu/services/configuration.scm | |
| parent | 7b69cd07408bf64fff026e4597920a90259e3205 (diff) | |
| parent | 99b73f60415b282f2be39134f385cbda4840c336 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/services/configuration.scm')
| -rw-r--r-- | gnu/services/configuration.scm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm index e3c101d042..3007e8de35 100644 --- a/gnu/services/configuration.scm +++ b/gnu/services/configuration.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2017 Mathieu Othacehe <[email protected]> ;;; Copyright © 2017, 2018 Clément Lassieur <[email protected]> ;;; Copyright © 2021 Xinglu Chen <[email protected]> -;;; Copyright © 2021 Maxim Cournoyer <[email protected]> +;;; Copyright © 2021, 2022 Maxim Cournoyer <[email protected]> ;;; Copyright © 2021 Andrew Tropin <[email protected]> ;;; Copyright © 2022 Maxime Devos <[email protected]> ;;; @@ -142,8 +142,7 @@ does not have a default value" field kind))) (id #'stem #'serialize-maybe- #'stem)))) #`(begin (define (maybe-stem? val) - (or (unspecified? val) - (stem? val))) + (or (eq? val 'unset) (stem? val))) #,@(if serialize? (list #'(define (serialize-maybe-stem field-name val) (if (stem? val) @@ -171,10 +170,10 @@ does not have a default value" field kind))) (values #'(field-type def))) ((field-type) (identifier? #'field-type) - (values #'(field-type *unspecified*))) + (values #'(field-type 'unset))) (field-type (identifier? #'field-type) - (values #'(field-type *unspecified*))))) + (values #'(field-type 'unset))))) (define (define-configuration-helper serialize? serializer-prefix syn) (syntax-case syn () @@ -262,7 +261,7 @@ does not have a default value" field kind))) (lambda () (display '#,(id #'stem #'% #'stem)) (if (eq? (syntax->datum field-default) - '*unspecified*) + 'unset) (configuration-missing-default-value '#,(id #'stem #'% #'stem) 'field) field-default))) |