me/guix
Archived
1
0
Fork 0
Code Activity

weather: Use the same substitute URLs as guix-daemon.

Browse source 
* guix/scripts/weather.scm (%default-options): Remove ‘substitute-urls’.
(guix-weather): Call ‘substitute-urls’ when OPTS doesn’t have it.  Warn
when ‘substitute-urls’ returns #f.
* doc/guix.texi (Invoking guix weather): Adjust accordingly.

Change-Id: I3e9100074f2ad559e5c408660db70430d64f2bef
This commit is contained in:
Ludovic Courtès 2023-11-10 21:42:50 +01:00
parent f63a8c5ca2
commit 7e11369586
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/guix.texi
View file

@ -16566,8 +16566,9 @@ The available options are listed below.
@table @code @table @code
@item --substitute-urls=@var{urls} @item --substitute-urls=@var{urls}
@var{urls} is the space-separated list of substitute server URLs to @var{urls} is the space-separated list of substitute server URLs to
query. When this option is omitted, the default set of substitute query. When this option is omitted, the URLs specified with the
servers is queried. @option{--substitute-urls} option of @command{guix-daemon} are used or,
as a last resort, the default set of substitute URLs.
@item --system=@var{system} @item --system=@var{system}
@itemx -s @var{system} @itemx -s @var{system}

12
guix/scripts/weather.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017-2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Kyle Meyer <kyle@kyleam.com> ;;; Copyright © 2018 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
@ -391,7 +391,7 @@ Report the availability of substitutes.\n"))
%standard-native-build-options)) %standard-native-build-options))
(define %default-options (define %default-options
`((substitute-urls . ,%default-substitute-urls))) '())
(define (load-manifest file) (define (load-manifest file)
"Load the manifest from FILE and return the list of packages it refers to." "Load the manifest from FILE and return the list of packages it refers to."
@ -582,7 +582,13 @@ SERVER. Display information for packages with at least THRESHOLD dependents."
(let* ((opts (parse-command-line args %options (let* ((opts (parse-command-line args %options
(list %default-options) (list %default-options)
#:build-options? #f)) #:build-options? #f))
(urls (assoc-ref opts 'substitute-urls)) (urls (or (assoc-ref opts 'substitute-urls)
(with-store store
(substitute-urls store))
(begin
(warning (G_ "could not determine current \
substitute URLs; using defaults~%"))
%default-substitute-urls)))
(systems (match (filter-map (match-lambda (systems (match (filter-map (match-lambda
(('system . system) system) (('system . system) system)
(_ #f)) (_ #f))