diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-09-14 16:17:19 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-09-14 16:17:19 -0400 |
| commit | fa8fe90edb4efaf7d52f71516c4dcabb13d56418 (patch) | |
| tree | 8d69a1132e95845d8a3d90f1fe4d0ef04039e2f4 /Makefile.am | |
| parent | 1bec03df9b60f156c657a64a323ef27f4ed14b44 (diff) | |
| parent | d60739dff2e2f5eb74173b73a5fd207ef7cd110a (diff) | |
| download | guix-fa8fe90edb4efaf7d52f71516c4dcabb13d56418.tar.gz guix-fa8fe90edb4efaf7d52f71516c4dcabb13d56418.zip | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 9c38c2f83c..8e91e1e558 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,7 +68,6 @@ MODULES = \ guix/cpio.scm \ guix/deprecation.scm \ guix/docker.scm \ - guix/json.scm \ guix/records.scm \ guix/openpgp.scm \ guix/pki.scm \ @@ -80,6 +79,7 @@ MODULES = \ guix/modules.scm \ guix/download.scm \ guix/discovery.scm \ + guix/android-repo-download.scm \ guix/bzr-download.scm \ guix/git-download.scm \ guix/hg-download.scm \ @@ -170,6 +170,7 @@ MODULES = \ guix/build/minify-build-system.scm \ guix/build/font-build-system.scm \ guix/build/go-build-system.scm \ + guix/build/android-repo.scm \ guix/build/asdf-build-system.scm \ guix/build/bzr.scm \ guix/build/copy-build-system.scm \ @@ -335,10 +336,6 @@ AUX_FILES = \ gnu/packages/aux-files/linux-libre/5.8-arm64.conf \ gnu/packages/aux-files/linux-libre/5.8-i686.conf \ gnu/packages/aux-files/linux-libre/5.8-x86_64.conf \ - gnu/packages/aux-files/linux-libre/5.7-arm.conf \ - gnu/packages/aux-files/linux-libre/5.7-arm64.conf \ - gnu/packages/aux-files/linux-libre/5.7-i686.conf \ - gnu/packages/aux-files/linux-libre/5.7-x86_64.conf \ gnu/packages/aux-files/linux-libre/5.4-arm.conf \ gnu/packages/aux-files/linux-libre/5.4-arm64.conf \ gnu/packages/aux-files/linux-libre/5.4-i686.conf \ @@ -838,6 +835,7 @@ release: dist-with-updated-version image=`$(top_builddir)/pre-inst-env \ guix system disk-image \ --file-system-type=iso9660 \ + --label="GUIX_$${system}_$(VERSION)" \ --system=$$system --fallback \ gnu/system/install.scm` ; \ if [ ! -f "$$image" ] ; then \ |