diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-10-30 14:32:53 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-10-30 14:32:53 +0100 |
commit | 998e6cdcd2a9fcce18b46676ce47990867227945 (patch) | |
tree | 5b6b08860183d164108257a3715e0c5673063f5a /guix/scripts/pull.scm | |
parent | a557810ac72effd6841b76772195b10c03dee345 (diff) | |
parent | d8bb1097d764949e80f9e41d26b3b194163dd716 (diff) | |
download | guix-patches-998e6cdcd2a9fcce18b46676ce47990867227945.tar guix-patches-998e6cdcd2a9fcce18b46676ce47990867227945.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'guix/scripts/pull.scm')
-rw-r--r-- | guix/scripts/pull.scm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 7876019eac..80d070652b 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -714,6 +714,9 @@ transformations specified in OPTS (resulting from '--url', '--commit', or (define default-file (string-append (config-directory) "/channels.scm")) + (define global-file + (string-append %sysconfdir "/guix/channels.scm")) + (define (load-channels file) (let ((result (load* file (make-user-module '((guix channels)))))) (if (and (list? result) (every channel? result)) @@ -725,6 +728,8 @@ transformations specified in OPTS (resulting from '--url', '--commit', or (load-channels file)) ((file-exists? default-file) (load-channels default-file)) + ((file-exists? global-file) + (load-channels global-file)) (else %default-channels))) |