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.
Showing
- configure.ac 2 additions, 2 deletionsconfigure.ac
- doc/guix.texi 1 addition, 1 deletiondoc/guix.texi
- gnu/installer.scm 2 additions, 2 deletionsgnu/installer.scm
- gnu/installer/locale.scm 12 additions, 9 deletionsgnu/installer/locale.scm
- gnu/system/vm.scm 1 addition, 1 deletiongnu/system/vm.scm
- guix/docker.scm 10 additions, 9 deletionsguix/docker.scm
- guix/git-download.scm 2 additions, 2 deletionsguix/git-download.scm
- guix/import/cpan.scm 7 additions, 7 deletionsguix/import/cpan.scm
- guix/import/crate.scm 3 additions, 3 deletionsguix/import/crate.scm
- guix/import/gem.scm 7 additions, 3 deletionsguix/import/gem.scm
- guix/import/github.scm 7 additions, 6 deletionsguix/import/github.scm
- guix/import/json.scm 2 additions, 9 deletionsguix/import/json.scm
- guix/import/launchpad.scm 7 additions, 6 deletionsguix/import/launchpad.scm
- guix/import/pypi.scm 4 additions, 4 deletionsguix/import/pypi.scm
- guix/import/stackage.scm 2 additions, 2 deletionsguix/import/stackage.scm
- guix/import/utils.scm 6 additions, 19 deletionsguix/import/utils.scm
- guix/scripts/import/json.scm 1 addition, 1 deletionguix/scripts/import/json.scm
- guix/scripts/pack.scm 1 addition, 1 deletionguix/scripts/pack.scm
- guix/self.scm 1 addition, 1 deletionguix/self.scm
- guix/swh.scm 19 additions, 16 deletionsguix/swh.scm
Loading
Please register or sign in to comment