HCoop / jackhill / guix / guix.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
WIP: bees service
[jackhill/guix/guix.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 407df15..1259d37 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,7 @@
 # Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
 # Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
 # Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
+# Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
 #
 # This file is part of GNU Guix.
 #
@@ -114,6 +115,7 @@ MODULES =                                   \
   guix/channels.scm                            \
   guix/gnu-maintenance.scm                     \
   guix/self.scm                                        \
+  guix/substitutes.scm                         \
   guix/upstream.scm                            \
   guix/licenses.scm                            \
   guix/lint.scm                                \
@@ -124,6 +126,7 @@ MODULES =                                   \
   guix/cache.scm                               \
   guix/cve.scm                                 \
   guix/workers.scm                             \
+  guix/ipfs.scm                                        \
   guix/build-system.scm                                \
   guix/build-system/android-ndk.scm            \
   guix/build-system/ant.scm                    \
@@ -150,6 +153,7 @@ MODULES =                                   \
   guix/build-system/node.scm                   \
   guix/build-system/perl.scm                   \
   guix/build-system/python.scm                 \
+  guix/build-system/renpy.scm                  \
   guix/build-system/ocaml.scm                  \
   guix/build-system/qt.scm                     \
   guix/build-system/waf.scm                    \
@@ -205,6 +209,7 @@ MODULES =                                   \
   guix/build/ocaml-build-system.scm            \
   guix/build/qt-build-system.scm               \
   guix/build/r-build-system.scm                        \
+  guix/build/renpy-build-system.scm                    \
   guix/build/rakudo-build-system.scm           \
   guix/build/ruby-build-system.scm             \
   guix/build/scons-build-system.scm            \
@@ -248,6 +253,7 @@ MODULES =                                   \
   guix/import/github.scm                       \
   guix/import/gnome.scm                                \
   guix/import/gnu.scm                          \
+  guix/import/go.scm                           \
   guix/import/hackage.scm                      \
   guix/import/json.scm                         \
   guix/import/kde.scm                          \
@@ -255,7 +261,6 @@ MODULES =                                   \
   guix/import/opam.scm                         \
   guix/import/print.scm                                \
   guix/import/pypi.scm                         \
-  guix/import/snix.scm                         \
   guix/import/stackage.scm                     \
   guix/import/texlive.scm                      \
   guix/import/utils.scm                                \
@@ -291,9 +296,9 @@ MODULES =                                   \
   guix/scripts/import/elpa.scm                 \
   guix/scripts/import/gem.scm                  \
   guix/scripts/import/gnu.scm                  \
+  guix/scripts/import/go.scm                   \
   guix/scripts/import/hackage.scm              \
   guix/scripts/import/json.scm                 \
-  guix/scripts/import/nix.scm                  \
   guix/scripts/import/opam.scm                 \
   guix/scripts/import/pypi.scm                 \
   guix/scripts/import/stackage.scm             \
@@ -358,6 +363,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.11-arm.conf     \
+  gnu/packages/aux-files/linux-libre/5.11-arm64.conf   \
+  gnu/packages/aux-files/linux-libre/5.11-i686.conf    \
+  gnu/packages/aux-files/linux-libre/5.11-x86_64.conf  \
   gnu/packages/aux-files/linux-libre/5.10-arm.conf     \
   gnu/packages/aux-files/linux-libre/5.10-arm64.conf   \
   gnu/packages/aux-files/linux-libre/5.10-i686.conf    \
@@ -448,6 +457,7 @@ SCM_TESTS =                                 \
   tests/git-authenticate.scm                   \
   tests/glob.scm                               \
   tests/gnu-maintenance.scm                    \
+  tests/go.scm                                 \
   tests/grafts.scm                             \
   tests/graph.scm                              \
   tests/gremlin.scm                            \
@@ -473,10 +483,10 @@ SCM_TESTS =                                       \
   tests/scripts.scm                            \
   tests/search-paths.scm                       \
   tests/services.scm                           \
+  tests/services/file-sharing.scm              \
   tests/services/linux.scm                     \
   tests/sets.scm                               \
   tests/size.scm                               \
-  tests/snix.scm                               \
   tests/status.scm                             \
   tests/store-database.scm                     \
   tests/store-deduplication.scm                \
@@ -600,14 +610,7 @@ EXTRA_DIST +=                                              \
   etc/historical-authorizations                                \
   build-aux/build-self.scm                             \
   build-aux/compile-all.scm                            \
-  build-aux/hydra/evaluate.scm                         \
-  build-aux/hydra/gnu-system.scm                       \
-  build-aux/hydra/guix.scm                             \
-  build-aux/hydra/guix-modular.scm                     \
-  build-aux/cuirass/gnu-system.scm                     \
-  build-aux/cuirass/guix-modular.scm                   \
   build-aux/cuirass/hurd-manifest.scm                  \
-  build-aux/cuirass/hydra-to-cuirass.scm               \
   build-aux/check-final-inputs-self-contained.scm      \
   build-aux/check-channel-news.scm                     \
   build-aux/compile-as-derivation.scm                  \
@@ -795,7 +798,8 @@ SOURCE_TARBALLS =                                   \
   $(foreach ext,tar.gz,$(PACKAGE_FULL_TARNAME).$(ext))
 
 # Systems supported by Guix.
-SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux armhf-linux aarch64-linux
+SUPPORTED_SYSTEMS ?= x86_64-linux i686-linux armhf-linux aarch64-linux \
+  powerpc64le-linux
 
 # Guix binary tarballs.
 BINARY_TARBALLS =                                                      \
@@ -947,28 +951,18 @@ check-channel-news: $(GOBJECTS)
        $(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)"       \
          "$(top_srcdir)/build-aux/check-channel-news.scm"
 
-# Compute the Hydra jobs and write them in the target file.
-hydra-jobs.scm: $(GOBJECTS)
-       $(AM_V_at)$(MKDIR_P) "`dirname "$@"`"
+# Compute the Cuirass jobs.
+cuirass-jobs: $(GOBJECTS)
+       rm -rf "$@"
+       $(AM_V_at)$(MKDIR_P) "$@"
        $(AM_V_GEN)$(top_builddir)/pre-inst-env "$(GUILE)"              \
-         "$(top_srcdir)/build-aux/hydra/evaluate.scm"                  \
-         "$(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" "$@"
+         "$(top_srcdir)/build-aux/cuirass/evaluate.scm" "$@"
 
 .PHONY: gen-ChangeLog gen-AUTHORS gen-tarball-version
 .PHONY: assert-no-store-file-names assert-binaries-available
 .PHONY: assert-final-inputs-self-contained check-channel-news
 .PHONY: clean-go make-go as-derivation authenticate
-.PHONY: update-guix-package update-NEWS release
+.PHONY: update-guix-package update-NEWS cuirass-jobs release
 
 # Downloading up-to-date PO files.
 
jackhill's copy of GNU Guix: https://guix.gnu.org/