HCoop / jackhill / guix / guix.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
gnu: retroarch: Update to 1.7.0.
[jackhill/guix/guix.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 071553b..a0e5ff1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,7 @@
 # Copyright © 2017 Leo Famulari <leo@famulari.name>
 # Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 # Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
+# Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
 #
 # This file is part of GNU Guix.
 #
@@ -33,7 +34,8 @@ nodist_noinst_SCRIPTS =                               \
 
 # Modules that are not compiled but are installed nonetheless, such as
 # build-side modules with unusual dependencies.
-MODULES_NOT_COMPILED =
+MODULES_NOT_COMPILED =                         \
+  guix/man-db.scm
 
 include gnu/local.mk
 
@@ -94,18 +96,22 @@ MODULES =                                   \
   guix/build-system/waf.scm                    \
   guix/build-system/r.scm                      \
   guix/build-system/ruby.scm                   \
+  guix/build-system/scons.scm                  \
   guix/build-system/texlive.scm                        \
   guix/build-system/trivial.scm                        \
   guix/ftp-client.scm                          \
   guix/http-client.scm                         \
   guix/gnupg.scm                               \
   guix/elf.scm                                 \
+  guix/profiling.scm                           \
   guix/store.scm                               \
   guix/cvs-download.scm                                \
   guix/svn-download.scm                                \
+  guix/i18n.scm                                        \
   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              \
@@ -125,6 +131,7 @@ MODULES =                                   \
   guix/build/ocaml-build-system.scm            \
   guix/build/r-build-system.scm                        \
   guix/build/ruby-build-system.scm             \
+  guix/build/scons-build-system.scm            \
   guix/build/texlive-build-system.scm          \
   guix/build/waf-build-system.scm              \
   guix/build/haskell-build-system.scm          \
@@ -132,6 +139,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                           \
@@ -178,7 +186,6 @@ MODULES =                                   \
   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                 \
@@ -206,6 +213,7 @@ MODULES +=                                  \
   guix/import/stackage.scm                     \
   guix/scripts/import/crate.scm                        \
   guix/scripts/import/gem.scm                  \
+  guix/scripts/import/json.scm                 \
   guix/scripts/import/pypi.scm                 \
   guix/scripts/import/stackage.scm
 
@@ -233,8 +241,9 @@ 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.13-i686.conf    \
-  gnu/packages/aux-files/linux-libre/4.13-x86_64.conf  \
+  gnu/packages/aux-files/linux-libre/4.14-arm.conf     \
+  gnu/packages/aux-files/linux-libre/4.14-i686.conf    \
+  gnu/packages/aux-files/linux-libre/4.14-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     \
@@ -245,6 +254,7 @@ AUX_FILES =                                         \
 # Templates, examples.
 EXAMPLES =                                     \
   gnu/system/examples/bare-bones.tmpl          \
+  gnu/system/examples/beaglebone-black.tmpl    \
   gnu/system/examples/desktop.tmpl             \
   gnu/system/examples/lightweight-desktop.tmpl \
   gnu/system/examples/vm-image.tmpl
@@ -409,7 +419,7 @@ check-system: $(GOBJECTS) $(BOOTSTRAP_GUILE_TARBALLS)
 # Public key used to sign substitutes from hydra.gnu.org & co.
 dist_pkgdata_DATA =                            \
   hydra.gnu.org.pub                            \
-  bayfront.guixsd.org.pub
+  berlin.guixsd.org.pub
 
 # Bash completion file.
 dist_bashcompletion_DATA = etc/completion/bash/guix
@@ -428,6 +438,7 @@ EXTRA_DIST =                                                \
   build-aux/hydra/evaluate.scm                         \
   build-aux/hydra/gnu-system.scm                       \
   build-aux/hydra/guix.scm                             \
+  build-aux/hydra/guix-modular.scm                     \
   build-aux/check-available-binaries.scm               \
   build-aux/check-final-inputs-self-contained.scm      \
   build-aux/download.scm                               \
@@ -576,7 +587,7 @@ SOURCE_TARBALLS =                                   \
   $(foreach ext,tar.gz,$(PACKAGE_FULL_TARNAME).$(ext))
 
 # Systems supported by Guix.
-SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux armhf-linux
+SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux armhf-linux aarch64-linux
 
 # Guix binary tarballs.
 BINARY_TARBALLS =                                                      \
@@ -594,9 +605,6 @@ 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 VM image (for x86_64 typically).
-GUIXSD_VM_IMAGE_SIZE ?= 2GiB
-
 # The release process works in several phases:
 #
 #   0. We assume the developer created a 'vX.Y' tag.
@@ -647,15 +655,14 @@ release: dist
            echo "failed to produced GuixSD installation image for $$system" >&2 ;      \
            exit 1 ;                                                                    \
          fi ;                                                                          \
-         xz < "$$image" > "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.xz.tmp" ;       \
-         mv "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.xz.tmp"                       \
-            "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.xz" ;                         \
+         xz < "$$image" > "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.iso.xz.tmp" ;   \
+         mv "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.iso.xz.tmp"                   \
+            "$(releasedir)/$(GUIXSD_IMAGE_BASE).$$system.iso.xz" ;                     \
        done
        for system in $(GUIXSD_VM_SYSTEMS) ; do                                         \
          image=`$(top_builddir)/pre-inst-env                                           \
            guix system vm-image                                                        \
            --system=$$system                                                           \
-           --image-size=$(GUIXSD_VM_IMAGE_SIZE)                                        \
            gnu/system/examples/vm-image.tmpl` ;                                        \
          if [ ! -f "$$image" ] ; then                                                  \
            echo "failed to produced GuixSD VM image for $$system" >&2 ;                \
jackhill's copy of GNU Guix: https://guix.gnu.org/