build-system: Add pyproject-build-system.

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

diff --git a/Makefile.am b/Makefile.am
index e536314..6ccb790 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,6 +130,7 @@ MODULES =                                   \
   guix/cve.scm                                 \
   guix/workers.scm                             \
   guix/least-authority.scm                     \
+  guix/read-print.scm                          \
   guix/ipfs.scm                                        \
   guix/platform.scm                             \
   guix/platforms/arm.scm                        \
@@ -141,6 +142,7 @@ MODULES =                                   \
   guix/build-system/android-ndk.scm            \
   guix/build-system/ant.scm                    \
   guix/build-system/cargo.scm                  \
+  guix/build-system/channel.scm                        \
   guix/build-system/chicken.scm                        \
   guix/build-system/clojure.scm                        \
   guix/build-system/cmake.scm                  \
@@ -164,6 +166,7 @@ MODULES =                                   \
   guix/build-system/maven.scm                  \
   guix/build-system/node.scm                   \
   guix/build-system/perl.scm                   \
+  guix/build-system/pyproject.scm              \
   guix/build-system/python.scm                 \
   guix/build-system/renpy.scm                  \
   guix/build-system/ocaml.scm                  \
@@ -220,6 +223,7 @@ MODULES =                                   \
   guix/build/minetest-build-system.scm         \
   guix/build/node-build-system.scm             \
   guix/build/perl-build-system.scm             \
+  guix/build/pyproject-build-system.scm                \
   guix/build/python-build-system.scm           \
   guix/build/ocaml-build-system.scm            \
   guix/build/qt-build-system.scm               \
@@ -395,10 +399,10 @@ AUX_FILES =                                               \
   gnu/packages/aux-files/chromium/master-preferences.json              \
   gnu/packages/aux-files/emacs/guix-emacs.el           \
   gnu/packages/aux-files/guix.vim                      \
-  gnu/packages/aux-files/linux-libre/5.18-arm.conf     \
-  gnu/packages/aux-files/linux-libre/5.18-arm64.conf   \
-  gnu/packages/aux-files/linux-libre/5.18-i686.conf    \
-  gnu/packages/aux-files/linux-libre/5.18-x86_64.conf  \
+  gnu/packages/aux-files/linux-libre/5.19-arm.conf     \
+  gnu/packages/aux-files/linux-libre/5.19-arm64.conf   \
+  gnu/packages/aux-files/linux-libre/5.19-i686.conf    \
+  gnu/packages/aux-files/linux-libre/5.19-x86_64.conf  \
   gnu/packages/aux-files/linux-libre/5.15-arm.conf     \
   gnu/packages/aux-files/linux-libre/5.15-arm64.conf   \
   gnu/packages/aux-files/linux-libre/5.15-i686.conf    \
@@ -524,12 +528,14 @@ SCM_TESTS =                                       \
   tests/profiles.scm                           \
   tests/publish.scm                            \
   tests/pypi.scm                               \
+  tests/read-print.scm                         \
   tests/records.scm                            \
   tests/scripts.scm                            \
   tests/search-paths.scm                       \
   tests/services.scm                           \
   tests/services/file-sharing.scm              \
   tests/services/configuration.scm             \
+  tests/services/lightdm.scm                   \
   tests/services/linux.scm                     \
   tests/services/telephony.scm                 \
   tests/sets.scm                               \
@@ -578,6 +584,7 @@ SH_TESTS =                                  \
   tests/guix-package.sh                                \
   tests/guix-package-aliases.sh                        \
   tests/guix-package-net.sh                    \
+  tests/guix-style.sh                          \
   tests/guix-system.sh                         \
   tests/guix-home.sh                           \
   tests/guix-archive.sh                                \
@@ -973,25 +980,21 @@ release: dist-with-updated-version all
          mv "guix-binary.$$system.tar.xz"                                      \
              "$(releasedir)/guix-binary-$(PACKAGE_VERSION).$$system.tar.xz" ;  \
        done
-# Bump the Guix package version and build it (again).
-       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                    \
+# Build 'current-guix' to speed things up for the next step.
+       $(top_builddir)/pre-inst-env guix build                         \
+             -e '((@ (gnu packages package-management) current-guix))' \
              $(call system_flags,$(GUIX_SYSTEM_SUPPORTED_SYSTEMS))     \
              -v1 --no-grafts --fallback
 # Generate the ISO installation images.
        for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do                             \
+         GUIX_DISPLAYED_VERSION="`git describe --match=v* | sed -'es/^v//v'`" ;        \
          image=`$(top_builddir)/pre-inst-env                                           \
-           guix system image -t iso9660                                                \
+           guix system image -t iso9660                                                \
            --label="GUIX_$${system}_$(VERSION)"                                        \
             --system=$$system --fallback                                               \
            gnu/system/install.scm` ;                                                   \
          if [ ! -f "$$image" ] ; then                                                  \
-           echo "failed to produce Guix installation image for $$system" >&2 ; \
+           echo "failed to produce Guix installation image for $$system" >&2 ;         \
            exit 1 ;                                                                    \
          fi ;                                                                          \
          cp "$$image" "$(releasedir)/$(GUIX_SYSTEM_IMAGE_BASE).$$system.iso.tmp" ;     \
@@ -1000,6 +1003,7 @@ release: dist-with-updated-version all
        done
 # Generate the VM images.
        for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do                                    \
+         GUIX_DISPLAYED_VERSION="`git describe --match=v* | sed -'es/^v//v'`" ;        \
          image=`$(top_builddir)/pre-inst-env                                           \
            guix system image -t qcow2 $(GUIX_SYSTEM_VM_IMAGE_FLAGS)                    \
            --save-provenance                                                           \