diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
| commit | 839bb4616f13171a23ad7937bf57d0a01d61d42a (patch) | |
| tree | 01de78a5ce973b9fb7ac0f9216d64f736f8e163d /guix/channels.scm | |
| parent | 0357bbbcd850f9220078a62da3c30358b8983765 (diff) | |
| parent | ef71e3290916583973724316e815cee840c1b6d8 (diff) | |
Merge remote-tracking branch 'origin/master' into staging.
With resolved conflicts in:
gnu/packages/ibus.scm
gnu/packages/image.scm
gnu/packages/lisp.scm
gnu/packages/virtualization.scm
Diffstat (limited to 'guix/channels.scm')
| -rw-r--r-- | guix/channels.scm | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/guix/channels.scm b/guix/channels.scm index 40cbc4bb3a..1ff72b7e72 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -29,8 +29,6 @@ #:use-module (guix base16) #:use-module (guix records) #:use-module (guix gexp) - #:use-module (guix modules) - #:use-module (guix discovery) #:use-module (guix monads) #:use-module (guix profiles) #:use-module (guix packages) @@ -55,8 +53,6 @@ #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (ice-9 vlist) - #:use-module ((ice-9 rdelim) #:select (read-string)) - #:use-module ((rnrs bytevectors) #:select (bytevector=?)) #:export (channel channel? channel-name @@ -952,6 +948,10 @@ be used as a profile hook." (backtrace)))) (mkdir #$output)))) + (define channels + (map (compose string->symbol manifest-entry-name) + (manifest-entries manifest))) + (gexp->derivation-in-inferior "guix-package-cache" build profile @@ -960,8 +960,9 @@ be used as a profile hook." ;; instead of failing. #:silent-failure? #t - #:properties '((type . profile-hook) - (hook . package-cache)) + #:properties `((type . profile-hook) + (hook . package-cache) + (channels . ,channels)) #:local-build? #t))) (define %channel-profile-hooks |