HCoop / jackhill / guix / guix.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
guix system: Simplify bootloader package handling.
[jackhill/guix/guix.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index f4cdba9..c63b65b 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.
 #
@@ -62,9 +63,6 @@ MODULES =                                     \
   guix/base64.scm                              \
   guix/cpio.scm                                        \
   guix/records.scm                             \
-  guix/gcrypt.scm                              \
-  guix/hash.scm                                        \
-  guix/pk-crypto.scm                           \
   guix/pki.scm                                 \
   guix/progress.scm                            \
   guix/combinators.scm                         \
@@ -84,6 +82,9 @@ MODULES =                                     \
   guix/nar.scm                                 \
   guix/derivations.scm                         \
   guix/grafts.scm                              \
+  guix/inferior.scm                            \
+  guix/describe.scm                            \
+  guix/channels.scm                            \
   guix/gnu-maintenance.scm                     \
   guix/self.scm                                        \
   guix/upstream.scm                            \
@@ -109,6 +110,7 @@ MODULES =                                   \
   guix/build-system/asdf.scm                   \
   guix/build-system/glib-or-gtk.scm            \
   guix/build-system/gnu.scm                    \
+  guix/build-system/guile.scm                  \
   guix/build-system/haskell.scm                        \
   guix/build-system/perl.scm                   \
   guix/build-system/python.scm                 \
@@ -129,6 +131,7 @@ MODULES =                                   \
   guix/svn-download.scm                                \
   guix/i18n.scm                                        \
   guix/ui.scm                                  \
+  guix/status.scm                              \
   guix/build/android-ndk-build-system.scm      \
   guix/build/ant-build-system.scm              \
   guix/build/download.scm                      \
@@ -147,6 +150,7 @@ MODULES =                                   \
   guix/build/glib-or-gtk-build-system.scm      \
   guix/build/gnu-build-system.scm              \
   guix/build/gnu-dist.scm                      \
+  guix/build/guile-build-system.scm            \
   guix/build/perl-build-system.scm             \
   guix/build/python-build-system.scm           \
   guix/build/ocaml-build-system.scm            \
@@ -167,6 +171,7 @@ MODULES =                                   \
   guix/build/svn.scm                           \
   guix/build/syscalls.scm                       \
   guix/build/gremlin.scm                       \
+  guix/build/debug-link.scm                    \
   guix/build/emacs-utils.scm                   \
   guix/build/java-utils.scm                    \
   guix/build/lisp-utils.scm                    \
@@ -196,9 +201,12 @@ MODULES =                                  \
   guix/scripts/hash.scm                                \
   guix/scripts/pack.scm                                \
   guix/scripts/pull.scm                                \
+  guix/scripts/processes.scm                   \
   guix/scripts/substitute.scm                  \
   guix/scripts/authenticate.scm                        \
   guix/scripts/refresh.scm                     \
+  guix/scripts/repl.scm                                \
+  guix/scripts/describe.scm                    \
   guix/scripts/system.scm                      \
   guix/scripts/system/search.scm               \
   guix/scripts/lint.scm                                \
@@ -230,11 +238,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
@@ -270,10 +280,10 @@ dist_noinst_DATA = guix/tests.scm guix/tests/http.scm
 # Auxiliary files for packages.
 AUX_FILES =                                            \
   gnu/packages/aux-files/emacs/guix-emacs.el           \
-  gnu/packages/aux-files/linux-libre/4.17-arm.conf     \
-  gnu/packages/aux-files/linux-libre/4.17-arm64.conf   \
-  gnu/packages/aux-files/linux-libre/4.17-i686.conf    \
-  gnu/packages/aux-files/linux-libre/4.17-x86_64.conf  \
+  gnu/packages/aux-files/linux-libre/4.19-arm.conf     \
+  gnu/packages/aux-files/linux-libre/4.19-arm64.conf   \
+  gnu/packages/aux-files/linux-libre/4.19-i686.conf    \
+  gnu/packages/aux-files/linux-libre/4.19-x86_64.conf  \
   gnu/packages/aux-files/linux-libre/4.14-arm.conf     \
   gnu/packages/aux-files/linux-libre/4.14-i686.conf    \
   gnu/packages/aux-files/linux-libre/4.14-x86_64.conf  \
@@ -281,8 +291,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.
@@ -323,8 +331,6 @@ SCM_TESTS =                                 \
   tests/base32.scm                             \
   tests/base64.scm                             \
   tests/cpio.scm                               \
-  tests/hash.scm                               \
-  tests/pk-crypto.scm                          \
   tests/pki.scm                                        \
   tests/print.scm                              \
   tests/sets.scm                               \
@@ -336,7 +342,9 @@ SCM_TESTS =                                 \
   tests/glob.scm                               \
   tests/grafts.scm                             \
   tests/ui.scm                                 \
+  tests/status.scm                             \
   tests/records.scm                            \
+  tests/processes.scm                          \
   tests/upstream.scm                           \
   tests/combinators.scm                                \
   tests/discovery.scm                          \
@@ -356,7 +364,9 @@ SCM_TESTS =                                 \
   tests/profiles.scm                           \
   tests/search-paths.scm                       \
   tests/syscalls.scm                           \
+  tests/inferior.scm                           \
   tests/gremlin.scm                            \
+  tests/debug-link.scm                         \
   tests/bournish.scm                           \
   tests/lint.scm                               \
   tests/publish.scm                            \
@@ -383,6 +393,7 @@ if HAVE_GUILE_JSON
 
 SCM_TESTS +=                                   \
   tests/pypi.scm                               \
+  tests/opam.scm                               \
   tests/cpan.scm                               \
   tests/gem.scm                                        \
   tests/crate.scm
@@ -395,6 +406,7 @@ SH_TESTS =                                  \
   tests/guix-gc.sh                             \
   tests/guix-hash.sh                           \
   tests/guix-pack.sh                           \
+  tests/guix-pack-relocatable.sh               \
   tests/guix-package.sh                                \
   tests/guix-package-net.sh                    \
   tests/guix-system.sh                         \
@@ -403,15 +415,9 @@ SH_TESTS =                                 \
   tests/guix-environment.sh                    \
   tests/guix-environment-container.sh          \
   tests/guix-graph.sh                          \
+  tests/guix-describe.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
@@ -457,11 +463,12 @@ check-system: $(GOBJECTS)
 
 # Public key used to sign substitutes from hydra.gnu.org & co.
 dist_pkgdata_DATA =                            \
-  hydra.gnu.org.pub                            \
-  berlin.guixsd.org.pub
+  etc/substitutes/hydra.gnu.org.pub            \
+  etc/substitutes/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
@@ -499,8 +506,6 @@ EXTRA_DIST +=                                               \
   build-aux/run-system-tests.scm                       \
   d3.v3.js                                             \
   graph.js                                             \
-  srfi/srfi-64.scm                                     \
-  srfi/srfi-64.upstream.scm                            \
   tests/test.drv                                       \
   tests/signing-key.pub                                        \
   tests/signing-key.sec                                        \
jackhill's copy of GNU Guix: https://guix.gnu.org/