gnu: calibre: Add optipng as an input.
[jackhill/guix/guix.git] / Makefile.am
index 436a003..fd6f972 100644 (file)
@@ -7,6 +7,7 @@
 # Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 # Copyright © 2017 Leo Famulari <leo@famulari.name>
 # Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
+# Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
 #
 # This file is part of GNU Guix.
 #
@@ -46,6 +47,7 @@ MODULES =                                     \
   guix/hash.scm                                        \
   guix/pk-crypto.scm                           \
   guix/pki.scm                                 \
+  guix/progress.scm                            \
   guix/combinators.scm                         \
   guix/memoization.scm                         \
   guix/utils.scm                               \
@@ -66,6 +68,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 +81,9 @@ MODULES =                                     \
   guix/build-system/dub.scm                    \
   guix/build-system/emacs.scm                  \
   guix/build-system/font.scm                   \
+  guix/build-system/go.scm                     \
+  guix/build-system/meson.scm                  \
+  guix/build-system/minify.scm                 \
   guix/build-system/asdf.scm                   \
   guix/build-system/glib-or-gtk.scm            \
   guix/build-system/gnu.scm                    \
@@ -100,11 +106,15 @@ MODULES =                                 \
   guix/ui.scm                                  \
   guix/build/ant-build-system.scm              \
   guix/build/download.scm                      \
+  guix/build/download-nar.scm                  \
   guix/build/cargo-build-system.scm            \
   guix/build/cmake-build-system.scm            \
   guix/build/dub-build-system.scm              \
   guix/build/emacs-build-system.scm            \
+  guix/build/meson-build-system.scm            \
+  guix/build/minify-build-system.scm           \
   guix/build/font-build-system.scm             \
+  guix/build/go-build-system.scm               \
   guix/build/asdf-build-system.scm             \
   guix/build/git.scm                           \
   guix/build/hg.scm                            \
@@ -123,6 +133,7 @@ MODULES =                                   \
   guix/build/utils.scm                         \
   guix/build/union.scm                         \
   guix/build/profiles.scm                      \
+  guix/build/compile.scm                       \
   guix/build/pull.scm                          \
   guix/build/rpath.scm                         \
   guix/build/cvs.scm                           \
@@ -138,6 +149,7 @@ MODULES =                                   \
   guix/build/make-bootstrap.scm                        \
   guix/search-paths.scm                                \
   guix/packages.scm                            \
+  guix/import/print.scm                                \
   guix/import/utils.scm                                \
   guix/import/gnu.scm                          \
   guix/import/snix.scm                         \
@@ -145,6 +157,7 @@ MODULES =                                   \
   guix/import/cran.scm                         \
   guix/import/hackage.scm                      \
   guix/import/elpa.scm                         \
+  guix/import/texlive.scm                      \
   guix/scripts.scm                             \
   guix/scripts/download.scm                    \
   guix/scripts/perform-download.scm            \
@@ -160,15 +173,19 @@ MODULES =                                 \
   guix/scripts/authenticate.scm                        \
   guix/scripts/refresh.scm                     \
   guix/scripts/system.scm                      \
+  guix/scripts/system/search.scm               \
   guix/scripts/lint.scm                                \
   guix/scripts/challenge.scm                   \
   guix/scripts/import/cran.scm                 \
   guix/scripts/import/gnu.scm                  \
   guix/scripts/import/nix.scm                  \
   guix/scripts/import/hackage.scm              \
+  guix/scripts/import/json.scm                 \
   guix/scripts/import/elpa.scm                 \
+  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                       \
@@ -185,6 +202,7 @@ MODULES +=                                  \
   guix/import/crate.scm                                \
   guix/import/gem.scm                          \
   guix/import/github.scm                       \
+  guix/import/gnome.scm                                \
   guix/import/json.scm                         \
   guix/import/pypi.scm                         \
   guix/import/stackage.scm                     \
@@ -204,13 +222,6 @@ MODULES +=                                 \
 
 endif HAVE_GUILE_SSH
 
-if HAVE_GUILE_GIT
-
-MODULES +=                                     \
-  guix/git.scm
-
-endif HAVE_GUILE_GIT
-
 if BUILD_DAEMON_OFFLOAD
 
 MODULES +=                                     \
@@ -224,8 +235,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     \
@@ -248,18 +259,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)
@@ -284,6 +283,7 @@ SCM_TESTS =                                 \
   tests/hash.scm                               \
   tests/pk-crypto.scm                          \
   tests/pki.scm                                        \
+  tests/print.scm                              \
   tests/sets.scm                               \
   tests/modules.scm                            \
   tests/gnu-maintenance.scm                    \
@@ -303,6 +303,7 @@ SCM_TESTS =                                 \
   tests/hackage.scm                            \
   tests/cran.scm                               \
   tests/elpa.scm                               \
+  tests/texlive.scm                            \
   tests/store.scm                              \
   tests/monads.scm                             \
   tests/gexp.scm                               \
@@ -324,6 +325,7 @@ SCM_TESTS =                                 \
   tests/workers.scm                            \
   tests/zlib.scm                               \
   tests/file-systems.scm                       \
+  tests/uuid.scm                               \
   tests/system.scm                             \
   tests/services.scm                           \
   tests/scripts-build.scm                      \
@@ -438,7 +440,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                                       \
@@ -590,14 +591,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
 
@@ -644,8 +642,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 ;      \
@@ -719,6 +717,15 @@ hydra-jobs.scm: $(GOBJECTS)
          "$(top_srcdir)/build-aux/hydra/gnu-system.scm" > "$@.tmp"
        $(AM_V_at)mv "$@.tmp" "$@"
 
+# Compute the Cuirass jobs and write them in the target file.
+cuirass-jobs.scm: $(GOBJECTS)
+       $(AM_V_at)$(MKDIR_P) "`dirname "$@"`"
+       $(AM_V_GEN)$(top_builddir)/pre-inst-env "$(GUILE)"              \
+         "$(top_srcdir)/build-aux/hydra/evaluate.scm"                  \
+         "$(top_srcdir)/build-aux/cuirass/gnu-system.scm"              \
+         cuirass > "$@.tmp"
+       $(AM_V_at)mv "$@.tmp" "$@"
+
 .PHONY: gen-ChangeLog gen-AUTHORS gen-tarball-version
 .PHONY: assert-no-store-file-names assert-binaries-available
 .PHONY: assert-final-inputs-self-contained