[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/08: substitute: Parse '_NIX_OPTIONS' once.
From: |
guix-commits |
Subject: |
02/08: substitute: Parse '_NIX_OPTIONS' once. |
Date: |
Mon, 9 Jan 2023 12:08:55 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 007e69756087234de4d9ea896e013e5d0232bd25
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Jan 9 10:27:54 2023 +0100
substitute: Parse '_NIX_OPTIONS' once.
* guix/scripts/substitute.scm (find-daemon-option): Arrange to call
'daemon-options' only once.
---
guix/scripts/substitute.scm | 10 ++++++----
1 file 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
- branch master updated (8b314efd50 -> 84f117f495), guix-commits, 2023/01/09
- 01/08: doc: cookbook: Add "Installing Guix on a Cluster" chapter., guix-commits, 2023/01/09
- 02/08: substitute: Parse '_NIX_OPTIONS' once.,
guix-commits <=
- 04/08: daemon: Improve error message for wrong hash sizes., guix-commits, 2023/01/09
- 05/08: read-print: Do not use extended notation when printing '1+', '1-', etc., guix-commits, 2023/01/09
- 06/08: gnu: Add minetest-wielded-light., guix-commits, 2023/01/09
- 08/08: gnu: LLVM, Clang, libomp, lld: Update to 15.0.6., guix-commits, 2023/01/09
- 03/08: derivations: 'read-derivation' correctly handles case with empty hash., guix-commits, 2023/01/09
- 07/08: gnu: Add minetest-mobs-monster., guix-commits, 2023/01/09