summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-08-25 16:44:07 +0200
committerMarius Bakke <mbakke@fastmail.com>2018-08-25 16:44:07 +0200
commit839167ff9d74fc490b32f6a197591964f73b65e5 (patch)
treed193bfad7c9ef5597c5cd7d2ea25fd007d01f88a /Makefile.am
parent27c1df05a866b639a61e16d48b3f2da8fa5eb767 (diff)
parent030c912616c8ee1595218e304460041bcb4f1ceb (diff)
downloadguix-patches-839167ff9d74fc490b32f6a197591964f73b65e5.tar
guix-patches-839167ff9d74fc490b32f6a197591964f73b65e5.tar.gz
Merge branch 'staging' into core-updates
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am10
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index b4cd07ed22..324674a60e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -171,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 \
@@ -277,10 +278,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.18-arm.conf \
+ gnu/packages/aux-files/linux-libre/4.18-arm64.conf \
+ gnu/packages/aux-files/linux-libre/4.18-i686.conf \
+ gnu/packages/aux-files/linux-libre/4.18-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 \
@@ -363,6 +364,7 @@ SCM_TESTS = \
tests/syscalls.scm \
tests/inferior.scm \
tests/gremlin.scm \
+ tests/debug-link.scm \
tests/bournish.scm \
tests/lint.scm \
tests/publish.scm \