diff options
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/channels.scm | 16 | ||||
| -rw-r--r-- | guix/profiles.scm | 2 | ||||
| -rwxr-xr-x | guix/scripts/substitute.scm | 6 |
3 files changed, 14 insertions, 10 deletions
diff --git a/guix/channels.scm b/guix/channels.scm index 1b07eb5221..66f3122f79 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018-2023 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2018-2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> @@ -20,12 +20,14 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (guix channels) - #:use-module (git) - #:use-module (guix git) - #:use-module (guix git-authenticate) - #:use-module ((guix openpgp) - #:select (openpgp-public-key-fingerprint - openpgp-format-fingerprint)) + #:use-module (git) ;TODO: autoload + #:autoload (guix git) (update-cached-checkout + url+commit->name + commit-difference + with-repository) + #:autoload (guix git-authenticate) (authenticate-repository) + #:autoload (guix openpgp) (openpgp-public-key-fingerprint + openpgp-format-fingerprint) #:use-module (guix base16) #:use-module (guix records) #:use-module (guix gexp) diff --git a/guix/profiles.scm b/guix/profiles.scm index 2d695a52f8..d41802422b 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1579,7 +1579,7 @@ MIME type." "Return a derivation that builds the @file{mime.cache} database from manifest entries. It's used to query the MIME type of a given file." (define shared-mime-info ; lazy reference - (module-ref (resolve-interface '(gnu packages gnome)) 'shared-mime-info)) + (module-ref (resolve-interface '(gnu packages freedesktop)) 'shared-mime-info)) (mlet %store-monad ((glib (manifest-lookup-package manifest "glib"))) (define build diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 37cd08e289..3af0bf0019 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013-2023 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013-2024 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> @@ -494,7 +494,9 @@ STATUS-PORT." (define (try-fetch choices) (match choices (((uri compression file-size) rest ...) - (guard (c ((and (pair? rest) (http-get-error? c)) + (guard (c ((and (pair? rest) + (or (http-get-error? c) + (network-error? c))) (warning (G_ "download from '~a' failed, trying next URL~%") (uri->string uri)) (try-fetch rest))) |