diff options
| author | David Thompson <dthompson2@worcester.edu> | 2014-09-27 10:16:23 -0400 |
|---|---|---|
| committer | David Thompson <dthompson2@worcester.edu> | 2014-09-29 19:30:28 -0400 |
| commit | 1b3e968512ebbccf02d00c52f7e089156946f445 (patch) | |
| tree | c45d203439ab9a74d01f2c76850cafb847a755e2 /configure.ac | |
| parent | 2efb3ddaa434b86a841dffbba89e21d2d9208526 (diff) | |
| download | guix-1b3e968512ebbccf02d00c52f7e089156946f445.tar guix-1b3e968512ebbccf02d00c52f7e089156946f445.tar.gz | |
import: Add PyPI importer.
* guix/snix.scm: Delete.
* guix/import/snix.scm: New file.
* guix/import/pypi.scm: New file.
* guix/import/utils.scm: New file.
* guix/scripts/import/nix.scm: New file.
* guix/scripts/import/pypi.scm: New file.
* tests/pypi.scm: New file.
* tests/snix.scm: Import (guix import snix) module.
* guix/scripts/import.scm (%default-options, %options): Delete.
(%standard-import-options, importers): New variables.
(show-help): List importers.
(guix-import): Factor out Nix-specific logic. Delegate to correct importer
based upon first argument.
* configure.ac (HAVE_GUILE_JSON): New conditional.
* Makefile.am (MODULES): Add new files and remove 'guix/snix.scm'.
(SCM_TESTS): Add 'tests/pypi.scm' if guile-json is installed.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index e516fa57b7..9c000912cc 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,10 @@ if test "x$GUILD" = "x"; then AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x installation.]) fi +dnl guile-json is used for the PyPI package importer +GUILE_MODULE_AVAILABLE([have_guile_json], [(json)]) +AM_CONDITIONAL([HAVE_GUILE_JSON], [test "x$have_guile_json" = "xyes"]) + dnl Make sure we have a full-fledged Guile. GUIX_ASSERT_GUILE_FEATURES([regex posix socket net-db threads]) |