gexp: Allow bytevector as content of `plain-file'.

[jackhill/guix/guix.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f4cdba9..618d165 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,7 @@
 # Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
 # Copyright © 2018 Nils Gillmann <ng0@n0.is>
 # Copyright © 2018 Julien Lepiller <julien@lepiller.eu>
+# Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
 #
 # This file is part of GNU Guix.
 #
@@ -230,11 +231,13 @@ MODULES +=                                        \
   guix/import/github.scm                       \
   guix/import/gnome.scm                                \
   guix/import/json.scm                         \
+  guix/import/opam.scm                         \
   guix/import/pypi.scm                         \
   guix/import/stackage.scm                     \
   guix/scripts/import/crate.scm                        \
   guix/scripts/import/gem.scm                  \
   guix/scripts/import/json.scm                 \
+  guix/scripts/import/opam.scm                 \
   guix/scripts/import/pypi.scm                 \
   guix/scripts/import/stackage.scm             \
   guix/scripts/weather.scm
@@ -281,8 +284,6 @@ AUX_FILES =                                         \
   gnu/packages/aux-files/linux-libre/4.9-x86_64.conf   \
   gnu/packages/aux-files/linux-libre/4.4-i686.conf     \
   gnu/packages/aux-files/linux-libre/4.4-x86_64.conf   \
-  gnu/packages/aux-files/linux-libre/4.1-i686.conf     \
-  gnu/packages/aux-files/linux-libre/4.1-x86_64.conf   \
   gnu/packages/aux-files/run-in-namespace.c
 
 # Templates, examples.
@@ -383,6 +384,7 @@ if HAVE_GUILE_JSON
 
 SCM_TESTS +=                                   \
   tests/pypi.scm                               \
+  tests/opam.scm                               \
   tests/cpan.scm                               \
   tests/gem.scm                                        \
   tests/crate.scm
@@ -405,13 +407,6 @@ SH_TESTS =                                 \
   tests/guix-graph.sh                          \
   tests/guix-lint.sh
 
-if BUILD_DAEMON
-
-SH_TESTS += tests/guix-register.sh
-
-endif BUILD_DAEMON
-
-
 TESTS = $(SCM_TESTS) $(SH_TESTS)
 
 AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)" GUILE_AUTO_COMPILE=0
@@ -461,7 +456,8 @@ dist_pkgdata_DATA =                         \
   berlin.guixsd.org.pub
 
 # Bash completion file.
-dist_bashcompletion_DATA = etc/completion/bash/guix
+dist_bashcompletion_DATA = etc/completion/bash/guix    \
+  etc/completion/bash/guix-daemon
 
 # Zsh completion file.
 dist_zshcompletion_DATA = etc/completion/zsh/_guix