diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-10-05 00:45:38 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-10-05 00:45:38 +0200 |
| commit | 7716ccd59c0c17f9399d73abec05001b775d100b (patch) | |
| tree | 17a3f8cc7201f9deed0b3de8d5d597b892aaede3 /Makefile.am | |
| parent | 86edcc53382c66be06165c62a3934d60ae7aabd8 (diff) | |
| parent | a35532f52df3ba3bc360346938aa90806cad493e (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index a178d53cb5..d054f78791 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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. # @@ -143,6 +144,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 \ @@ -173,6 +175,7 @@ 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 \ @@ -275,6 +278,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 \ @@ -708,6 +712,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 |