gnu: Add mate.

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

diff --git a/Makefile.am b/Makefile.am
index 4dfcd06..4c2e77d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,6 +66,7 @@ MODULES =                                     \
   guix/gnu-maintenance.scm                     \
   guix/upstream.scm                            \
   guix/licenses.scm                            \
+  guix/git.scm                                 \
   guix/graph.scm                               \
   guix/cache.scm                               \
   guix/cve.scm                                 \
@@ -78,6 +79,7 @@ MODULES =                                     \
   guix/build-system/dub.scm                    \
   guix/build-system/emacs.scm                  \
   guix/build-system/font.scm                   \
+  guix/build-system/minify.scm                 \
   guix/build-system/asdf.scm                   \
   guix/build-system/glib-or-gtk.scm            \
   guix/build-system/gnu.scm                    \
@@ -104,6 +106,7 @@ MODULES =                                   \
   guix/build/cmake-build-system.scm            \
   guix/build/dub-build-system.scm              \
   guix/build/emacs-build-system.scm            \
+  guix/build/minify-build-system.scm           \
   guix/build/font-build-system.scm             \
   guix/build/asdf-build-system.scm             \
   guix/build/git.scm                           \
@@ -171,6 +174,7 @@ MODULES =                                   \
   guix/scripts/import/texlive.scm              \
   guix/scripts/environment.scm                 \
   guix/scripts/publish.scm                     \
+  guix/scripts/weather.scm                     \
   guix/scripts/edit.scm                                \
   guix/scripts/size.scm                                \
   guix/scripts/graph.scm                       \
@@ -206,13 +210,6 @@ MODULES +=                                 \
 
 endif HAVE_GUILE_SSH
 
-if HAVE_GUILE_GIT
-
-MODULES +=                                     \
-  guix/git.scm
-
-endif HAVE_GUILE_GIT
-
 if BUILD_DAEMON_OFFLOAD
 
 MODULES +=                                     \
@@ -226,8 +223,8 @@ dist_noinst_DATA = guix/tests.scm guix/tests/http.scm
 # Auxiliary files for packages.
 AUX_FILES =                                            \
   gnu/packages/aux-files/emacs/guix-emacs.el           \
-  gnu/packages/aux-files/linux-libre/4.11-i686.conf    \
-  gnu/packages/aux-files/linux-libre/4.11-x86_64.conf  \
+  gnu/packages/aux-files/linux-libre/4.13-i686.conf    \
+  gnu/packages/aux-files/linux-libre/4.13-x86_64.conf  \
   gnu/packages/aux-files/linux-libre/4.9-i686.conf     \
   gnu/packages/aux-files/linux-libre/4.9-x86_64.conf   \
   gnu/packages/aux-files/linux-libre/4.4-i686.conf     \
@@ -250,18 +247,6 @@ nobase_dist_guilemodule_DATA =                                     \
 nobase_nodist_guilemodule_DATA = guix/config.scm
 nobase_nodist_guileobject_DATA = $(GOBJECTS)
 
-# Do we need to provide our own non-broken (srfi srfi-37) module?
-if INSTALL_SRFI_37
-
-nobase_nodist_guilemodule_DATA += srfi/srfi-37.scm
-GOBJECTS += srfi/srfi-37.go
-
-srfi/srfi-37.scm: srfi/srfi-37.scm.in
-       $(MKDIR_P) srfi
-       cp "$<" "$@"
-
-endif INSTALL_SRFI_37
-
 # Handy way to remove the .go files without removing all the rest.
 clean-go:
        -$(RM) -f $(GOBJECTS)
@@ -441,7 +426,6 @@ EXTRA_DIST =                                                \
   build-aux/run-system-tests.scm                       \
   d3.v3.js                                             \
   graph.js                                             \
-  srfi/srfi-37.scm.in                                  \
   srfi/srfi-64.scm                                     \
   srfi/srfi-64.upstream.scm                            \
   tests/test.drv                                       \
@@ -593,14 +577,11 @@ GUIXSD_SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux
 GUIXSD_VM_SYSTEMS ?= x86_64-linux
 
 # Prefix of the GuixSD installation image file name.
-GUIXSD_IMAGE_BASE = guixsd-usb-install-$(PACKAGE_VERSION)
+GUIXSD_IMAGE_BASE = guixsd-install-$(PACKAGE_VERSION)
 
 # Prefix of the GuixSD VM image file name.
 GUIXSD_VM_IMAGE_BASE = guixsd-vm-image-$(PACKAGE_VERSION)
 
-# Size of the installation image (for x86_64 typically).
-GUIXSD_INSTALLATION_IMAGE_SIZE ?= 950MiB
-
 # Size of the VM image (for x86_64 typically).
 GUIXSD_VM_IMAGE_SIZE ?= 2GiB
 
@@ -647,8 +628,8 @@ release: dist
        for system in $(GUIXSD_SUPPORTED_SYSTEMS) ; do                                  \
          image=`$(top_builddir)/pre-inst-env                                           \
            guix system disk-image                                                      \
+           --file-system-type=iso9660                                                  \
             --system=$$system                                                          \
-           --image-size=$(GUIXSD_INSTALLATION_IMAGE_SIZE)                              \
            gnu/system/install.scm` ;                                                   \
          if [ ! -f "$$image" ] ; then                                                  \
            echo "failed to produced GuixSD installation image for $$system" >&2 ;      \