gnu: python2-pygobject@2: Shorten patch file name.

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

diff --git a/Makefile.am b/Makefile.am
index 8e91e1e..e7053ee 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,6 +47,18 @@ scripts/guix: scripts/guix.in Makefile
        $(AM_V_GEN)$(do_subst) < "$(srcdir)/$@.in" > "$@-t"
        $(AM_V_at)chmod a+x,a-w "$@-t" && mv -f "$@-t" "$@"
 
+# This is our variant of the 'guile' executable, one that doesn't complain
+# about locales.
+pkglibexec_PROGRAMS = guile
+guile_SOURCES = gnu/packages/aux-files/guile-launcher.c
+guile_LDADD   = $(GUILE_LIBS)
+guile_CFLAGS  = $(GUILE_CFLAGS)
+
+# Have the 'guix' command refer to our 'guile'.
+install-exec-hook:
+       $(SED) -i "$(DESTDIR)$(bindir)/guix"                            \
+              -e 's,^#![[:graph:]]\+,#!$(pkglibexecdir)/guile,g'
+
 nodist_noinst_SCRIPTS =                                \
   pre-inst-env                                 \
   test-env
@@ -93,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                              \
@@ -332,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     \
@@ -395,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                        \
@@ -443,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                     \
@@ -460,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                           \
@@ -548,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                                              \
@@ -571,6 +585,7 @@ EXTRA_DIST +=                                               \
   build-aux/hydra/guix-modular.scm                     \
   build-aux/cuirass/gnu-system.scm                     \
   build-aux/cuirass/guix-modular.scm                   \
+  build-aux/cuirass/hurd-manifest.scm                  \
   build-aux/cuirass/hydra-to-cuirass.scm               \
   build-aux/check-final-inputs-self-contained.scm      \
   build-aux/check-channel-news.scm                     \
@@ -652,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)"
 
@@ -833,9 +850,8 @@ release: dist-with-updated-version
              -v1 --no-grafts --fallback
        for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do                             \
          image=`$(top_builddir)/pre-inst-env                                           \
-           guix system disk-image                                                      \
-           --file-system-type=iso9660                                                  \
-           --label="GUIX_$${system}_$(VERSION)"                                                \
+           guix system disk-image -t iso9660                                           \
+           --label="GUIX_$${system}_$(VERSION)"                                        \
             --system=$$system --fallback                                               \
            gnu/system/install.scm` ;                                                   \
          if [ ! -f "$$image" ] ; then                                                  \