diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-01-06 15:14:09 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-01-06 16:31:54 +0100 |
| commit | 6a7c4636d4dec47eefa03c95da5a1315bd0e0413 (patch) | |
| tree | 78a0f28f2c7d4de31d3368ec6df399cc604f67b1 /gnu/packages.scm | |
| parent | 9961cde3835743643e562e0034a73356b1d1eb0f (diff) | |
Adjust module autoloads.
In Guile < 2.9.7, autoloading a module would give you access to all its
bindings. In future versions, autoloading a module gives access only to
the listed bindings, as per #:select (see <https://bugs.gnu.org/38895>).
This commit adjusts autoloads to the new semantics, allowing Guix to be
built with Guile 2.9.7/2.9.8.
* guix/build/download.scm <top level>: Remove call to 'module-autoload!'.
(load-gnutls): New procedure.
(tls-wrap): Call it.
* guix/git.scm <top level>: Remove call to 'module-autoload!'.
(load-git-submodules): New procedure.
(update-submodules): Call it instead of 'resolve-interface'.
* gnu/bootloader/grub.scm: Replace #:autoload with #:use-module.
* gnu/packages.scm: Likewise.
* gnu/packages/ssh.scm: Likewise.
* gnu/packages/tex.scm: Likewise.
* gnu/services/cuirass.scm: Likewise.
* gnu/services/mcron.scm: Likewise.
* guix/lint.scm: Augment list of bindings in #:autoload.
* guix/scripts/build.scm: Likewise.
* guix/scripts/gc.scm: Likewise.
* guix/scripts/pack.scm: Likewise.
* guix/scripts/publish.scm: Likewise.
* guix/scripts/pull.scm: Likewise.
* guix/utils.scm: Remove unnecessary #:autoload clauses; replace one
of them with #:use-module.
Diffstat (limited to 'gnu/packages.scm')
| -rw-r--r-- | gnu/packages.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages.scm b/gnu/packages.scm index 959777ff8ff..143469b288a 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> |
| 3 | ;;; Copyright © 2013 Mark H Weaver <mhw@netris.org> | 3 | ;;; Copyright © 2013 Mark H Weaver <mhw@netris.org> |
| 4 | ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> | 4 | ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> |
| 5 | ;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com> | 5 | ;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com> |
| @@ -30,12 +30,12 @@ | |||
| 30 | #:select ((package-name->name+version | 30 | #:select ((package-name->name+version |
| 31 | . hyphen-separated-name->name+version) | 31 | . hyphen-separated-name->name+version) |
| 32 | mkdir-p)) | 32 | mkdir-p)) |
| 33 | #:autoload (guix profiles) (packages->manifest) | 33 | #:use-module (guix profiles) |
| 34 | #:use-module (guix describe) | 34 | #:use-module (guix describe) |
| 35 | #:use-module (guix deprecation) | 35 | #:use-module (guix deprecation) |
| 36 | #:use-module (ice-9 vlist) | 36 | #:use-module (ice-9 vlist) |
| 37 | #:use-module (ice-9 match) | 37 | #:use-module (ice-9 match) |
| 38 | #:autoload (ice-9 binary-ports) (put-bytevector) | 38 | #:use-module (ice-9 binary-ports) |
| 39 | #:autoload (system base compile) (compile) | 39 | #:autoload (system base compile) (compile) |
| 40 | #:use-module (srfi srfi-1) | 40 | #:use-module (srfi srfi-1) |
| 41 | #:use-module (srfi srfi-11) | 41 | #:use-module (srfi srfi-11) |