From: Alex Kost <alezost@gmail.com>
To: David Thompson <dthompson2@worcester.edu>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH] import: Add PyPI importer.
Date: Tue, 30 Sep 2014 09:49:48 +0400 [thread overview]
Message-ID: <871tqtd5dv.fsf@gmail.com> (raw)
In-Reply-To: <87y4t2knq8.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me> (David Thompson's message of "Mon, 29 Sep 2014 19:31:43 -0400")
[-- Attachment #1: Type: text/plain, Size: 845 bytes --]
David Thompson (2014-09-30 03:31 +0400) wrote:
> Ludovic Courtès <ludo@gnu.org> writes:
>
>> David Thompson <dthompson2@worcester.edu> skribis:
>>
>>> Oh yeah, almost forgot about the Automake rule! My autotools skills are
>>> weak so I'm not sure how to write this. Could you point me in the right
>>> direction?
>>
>> In configure.ac, do something like:
>>
>> GUILE_MODULE_AVAILABLE([have_guile_json], [(json)])
>> AM_CONDITIONAL([HAVE_GUILE_JSON], [text "x$have_guile_json" = "xyes"])
>>
>> and in Makefile.am:
>>
>> if HAVE_GUILE_JSON
>> TESTS += tests/pypi.scm
>> endif
>
> Done and pushed! Thanks!
Hello, I don't have guile-json and "make" has failed for me because
(guix import pypi) wants json module. Is it required now?
Perhaps it would be safe (?) to adjust “Makefile.am” like this:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-build-Build-pypi-modules-only-if-guile-json-is-avail.patch --]
[-- Type: text/x-diff, Size: 1169 bytes --]
From 85054932667d57224dde1d18c381d7d7c0a95dd4 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Tue, 30 Sep 2014 09:41:59 +0400
Subject: [PATCH] build: Build pypi modules only if 'guile-json' is available.
* Makefile.am (MODULES): Wrap 'guix/import/pypi.scm' and
'guix/scripts/import/pypi.scm' in 'if HAVE_GUILE_JSON'.
---
Makefile.am | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index a1a87c0..eba34af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,7 +77,6 @@ MODULES = \
guix/packages.scm \
guix/import/utils.scm \
guix/import/snix.scm \
- guix/import/pypi.scm \
guix/scripts/download.scm \
guix/scripts/build.scm \
guix/scripts/archive.scm \
@@ -92,7 +91,6 @@ MODULES = \
guix/scripts/system.scm \
guix/scripts/lint.scm \
guix/scripts/import/nix.scm \
- guix/scripts/import/pypi.scm \
guix.scm \
$(GNU_SYSTEM_MODULES)
@@ -168,6 +166,10 @@ SCM_TESTS = \
if HAVE_GUILE_JSON
+MODULES += \
+ guix/import/pypi.scm \
+ guix/scripts/import/pypi.scm
+
SCM_TESTS += tests/pypi.scm
endif
--
2.1.0
next prev parent reply other threads:[~2014-09-30 5:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-27 21:15 [PATCH] import: Add PyPI importer David Thompson
2014-09-27 21:19 ` David Thompson
2014-09-27 21:35 ` Ludovic Courtès
2014-09-29 11:23 ` David Thompson
2014-09-29 12:24 ` Ludovic Courtès
2014-09-29 23:31 ` David Thompson
2014-09-30 5:49 ` Alex Kost [this message]
2014-09-30 7:13 ` Ludovic Courtès
2014-09-30 11:55 ` David Thompson
2014-09-27 21:49 ` Ludovic Courtès
2014-09-28 23:48 ` David Thompson
2014-09-29 7:04 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871tqtd5dv.fsf@gmail.com \
--to=alezost@gmail.com \
--cc=dthompson2@worcester.edu \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).