[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/17: build: Compile stackage only if 'guile-json' is available.
From: |
Ludovic Courtès |
Subject: |
06/17: build: Compile stackage only if 'guile-json' is available. |
Date: |
Sat, 20 May 2017 04:24:04 -0400 (EDT) |
civodul pushed a commit to branch version-0.13.0
in repository guix.
commit 37fd9567710b0fc0d7b083f8a1eba3528597c2f6
Author: Alex Kost <address@hidden>
Date: Tue May 9 22:44:19 2017 +0300
build: Compile stackage only if 'guile-json' is available.
Fixes <http://bugs.gnu.org/26860>.
This is a followup to commit 3089b5d3f5a31b191b68ce3aa9255b646940b642.
* Makefile.am (MODULES): Move "guix/scripts/import/stackage.scm" within
'if HAVE_GUILE_JSON'.
Signed-off-by: Ludovic Courtès <address@hidden>
---
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index e1c7cdd..b90f419 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -160,7 +160,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 \
@@ -185,7 +184,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
- branch version-0.13.0 updated (920803f -> 03119da), Ludovic Courtès, 2017/05/20
- 04/17: profiles: Add elapsed time to manual-database hook to output message., Ludovic Courtès, 2017/05/20
- 01/17: gnu: tor: Update to 0.3.0.7., Ludovic Courtès, 2017/05/20
- 02/17: gnu: glibc/hurd: Use modify-phases syntax., Ludovic Courtès, 2017/05/20
- 03/17: gnu: glibc/hurd: Do not apply i686 patch., Ludovic Courtès, 2017/05/20
- 06/17: build: Compile stackage only if 'guile-json' is available.,
Ludovic Courtès <=
- 09/17: services: openssh: Don't depend on networking., Ludovic Courtès, 2017/05/20
- 11/17: services: user-homes: Do not create home directories marked as no-create., Ludovic Courtès, 2017/05/20
- 10/17: install: Enable SSH in installation image., Ludovic Courtès, 2017/05/20
- 15/17: gnu: guile-ssh: Fix potential double-free/use-after-free issue., Ludovic Courtès, 2017/05/20
- 07/17: gnu: aspell: 'dict-dir' set to ~/.guix-profile/lib/aspell or $ASPELL_DICT_DIR., Ludovic Courtès, 2017/05/20
- 14/17: modules: Add more source-less modules., Ludovic Courtès, 2017/05/20
- 12/17: union: Gracefully handle dangling symlinks in the input., Ludovic Courtès, 2017/05/20
- 13/17: publish: Fix narinfo rendering for already-compressed items., Ludovic Courtès, 2017/05/20
- 17/17: vm: Support creating FAT partitions., Ludovic Courtès, 2017/05/20
- 05/17: gnu: qemu: Fix CVE-2017-7493., Ludovic Courtès, 2017/05/20