diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-07-21 23:05:54 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-07-25 00:16:41 +0200 |
| commit | 81c3dc32244a17241d74eea9fa265edfcb326f6d (patch) | |
| tree | f480f5cb7728612aab25f2ff89da0fa7a249763a /gnu/installer | |
| parent | a0efa069a147f0e7b3bb305ae546609e9dd77045 (diff) | |
maint: Switch to Guile-JSON 3.x.
Guile-JSON 3.x is incompatible with Guile-JSON 1.x, which we relied on
until now: it maps JSON dictionaries to alists (instead of hash tables),
and JSON arrays to vectors (instead of lists). This commit is about
adjusting all the existing code to this new mapping.
* m4/guix.m4 (GUIX_CHECK_GUILE_JSON): New macro.
* configure.ac: Use it.
* doc/guix.texi (Requirements): Mention the Guile-JSON version.
* guix/git-download.scm (git-fetch)[guile-json]: Use GUILE-JSON-3.
* guix/import/cpan.scm (string->license): Expect vectors instead of
lists.
(module->dist-name): Use 'json-fetch' instead of 'json-fetch-alist'.
(cpan-fetch): Likewise.
* guix/import/crate.scm (crate-fetch): Likewise, and call 'vector->list'
for DEPS.
* guix/import/gem.scm (rubygems-fetch): Likewise.
* guix/import/json.scm (json-fetch-alist): Remove.
* guix/import/pypi.scm (pypi-fetch): Use 'json-fetch' instead of
'json-fetch-alist'.
(latest-source-release, latest-wheel-release): Call 'vector->list' on
RELEASES.
* guix/import/stackage.scm (stackage-lts-info-fetch): Use 'json-fetch'
instead of 'json-fetch-alist'.
(lts-package-version): Use 'vector->list'.
* guix/import/utils.scm (hash-table->alist): Remove.
(alist->package): Pass 'vector->list' on the inputs fields, and default
to the empty vector.
* guix/scripts/import/json.scm (guix-import-json): Remove call to
'hash-table->alist'.
* guix/swh.scm (define-json-reader): Expect pair? or null? instead of
hash-table?.
[extract-field]: Use 'assoc-ref' instead of 'hash-ref'.
(json->branches): Use 'map' instead of 'hash-map->list'.
(json->checksums): Likewise.
(json->directory-entries, origin-visits): Call 'vector->list' on the
result of 'json->scm'.
* tests/import-utils.scm ("alist->package with dependencies"): New test.
* gnu/installer.scm (build-compiled-file)[builder]: Use GUILE-JSON-3.
* gnu/installer.scm (installer-program)[installer-builder]: Likewise.
* gnu/installer/locale.scm (iso639->iso639-languages): Use 'assoc-ref'
instead of 'hash-ref', and pass vectors through 'vector->list'.
(iso3166->iso3166-territories): Likewise.
* gnu/system/vm.scm (system-docker-image)[build]: Use GUILE-JSON-3.
* guix/docker.scm (manifest, config): Adjust for Guile-JSON 3.
* guix/scripts/pack.scm (docker-image)[build]: Use GUILE-JSON-3.
* guix/import/github.scm (fetch-releases-or-tags): Update docstring.
(latest-released-version): Use 'assoc-ref' instead of 'hash-ref'. Pass
the result of 'fetch-releases-or-tags' to 'vector->list'.
* guix/import/launchpad.scm (latest-released-version): Likewise.
Diffstat (limited to 'gnu/installer')
| -rw-r--r-- | gnu/installer/locale.scm | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/gnu/installer/locale.scm b/gnu/installer/locale.scm index 13f3a1e881c..ccffb6d8ef5 100644 --- a/gnu/installer/locale.scm +++ b/gnu/installer/locale.scm | |||
| @@ -134,16 +134,18 @@ ISO639-3 and ISO639-5 files." | |||
| 134 | (lambda (port-iso639-5) | 134 | (lambda (port-iso639-5) |
| 135 | (filter-map | 135 | (filter-map |
| 136 | (lambda (hash) | 136 | (lambda (hash) |
| 137 | (let ((alpha2 (hash-ref hash "alpha_2")) | 137 | (let ((alpha2 (assoc-ref hash "alpha_2")) |
| 138 | (alpha3 (hash-ref hash "alpha_3")) | 138 | (alpha3 (assoc-ref hash "alpha_3")) |
| 139 | (name (hash-ref hash "name"))) | 139 | (name (assoc-ref hash "name"))) |
| 140 | (and (supported-locale? locales alpha2 alpha3) | 140 | (and (supported-locale? locales alpha2 alpha3) |
| 141 | `((alpha2 . ,alpha2) | 141 | `((alpha2 . ,alpha2) |
| 142 | (alpha3 . ,alpha3) | 142 | (alpha3 . ,alpha3) |
| 143 | (name . ,name))))) | 143 | (name . ,name))))) |
| 144 | (append | 144 | (append |
| 145 | (hash-ref (json->scm port-iso639-3) "639-3") | 145 | (vector->list |
| 146 | (hash-ref (json->scm port-iso639-5) "639-5")))))))) | 146 | (assoc-ref (json->scm port-iso639-3) "639-3")) |
| 147 | (vector->list | ||
| 148 | (assoc-ref (json->scm port-iso639-5) "639-5"))))))))) | ||
| 147 | 149 | ||
| 148 | (define (language-code->language-name languages language-code) | 150 | (define (language-code->language-name languages language-code) |
| 149 | "Using LANGUAGES as a list of ISO639 association lists, return the language | 151 | "Using LANGUAGES as a list of ISO639 association lists, return the language |
| @@ -179,10 +181,11 @@ ISO3166 file." | |||
| 179 | (call-with-input-file iso3166 | 181 | (call-with-input-file iso3166 |
| 180 | (lambda (port) | 182 | (lambda (port) |
| 181 | (map (lambda (hash) | 183 | (map (lambda (hash) |
| 182 | `((alpha2 . ,(hash-ref hash "alpha_2")) | 184 | `((alpha2 . ,(assoc-ref hash "alpha_2")) |
| 183 | (alpha3 . ,(hash-ref hash "alpha_3")) | 185 | (alpha3 . ,(assoc-ref hash "alpha_3")) |
| 184 | (name . ,(hash-ref hash "name")))) | 186 | (name . ,(assoc-ref hash "name")))) |
| 185 | (hash-ref (json->scm port) "3166-1"))))) | 187 | (vector->list |
| 188 | (assoc-ref (json->scm port) "3166-1")))))) | ||
| 186 | 189 | ||
| 187 | (define (territory-code->territory-name territories territory-code) | 190 | (define (territory-code->territory-name territories territory-code) |
| 188 | "Using TERRITORIES as a list of ISO3166 association lists return the | 191 | "Using TERRITORIES as a list of ISO3166 association lists return the |
