diff options
author | Ludovic Courtès <ludo@gnu.org> | 2021-05-15 22:55:24 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2021-05-15 22:55:24 +0200 |
commit | 25487c3fe6a41dd62f6e53f256392224a3be2a08 (patch) | |
tree | 1051a1716d962ba0a7bbbf9dc8f7b67aa2674400 /guix/scripts | |
parent | 4a9597e4516ec5ca58df3e007fcd5ef1d3fd2e54 (diff) | |
parent | 46eac03e720e9b21d225e2ec1c41299c09202d18 (diff) |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts')
-rw-r--r-- | guix/scripts/challenge.scm | 7 | ||||
-rw-r--r-- | guix/scripts/describe.scm | 9 | ||||
-rw-r--r-- | guix/scripts/import/go.scm | 5 | ||||
-rw-r--r-- | guix/scripts/system.scm | 1 |
4 files changed, 15 insertions, 7 deletions
diff --git a/guix/scripts/challenge.scm b/guix/scripts/challenge.scm index 4ec3be99ca..07477f816e 100644 --- a/guix/scripts/challenge.scm +++ b/guix/scripts/challenge.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015, 2016, 2017, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -253,10 +253,11 @@ taken since we do not import the archives." NARINFO." (let*-values (((uri compression size) (narinfo-best-uri narinfo)) - ((port response) + ((port actual-size) (http-fetch uri))) (define reporter - (progress-reporter/file (narinfo-path narinfo) size + (progress-reporter/file (narinfo-path narinfo) + (max size (or actual-size 0)) ;defensive #:abbreviation (const (uri-host uri)))) (define result diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm index b5f6249176..a3e3338f7e 100644 --- a/guix/scripts/describe.scm +++ b/guix/scripts/describe.scm @@ -301,4 +301,11 @@ text. The hyperlink links to a web view of COMMIT, when available." (channels (display-profile-info #f format channels)))) (profile - (display-profile-info (canonicalize-profile profile) format)))))) + ;; For the current profile, resort to 'current-channels', which has a + ;; fallback to metadata from (guix config) in case PROFILE lacks it. + (let ((channels (if (and (current-profile) + (string=? profile (current-profile))) + (current-channels) + (profile-channels profile)))) + (display-profile-info (canonicalize-profile profile) + format channels))))))) diff --git a/guix/scripts/import/go.scm b/guix/scripts/import/go.scm index 04b07f80cc..74e8e60cce 100644 --- a/guix/scripts/import/go.scm +++ b/guix/scripts/import/go.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -68,9 +69,7 @@ that are not yet in Guix")) (alist-cons 'recursive #t result))) (option '(#\p "goproxy") #t #f (lambda (opt name arg result) - (alist-cons 'goproxy - (string->symbol arg) - (alist-delete 'goproxy result)))) + (alist-cons 'goproxy arg (alist-delete 'goproxy result)))) (option '("pin-versions") #f #f (lambda (opt name arg result) (alist-cons 'pin-versions? #t result))) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 0a051ee4e3..40401d7e03 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -717,6 +717,7 @@ checking this by themselves in their 'check' procedure." (lower-object (system-image image))) ((docker-image) (system-docker-image os + #:memory-size 1024 #:shared-network? container-shared-network?))))) (define (maybe-suggest-running-guix-pull) |