diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-09-22 06:25:20 +0000 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-09-22 06:25:20 +0000 |
| commit | 0cccc2f52cedd9b0e0646cc4d3ae64a886f2db6b (patch) | |
| tree | d9724175476a27a7234140519e035c8d4c79aedc /Makefile.am | |
| parent | 22f7d4bce1e694b7ac38e62410d76a6d46d96c5d (diff) | |
| parent | d58e52b0713648dd30d41b41277854a935d8d15a (diff) | |
| download | guix-0cccc2f52cedd9b0e0646cc4d3ae64a886f2db6b.tar.gz | |
Merge remote-tracking branch core-updates-frozen into core-updates
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 2fef3b05ab..56f60278b7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -141,6 +141,7 @@ MODULES = \ guix/build-system/go.scm \ guix/build-system/meson.scm \ guix/build-system/minify.scm \ + guix/build-system/minetest.scm \ guix/build-system/asdf.scm \ guix/build-system/copy.scm \ guix/build-system/glib-or-gtk.scm \ @@ -203,6 +204,7 @@ MODULES = \ guix/build/gnu-dist.scm \ guix/build/guile-build-system.scm \ guix/build/maven-build-system.scm \ + guix/build/minetest-build-system.scm \ guix/build/node-build-system.scm \ guix/build/perl-build-system.scm \ guix/build/python-build-system.scm \ @@ -260,6 +262,7 @@ MODULES = \ guix/import/json.scm \ guix/import/kde.scm \ guix/import/launchpad.scm \ + guix/import/minetest.scm \ guix/import/opam.scm \ guix/import/print.scm \ guix/import/pypi.scm \ @@ -303,6 +306,7 @@ MODULES = \ guix/scripts/import/go.scm \ guix/scripts/import/hackage.scm \ guix/scripts/import/json.scm \ + guix/scripts/import/minetest.scm \ guix/scripts/import/opam.scm \ guix/scripts/import/pypi.scm \ guix/scripts/import/stackage.scm \ @@ -367,14 +371,14 @@ AUX_FILES = \ gnu/packages/aux-files/chromium/master-preferences.json \ gnu/packages/aux-files/emacs/guix-emacs.el \ gnu/packages/aux-files/guix.vim \ + gnu/packages/aux-files/linux-libre/5.14-arm.conf \ + gnu/packages/aux-files/linux-libre/5.14-arm64.conf \ + gnu/packages/aux-files/linux-libre/5.14-i686.conf \ + gnu/packages/aux-files/linux-libre/5.14-x86_64.conf \ gnu/packages/aux-files/linux-libre/5.13-arm.conf \ gnu/packages/aux-files/linux-libre/5.13-arm64.conf \ gnu/packages/aux-files/linux-libre/5.13-i686.conf \ gnu/packages/aux-files/linux-libre/5.13-x86_64.conf \ - gnu/packages/aux-files/linux-libre/5.12-arm.conf \ - gnu/packages/aux-files/linux-libre/5.12-arm64.conf \ - gnu/packages/aux-files/linux-libre/5.12-i686.conf \ - gnu/packages/aux-files/linux-libre/5.12-x86_64.conf \ gnu/packages/aux-files/linux-libre/5.10-arm.conf \ gnu/packages/aux-files/linux-libre/5.10-arm64.conf \ gnu/packages/aux-files/linux-libre/5.10-i686.conf \ @@ -475,6 +479,7 @@ SCM_TESTS = \ tests/import-utils.scm \ tests/inferior.scm \ tests/lint.scm \ + tests/minetest.scm \ tests/modules.scm \ tests/monads.scm \ tests/nar.scm \ @@ -496,6 +501,7 @@ SCM_TESTS = \ tests/services/file-sharing.scm \ tests/services/configuration.scm \ tests/services/linux.scm \ + tests/services/telephony.scm \ tests/sets.scm \ tests/size.scm \ tests/status.scm \ @@ -519,6 +525,8 @@ SCM_TESTS = \ if HAVE_GUILE_LIB SCM_TESTS += tests/go.scm +else +EXTRA_DIST += tests/go.scm endif if BUILD_DAEMON_OFFLOAD @@ -620,9 +628,11 @@ EXTRA_DIST += \ .guix-authorizations \ .guix-channel \ scripts/guix.in \ + etc/disarchive-manifest.scm \ etc/guix-install.sh \ etc/news.scm \ etc/release-manifest.scm \ + etc/source-manifest.scm \ etc/system-tests.scm \ etc/historical-authorizations \ build-aux/build-self.scm \ |