gnu: easyrpg-player: Update to 0.6.2.2.
[jackhill/guix/guix.git] / Makefile.am
index 9cf9318..8e91e1e 100644 (file)
@@ -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                         \
@@ -109,8 +109,6 @@ MODULES =                                   \
   guix/cache.scm                               \
   guix/cve.scm                                 \
   guix/workers.scm                             \
-  guix/zlib.scm                                        \
-  guix/lzlib.scm                               \
   guix/build-system.scm                                \
   guix/build-system/android-ndk.scm            \
   guix/build-system/ant.scm                    \
@@ -132,6 +130,7 @@ MODULES =                                   \
   guix/build-system/haskell.scm                        \
   guix/build-system/julia.scm                  \
   guix/build-system/linux-module.scm           \
+  guix/build-system/maven.scm                  \
   guix/build-system/node.scm                   \
   guix/build-system/perl.scm                   \
   guix/build-system/python.scm                 \
@@ -171,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             \
@@ -181,6 +181,7 @@ MODULES =                                   \
   guix/build/gnu-build-system.scm              \
   guix/build/gnu-dist.scm                      \
   guix/build/guile-build-system.scm            \
+  guix/build/maven-build-system.scm            \
   guix/build/node-build-system.scm             \
   guix/build/perl-build-system.scm             \
   guix/build/python-build-system.scm           \
@@ -212,6 +213,9 @@ MODULES =                                   \
   guix/build/emacs-utils.scm                   \
   guix/build/java-utils.scm                    \
   guix/build/lisp-utils.scm                    \
+  guix/build/maven/java.scm                    \
+  guix/build/maven/plugin.scm                  \
+  guix/build/maven/pom.scm                     \
   guix/build/graft.scm                         \
   guix/build/bournish.scm                      \
   guix/build/qt-utils.scm                      \
@@ -281,6 +285,8 @@ MODULES =                                   \
   guix/scripts/publish.scm                     \
   guix/scripts/edit.scm                                \
   guix/scripts/size.scm                                \
+  guix/scripts/git.scm                         \
+  guix/scripts/git/authenticate.scm            \
   guix/scripts/graph.scm                       \
   guix/scripts/weather.scm                     \
   guix/scripts/container.scm                   \
@@ -326,6 +332,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.4-arm.conf      \
   gnu/packages/aux-files/linux-libre/5.4-arm64.conf    \
   gnu/packages/aux-files/linux-libre/5.4-i686.conf     \
@@ -416,11 +426,11 @@ SCM_TESTS =                                       \
   tests/import-utils.scm                       \
   tests/inferior.scm                           \
   tests/lint.scm                               \
-  tests/lzlib.scm                              \
   tests/modules.scm                            \
   tests/monads.scm                             \
   tests/nar.scm                                \
   tests/networking.scm                         \
+  tests/offload.scm                            \
   tests/opam.scm                               \
   tests/openpgp.scm                            \
   tests/packages.scm                           \
@@ -455,14 +465,14 @@ SCM_TESTS =                                       \
   tests/upstream.scm                           \
   tests/utils.scm                              \
   tests/uuid.scm                               \
-  tests/workers.scm                            \
-  tests/zlib.scm
+  tests/workers.scm
 
 SH_TESTS =                                     \
   tests/guix-build.sh                          \
   tests/guix-build-branch.sh                   \
   tests/guix-download.sh                       \
   tests/guix-gc.sh                             \
+  tests/guix-git-authenticate.sh               \
   tests/guix-hash.sh                           \
   tests/guix-pack.sh                           \
   tests/guix-pack-localstatedir.sh             \
@@ -477,6 +487,7 @@ SH_TESTS =                                  \
   tests/guix-environment-container.sh          \
   tests/guix-graph.sh                          \
   tests/guix-describe.sh                       \
+  tests/guix-repl.sh                           \
   tests/guix-lint.sh
 
 TESTS = $(SCM_TESTS) $(SH_TESTS)
@@ -522,7 +533,7 @@ check-system: $(GOBJECTS)
 
 # Public keys used to sign substitutes.
 dist_pkgdata_DATA =                            \
-  etc/substitutes/berlin.guixsd.org.pub                \
+  etc/substitutes/berlin.guix.gnu.org.pub      \
   etc/substitutes/ci.guix.gnu.org.pub          \
   etc/substitutes/ci.guix.info.pub
 
@@ -551,6 +562,7 @@ EXTRA_DIST +=                                               \
   etc/news.scm                                         \
   etc/release-manifest.scm                             \
   etc/system-tests.scm                                 \
+  etc/historical-authorizations                                \
   build-aux/build-self.scm                             \
   build-aux/compile-all.scm                            \
   build-aux/hydra/evaluate.scm                         \
@@ -564,7 +576,6 @@ EXTRA_DIST +=                                               \
   build-aux/check-channel-news.scm                     \
   build-aux/compile-as-derivation.scm                  \
   build-aux/generate-authors.scm                       \
-  build-aux/git-authenticate.scm                       \
   build-aux/test-driver.scm                            \
   build-aux/update-guix-package.scm                    \
   build-aux/update-NEWS.scm                            \
@@ -636,14 +647,16 @@ install-data-hook:
 # Commit corresponding to the 'v1.0.0' tag.
 commit_v1_0_0 = 6298c3ffd9654d3231a6f25390b056483e8f407c
 
-# Authenticate the current Git checkout by checking signatures on every commit
-# starting from $(commit_v1_0_0).
-authenticate: guix/openpgp.go guix/git-authenticate.go guix/git.go
+# Introduction of the 'guix' channel.  Keep in sync with (guix channels)!
+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.
+authenticate:
        $(AM_V_at)echo "Authenticating Git checkout..." ;       \
-       "$(top_builddir)/pre-inst-env" $(GUILE)                 \
-         --no-auto-compile -e git-authenticate                 \
-         "$(top_srcdir)/build-aux/git-authenticate.scm"        \
-         "$(commit_v1_0_0)"
+       guix git authenticate                                   \
+           --cache-key=channels/guix --stats                   \
+           "$(channel_intro_commit)" "$(channel_intro_signer)"
 
 # Assuming Guix is already installed and the daemon is up and running, this
 # rule builds from $(srcdir), creating and building derivations.
@@ -822,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                                                  \