all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Alex Kost <alezost@gmail.com>
To: 26860@debbugs.gnu.org
Subject: bug#26860: [PATCH] Remove hard dependency on guile-json
Date: Tue, 09 May 2017 22:53:07 +0300	[thread overview]
Message-ID: <87shkdbye4.fsf@gmail.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 91 bytes --]

Hello.  Currently, Guix cannot be built without guile-json.  The
attached patch fixes it.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-build-Compile-stackage-only-if-guile-json-is-availab.patch --]
[-- Type: text/x-diff, Size: 1124 bytes --]

From 3a65a2f35b54604327ba69a55381fee0faac18e7 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
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


             reply	other threads:[~2017-05-09 19:54 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-09 19:53 Alex Kost [this message]
2017-05-09 20:43 ` bug#26860: [PATCH] Remove hard dependency on guile-json Danny Milosavljevic
2017-05-10  6:38 ` Ricardo Wurmus
2017-05-10 19:18   ` Alex Kost
2017-05-17  8:33   ` Ludovic Courtès
2017-05-17 13:29 ` 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87shkdbye4.fsf@gmail.com \
    --to=alezost@gmail.com \
    --cc=26860@debbugs.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 external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.