diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-11-13 01:00:00 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2022-11-13 01:00:00 +0100 |
| commit | 39e4e00f75be8055300cb0afffb8bd4b4d35f2cc (patch) | |
| tree | c75f25be3cf5fba52e03b79e9ec861427655abc9 /gnu/services/configuration.scm | |
| parent | 0ad036b0907dd080a745fe8dd209ffcc5b0389d3 (diff) | |
| download | guix-39e4e00f75be8055300cb0afffb8bd4b4d35f2cc.tar guix-39e4e00f75be8055300cb0afffb8bd4b4d35f2cc.tar.gz | |
services: configuration: Revert to a working ‘guix home’.
This reverts commit 543d971ed2a1d9eb934af1f51930741d7cc4e7ef, and
its dependent commit 9b21cd2e9a614f1937769caf3917a791b151d841, which
appear to have triggered a recent wave of ‘guix home’ regressions
involving (services (list (service home-bash-service-type))):
In gnu/home/services/shells.scm:
504:7 3 (home-bash-extensions #<<home-bash-configuration> package: #<package bash@5.1.8 gnu/packages/ba…> …)
In unknown file:
2 (append #<<location> file: "…" line: 14 column: 12> ())
In ice-9/boot-9.scm:
1685:16 1 (raise-exception _ #:continuable? _)
1685:16 0 (raise-exception _ #:continuable? _)
ice-9/boot-9.scm:1685:16: In procedure raise-exception:
In procedure append: Wrong type argument in position 1 (expecting empty list): #<<location> file: "…" line: 14 column: 12>
I should love to dive in & fix this rather than revert, but urgently
need sleep.
Diffstat (limited to 'gnu/services/configuration.scm')
| -rw-r--r-- | gnu/services/configuration.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm index dacfc52ba9..636c49ccba 100644 --- a/gnu/services/configuration.scm +++ b/gnu/services/configuration.scm @@ -242,17 +242,17 @@ does not have a default value" field kind))) stem #,(id #'stem #'make- #'stem) #,(id #'stem #'stem #'?) + (%location #,(id #'stem #'stem #'-location) + (default (and=> (current-source-location) + source-properties->location)) + (innate)) #,@(map (lambda (name getter def) #`(#,name #,getter (default #,def) (sanitize #,(id #'stem #'validate- #'stem #'- name)))) #'(field ...) #'(field-getter ...) - #'(field-default ...)) - (%location #,(id #'stem #'stem #'-location) - (default (and=> (current-source-location) - source-properties->location)) - (innate))) + #'(field-default ...))) (define #,(id #'stem #'stem #'-fields) (list (configuration-field |