diff options
| author | Marius Bakke <marius@gnu.org> | 2023-01-10 00:24:11 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2023-01-10 00:24:11 +0100 |
| commit | d9bcd1a8d6300b79f5884e48b2cefff05de8dce4 (patch) | |
| tree | e484be53fb1d3cd7c5bb76a34451c7364502d9ec /guix/scripts | |
| parent | 0d65f7daae7428b26a8141b83c2567e6d0d9d009 (diff) | |
| parent | 79a9bb25bcb3d8b29968363db9b288cf3844108a (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/scripts')
| -rwxr-xr-x | guix/scripts/substitute.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 0efa61b0d7..fedb33019d 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013-2022 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013-2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2018 Kyle Meyer <kyle@kyleam.com> ;;; Copyright © 2020 Christopher Baines <mail@cbaines.net> @@ -706,10 +706,12 @@ substitutes may be unavailable\n"))))) (string-drop option=value (+ 1 equal-sign)))))) (string-tokenize newline-separated %not-newline))))) -(define (find-daemon-option option) - "Return the value of build daemon option OPTION, or #f if it could not be +(define find-daemon-option + (let ((options (delay (daemon-options)))) + (lambda (option) + "Return the value of build daemon option OPTION, or #f if it could not be found." - (assoc-ref (daemon-options) option)) + (assoc-ref (force options) option)))) (define %default-substitute-urls (match (and=> (or (find-daemon-option "untrusted-substitute-urls") ;client |