gnu: python-flask-basicauth: Fix indentation.

[jackhill/guix/guix.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a75d9c1..6faf8c9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -105,6 +105,7 @@ MODULES =                                   \
   guix/derivations.scm                         \
   guix/grafts.scm                              \
   guix/repl.scm                                        \
+  guix/transformations.scm                     \
   guix/inferior.scm                            \
   guix/describe.scm                            \
   guix/quirks.scm                              \
@@ -344,10 +345,10 @@ dist_noinst_DATA =                                \
 AUX_FILES =                                            \
   gnu/packages/aux-files/chromium/master-preferences.json              \
   gnu/packages/aux-files/emacs/guix-emacs.el           \
-  gnu/packages/aux-files/linux-libre/5.8-arm.conf       \
-  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.9-arm.conf       \
+  gnu/packages/aux-files/linux-libre/5.9-arm64.conf     \
+  gnu/packages/aux-files/linux-libre/5.9-i686.conf      \
+  gnu/packages/aux-files/linux-libre/5.9-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     \
@@ -407,6 +408,7 @@ SCM_TESTS =                                 \
   tests/base16.scm                             \
   tests/base32.scm                             \
   tests/base64.scm                             \
+  tests/boot-parameters.scm                    \
   tests/bournish.scm                           \
   tests/builders.scm                           \
   tests/build-utils.scm                        \
@@ -455,7 +457,6 @@ SCM_TESTS =                                 \
   tests/pypi.scm                               \
   tests/records.scm                            \
   tests/scripts.scm                            \
-  tests/scripts-build.scm                      \
   tests/search-paths.scm                       \
   tests/services.scm                           \
   tests/services/linux.scm                     \
@@ -472,6 +473,7 @@ SCM_TESTS =                                 \
   tests/syscalls.scm                           \
   tests/system.scm                             \
   tests/texlive.scm                            \
+  tests/transformations.scm                    \
   tests/ui.scm                                 \
   tests/union.scm                              \
   tests/upstream.scm                           \
@@ -560,7 +562,7 @@ dist_zshcompletion_DATA = etc/completion/zsh/_guix
 dist_fishcompletion_DATA = etc/completion/fish/guix.fish
 
 # SELinux policy
-dist_selinux_policy_DATA = etc/guix-daemon.cil
+nodist_selinux_policy_DATA = etc/guix-daemon.cil.in
 
 EXTRA_DIST +=                                          \
   HACKING                                              \
@@ -665,9 +667,11 @@ channel_intro_commit = 9edb3f66fd807b096b48283debdcddccfea34bad
 channel_intro_signer = BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA
 
 # Authenticate the current Git checkout by checking signatures on every commit.
+GUIX_GIT_KEYRING = origin/keyring
 authenticate:
        $(AM_V_at)echo "Authenticating Git checkout..." ;       \
        guix git authenticate                                   \
+           --keyring=$(GUIX_GIT_KEYRING)                       \
            --cache-key=channels/guix --stats                   \
            "$(channel_intro_commit)" "$(channel_intro_signer)"
 
@@ -822,9 +826,10 @@ release: dist-with-updated-version
        $(MKDIR_P) "$(releasedir)"
        rm -f "$(releasedir)"/*
        mv $(SOURCE_TARBALLS) "$(releasedir)"
-       $(top_builddir)/pre-inst-env "$(GUILE)"                 \
-          $(top_srcdir)/build-aux/update-guix-package.scm      \
-          "`git rev-parse HEAD`" "$(PACKAGE_VERSION)"
+       GUIX_ALLOW_ME_TO_USE_PRIVATE_COMMIT=yes \
+       $(top_builddir)/pre-inst-env "$(GUILE)" \
+               $(top_srcdir)/build-aux/update-guix-package.scm \
+               "`git rev-parse HEAD`" "$(PACKAGE_VERSION)"
        git add $(top_srcdir)/gnu/packages/package-management.scm
        git commit -m "gnu: guix: Update to $(PACKAGE_VERSION)."
        $(top_builddir)/pre-inst-env guix build $(GUIX_FOR_BINARY_TARBALL)      \
@@ -836,9 +841,10 @@ release: dist-with-updated-version
          mv "guix-binary.$$system.tar.xz"                                      \
              "$(releasedir)/guix-binary-$(PACKAGE_VERSION).$$system.tar.xz" ;  \
        done
-       $(top_builddir)/pre-inst-env "$(GUILE)"                 \
-          $(top_srcdir)/build-aux/update-guix-package.scm      \
-          "`git rev-parse HEAD`"
+       GUIX_ALLOW_ME_TO_USE_PRIVATE_COMMIT=yes \
+       $(top_builddir)/pre-inst-env "$(GUILE)" \
+               $(top_srcdir)/build-aux/update-guix-package.scm \
+               "`git rev-parse HEAD`"
        git add $(top_srcdir)/gnu/packages/package-management.scm
        git commit -m "gnu: guix: Update to `git rev-parse HEAD | cut -c1-7`."
        $(top_builddir)/pre-inst-env guix build guix                    \