2013-01-05 23:47:50 +00:00
|
|
|
# GNU Guix --- Functional package management for GNU
|
Add (guix memoization).
* guix/combinators.scm (memoize): Remove.
* guix/memoization.scm: New file.
* Makefile.am (MODULES): Add it.
* gnu/packages.scm, gnu/packages/bootstrap.scm,
guix/build-system/gnu.scm, guix/build-system/python.scm,
guix/derivations.scm, guix/gnu-maintenance.scm,
guix/import/cran.scm, guix/import/elpa.scm,
guix/modules.scm, guix/scripts/build.scm,
guix/scripts/graph.scm, guix/scripts/lint.scm,
guix/store.scm, guix/utils.scm: Adjust imports accordingly.
2017-01-28 15:33:57 +00:00
|
|
|
# Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
2013-01-17 21:09:15 +00:00
|
|
|
# Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
2017-02-17 10:28:16 +00:00
|
|
|
# Copyright © 2015, 2017 Alex Kost <alezost@gmail.com>
|
2016-01-24 17:48:29 +00:00
|
|
|
# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
|
2017-02-20 05:26:59 +00:00
|
|
|
# Copyright © 2016, 2017 Mark H Weaver <mhw@netris.org>
|
2012-06-13 16:01:25 +00:00
|
|
|
#
|
2013-01-05 23:47:50 +00:00
|
|
|
# This file is part of GNU Guix.
|
2012-06-13 16:01:25 +00:00
|
|
|
#
|
2013-01-05 23:47:50 +00:00
|
|
|
# GNU Guix is free software; you can redistribute it and/or modify it
|
2012-06-13 16:01:25 +00:00
|
|
|
# under the terms of the GNU General Public License as published by
|
|
|
|
|
# the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
|
# your option) any later version.
|
|
|
|
|
#
|
2013-01-05 23:47:50 +00:00
|
|
|
# GNU Guix is distributed in the hope that it will be useful, but
|
2012-06-13 16:01:25 +00:00
|
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
|
#
|
|
|
|
|
# You should have received a copy of the GNU General Public License
|
2013-01-05 23:47:50 +00:00
|
|
|
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
2012-06-13 16:01:25 +00:00
|
|
|
|
2012-10-24 21:10:09 +00:00
|
|
|
bin_SCRIPTS = \
|
Replace individual scripts with master 'guix' script.
* scripts/guix.in: New script.
* Makefile.am (bin_SCRIPTS): Add 'scripts/guix'. Remove 'guix-build',
'guix-download', 'guix-import', 'guix-package', and 'guix-gc'.
(MODULES): Add 'guix/scripts/build.scm', 'guix/scripts/download.scm',
'guix/scripts/import.scm', 'guix/scripts/package.scm', and
'guix/scripts/gc.scm'.
* configure.ac (AC_CONFIG_FILES): Add 'scripts/guix'. Remove 'guix-build',
'guix-download', 'guix-import', 'guix-package', and 'guix-gc'.
* guix-build.in, guix-download.in, guix-gc.in, guix-import.in,
guix-package.in: Remove shell script boilerplate. Move to guix-COMMAND.in
to guix/scripts/COMMAND.scm. Rename module from (guix-COMMAND) to
(guix scripts COMMAND). Change "guix-COMMAND" to "guix COMMAND" in
usage help string.
* pre-inst-env.in: Add "@abs_top_builddir@/scripts" to the front of $PATH.
Export $GUIX_UNINSTALLED.
* tests/guix-build.sh, tests/guix-daemon.sh, tests/guix-download.sh,
tests/guix-gc.sh, tests/guix-package.sh: Use "guix COMMAND" instead of
"guix-COMMAND".
* doc/guix.texi: Replace all occurrences of "guix-COMMAND" with
"guix COMMAND".
* po/POTFILES.in: Update.
2013-02-14 09:15:25 +00:00
|
|
|
scripts/guix
|
2012-06-30 22:56:24 +00:00
|
|
|
|
2013-02-12 00:23:20 +00:00
|
|
|
nodist_noinst_SCRIPTS = \
|
|
|
|
|
pre-inst-env \
|
|
|
|
|
test-env
|
|
|
|
|
|
2016-04-21 16:07:52 +00:00
|
|
|
include gnu/local.mk
|
build: Split Makefile.am into two parts.
* Makefile.am (MODULES): Move gnu/* to gnu-system.am.
(patchdir, dist_patch_DATA, bootstrapdir,
bootstrap_x86_64_linuxdir, bootstrap_i686_linuxdir,
dist_bootstrap_x86_64_linux_DATA, dist_bootstrap_i686_linux_DATA,
nodist_bootstrap_x86_64_linux_DATA, nodist_bootstrap_i686_linux_DATA,
install-data-hook, DISTCLEANFILES, DOWNLOAD_FILE,
gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz,
gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz): Move to...
* gnu-system.am: ... here. New file.
2013-06-19 21:19:03 +00:00
|
|
|
|
2012-06-13 16:01:25 +00:00
|
|
|
MODULES = \
|
utils: Move base16 procedures to (guix base16).
* guix/utils.scm (bytevector->base16-string, base16-string->bytevector):
Move to...
* guix/base16.scm: ... here. New file.
* tests/utils.scm ("bytevector->base16-string->bytevector"): Move to...
* tests/base16.scm: ... here. New file.
* Makefile.am (MODULES): Add guix/base16.scm.
(SCM_TESTS): Add tests/base16.scm.
* build-aux/download.scm, guix/derivations.scm,
guix/docker.scm, guix/import/snix.scm, guix/pk-crypto.scm,
guix/scripts/authenticate.scm, guix/scripts/download.scm,
guix/scripts/hash.scm, guix/store.scm, tests/hash.scm,
tests/pk-crypto.scm: Adjust imports accordingly.
2017-03-15 20:54:34 +00:00
|
|
|
guix/base16.scm \
|
Move base32 code to (guix base32).
* guix/utils.scm (bytevector-quintet-ref, bytevector-quintet-ref-right,
bytevector-quintet-length, bytevector-quintet-fold,
bytevector-quintet-fold-right, make-bytevector->base32-string,
%nix-base32-chars, %rfc4648-base32-chars, bytevector->base32-string,
bytevector->nix-base32-string, bytevector-quintet-set!,
bytevector-quintet-set-right!, base32-string-unfold,
base32-string-unfold-right, make-base32-string->bytevector,
base32-string->bytevector, nix-base32-string->bytevector): Move to...
* guix/base32.scm: ... here. New file.
* tests/utils.scm (%nix-hash, "bytevector->base32-string",
"base32-string->bytevector", "nix-base32-string->bytevector", "sha256
& bytevector->base32-string"): Move to...
* tests/base32.scm: ... here. New file
* guix-download.in, guix/derivations.scm, guix/packages.scm,
guix/snix.scm, tests/builders.scm, tests/derivations.scm: Adjust
accordingly.
* guix.scm (%public-modules): Add `base32'.
2012-11-11 21:33:28 +00:00
|
|
|
guix/base32.scm \
|
2014-03-28 23:06:41 +00:00
|
|
|
guix/base64.scm \
|
2015-06-24 16:03:28 +00:00
|
|
|
guix/cpio.scm \
|
2013-05-12 13:46:16 +00:00
|
|
|
guix/records.scm \
|
2015-01-26 20:38:49 +00:00
|
|
|
guix/gcrypt.scm \
|
2013-07-01 21:28:21 +00:00
|
|
|
guix/hash.scm \
|
2013-12-19 23:36:26 +00:00
|
|
|
guix/pk-crypto.scm \
|
2013-12-29 14:53:49 +00:00
|
|
|
guix/pki.scm \
|
utils: Move combinators to (guix combinators).
* guix/utils.scm (compile-time-value, memoize, fold2)
(fold-tree, fold-tree-leaves): Move to...
* guix/combinators: ... here. New file.
* tests/utils.scm ("fold2, 1 list", "fold2, 2 lists")
(fold-tree tests): Move to...
* tests/combinators.scm: ... here. New file.
* Makefile.am (MODULES, SCM_TESTS): Add them.
* gnu/packages.scm, gnu/packages/bootstrap.scm,
gnu/services/herd.scm, guix/build-system/gnu.scm,
guix/build-system/python.scm, guix/derivations.scm,
guix/gnu-maintenance.scm, guix/import/elpa.scm,
guix/scripts/archive.scm, guix/scripts/build.scm,
guix/scripts/graph.scm, guix/scripts/lint.scm,
guix/scripts/size.scm, guix/scripts/substitute.scm,
guix/serialization.scm, guix/store.scm, guix/ui.scm: Adjust imports
accordingly.
2016-05-04 15:35:47 +00:00
|
|
|
guix/combinators.scm \
|
Add (guix memoization).
* guix/combinators.scm (memoize): Remove.
* guix/memoization.scm: New file.
* Makefile.am (MODULES): Add it.
* gnu/packages.scm, gnu/packages/bootstrap.scm,
guix/build-system/gnu.scm, guix/build-system/python.scm,
guix/derivations.scm, guix/gnu-maintenance.scm,
guix/import/cran.scm, guix/import/elpa.scm,
guix/modules.scm, guix/scripts/build.scm,
guix/scripts/graph.scm, guix/scripts/lint.scm,
guix/store.scm, guix/utils.scm: Adjust imports accordingly.
2017-01-28 15:33:57 +00:00
|
|
|
guix/memoization.scm \
|
2012-07-01 13:10:50 +00:00
|
|
|
guix/utils.scm \
|
2015-01-11 22:43:30 +00:00
|
|
|
guix/sets.scm \
|
2016-09-04 21:41:53 +00:00
|
|
|
guix/modules.scm \
|
2013-12-05 21:49:51 +00:00
|
|
|
guix/download.scm \
|
2014-02-21 22:41:11 +00:00
|
|
|
guix/git-download.scm \
|
2016-06-15 08:38:10 +00:00
|
|
|
guix/hg-download.scm \
|
2013-10-03 20:45:25 +00:00
|
|
|
guix/monads.scm \
|
2014-08-15 14:22:11 +00:00
|
|
|
guix/monad-repl.scm \
|
2014-04-28 21:00:57 +00:00
|
|
|
guix/gexp.scm \
|
Add (guix profiles).
* guix/scripts/package.scm (show-what-to-remove/install): New procedure,
moved from...
(guix-package): ... here.
(<manifest>, make-manifest, <manifest-entry>,
profile-manifest, manifest->sexp, sexp->manifest, read-manifest,
write-manifest, remove-manifest-entry, manifest-remove,
manifest-installed?, manifest=?, profile-regexp, generation-numbers,
previous-generation-number, profile-derivation, generation-number,
generation-file-name, generation-time, lower-input): Move to...
* guix/profiles.scm: ... here. New file.
* Makefile.am (MODULES): Add it.
2013-11-01 15:31:45 +00:00
|
|
|
guix/profiles.scm \
|
Add (guix nar) and (guix serialization).
* guix/store.scm (write-int, read-int, write-long-long, read-long-long,
write-padding, write-string, read-string, read-latin1-string,
write-string-list, read-string-list, write-store-path,
read-store-path, write-store-path-list, read-store-path-list): Move to
serialization.scm.
(write-contents, write-file): Move to nar.scm.
* guix/nar.scm, guix/serialization.scm: New files.
* Makefile.am (MODULES): Add them.
2013-04-04 20:29:08 +00:00
|
|
|
guix/serialization.scm \
|
|
|
|
|
guix/nar.scm \
|
2012-06-13 16:01:25 +00:00
|
|
|
guix/derivations.scm \
|
2016-02-22 15:29:44 +00:00
|
|
|
guix/grafts.scm \
|
2012-12-04 23:02:22 +00:00
|
|
|
guix/gnu-maintenance.scm \
|
2015-10-21 09:11:25 +00:00
|
|
|
guix/upstream.scm \
|
2012-12-08 01:48:17 +00:00
|
|
|
guix/licenses.scm \
|
2015-11-21 12:12:02 +00:00
|
|
|
guix/graph.scm \
|
2015-11-26 20:52:25 +00:00
|
|
|
guix/cve.scm \
|
2016-07-18 21:14:14 +00:00
|
|
|
guix/zlib.scm \
|
2012-06-27 21:58:07 +00:00
|
|
|
guix/build-system.scm \
|
2015-12-29 15:56:49 +00:00
|
|
|
guix/build-system/ant.scm \
|
2016-09-22 12:58:31 +00:00
|
|
|
guix/build-system/cargo.scm \
|
2013-03-26 21:14:24 +00:00
|
|
|
guix/build-system/cmake.scm \
|
2017-02-06 15:45:08 +00:00
|
|
|
guix/build-system/dub.scm \
|
2015-06-21 08:10:05 +00:00
|
|
|
guix/build-system/emacs.scm \
|
2016-10-07 21:57:08 +00:00
|
|
|
guix/build-system/asdf.scm \
|
2014-10-06 13:49:29 +00:00
|
|
|
guix/build-system/glib-or-gtk.scm \
|
2012-06-27 21:58:07 +00:00
|
|
|
guix/build-system/gnu.scm \
|
2015-04-12 13:16:48 +00:00
|
|
|
guix/build-system/haskell.scm \
|
2013-03-03 23:41:46 +00:00
|
|
|
guix/build-system/perl.scm \
|
2013-05-08 22:44:28 +00:00
|
|
|
guix/build-system/python.scm \
|
2016-12-22 18:56:33 +00:00
|
|
|
guix/build-system/ocaml.scm \
|
2015-02-05 21:41:24 +00:00
|
|
|
guix/build-system/waf.scm \
|
2015-07-31 12:47:34 +00:00
|
|
|
guix/build-system/r.scm \
|
2014-09-28 15:14:53 +00:00
|
|
|
guix/build-system/ruby.scm \
|
2012-09-10 20:47:10 +00:00
|
|
|
guix/build-system/trivial.scm \
|
2012-09-12 21:47:49 +00:00
|
|
|
guix/ftp-client.scm \
|
2013-07-14 14:35:37 +00:00
|
|
|
guix/http-client.scm \
|
2013-04-24 21:48:36 +00:00
|
|
|
guix/gnupg.scm \
|
2014-11-27 22:51:48 +00:00
|
|
|
guix/elf.scm \
|
2012-06-13 16:01:25 +00:00
|
|
|
guix/store.scm \
|
2015-01-18 03:11:45 +00:00
|
|
|
guix/cvs-download.scm \
|
2014-03-26 16:59:01 +00:00
|
|
|
guix/svn-download.scm \
|
2012-10-31 23:50:01 +00:00
|
|
|
guix/ui.scm \
|
2015-12-29 15:56:49 +00:00
|
|
|
guix/build/ant-build-system.scm \
|
2012-11-12 22:10:26 +00:00
|
|
|
guix/build/download.scm \
|
2016-09-22 12:58:31 +00:00
|
|
|
guix/build/cargo-build-system.scm \
|
2013-03-26 21:14:24 +00:00
|
|
|
guix/build/cmake-build-system.scm \
|
2017-02-06 15:45:08 +00:00
|
|
|
guix/build/dub-build-system.scm \
|
2015-06-21 08:10:05 +00:00
|
|
|
guix/build/emacs-build-system.scm \
|
2016-10-07 21:57:08 +00:00
|
|
|
guix/build/asdf-build-system.scm \
|
2014-02-21 22:41:11 +00:00
|
|
|
guix/build/git.scm \
|
2016-06-15 08:38:10 +00:00
|
|
|
guix/build/hg.scm \
|
2014-10-06 13:49:29 +00:00
|
|
|
guix/build/glib-or-gtk-build-system.scm \
|
2012-06-13 16:01:25 +00:00
|
|
|
guix/build/gnu-build-system.scm \
|
2013-08-24 15:17:06 +00:00
|
|
|
guix/build/gnu-dist.scm \
|
2013-03-03 23:41:46 +00:00
|
|
|
guix/build/perl-build-system.scm \
|
2013-05-08 22:44:28 +00:00
|
|
|
guix/build/python-build-system.scm \
|
2016-12-22 18:56:33 +00:00
|
|
|
guix/build/ocaml-build-system.scm \
|
2015-07-31 12:47:34 +00:00
|
|
|
guix/build/r-build-system.scm \
|
2014-09-28 15:14:53 +00:00
|
|
|
guix/build/ruby-build-system.scm \
|
2015-02-05 21:41:24 +00:00
|
|
|
guix/build/waf-build-system.scm \
|
2015-04-16 07:49:52 +00:00
|
|
|
guix/build/haskell-build-system.scm \
|
2014-09-04 21:05:12 +00:00
|
|
|
guix/build/store-copy.scm \
|
2012-06-15 08:03:08 +00:00
|
|
|
guix/build/utils.scm \
|
2012-10-29 21:39:46 +00:00
|
|
|
guix/build/union.scm \
|
2015-05-06 12:14:58 +00:00
|
|
|
guix/build/profiles.scm \
|
2013-12-16 22:07:17 +00:00
|
|
|
guix/build/pull.scm \
|
2013-05-08 21:24:05 +00:00
|
|
|
guix/build/rpath.scm \
|
2015-01-18 03:11:45 +00:00
|
|
|
guix/build/cvs.scm \
|
2014-03-26 16:59:01 +00:00
|
|
|
guix/build/svn.scm \
|
2016-06-17 19:44:37 +00:00
|
|
|
guix/build/syscalls.scm \
|
2015-03-31 20:10:08 +00:00
|
|
|
guix/build/gremlin.scm \
|
2014-08-02 23:24:50 +00:00
|
|
|
guix/build/emacs-utils.scm \
|
2016-10-07 21:57:08 +00:00
|
|
|
guix/build/lisp-utils.scm \
|
2014-10-07 21:23:09 +00:00
|
|
|
guix/build/graft.scm \
|
2016-02-08 22:23:35 +00:00
|
|
|
guix/build/bournish.scm \
|
2016-08-25 21:06:27 +00:00
|
|
|
guix/build/qt-utils.scm \
|
2016-11-30 14:49:48 +00:00
|
|
|
guix/build/make-bootstrap.scm \
|
Move search path specifications to (guix search-paths).
* guix/packages.scm (<search-path-specification>,
search-path-specification->sexp, sexp->search-path-specification):
Move to...
* guix/search-paths.scm: ... here. New file.
* Makefile.am (MODULES): Add it.
* guix/build-system/cmake.scm, guix/build-system/glib-or-gtk.scm,
guix/build-system/gnu.scm, guix/build-system/haskell.scm,
guix/build-system/perl.scm, guix/build-system/python.scm,
guix/build-system/ruby.scm, guix/build-system/waf.scm,
guix/profiles.scm, guix/scripts/package.scm: Use it.
2015-05-04 20:11:37 +00:00
|
|
|
guix/search-paths.scm \
|
2012-06-27 23:24:34 +00:00
|
|
|
guix/packages.scm \
|
2014-09-27 14:16:23 +00:00
|
|
|
guix/import/utils.scm \
|
2014-11-11 14:30:58 +00:00
|
|
|
guix/import/gnu.scm \
|
2014-09-27 14:16:23 +00:00
|
|
|
guix/import/snix.scm \
|
2015-04-26 09:22:29 +00:00
|
|
|
guix/import/cabal.scm \
|
2015-07-24 14:49:57 +00:00
|
|
|
guix/import/cran.scm \
|
2015-04-26 09:22:29 +00:00
|
|
|
guix/import/hackage.scm \
|
2017-02-06 17:19:26 +00:00
|
|
|
guix/import/stackage.scm \
|
2015-06-16 08:50:06 +00:00
|
|
|
guix/import/elpa.scm \
|
2015-09-10 09:37:36 +00:00
|
|
|
guix/scripts.scm \
|
2013-12-05 21:49:51 +00:00
|
|
|
guix/scripts/download.scm \
|
2015-07-20 02:30:16 +00:00
|
|
|
guix/scripts/perform-download.scm \
|
2013-12-05 21:49:51 +00:00
|
|
|
guix/scripts/build.scm \
|
2013-12-22 00:08:21 +00:00
|
|
|
guix/scripts/archive.scm \
|
2013-12-05 21:49:51 +00:00
|
|
|
guix/scripts/import.scm \
|
|
|
|
|
guix/scripts/package.scm \
|
|
|
|
|
guix/scripts/gc.scm \
|
|
|
|
|
guix/scripts/hash.scm \
|
2017-03-12 15:48:40 +00:00
|
|
|
guix/scripts/pack.scm \
|
2013-12-05 21:49:51 +00:00
|
|
|
guix/scripts/pull.scm \
|
2015-03-25 09:34:27 +00:00
|
|
|
guix/scripts/substitute.scm \
|
2013-12-20 16:17:42 +00:00
|
|
|
guix/scripts/authenticate.scm \
|
2013-12-05 21:49:51 +00:00
|
|
|
guix/scripts/refresh.scm \
|
2014-02-18 22:45:58 +00:00
|
|
|
guix/scripts/system.scm \
|
2014-09-01 00:13:21 +00:00
|
|
|
guix/scripts/lint.scm \
|
2015-10-19 22:55:09 +00:00
|
|
|
guix/scripts/challenge.scm \
|
2015-07-24 14:49:57 +00:00
|
|
|
guix/scripts/import/cran.scm \
|
2014-11-11 14:30:58 +00:00
|
|
|
guix/scripts/import/gnu.scm \
|
2014-09-27 14:16:23 +00:00
|
|
|
guix/scripts/import/nix.scm \
|
2015-04-26 09:22:29 +00:00
|
|
|
guix/scripts/import/hackage.scm \
|
2017-02-06 17:19:26 +00:00
|
|
|
guix/scripts/import/stackage.scm \
|
2015-06-16 08:50:06 +00:00
|
|
|
guix/scripts/import/elpa.scm \
|
2014-09-21 17:40:05 +00:00
|
|
|
guix/scripts/environment.scm \
|
2015-03-17 14:21:31 +00:00
|
|
|
guix/scripts/publish.scm \
|
2015-06-17 19:58:04 +00:00
|
|
|
guix/scripts/edit.scm \
|
2015-06-17 22:22:13 +00:00
|
|
|
guix/scripts/size.scm \
|
2015-08-26 22:36:41 +00:00
|
|
|
guix/scripts/graph.scm \
|
2015-07-02 00:32:07 +00:00
|
|
|
guix/scripts/container.scm \
|
|
|
|
|
guix/scripts/container/exec.scm \
|
2012-06-27 23:24:34 +00:00
|
|
|
guix.scm \
|
build: Split Makefile.am into two parts.
* Makefile.am (MODULES): Move gnu/* to gnu-system.am.
(patchdir, dist_patch_DATA, bootstrapdir,
bootstrap_x86_64_linuxdir, bootstrap_i686_linuxdir,
dist_bootstrap_x86_64_linux_DATA, dist_bootstrap_i686_linux_DATA,
nodist_bootstrap_x86_64_linux_DATA, nodist_bootstrap_i686_linux_DATA,
install-data-hook, DISTCLEANFILES, DOWNLOAD_FILE,
gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz,
gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz): Move to...
* gnu-system.am: ... here. New file.
2013-06-19 21:19:03 +00:00
|
|
|
$(GNU_SYSTEM_MODULES)
|
2012-06-13 16:01:25 +00:00
|
|
|
|
2016-01-12 15:37:45 +00:00
|
|
|
if HAVE_GUILE_JSON
|
|
|
|
|
|
|
|
|
|
MODULES += \
|
2017-01-03 15:20:15 +00:00
|
|
|
guix/docker.scm \
|
2016-03-03 16:46:58 +00:00
|
|
|
guix/import/github.scm \
|
2016-01-12 15:37:45 +00:00
|
|
|
guix/import/json.scm \
|
2016-12-30 19:15:35 +00:00
|
|
|
guix/import/crate.scm \
|
|
|
|
|
guix/scripts/import/crate.scm \
|
2016-01-12 15:37:45 +00:00
|
|
|
guix/import/pypi.scm \
|
|
|
|
|
guix/scripts/import/pypi.scm \
|
|
|
|
|
guix/import/cpan.scm \
|
|
|
|
|
guix/scripts/import/gem.scm \
|
|
|
|
|
guix/import/gem.scm
|
|
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
2016-12-30 22:22:27 +00:00
|
|
|
if HAVE_GUILE_SSH
|
|
|
|
|
|
|
|
|
|
MODULES += \
|
2016-12-31 17:19:56 +00:00
|
|
|
guix/ssh.scm \
|
|
|
|
|
guix/scripts/copy.scm
|
2016-12-30 22:22:27 +00:00
|
|
|
|
|
|
|
|
endif HAVE_GUILE_SSH
|
|
|
|
|
|
2014-01-23 22:48:34 +00:00
|
|
|
if BUILD_DAEMON_OFFLOAD
|
|
|
|
|
|
|
|
|
|
MODULES += \
|
|
|
|
|
guix/scripts/offload.scm
|
|
|
|
|
|
|
|
|
|
endif BUILD_DAEMON_OFFLOAD
|
|
|
|
|
|
2016-11-16 15:34:17 +00:00
|
|
|
# Internal modules with test suite support.
|
|
|
|
|
dist_noinst_DATA = guix/tests.scm guix/tests/http.scm
|
2014-08-23 17:18:01 +00:00
|
|
|
|
2017-02-17 10:28:16 +00:00
|
|
|
# Auxiliary files for packages.
|
|
|
|
|
AUX_FILES = \
|
2017-02-18 08:24:41 +00:00
|
|
|
gnu/packages/aux-files/emacs/guix-emacs.el \
|
2017-02-17 10:28:16 +00:00
|
|
|
gnu/packages/aux-files/linux-libre/4.10-i686.conf \
|
|
|
|
|
gnu/packages/aux-files/linux-libre/4.10-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 \
|
|
|
|
|
gnu/packages/aux-files/linux-libre/4.4-x86_64.conf \
|
|
|
|
|
gnu/packages/aux-files/linux-libre/4.1-i686.conf \
|
|
|
|
|
gnu/packages/aux-files/linux-libre/4.1-x86_64.conf
|
2013-07-17 09:05:19 +00:00
|
|
|
|
2014-08-11 15:15:27 +00:00
|
|
|
# Templates, examples.
|
|
|
|
|
EXAMPLES = \
|
2015-05-09 21:16:11 +00:00
|
|
|
gnu/system/examples/bare-bones.tmpl \
|
2016-03-22 22:48:21 +00:00
|
|
|
gnu/system/examples/desktop.tmpl \
|
|
|
|
|
gnu/system/examples/lightweight-desktop.tmpl
|
2014-08-11 15:15:27 +00:00
|
|
|
|
2016-11-16 15:34:17 +00:00
|
|
|
GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go)
|
2012-06-13 16:01:25 +00:00
|
|
|
|
2014-12-23 11:31:50 +00:00
|
|
|
nobase_dist_guilemodule_DATA = \
|
2017-02-17 10:28:16 +00:00
|
|
|
$(MODULES) $(AUX_FILES) $(EXAMPLES) \
|
2014-12-23 11:31:50 +00:00
|
|
|
$(MISC_DISTRO_FILES)
|
2017-03-20 21:13:27 +00:00
|
|
|
nobase_nodist_guilemodule_DATA = guix/config.scm
|
|
|
|
|
nobase_nodist_guileobject_DATA = $(GOBJECTS)
|
2012-08-22 15:24:38 +00:00
|
|
|
|
2013-07-17 09:05:19 +00:00
|
|
|
# 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
|
2012-10-17 19:44:25 +00:00
|
|
|
|
2013-10-15 21:25:08 +00:00
|
|
|
# Handy way to remove the .go files without removing all the rest.
|
|
|
|
|
clean-go:
|
|
|
|
|
-$(RM) -f $(GOBJECTS)
|
2016-09-16 04:31:41 +00:00
|
|
|
@find . -name '*.go' -print | \
|
|
|
|
|
if test -t 1; then \
|
|
|
|
|
xargs -r echo -e "\033[31mwarning:\033[0m stray .go files:"; \
|
|
|
|
|
else \
|
|
|
|
|
xargs -r echo "warning: stray .go files:"; \
|
|
|
|
|
fi
|
2013-10-15 21:25:08 +00:00
|
|
|
|
2012-06-13 16:01:25 +00:00
|
|
|
|
2016-01-12 15:37:45 +00:00
|
|
|
# Test extensions; has to be unconditional.
|
|
|
|
|
TEST_EXTENSIONS = .scm .sh
|
|
|
|
|
|
|
|
|
|
if CAN_RUN_TESTS
|
|
|
|
|
|
2013-04-29 19:52:21 +00:00
|
|
|
SCM_TESTS = \
|
utils: Move base16 procedures to (guix base16).
* guix/utils.scm (bytevector->base16-string, base16-string->bytevector):
Move to...
* guix/base16.scm: ... here. New file.
* tests/utils.scm ("bytevector->base16-string->bytevector"): Move to...
* tests/base16.scm: ... here. New file.
* Makefile.am (MODULES): Add guix/base16.scm.
(SCM_TESTS): Add tests/base16.scm.
* build-aux/download.scm, guix/derivations.scm,
guix/docker.scm, guix/import/snix.scm, guix/pk-crypto.scm,
guix/scripts/authenticate.scm, guix/scripts/download.scm,
guix/scripts/hash.scm, guix/store.scm, tests/hash.scm,
tests/pk-crypto.scm: Adjust imports accordingly.
2017-03-15 20:54:34 +00:00
|
|
|
tests/base16.scm \
|
Move base32 code to (guix base32).
* guix/utils.scm (bytevector-quintet-ref, bytevector-quintet-ref-right,
bytevector-quintet-length, bytevector-quintet-fold,
bytevector-quintet-fold-right, make-bytevector->base32-string,
%nix-base32-chars, %rfc4648-base32-chars, bytevector->base32-string,
bytevector->nix-base32-string, bytevector-quintet-set!,
bytevector-quintet-set-right!, base32-string-unfold,
base32-string-unfold-right, make-base32-string->bytevector,
base32-string->bytevector, nix-base32-string->bytevector): Move to...
* guix/base32.scm: ... here. New file.
* tests/utils.scm (%nix-hash, "bytevector->base32-string",
"base32-string->bytevector", "nix-base32-string->bytevector", "sha256
& bytevector->base32-string"): Move to...
* tests/base32.scm: ... here. New file
* guix-download.in, guix/derivations.scm, guix/packages.scm,
guix/snix.scm, tests/builders.scm, tests/derivations.scm: Adjust
accordingly.
* guix.scm (%public-modules): Add `base32'.
2012-11-11 21:33:28 +00:00
|
|
|
tests/base32.scm \
|
2014-03-28 23:06:41 +00:00
|
|
|
tests/base64.scm \
|
2015-06-24 16:03:28 +00:00
|
|
|
tests/cpio.scm \
|
2013-07-02 20:38:03 +00:00
|
|
|
tests/hash.scm \
|
2013-12-19 23:36:26 +00:00
|
|
|
tests/pk-crypto.scm \
|
2013-12-29 14:53:49 +00:00
|
|
|
tests/pki.scm \
|
2015-01-11 22:43:30 +00:00
|
|
|
tests/sets.scm \
|
2016-09-04 21:41:53 +00:00
|
|
|
tests/modules.scm \
|
2015-12-07 21:45:00 +00:00
|
|
|
tests/gnu-maintenance.scm \
|
2015-03-25 09:34:27 +00:00
|
|
|
tests/substitute.scm \
|
2012-06-13 16:01:25 +00:00
|
|
|
tests/builders.scm \
|
|
|
|
|
tests/derivations.scm \
|
2016-02-22 15:29:44 +00:00
|
|
|
tests/grafts.scm \
|
2013-02-01 12:16:27 +00:00
|
|
|
tests/ui.scm \
|
2013-05-12 13:46:16 +00:00
|
|
|
tests/records.scm \
|
2016-03-09 14:08:00 +00:00
|
|
|
tests/upstream.scm \
|
utils: Move combinators to (guix combinators).
* guix/utils.scm (compile-time-value, memoize, fold2)
(fold-tree, fold-tree-leaves): Move to...
* guix/combinators: ... here. New file.
* tests/utils.scm ("fold2, 1 list", "fold2, 2 lists")
(fold-tree tests): Move to...
* tests/combinators.scm: ... here. New file.
* Makefile.am (MODULES, SCM_TESTS): Add them.
* gnu/packages.scm, gnu/packages/bootstrap.scm,
gnu/services/herd.scm, guix/build-system/gnu.scm,
guix/build-system/python.scm, guix/derivations.scm,
guix/gnu-maintenance.scm, guix/import/elpa.scm,
guix/scripts/archive.scm, guix/scripts/build.scm,
guix/scripts/graph.scm, guix/scripts/lint.scm,
guix/scripts/size.scm, guix/scripts/substitute.scm,
guix/serialization.scm, guix/store.scm, guix/ui.scm: Adjust imports
accordingly.
2016-05-04 15:35:47 +00:00
|
|
|
tests/combinators.scm \
|
2012-06-27 23:24:34 +00:00
|
|
|
tests/utils.scm \
|
2012-07-01 15:32:03 +00:00
|
|
|
tests/build-utils.scm \
|
2012-10-29 21:39:46 +00:00
|
|
|
tests/packages.scm \
|
2012-11-04 18:38:31 +00:00
|
|
|
tests/snix.scm \
|
2015-04-26 09:22:29 +00:00
|
|
|
tests/hackage.scm \
|
2015-07-24 14:49:57 +00:00
|
|
|
tests/cran.scm \
|
2015-06-16 08:50:06 +00:00
|
|
|
tests/elpa.scm \
|
2012-12-09 22:52:59 +00:00
|
|
|
tests/store.scm \
|
2013-10-03 20:45:25 +00:00
|
|
|
tests/monads.scm \
|
2014-04-28 21:00:57 +00:00
|
|
|
tests/gexp.scm \
|
2013-04-08 20:54:08 +00:00
|
|
|
tests/nar.scm \
|
2013-11-01 22:11:17 +00:00
|
|
|
tests/union.scm \
|
2014-05-10 19:49:11 +00:00
|
|
|
tests/profiles.scm \
|
2014-09-01 00:13:21 +00:00
|
|
|
tests/syscalls.scm \
|
2015-03-31 20:10:08 +00:00
|
|
|
tests/gremlin.scm \
|
2016-06-06 16:12:31 +00:00
|
|
|
tests/bournish.scm \
|
2015-03-17 14:21:31 +00:00
|
|
|
tests/lint.scm \
|
2015-06-17 22:22:13 +00:00
|
|
|
tests/publish.scm \
|
2015-09-10 09:37:36 +00:00
|
|
|
tests/scripts.scm \
|
2015-06-02 12:48:16 +00:00
|
|
|
tests/size.scm \
|
2015-08-26 22:36:41 +00:00
|
|
|
tests/graph.scm \
|
2015-10-19 22:55:09 +00:00
|
|
|
tests/challenge.scm \
|
2015-11-26 20:52:25 +00:00
|
|
|
tests/cve.scm \
|
2016-07-18 21:14:14 +00:00
|
|
|
tests/zlib.scm \
|
2015-07-14 13:06:46 +00:00
|
|
|
tests/file-systems.scm \
|
2016-01-21 21:45:54 +00:00
|
|
|
tests/system.scm \
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 21:44:26 +00:00
|
|
|
tests/services.scm \
|
2016-01-31 19:18:52 +00:00
|
|
|
tests/scripts-build.scm \
|
2016-01-17 00:20:59 +00:00
|
|
|
tests/containers.scm \
|
2017-03-14 21:43:10 +00:00
|
|
|
tests/pack.scm \
|
2016-01-17 00:20:59 +00:00
|
|
|
tests/import-utils.scm
|
2013-04-29 19:52:21 +00:00
|
|
|
|
2014-09-27 14:16:23 +00:00
|
|
|
if HAVE_GUILE_JSON
|
|
|
|
|
|
2015-01-08 20:51:13 +00:00
|
|
|
SCM_TESTS += \
|
|
|
|
|
tests/pypi.scm \
|
2015-09-01 23:57:44 +00:00
|
|
|
tests/cpan.scm \
|
2016-09-22 09:40:58 +00:00
|
|
|
tests/gem.scm \
|
|
|
|
|
tests/crate.scm
|
2014-09-27 14:16:23 +00:00
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
2013-04-29 19:52:21 +00:00
|
|
|
SH_TESTS = \
|
2012-11-01 00:46:15 +00:00
|
|
|
tests/guix-build.sh \
|
2012-11-07 23:13:25 +00:00
|
|
|
tests/guix-download.sh \
|
2013-01-05 23:28:06 +00:00
|
|
|
tests/guix-gc.sh \
|
2013-05-11 13:09:56 +00:00
|
|
|
tests/guix-hash.sh \
|
2013-12-21 20:47:17 +00:00
|
|
|
tests/guix-package.sh \
|
2015-04-06 19:52:40 +00:00
|
|
|
tests/guix-package-net.sh \
|
2014-06-26 20:23:36 +00:00
|
|
|
tests/guix-system.sh \
|
2013-12-22 00:08:21 +00:00
|
|
|
tests/guix-archive.sh \
|
2014-10-11 23:58:29 +00:00
|
|
|
tests/guix-authenticate.sh \
|
2015-06-30 10:35:27 +00:00
|
|
|
tests/guix-environment.sh \
|
2015-06-19 12:57:44 +00:00
|
|
|
tests/guix-environment-container.sh \
|
2015-08-26 22:36:41 +00:00
|
|
|
tests/guix-graph.sh \
|
2014-10-11 23:58:29 +00:00
|
|
|
tests/guix-lint.sh
|
2012-06-13 16:01:25 +00:00
|
|
|
|
2013-09-22 21:23:38 +00:00
|
|
|
if BUILD_DAEMON
|
|
|
|
|
|
|
|
|
|
SH_TESTS += tests/guix-register.sh
|
|
|
|
|
|
|
|
|
|
endif BUILD_DAEMON
|
|
|
|
|
|
|
|
|
|
|
2013-04-29 19:52:21 +00:00
|
|
|
TESTS = $(SCM_TESTS) $(SH_TESTS)
|
|
|
|
|
|
build: Add a Guile custom test driver using SRFI-64.
Before that '.log' files for scheme tests were fragmented and not
included in test-suite.log. This unifies the semantics of SRFI-64 API
with Automake test suite.
* build-aux/test-driver.scm: New file.
* Makefile.am (SCM_LOG_DRIVER, AM_SCM_LOG_DRIVER_FLAGS): New variables.
(SCM_LOG_COMPILER, AM_SCM_LOG_FLAGS): Delete variables.
(AM_TESTS_ENVIRONMENT): Set GUILE_AUTO_COMPILE to 0.
* test-env.in: Silence guix-daemon.
* doc/guix.texi (Running the Test Suite): Describe how to display the
detailed results. Bug reports require only 'test-suite.log' file.
* tests/base32.scm, tests/build-utils.scm, tests/builders.scm,
tests/challenge.scm, tests/cpan.scm, tests/cpio.scm, tests/cran.scm,
tests/cve.scm, tests/derivations.scm, tests/elpa.scm,
tests/file-systems.scm, tests/gem.scm, tests/gexp.scm,
tests/gnu-maintenance.scm, tests/grafts.scm, tests/graph.scm,
tests/gremlin.scm, tests/hackage.scm, tests/hash.scm,
tests/import-utils.scm, tests/lint.scm, tests/monads.scm, tests/nar.scm,
tests/packages.scm, tests/pk-crypto.scm, tests/pki.scm,
tests/profiles.scm, tests/publish.scm, tests/pypi.scm,
tests/records.scm, tests/scripts-build.scm, tests/scripts.scm,
tests/services.scm, tests/sets.scm, tests/size.scm, tests/snix.scm,
tests/store.scm, tests/substitute.scm, tests/syscalls.scm,
tests/system.scm, tests/ui.scm, tests/union.scm, tests/upstream.scm,
tests/utils.scm: Don't exit at the end of test groups.
* tests/containers.scm: Likewise. Use 'test-skip' instead of exiting
with error code 77.
2015-10-26 22:47:24 +00:00
|
|
|
AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)" GUILE_AUTO_COMPILE=0
|
2012-11-13 21:57:50 +00:00
|
|
|
|
2016-05-04 15:49:32 +00:00
|
|
|
SCM_LOG_DRIVER = \
|
|
|
|
|
$(top_builddir)/test-env --quiet-stderr \
|
|
|
|
|
$(GUILE) --no-auto-compile -e main \
|
|
|
|
|
$(top_srcdir)/build-aux/test-driver.scm
|
|
|
|
|
|
build: Add a Guile custom test driver using SRFI-64.
Before that '.log' files for scheme tests were fragmented and not
included in test-suite.log. This unifies the semantics of SRFI-64 API
with Automake test suite.
* build-aux/test-driver.scm: New file.
* Makefile.am (SCM_LOG_DRIVER, AM_SCM_LOG_DRIVER_FLAGS): New variables.
(SCM_LOG_COMPILER, AM_SCM_LOG_FLAGS): Delete variables.
(AM_TESTS_ENVIRONMENT): Set GUILE_AUTO_COMPILE to 0.
* test-env.in: Silence guix-daemon.
* doc/guix.texi (Running the Test Suite): Describe how to display the
detailed results. Bug reports require only 'test-suite.log' file.
* tests/base32.scm, tests/build-utils.scm, tests/builders.scm,
tests/challenge.scm, tests/cpan.scm, tests/cpio.scm, tests/cran.scm,
tests/cve.scm, tests/derivations.scm, tests/elpa.scm,
tests/file-systems.scm, tests/gem.scm, tests/gexp.scm,
tests/gnu-maintenance.scm, tests/grafts.scm, tests/graph.scm,
tests/gremlin.scm, tests/hackage.scm, tests/hash.scm,
tests/import-utils.scm, tests/lint.scm, tests/monads.scm, tests/nar.scm,
tests/packages.scm, tests/pk-crypto.scm, tests/pki.scm,
tests/profiles.scm, tests/publish.scm, tests/pypi.scm,
tests/records.scm, tests/scripts-build.scm, tests/scripts.scm,
tests/services.scm, tests/sets.scm, tests/size.scm, tests/snix.scm,
tests/store.scm, tests/substitute.scm, tests/syscalls.scm,
tests/system.scm, tests/ui.scm, tests/union.scm, tests/upstream.scm,
tests/utils.scm: Don't exit at the end of test groups.
* tests/containers.scm: Likewise. Use 'test-skip' instead of exiting
with error code 77.
2015-10-26 22:47:24 +00:00
|
|
|
AM_SCM_LOG_DRIVER_FLAGS = --brief=yes
|
2012-10-31 22:27:51 +00:00
|
|
|
|
2012-12-05 23:03:26 +00:00
|
|
|
SH_LOG_COMPILER = $(top_builddir)/test-env $(SHELL)
|
2012-10-31 22:27:51 +00:00
|
|
|
AM_SH_LOG_FLAGS = -x -e
|
2012-06-13 16:01:25 +00:00
|
|
|
|
2013-05-11 20:37:33 +00:00
|
|
|
# Make sure `tests/guix-gc.sh' runs last, after all the others. Otherwise it
|
|
|
|
|
# could end up removing files from the store while they are being used by
|
|
|
|
|
# other instances of the daemon.
|
|
|
|
|
tests/guix-gc.log: \
|
|
|
|
|
$(patsubst %.sh,%.log,$(filter-out tests/guix-gc.sh,$(SH_TESTS))) \
|
|
|
|
|
$(SCM_TESTS:%.scm=%.log)
|
|
|
|
|
|
2016-01-12 15:37:45 +00:00
|
|
|
else !CAN_RUN_TESTS
|
|
|
|
|
|
|
|
|
|
TESTS =
|
|
|
|
|
SH_TESTS =
|
|
|
|
|
SCM_TESTS =
|
|
|
|
|
|
|
|
|
|
# Automake always generates a 'check' target, so better not override it.
|
|
|
|
|
check-local:
|
|
|
|
|
@echo
|
|
|
|
|
@echo "Cannot run tests because file name limits would be exceeded." >&2
|
|
|
|
|
@echo "Look for 'length' in the 'config.log' file for details." >&2
|
|
|
|
|
@echo
|
|
|
|
|
@exit 1
|
|
|
|
|
|
|
|
|
|
endif !CAN_RUN_TESTS
|
|
|
|
|
|
2016-05-04 21:33:59 +00:00
|
|
|
check-system: $(GOBJECTS)
|
|
|
|
|
$(AM_V_at)$(top_builddir)/pre-inst-env \
|
|
|
|
|
$(GUILE) --no-auto-compile \
|
|
|
|
|
-e '(@@ (run-system-tests) run-system-tests)' \
|
|
|
|
|
$(top_srcdir)/build-aux/run-system-tests.scm
|
|
|
|
|
|
2014-03-30 21:34:20 +00:00
|
|
|
# Public key used to sign substitutes from hydra.gnu.org.
|
2014-04-07 16:04:39 +00:00
|
|
|
dist_pkgdata_DATA = hydra.gnu.org.pub
|
2013-05-11 20:37:33 +00:00
|
|
|
|
2015-04-09 21:44:14 +00:00
|
|
|
# Bash completion file.
|
|
|
|
|
dist_bashcompletion_DATA = etc/completion/bash/guix
|
|
|
|
|
|
2016-09-07 05:57:38 +00:00
|
|
|
# Zsh completion file.
|
|
|
|
|
dist_zshcompletion_DATA = etc/completion/zsh/_guix
|
|
|
|
|
|
2014-06-18 13:03:13 +00:00
|
|
|
EXTRA_DIST = \
|
|
|
|
|
HACKING \
|
|
|
|
|
ROADMAP \
|
|
|
|
|
TODO \
|
2015-12-09 12:39:40 +00:00
|
|
|
CODE-OF-CONDUCT \
|
2014-06-18 13:03:13 +00:00
|
|
|
.dir-locals.el \
|
2014-11-09 21:32:21 +00:00
|
|
|
build-aux/build-self.scm \
|
2015-11-05 22:42:45 +00:00
|
|
|
build-aux/compile-all.scm \
|
2016-04-13 17:18:03 +00:00
|
|
|
build-aux/hydra/evaluate.scm \
|
2014-06-18 13:03:13 +00:00
|
|
|
build-aux/hydra/gnu-system.scm \
|
|
|
|
|
build-aux/hydra/demo-os.scm \
|
|
|
|
|
build-aux/hydra/guix.scm \
|
|
|
|
|
build-aux/check-available-binaries.scm \
|
|
|
|
|
build-aux/check-final-inputs-self-contained.scm \
|
|
|
|
|
build-aux/download.scm \
|
2015-07-19 19:54:42 +00:00
|
|
|
build-aux/generate-authors.scm \
|
2016-04-03 14:25:07 +00:00
|
|
|
build-aux/test-driver.scm \
|
2016-05-04 21:56:42 +00:00
|
|
|
build-aux/run-system-tests.scm \
|
2016-10-21 22:02:19 +00:00
|
|
|
d3.v3.js \
|
|
|
|
|
graph.js \
|
2014-06-18 13:03:13 +00:00
|
|
|
srfi/srfi-37.scm.in \
|
|
|
|
|
srfi/srfi-64.scm \
|
|
|
|
|
srfi/srfi-64.upstream.scm \
|
|
|
|
|
tests/test.drv \
|
|
|
|
|
tests/signing-key.pub \
|
|
|
|
|
tests/signing-key.sec \
|
2015-11-26 20:52:25 +00:00
|
|
|
tests/cve-sample.xml \
|
2014-06-18 13:03:13 +00:00
|
|
|
build-aux/config.rpath \
|
|
|
|
|
bootstrap \
|
|
|
|
|
release.nix \
|
2012-08-14 16:28:04 +00:00
|
|
|
$(TESTS)
|
2012-07-05 22:55:07 +00:00
|
|
|
|
2014-01-23 22:48:34 +00:00
|
|
|
if !BUILD_DAEMON_OFFLOAD
|
|
|
|
|
|
|
|
|
|
EXTRA_DIST += \
|
|
|
|
|
guix/scripts/offload.scm
|
|
|
|
|
|
|
|
|
|
endif !BUILD_DAEMON_OFFLOAD
|
|
|
|
|
|
|
|
|
|
|
2013-04-29 19:52:21 +00:00
|
|
|
CLEANFILES = \
|
|
|
|
|
$(GOBJECTS) \
|
2013-05-11 20:42:38 +00:00
|
|
|
$(SCM_TESTS:tests/%.scm=%.log)
|
2012-06-13 16:01:25 +00:00
|
|
|
|
2015-01-20 13:55:06 +00:00
|
|
|
# Unset 'GUILE_LOAD_COMPILED_PATH' altogether while compiling. Otherwise, if
|
|
|
|
|
# $GUILE_LOAD_COMPILED_PATH contains $(moduledir), we may find .go files in
|
|
|
|
|
# there that are newer than the local .scm files (for instance because the
|
|
|
|
|
# user ran 'make install' recently). When that happens, we end up loading
|
|
|
|
|
# those previously-installed .go files, which may be stale, thereby breaking
|
2016-08-01 20:52:54 +00:00
|
|
|
# the whole thing. Likewise, set 'XDG_CACHE_HOME' to avoid loading possibly
|
|
|
|
|
# stale files from ~/.cache/guile/ccache.
|
2015-11-05 22:42:45 +00:00
|
|
|
%.go: make-go ; @:
|
2016-11-16 15:34:17 +00:00
|
|
|
make-go: $(MODULES) guix/config.scm $(dist_noinst_DATA)
|
2015-11-05 22:42:45 +00:00
|
|
|
$(AM_V_at)echo "Compiling Scheme modules..." ; \
|
2015-01-20 13:55:06 +00:00
|
|
|
unset GUILE_LOAD_COMPILED_PATH ; \
|
2016-08-01 20:52:54 +00:00
|
|
|
XDG_CACHE_HOME=/nowhere \
|
2015-11-05 22:42:45 +00:00
|
|
|
host=$(host) srcdir="$(top_srcdir)" \
|
2012-11-12 23:33:43 +00:00
|
|
|
$(top_builddir)/pre-inst-env \
|
2015-11-05 22:42:45 +00:00
|
|
|
$(GUILE) -L "$(top_builddir)" -L "$(top_srcdir)" \
|
|
|
|
|
--no-auto-compile \
|
|
|
|
|
-s "$(top_srcdir)"/build-aux/compile-all.scm $^
|
2012-06-13 16:01:25 +00:00
|
|
|
|
|
|
|
|
SUFFIXES = .go
|
|
|
|
|
|
|
|
|
|
# Make sure source files are installed first, so that the mtime of
|
|
|
|
|
# installed compiled files is greater than that of installed source
|
|
|
|
|
# files. See
|
|
|
|
|
# <http://lists.gnu.org/archive/html/guile-devel/2010-07/msg00125.html>
|
|
|
|
|
# for details.
|
2017-03-20 21:13:27 +00:00
|
|
|
guix_install_go_files = install-nobase_nodist_guileobjectDATA
|
2012-06-13 16:01:25 +00:00
|
|
|
$(guix_install_go_files): install-nobase_dist_guilemoduleDATA
|
2012-06-29 20:22:48 +00:00
|
|
|
|
2014-12-09 10:44:21 +00:00
|
|
|
# The above trick doesn't work for 'config.go' because both 'config.scm' and
|
2017-03-20 21:13:27 +00:00
|
|
|
# 'config.go' are listed in $(nobase_nodist_guileobject_DATA). Thus, give it
|
2014-12-09 10:44:21 +00:00
|
|
|
# special treatment.
|
|
|
|
|
install-data-hook: set-bootstrap-executable-permissions
|
2017-03-20 21:13:27 +00:00
|
|
|
touch "$(DESTDIR)$(guileobjectdir)/guix/config.go"
|
2014-12-09 10:44:21 +00:00
|
|
|
|
|
|
|
|
|
2014-06-13 15:30:40 +00:00
|
|
|
SUBDIRS = po/guix po/packages
|
2014-07-24 21:38:39 +00:00
|
|
|
BUILT_SOURCES =
|
2013-08-29 19:20:51 +00:00
|
|
|
|
2016-04-21 16:07:52 +00:00
|
|
|
include doc/local.mk
|
2012-10-13 14:05:01 +00:00
|
|
|
|
2012-12-03 22:04:47 +00:00
|
|
|
if BUILD_DAEMON
|
|
|
|
|
|
2016-04-21 16:07:52 +00:00
|
|
|
include nix/local.mk
|
2012-12-03 22:04:47 +00:00
|
|
|
|
|
|
|
|
endif BUILD_DAEMON
|
|
|
|
|
|
2012-06-29 20:22:48 +00:00
|
|
|
ACLOCAL_AMFLAGS = -I m4
|
2016-03-19 13:45:58 +00:00
|
|
|
|
|
|
|
|
# Pass an explicit '--localstatedir' so that configure does not error out if
|
|
|
|
|
# it finds an existing installation with a different localstatedir.
|
2012-11-03 20:11:02 +00:00
|
|
|
AM_DISTCHECK_CONFIGURE_FLAGS = \
|
2016-03-19 13:45:58 +00:00
|
|
|
--localstatedir="$$dc_install_base/var" \
|
2012-11-03 20:43:30 +00:00
|
|
|
--with-libgcrypt-prefix="$(LIBGCRYPT_PREFIX)" \
|
2014-05-17 13:41:56 +00:00
|
|
|
--with-libgcrypt-libdir="$(LIBGCRYPT_LIBDIR)" \
|
2012-12-05 23:04:43 +00:00
|
|
|
--with-nix-prefix="$(NIX_PREFIX)" \
|
|
|
|
|
--enable-daemon
|
2013-04-17 16:09:43 +00:00
|
|
|
|
2015-04-14 21:19:01 +00:00
|
|
|
# The self-contained tarball.
|
|
|
|
|
guix-binary.%.tar.xz:
|
2017-03-12 15:48:40 +00:00
|
|
|
$(AM_V_GEN)GUIX_PACKAGE_PATH= \
|
|
|
|
|
tarball=`$(top_builddir)/pre-inst-env guix pack -C xz \
|
2017-03-14 14:11:03 +00:00
|
|
|
-s "$*" --localstatedir guix` ; \
|
2017-03-12 15:48:40 +00:00
|
|
|
cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@"
|
2015-04-14 21:19:01 +00:00
|
|
|
|
|
|
|
|
|
2015-07-04 09:27:26 +00:00
|
|
|
dist-hook: sync-descriptions gen-ChangeLog gen-AUTHORS
|
|
|
|
|
dist-hook: assert-no-store-file-names
|
|
|
|
|
|
2014-06-18 13:03:13 +00:00
|
|
|
distcheck-hook: assert-binaries-available assert-final-inputs-self-contained
|
2013-05-12 14:14:25 +00:00
|
|
|
|
2013-10-09 14:13:02 +00:00
|
|
|
sync-descriptions:
|
2016-01-24 18:04:53 +00:00
|
|
|
$(AM_V_at)GUIX_PACKAGE_PATH= \
|
2015-01-26 22:56:58 +00:00
|
|
|
$(top_builddir)/pre-inst-env guix lint --checkers=gnu-description
|
2013-05-12 14:14:25 +00:00
|
|
|
|
|
|
|
|
gen-ChangeLog:
|
2016-01-24 18:04:53 +00:00
|
|
|
$(AM_V_GEN)if test -d .git; then \
|
2013-05-12 14:14:25 +00:00
|
|
|
$(top_srcdir)/build-aux/gitlog-to-changelog \
|
|
|
|
|
> $(distdir)/cl-t; \
|
|
|
|
|
rm -f $(distdir)/ChangeLog; \
|
|
|
|
|
mv $(distdir)/cl-t $(distdir)/ChangeLog; \
|
|
|
|
|
fi
|
|
|
|
|
|
2015-07-04 09:27:26 +00:00
|
|
|
gen-AUTHORS:
|
2016-01-24 18:04:53 +00:00
|
|
|
$(AM_V_GEN)if test -d .git; then \
|
2015-07-19 19:50:57 +00:00
|
|
|
rm -f "$(distdir)/AUTHORS"; \
|
|
|
|
|
$(top_builddir)/pre-inst-env "$(GUILE)" \
|
|
|
|
|
"$(top_srcdir)/build-aux/generate-authors.scm" \
|
|
|
|
|
"$(top_srcdir)" "$(distdir)/AUTHORS"; \
|
|
|
|
|
fi
|
2015-07-04 09:27:26 +00:00
|
|
|
|
2014-03-09 21:09:12 +00:00
|
|
|
# Make sure we're not shipping a file that embeds a local /gnu/store file name.
|
2013-05-12 14:26:12 +00:00
|
|
|
assert-no-store-file-names:
|
2016-01-24 18:04:53 +00:00
|
|
|
$(AM_V_at)if grep -r --exclude=*.texi --exclude=*.info \
|
2016-10-12 13:26:01 +00:00
|
|
|
--exclude=*.info-[0-9] --exclude=*.dot \
|
|
|
|
|
--exclude=*.eps --exclude-dir=bootstrap \
|
|
|
|
|
--exclude=guix-prettify.el \
|
2016-12-16 23:21:23 +00:00
|
|
|
--exclude=ChangeLog \
|
2016-10-12 13:26:01 +00:00
|
|
|
-E "$(storedir)/[a-z0-9]{32}-" $(distdir) ; \
|
2013-05-12 14:26:12 +00:00
|
|
|
then \
|
|
|
|
|
echo "error: store file names embedded in the distribution" >&2 ; \
|
|
|
|
|
exit 1 ; \
|
|
|
|
|
fi
|
|
|
|
|
|
2013-07-15 21:06:14 +00:00
|
|
|
# Make sure hydra.gnu.org has the important binaries.
|
2016-04-27 13:09:15 +00:00
|
|
|
assert-binaries-available: $(GOBJECTS)
|
2016-01-24 18:04:53 +00:00
|
|
|
$(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)" \
|
2013-07-15 21:06:14 +00:00
|
|
|
"$(top_srcdir)/build-aux/check-available-binaries.scm"
|
|
|
|
|
|
2014-06-18 13:03:13 +00:00
|
|
|
# Make sure the final inputs don't refer to bootstrap tools.
|
2016-04-27 13:09:15 +00:00
|
|
|
assert-final-inputs-self-contained: $(GOBJECTS)
|
2016-01-24 18:04:53 +00:00
|
|
|
$(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)" \
|
2014-06-18 13:03:13 +00:00
|
|
|
"$(top_srcdir)/build-aux/check-final-inputs-self-contained.scm"
|
|
|
|
|
|
2016-04-13 17:18:03 +00:00
|
|
|
# Compute the Hydra jobs and write them in the target file.
|
|
|
|
|
hydra-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/hydra/gnu-system.scm" > "$@.tmp"
|
2016-05-12 21:15:37 +00:00
|
|
|
$(AM_V_at)mv "$@.tmp" "$@"
|
2016-04-13 17:18:03 +00:00
|
|
|
|
2015-11-05 22:42:45 +00:00
|
|
|
.PHONY: sync-descriptions gen-ChangeLog gen-AUTHORS clean-go make-go
|
2013-07-15 21:06:14 +00:00
|
|
|
.PHONY: assert-no-store-file-names assert-binaries-available
|
2014-06-18 13:03:13 +00:00
|
|
|
.PHONY: assert-final-inputs-self-contained
|
2016-01-24 17:48:29 +00:00
|
|
|
|
|
|
|
|
## -------------- ##
|
|
|
|
|
## Silent rules. ##
|
|
|
|
|
## -------------- ##
|
|
|
|
|
|
|
|
|
|
AM_V_DL = $(AM_V_DL_$(V))
|
|
|
|
|
AM_V_DL_ = $(AM_V_DL_$(AM_DEFAULT_VERBOSITY))
|
|
|
|
|
AM_V_DL_0 = @echo " DL " $@;
|
2016-01-24 17:55:38 +00:00
|
|
|
|
|
|
|
|
AM_V_DOT = $(AM_V_DOT_$(V))
|
|
|
|
|
AM_V_DOT_ = $(AM_V_DOT_$(AM_DEFAULT_VERBOSITY))
|
|
|
|
|
AM_V_DOT_0 = @echo " DOT " $@;
|
2016-01-24 17:57:49 +00:00
|
|
|
|
2016-01-24 18:00:27 +00:00
|
|
|
AM_V_HELP2MAN = $(AM_V_HELP2MAN_$(V))
|
|
|
|
|
AM_V_HELP2MAN_ = $(AM_V_HELP2MAN_$(AM_DEFAULT_VERBOSITY))
|
|
|
|
|
AM_V_HELP2MAN_0 = @echo " HELP2MAN" $@;
|
