From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33236) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8BCw-0006Es-2s for guix-patches@gnu.org; Tue, 09 May 2017 15:54:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8BCs-0005n1-TY for guix-patches@gnu.org; Tue, 09 May 2017 15:54:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:60087) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d8BCs-0005mx-Oq for guix-patches@gnu.org; Tue, 09 May 2017 15:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d8BCs-0006Ag-Hh for guix-patches@gnu.org; Tue, 09 May 2017 15:54:02 -0400 Subject: bug#26860: [PATCH] Remove hard dependency on guile-json Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:32940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8BC6-0005d5-KO for guix-patches@gnu.org; Tue, 09 May 2017 15:53:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8BC3-0005bb-AT for guix-patches@gnu.org; Tue, 09 May 2017 15:53:14 -0400 Received: from mail-lf0-x22e.google.com ([2a00:1450:4010:c07::22e]:34393) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d8BC3-0005al-2U for guix-patches@gnu.org; Tue, 09 May 2017 15:53:11 -0400 Received: by mail-lf0-x22e.google.com with SMTP id 99so8427278lfu.1 for ; Tue, 09 May 2017 12:53:10 -0700 (PDT) Received: from leviafan ([217.107.194.130]) by smtp.gmail.com with ESMTPSA id y25sm166440lfj.31.2017.05.09.12.53.08 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 May 2017 12:53:08 -0700 (PDT) From: Alex Kost Date: Tue, 09 May 2017 22:53:07 +0300 Message-ID: <87shkdbye4.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26860@debbugs.gnu.org --=-=-= Content-Type: text/plain Hello. Currently, Guix cannot be built without guile-json. The attached patch fixes it. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-build-Compile-stackage-only-if-guile-json-is-availab.patch >From 3a65a2f35b54604327ba69a55381fee0faac18e7 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Tue, 9 May 2017 22:44:19 +0300 Subject: [PATCH] build: Compile stackage only if 'guile-json' is available. This is a followup to commit 3089b5d3f5a31b191b68ce3aa9255b646940b642. * Makefile.am (MODULES): Move "guix/scripts/import/stackage.scm" within 'if HAVE_GUILE_JSON'. --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index f6a8f66..8ea4f4b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -159,7 +159,6 @@ MODULES = \ guix/scripts/import/gnu.scm \ guix/scripts/import/nix.scm \ guix/scripts/import/hackage.scm \ - guix/scripts/import/stackage.scm \ guix/scripts/import/elpa.scm \ guix/scripts/environment.scm \ guix/scripts/publish.scm \ @@ -184,7 +183,8 @@ MODULES += \ guix/import/stackage.scm \ guix/scripts/import/crate.scm \ guix/scripts/import/gem.scm \ - guix/scripts/import/pypi.scm + guix/scripts/import/pypi.scm \ + guix/scripts/import/stackage.scm endif -- 2.10.2 --=-=-=--