build-system: Add pyproject-build-system.

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

diff --git a/Makefile.am b/Makefile.am
index ac6df11..6ccb790 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -166,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                  \
@@ -222,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               \
@@ -397,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    \
@@ -533,6 +535,7 @@ SCM_TESTS =                                 \
   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                               \
@@ -984,13 +987,14 @@ release: dist-with-updated-version all
              -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" ;     \
@@ -999,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                                                           \