Merge branch 'version-1.5.0'

Change-Id: Id73c0c74600a3da3373b3a37236b505af65bfe31

1 files changed, 8 insertions, 3 deletions

diff --git a/Makefile.am b/Makefile.am
index e71b2d2ed5e..7904fd05937 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -376,6 +376,7 @@ MODULES =					\
   guix/scripts/import/luanti.scm                \
   guix/scripts/import/minetest.scm              \
   guix/scripts/import/npm-binary.scm            \
+  guix/scripts/import/nuget.scm                 \
   guix/scripts/import/opam.scm                  \
   guix/scripts/import/pypi.scm                  \
   guix/scripts/import/stackage.scm              \
@@ -505,7 +506,8 @@ EXAMPLES =					\
   gnu/system/examples/plasma.tmpl               \
   gnu/system/examples/raspberry-pi-64.tmpl      \
   gnu/system/examples/raspberry-pi-64-nfs-root.tmpl     \
-  gnu/system/examples/vm-image.tmpl
+  gnu/system/examples/vm-image.tmpl             \
+  gnu/system/examples/vm-image-efi.tmpl
 
 GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go)
 
@@ -748,7 +750,7 @@ dist_fishcompletion_DATA = etc/completion/fish/guix.fish
 nodist_selinux_policy_DATA = etc/guix-daemon.cil
 
 # AppArmor profiles.
-nodist_apparmor_profile_DATA =  \
+dist_apparmor_profile_DATA =    \
   etc/apparmor.d/guix           \
   etc/apparmor.d/guix-daemon
 
@@ -772,9 +774,12 @@ EXTRA_DIST +=						\
   build-aux/compile-as-derivation.scm                   \
   build-aux/config.rpath                                \
   build-aux/convert-xref.scm                            \
+  build-aux/cuirass/evaluate.scm                        \
   build-aux/extract-syscall-ranges.sh                   \
   build-aux/generate-authors.scm                        \
+  build-aux/gitlog-to-changelog                         \
   build-aux/git-version-gen                             \
+  build-aux/keep-only-translated.scm                    \
   build-aux/mdate-from-git.scm                          \
   build-aux/test-driver.scm                             \
   build-aux/update-NEWS.scm                             \
@@ -1186,7 +1191,7 @@ release: all
         $(MKDIR_P) "$(releasedir)"
         @echo "Building guix inferior for current commit."
         COMMIT="$$(git rev-parse HEAD)" &&                                      \
-        GUIX="$$(guix time-machine --commit=$$COMMIT)/bin/guix" &&              \
+        GUIX="$$(guix time-machine -q --commit=$$COMMIT)/bin/guix" &&           \
         echo "Building artifacts for current commit: $$COMMIT." &&              \
         ARTIFACTS="$$($$GUIX build --no-grafts                                  \
                 -f ./etc/teams/release/artifacts.scm)" &&                       \