# GNU Guix --- Functional package management for GNU
# Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2013 Andreas Enge <andreas@enge.fr>
-# Copyright © 2015 Alex Kost <alezost@gmail.com>
+# Copyright © 2015
, 2017 Alex Kost <alezost@gmail.com>
# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
# Copyright © 2016, 2017 Mark H Weaver <mhw@netris.org>
+# Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
#
# This file is part of GNU Guix.
#
include gnu/local.mk
MODULES = \
+ guix/base16.scm \
guix/base32.scm \
guix/base64.scm \
guix/cpio.scm \
guix/upstream.scm \
guix/licenses.scm \
guix/graph.scm \
+ guix/cache.scm \
guix/cve.scm \
+ guix/workers.scm \
guix/zlib.scm \
guix/build-system.scm \
guix/build-system/ant.scm \
guix/import/cabal.scm \
guix/import/cran.scm \
guix/import/hackage.scm \
- guix/import/stackage.scm \
guix/import/elpa.scm \
guix/scripts.scm \
guix/scripts/download.scm \
guix/scripts/package.scm \
guix/scripts/gc.scm \
guix/scripts/hash.scm \
+ guix/scripts/pack.scm \
guix/scripts/pull.scm \
guix/scripts/substitute.scm \
guix/scripts/authenticate.scm \
MODULES += \
guix/docker.scm \
+ guix/import/cpan.scm \
+ guix/import/crate.scm \
+ guix/import/gem.scm \
guix/import/github.scm \
guix/import/json.scm \
- guix/import/crate.scm \
- guix/scripts/import/crate.scm \
guix/import/pypi.scm \
- guix/scripts/import/pypi.scm \
- guix/import/cpan.scm \
+ guix/import/stackage.scm \
+ guix/scripts/import/crate.scm \
guix/scripts/import/gem.scm \
- guix/import/gem.scm
+ guix/scripts/import/pypi.scm
endif
MODULES += \
guix/ssh.scm \
- guix/scripts/copy.scm
+ guix/scripts/copy.scm \
+ guix/store/ssh.scm
endif HAVE_GUILE_SSH
# Internal modules with test suite support.
dist_noinst_DATA = guix/tests.scm guix/tests/http.scm
-# Linux-Libre configurations.
-KCONFIGS = \
- gnu/packages/linux-libre-4.10-i686.conf \
- gnu/packages/linux-libre-4.10-x86_64.conf \
- gnu/packages/linux-libre-4.9-i686.conf \
- gnu/packages/linux-libre-4.9-x86_64.conf \
- gnu/packages/linux-libre-4.4-i686.conf \
- gnu/packages/linux-libre-4.4-x86_64.conf \
- gnu/packages/linux-libre-4.1-i686.conf \
- gnu/packages/linux-libre-4.1-x86_64.conf
+# Auxiliary files for packages.
+AUX_FILES = \
+ gnu/packages/aux-files/emacs/guix-emacs.el \
+ 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
# Templates, examples.
EXAMPLES = \
GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go)
nobase_dist_guilemodule_DATA = \
- $(MODULES) $(KCONFIGS) $(EXAMPLES) \
+ $(MODULES) $(AUX_FILES) $(EXAMPLES) \
$(MISC_DISTRO_FILES)
-nobase_nodist_guilemodule_DATA = $(GOBJECTS) guix/config.scm
+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
if CAN_RUN_TESTS
SCM_TESTS = \
+ tests/base16.scm \
tests/base32.scm \
tests/base64.scm \
tests/cpio.scm \
tests/nar.scm \
tests/union.scm \
tests/profiles.scm \
+ tests/search-paths.scm \
tests/syscalls.scm \
tests/gremlin.scm \
tests/bournish.scm \
tests/size.scm \
tests/graph.scm \
tests/challenge.scm \
+ tests/cache.scm \
tests/cve.scm \
+ tests/workers.scm \
tests/zlib.scm \
tests/file-systems.scm \
tests/system.scm \
tests/services.scm \
tests/scripts-build.scm \
tests/containers.scm \
+ tests/pack.scm \
tests/import-utils.scm
if HAVE_GUILE_JSON
TODO \
CODE-OF-CONDUCT \
.dir-locals.el \
+ gnu/build/svg.scm \
build-aux/build-self.scm \
build-aux/compile-all.scm \
build-aux/hydra/evaluate.scm \
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 \
- build-aux/make-binary-tarball.scm \
build-aux/generate-authors.scm \
build-aux/test-driver.scm \
build-aux/run-system-tests.scm \
# files. See
# <http://lists.gnu.org/archive/html/guile-devel/2010-07/msg00125.html>
# for details.
-guix_install_go_files = install-nobase_nodist_guilemoduleDATA
+guix_install_go_files = install-nobase_nodist_guileobjectDATA
$(guix_install_go_files): install-nobase_dist_guilemoduleDATA
# The above trick doesn't work for 'config.go' because both 'config.scm' and
-# 'config.go' are listed in $(nobase_nodist_guilemodule_DATA). Thus, give it
+# 'config.go' are listed in $(nobase_nodist_guileobject_DATA). Thus, give it
# special treatment.
install-data-hook: set-bootstrap-executable-permissions
- touch "$(DESTDIR)$(guilemoduledir)/guix/config.go"
+ touch "$(DESTDIR)$(guileobjectdir)/guix/config.go"
SUBDIRS = po/guix po/packages
--with-nix-prefix="$(NIX_PREFIX)" \
--enable-daemon
-# The self-contained tarball.
+# The self-contained tarball. Add 'glibc-utf8-locales' along with glibc just
+# so 'etc/profile' defines 'GUIX_LOCPATH' pointing to a valid set of locales.
guix-binary.%.tar.xz:
- $(AM_V_GEN)GUIX_PACKAGE_PATH= \
- $(top_builddir)/pre-inst-env "$(GUILE)" \
- "$(top_srcdir)/build-aux/make-binary-tarball.scm" "$*" "$@"
+ $(AM_V_GEN)GUIX_PACKAGE_PATH= \
+ tarball=`$(top_builddir)/pre-inst-env guix pack -C xz \
+ -s "$*" --localstatedir guix glibc-utf8-locales \
+ -e '(@@ (gnu packages commencement) glibc-final)'` ; \
+ cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@"
dist-hook: sync-descriptions gen-ChangeLog gen-AUTHORS
HCoop / jackhill / guix / guix.git / blobdiff