From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: Re: [PATCH] import: Add PyPI importer. Date: Tue, 30 Sep 2014 09:49:48 +0400 Message-ID: <871tqtd5dv.fsf@gmail.com> References: <8761g8ojde.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me> <8738bcoj77.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me> <874mvsg31g.fsf@gnu.org> <87fvfazn4z.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me> <877g0mzk9y.fsf@gnu.org> <87y4t2knq8.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYqK3-0004IP-Hl for guix-devel@gnu.org; Tue, 30 Sep 2014 01:50:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XYqJs-0002RP-Vz for guix-devel@gnu.org; Tue, 30 Sep 2014 01:50:00 -0400 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") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: David Thompson Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable David Thompson (2014-09-30 03:31 +0400) wrote: > Ludovic Court=C3=A8s writes: > >> David Thompson 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" =3D "xyes"= ]) >> >> and in Makefile.am: >> >> if HAVE_GUILE_JSON >> TESTS +=3D 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 =E2=80=9CMakefile.am=E2=80=9D like t= his: --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-build-Build-pypi-modules-only-if-guile-json-is-avail.patch >From 85054932667d57224dde1d18c381d7d7c0a95dd4 Mon Sep 17 00:00:00 2001 From: Alex Kost 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 --=-=-=--