HCoop / jackhill / guix / guix.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
gnu: qpwgragh: Update to 0.3.7.
[jackhill/guix/guix.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index f585d00..22dcc43 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -97,7 +97,6 @@ MODULES =                                     \
   guix/discovery.scm                           \
   guix/android-repo-download.scm               \
   guix/bzr-download.scm                        \
-  guix/extracting-download.scm                 \
   guix/git-download.scm                                \
   guix/hg-download.scm                         \
   guix/hash.scm                                        \
@@ -131,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                        \
@@ -142,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                  \
@@ -172,6 +173,7 @@ MODULES =                                   \
   guix/build-system/waf.scm                    \
   guix/build-system/r.scm                      \
   guix/build-system/rakudo.scm                 \
+  guix/build-system/rebar.scm                  \
   guix/build-system/ruby.scm                   \
   guix/build-system/scons.scm                  \
   guix/build-system/texlive.scm                        \
@@ -226,6 +228,7 @@ MODULES =                                   \
   guix/build/r-build-system.scm                        \
   guix/build/renpy-build-system.scm                    \
   guix/build/rakudo-build-system.scm           \
+  guix/build/rebar-build-system.scm            \
   guix/build/ruby-build-system.scm             \
   guix/build/scons-build-system.scm            \
   guix/build/texlive-build-system.scm          \
@@ -274,6 +277,7 @@ MODULES =                                   \
   guix/import/gnu.scm                          \
   guix/import/go.scm                           \
   guix/import/hackage.scm                      \
+  guix/import/hexpm.scm                                \
   guix/import/json.scm                         \
   guix/import/kde.scm                          \
   guix/import/launchpad.scm                    \
@@ -312,6 +316,7 @@ MODULES =                                   \
   guix/scripts/system/reconfigure.scm          \
   guix/scripts/system/search.scm               \
   guix/scripts/home.scm                        \
+  guix/scripts/home/edit.scm                   \
   guix/scripts/home/import.scm                 \
   guix/scripts/lint.scm                                \
   guix/scripts/challenge.scm                   \
@@ -324,6 +329,7 @@ MODULES =                                   \
   guix/scripts/import/gnu.scm                  \
   guix/scripts/import/go.scm                   \
   guix/scripts/import/hackage.scm              \
+  guix/scripts/import/hexpm.scm                        \
   guix/scripts/import/json.scm                 \
   guix/scripts/import/minetest.scm             \
   guix/scripts/import/opam.scm                 \
@@ -391,10 +397,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.17-arm.conf     \
-  gnu/packages/aux-files/linux-libre/5.17-arm64.conf   \
-  gnu/packages/aux-files/linux-libre/5.17-i686.conf    \
-  gnu/packages/aux-files/linux-libre/5.17-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    \
@@ -468,6 +474,7 @@ SCM_TESTS =                                 \
   tests/boot-parameters.scm                    \
   tests/bournish.scm                           \
   tests/builders.scm                           \
+  tests/build-emacs-utils.scm                  \
   tests/build-utils.scm                        \
   tests/cache.scm                              \
   tests/challenge.scm                          \
@@ -497,6 +504,7 @@ SCM_TESTS =                                 \
   tests/gremlin.scm                            \
   tests/hackage.scm                            \
   tests/home-import.scm                                \
+  tests/home-services.scm                      \
   tests/http-client.scm                                \
   tests/import-git.scm                         \
   tests/import-github.scm                      \
@@ -518,12 +526,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                               \
@@ -572,6 +582,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                                \
@@ -661,6 +672,7 @@ EXTRA_DIST +=                                               \
   etc/release-manifest.scm                             \
   etc/source-manifest.scm                              \
   etc/system-tests.scm                                 \
+  etc/time-travel-manifest.scm                         \
   etc/historical-authorizations                                \
   build-aux/build-self.scm                             \
   build-aux/compile-all.scm                            \
@@ -966,25 +978,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" ;     \
@@ -993,6 +1001,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                                                           \
jackhill's copy of GNU Guix: https://guix.gnu.org/