summaryrefslogtreecommitdiff
path: root/gnu/services/base.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/services/base.scm')
-rw-r--r--gnu/services/base.scm7
1 files changed, 7 insertions, 0 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 6a5ed3aa578..42d86ac3d32 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -241,6 +241,7 @@
241 guix-extension 241 guix-extension
242 guix-extension? 242 guix-extension?
243 guix-extension-authorized-keys 243 guix-extension-authorized-keys
244 guix-extension-channels
244 guix-extension-substitute-urls 245 guix-extension-substitute-urls
245 guix-extension-chroot-directories 246 guix-extension-chroot-directories
246 247
@@ -2428,6 +2429,8 @@ guix-daemon have the right ownership."))
2428(define-record-type* <guix-extension> 2429(define-record-type* <guix-extension>
2429 guix-extension make-guix-extension 2430 guix-extension make-guix-extension
2430 guix-extension? 2431 guix-extension?
2432 (channels guix-extension-channels ;list of channel
2433 (default '()))
2431 (authorized-keys guix-extension-authorized-keys ;list of file-like 2434 (authorized-keys guix-extension-authorized-keys ;list of file-like
2432 (default '())) 2435 (default '()))
2433 (substitute-urls guix-extension-substitute-urls ;list of strings 2436 (substitute-urls guix-extension-substitute-urls ;list of strings
@@ -2439,6 +2442,8 @@ guix-daemon have the right ownership."))
2439 2442
2440(define (guix-extension-merge a b) 2443(define (guix-extension-merge a b)
2441 (guix-extension 2444 (guix-extension
2445 (channels (append (guix-extension-channels a)
2446 (guix-extension-channels b)))
2442 (authorized-keys (append (guix-extension-authorized-keys a) 2447 (authorized-keys (append (guix-extension-authorized-keys a)
2443 (guix-extension-authorized-keys b))) 2448 (guix-extension-authorized-keys b)))
2444 (substitute-urls (append (guix-extension-substitute-urls a) 2449 (substitute-urls (append (guix-extension-substitute-urls a)
@@ -2464,6 +2469,8 @@ guix-daemon have the right ownership."))
2464 (extend (lambda (config extension) 2469 (extend (lambda (config extension)
2465 (guix-configuration 2470 (guix-configuration
2466 (inherit config) 2471 (inherit config)
2472 (channels (append (guix-extension-channels extension)
2473 (guix-configuration-channels config)))
2467 (authorized-keys (append (guix-extension-authorized-keys extension) 2474 (authorized-keys (append (guix-extension-authorized-keys extension)
2468 (guix-configuration-authorized-keys config))) 2475 (guix-configuration-authorized-keys config)))
2469 (substitute-urls (append (guix-extension-substitute-urls extension) 2476 (substitute-urls (append (guix-extension-substitute-urls extension)