diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-11-05 23:56:22 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-11-05 23:56:22 +0100 |
| commit | f4a5faa9dcadc698383e15743ac5f974ee0e3c8b (patch) | |
| tree | 96124567d5604c496cf8d2848ffe348de0b701ac /Makefile.am | |
| parent | 16b89ecc1f2f1f9651d119518c0e752b01f0f07b (diff) | |
| parent | adde15186da7529b85097fdafffc2a13b0e60bdf (diff) | |
| download | guix-f4a5faa9dcadc698383e15743ac5f974ee0e3c8b.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 7fd29b90a8..8c3df8f396 100644 --- a/Makefile.am +++ b/Makefile.am @@ -201,6 +201,7 @@ 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 \ @@ -279,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.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.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 \ @@ -343,6 +344,7 @@ SCM_TESTS = \ tests/ui.scm \ tests/status.scm \ tests/records.scm \ + tests/processes.scm \ tests/upstream.scm \ tests/combinators.scm \ tests/discovery.scm \ |