diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-07-24 23:10:32 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-07-25 19:11:36 +0200 |
| commit | 6a79eed920fd4914b162461553a8d7e8f5eee324 (patch) | |
| tree | c2a5132d4d1c24e5be9b0bab6946a17bd874b9bd | |
| parent | a5e2fc73760a2ae023f2e56bdbf8025971f90e64 (diff) | |
| download | guix-patches-6a79eed920fd4914b162461553a8d7e8f5eee324.tar guix-patches-6a79eed920fd4914b162461553a8d7e8f5eee324.tar.gz | |
utils: Remove compatibility re-export of 'memoize'.
The 'memoize' binding was re-exported in 2016, commit
19e1d5f7f90194f1ac7e783b28a688ce1441786d, as a backwards-compatibility
measure that makes little sense now.
* guix/utils.scm: Don't re-export 'memoize'.
* guix/import/pypi.scm: Adjust imports.
* tests/pypi.scm: Remove duplicate (guix memoization) import.
| -rw-r--r-- | guix/import/pypi.scm | 4 | ||||
| -rw-r--r-- | guix/utils.scm | 4 | ||||
| -rw-r--r-- | tests/pypi.scm | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index a2b5d995ef..a4a2489688 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -34,8 +34,10 @@ #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) - #:use-module (guix ui) #:use-module (guix utils) + #:use-module (guix memoization) + #:use-module (guix diagnostics) + #:use-module (guix i18n) #:use-module ((guix build utils) #:select ((package-name->name+version . hyphen-package-name->name+version) diff --git a/guix/utils.scm b/guix/utils.scm index 64894ecf1f..8198204ade 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -44,9 +44,7 @@ #:use-module (ice-9 format) #:use-module ((ice-9 iconv) #:prefix iconv:) #:use-module (system foreign) - #:re-export (memoize ;for backwards compatibility - - <location> + #:re-export (<location> ;for backwards compatibility location location? location-file diff --git a/tests/pypi.scm b/tests/pypi.scm index 6788c8db3e..f421d6d9df 100644 --- a/tests/pypi.scm +++ b/tests/pypi.scm @@ -23,7 +23,6 @@ #:use-module (guix base32) #:use-module (guix memoization) #:use-module (gcrypt hash) - #:use-module (guix memoization) #:use-module (guix tests) #:use-module (guix build-system python) #:use-module ((guix build utils) #:select (delete-file-recursively which mkdir-p)) |