X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/98148830c0afb9adc8acf150afc48f09aae42ac1..11456ba8d7ec08c7c563c719eac8c5c9c58e92bd:/Makefile.am diff --git a/Makefile.am b/Makefile.am index 654734a991..1a3ca227a4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,9 +7,9 @@ # Copyright © 2017 Mathieu Othacehe # Copyright © 2017 Leo Famulari # Copyright © 2017 Ricardo Wurmus -# Copyright © 2017 Jan Nieuwenhuizen +# Copyright © 2017, 2020 Jan (janneke) Nieuwenhuizen # Copyright © 2017 Arun Isaac -# Copyright © 2018 ng0 +# Copyright © 2018 Nikita # Copyright © 2018 Julien Lepiller # Copyright © 2018 Oleg Pykhalov # Copyright © 2018 Alex Vong @@ -47,6 +47,18 @@ scripts/guix: scripts/guix.in Makefile $(AM_V_GEN)$(do_subst) < "$(srcdir)/$@.in" > "$@-t" $(AM_V_at)chmod a+x,a-w "$@-t" && mv -f "$@-t" "$@" +# This is our variant of the 'guile' executable, one that doesn't complain +# about locales. +pkglibexec_PROGRAMS = guile +guile_SOURCES = gnu/packages/aux-files/guile-launcher.c +guile_LDADD = $(GUILE_LIBS) +guile_CFLAGS = $(GUILE_CFLAGS) + +# Have the 'guix' command refer to our 'guile'. +install-exec-hook: + $(SED) -i "$(DESTDIR)$(bindir)/guix" \ + -e 's,^#![[:graph:]]\+,#!$(pkglibexecdir)/guile,g' + nodist_noinst_SCRIPTS = \ pre-inst-env \ test-env @@ -68,8 +80,8 @@ MODULES = \ guix/cpio.scm \ guix/deprecation.scm \ guix/docker.scm \ - guix/json.scm \ guix/records.scm \ + guix/openpgp.scm \ guix/pki.scm \ guix/progress.scm \ guix/combinators.scm \ @@ -79,6 +91,7 @@ MODULES = \ guix/modules.scm \ guix/download.scm \ guix/discovery.scm \ + guix/android-repo-download.scm \ guix/bzr-download.scm \ guix/git-download.scm \ guix/hg-download.scm \ @@ -92,8 +105,10 @@ MODULES = \ guix/derivations.scm \ guix/grafts.scm \ guix/repl.scm \ + guix/transformations.scm \ guix/inferior.scm \ guix/describe.scm \ + guix/quirks.scm \ guix/channels.scm \ guix/gnu-maintenance.scm \ guix/self.scm \ @@ -102,16 +117,16 @@ MODULES = \ guix/lint.scm \ guix/glob.scm \ guix/git.scm \ + guix/git-authenticate.scm \ guix/graph.scm \ guix/cache.scm \ guix/cve.scm \ guix/workers.scm \ - guix/zlib.scm \ - guix/lzlib.scm \ guix/build-system.scm \ guix/build-system/android-ndk.scm \ guix/build-system/ant.scm \ guix/build-system/cargo.scm \ + guix/build-system/chicken.scm \ guix/build-system/clojure.scm \ guix/build-system/cmake.scm \ guix/build-system/dub.scm \ @@ -129,6 +144,7 @@ MODULES = \ guix/build-system/haskell.scm \ guix/build-system/julia.scm \ guix/build-system/linux-module.scm \ + guix/build-system/maven.scm \ guix/build-system/node.scm \ guix/build-system/perl.scm \ guix/build-system/python.scm \ @@ -160,6 +176,7 @@ MODULES = \ guix/build/download-nar.scm \ guix/build/cargo-build-system.scm \ guix/build/cargo-utils.scm \ + guix/build/chicken-build-system.scm \ guix/build/cmake-build-system.scm \ guix/build/dub-build-system.scm \ guix/build/dune-build-system.scm \ @@ -168,15 +185,18 @@ MODULES = \ guix/build/minify-build-system.scm \ guix/build/font-build-system.scm \ guix/build/go-build-system.scm \ + guix/build/android-repo.scm \ guix/build/asdf-build-system.scm \ guix/build/bzr.scm \ guix/build/copy-build-system.scm \ guix/build/git.scm \ guix/build/hg.scm \ guix/build/glib-or-gtk-build-system.scm \ + guix/build/gnu-bootstrap.scm \ guix/build/gnu-build-system.scm \ guix/build/gnu-dist.scm \ guix/build/guile-build-system.scm \ + guix/build/maven-build-system.scm \ guix/build/node-build-system.scm \ guix/build/perl-build-system.scm \ guix/build/python-build-system.scm \ @@ -208,6 +228,9 @@ MODULES = \ guix/build/emacs-utils.scm \ guix/build/java-utils.scm \ guix/build/lisp-utils.scm \ + guix/build/maven/java.scm \ + guix/build/maven/plugin.scm \ + guix/build/maven/pom.scm \ guix/build/graft.scm \ guix/build/bournish.scm \ guix/build/qt-utils.scm \ @@ -277,6 +300,8 @@ MODULES = \ guix/scripts/publish.scm \ guix/scripts/edit.scm \ guix/scripts/size.scm \ + guix/scripts/git.scm \ + guix/scripts/git/authenticate.scm \ guix/scripts/graph.scm \ guix/scripts/weather.scm \ guix/scripts/container.scm \ @@ -296,6 +321,14 @@ MODULES += \ endif HAVE_GUILE_SSH +if HAVE_GUILE_AVAHI + +MODULES += \ + guix/avahi.scm \ + guix/scripts/discover.scm + +endif HAVE_GUILE_AVAHI + if BUILD_DAEMON_OFFLOAD MODULES += \ @@ -315,12 +348,17 @@ MODULES += $(STORE_MODULES) dist_noinst_DATA = \ guix/tests.scm \ guix/tests/http.scm \ - guix/tests/git.scm + guix/tests/git.scm \ + guix/tests/gnupg.scm # Auxiliary files for packages. AUX_FILES = \ gnu/packages/aux-files/chromium/master-preferences.json \ gnu/packages/aux-files/emacs/guix-emacs.el \ + gnu/packages/aux-files/linux-libre/5.9-arm.conf \ + gnu/packages/aux-files/linux-libre/5.9-arm64.conf \ + gnu/packages/aux-files/linux-libre/5.9-i686.conf \ + gnu/packages/aux-files/linux-libre/5.9-x86_64.conf \ gnu/packages/aux-files/linux-libre/5.4-arm.conf \ gnu/packages/aux-files/linux-libre/5.4-arm64.conf \ gnu/packages/aux-files/linux-libre/5.4-i686.conf \ @@ -336,12 +374,14 @@ AUX_FILES = \ 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/pack-audit.c \ gnu/packages/aux-files/run-in-namespace.c # Templates, examples. EXAMPLES = \ gnu/system/examples/asus-c201.tmpl \ gnu/system/examples/bare-bones.tmpl \ + gnu/system/examples/bare-hurd.tmpl \ gnu/system/examples/beaglebone-black.tmpl \ gnu/system/examples/desktop.tmpl \ gnu/system/examples/lightweight-desktop.tmpl \ @@ -378,6 +418,7 @@ SCM_TESTS = \ tests/base16.scm \ tests/base32.scm \ tests/base64.scm \ + tests/boot-parameters.scm \ tests/bournish.scm \ tests/builders.scm \ tests/build-utils.scm \ @@ -399,6 +440,7 @@ SCM_TESTS = \ tests/gem.scm \ tests/gexp.scm \ tests/git.scm \ + tests/git-authenticate.scm \ tests/glob.scm \ tests/gnu-maintenance.scm \ tests/grafts.scm \ @@ -408,12 +450,13 @@ SCM_TESTS = \ tests/import-utils.scm \ tests/inferior.scm \ tests/lint.scm \ - tests/lzlib.scm \ tests/modules.scm \ tests/monads.scm \ tests/nar.scm \ tests/networking.scm \ + tests/offload.scm \ tests/opam.scm \ + tests/openpgp.scm \ tests/packages.scm \ tests/pack.scm \ tests/pki.scm \ @@ -424,7 +467,6 @@ SCM_TESTS = \ tests/pypi.scm \ tests/records.scm \ tests/scripts.scm \ - tests/scripts-build.scm \ tests/search-paths.scm \ tests/services.scm \ tests/services/linux.scm \ @@ -441,19 +483,20 @@ SCM_TESTS = \ tests/syscalls.scm \ tests/system.scm \ tests/texlive.scm \ + tests/transformations.scm \ tests/ui.scm \ tests/union.scm \ tests/upstream.scm \ tests/utils.scm \ tests/uuid.scm \ - tests/workers.scm \ - tests/zlib.scm + tests/workers.scm SH_TESTS = \ tests/guix-build.sh \ tests/guix-build-branch.sh \ tests/guix-download.sh \ tests/guix-gc.sh \ + tests/guix-git-authenticate.sh \ tests/guix-hash.sh \ tests/guix-pack.sh \ tests/guix-pack-localstatedir.sh \ @@ -468,6 +511,7 @@ SH_TESTS = \ tests/guix-environment-container.sh \ tests/guix-graph.sh \ tests/guix-describe.sh \ + tests/guix-repl.sh \ tests/guix-lint.sh TESTS = $(SCM_TESTS) $(SH_TESTS) @@ -513,7 +557,7 @@ check-system: $(GOBJECTS) # Public keys used to sign substitutes. dist_pkgdata_DATA = \ - etc/substitutes/berlin.guixsd.org.pub \ + etc/substitutes/berlin.guix.gnu.org.pub \ etc/substitutes/ci.guix.gnu.org.pub \ etc/substitutes/ci.guix.info.pub @@ -528,7 +572,7 @@ dist_zshcompletion_DATA = etc/completion/zsh/_guix dist_fishcompletion_DATA = etc/completion/fish/guix.fish # SELinux policy -dist_selinux_policy_DATA = etc/guix-daemon.cil +nodist_selinux_policy_DATA = etc/guix-daemon.cil EXTRA_DIST += \ HACKING \ @@ -536,12 +580,14 @@ EXTRA_DIST += \ TODO \ CODE-OF-CONDUCT \ .dir-locals.el \ + .guix-authorizations \ .guix-channel \ scripts/guix.in \ etc/guix-install.sh \ etc/news.scm \ etc/release-manifest.scm \ etc/system-tests.scm \ + etc/historical-authorizations \ build-aux/build-self.scm \ build-aux/compile-all.scm \ build-aux/hydra/evaluate.scm \ @@ -550,11 +596,12 @@ EXTRA_DIST += \ 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 \ build-aux/generate-authors.scm \ - build-aux/git-authenticate.scm \ build-aux/test-driver.scm \ build-aux/update-guix-package.scm \ build-aux/update-NEWS.scm \ @@ -564,6 +611,13 @@ EXTRA_DIST += \ tests/signing-key.pub \ tests/signing-key.sec \ tests/cve-sample.json \ + tests/civodul.key \ + tests/rsa.key \ + tests/dsa.key \ + tests/ed25519.key \ + tests/ed25519.sec \ + tests/ed25519bis.key \ + tests/ed25519bis.sec \ build-aux/config.rpath \ bootstrap \ doc/build.scm \ @@ -616,17 +670,21 @@ $(guix_install_go_files): install-nobase_dist_guilemoduleDATA install-data-hook: touch "$(DESTDIR)$(guileobjectdir)/guix/config.go" -# Commit corresponding to the 'v1.0.1' tag. -commit_v1_0_1 = d68de958b60426798ed62797ff7c96c327a672ac +# Commit corresponding to the 'v1.0.0' tag. +commit_v1_0_0 = 6298c3ffd9654d3231a6f25390b056483e8f407c + +# Introduction of the 'guix' channel. Keep in sync with (guix channels)! +channel_intro_commit = 9edb3f66fd807b096b48283debdcddccfea34bad +channel_intro_signer = BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA -# Authenticate the current Git checkout by checking signatures on every commit -# starting from $(commit_v1_0_1). +# Authenticate the current Git checkout by checking signatures on every commit. +GUIX_GIT_KEYRING = origin/keyring authenticate: $(AM_V_at)echo "Authenticating Git checkout..." ; \ - "$(top_builddir)/pre-inst-env" $(GUILE) \ - --no-auto-compile -e git-authenticate \ - "$(top_srcdir)/build-aux/git-authenticate.scm" \ - "$(commit_v1_0_1)" + guix git authenticate \ + --keyring=$(GUIX_GIT_KEYRING) \ + --cache-key=channels/guix --stats \ + "$(channel_intro_commit)" "$(channel_intro_signer)" # Assuming Guix is already installed and the daemon is up and running, this # rule builds from $(srcdir), creating and building derivations. @@ -663,12 +721,12 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \ ac_cv_guix_test_root="$(GUIX_TEST_ROOT)" # Name of the 'guix' package shipped in the binary tarball. -GUIX_FOR_BINARY_TARBALL = guile3.0-guix +GUIX_FOR_BINARY_TARBALL = guix # The self-contained tarball. guix-binary.%.tar.xz: $(AM_V_GEN)GUIX_PACKAGE_PATH= \ - tarball=`$(top_builddir)/pre-inst-env guix pack -K -C xz \ + tarball=`$(top_builddir)/pre-inst-env guix pack -C xz \ --fallback \ -s "$*" --localstatedir --profile-name=current-guix \ $(GUIX_FOR_BINARY_TARBALL)` ; \ @@ -683,8 +741,8 @@ distcheck-hook: assert-binaries-available assert-final-inputs-self-contained EXTRA_DIST += $(top_srcdir)/.version BUILT_SOURCES += $(top_srcdir)/.version -$(top_srcdir)/.version: - echo $(VERSION) > "$@-t" && mv "$@-t" "$@" +$(top_srcdir)/.version: config.status + $(AM_V_GEN)echo $(VERSION) > "$@-t" && mv "$@-t" "$@" gen-tarball-version: echo $(VERSION) > "$(distdir)/.tarball-version" @@ -705,6 +763,16 @@ gen-AUTHORS: "$(top_srcdir)" "$(distdir)/AUTHORS"; \ fi +# Like 'dist', but regenerate 'configure' so we get an up-to-date +# 'PACKAGE_VERSION' string. (In Gnulib, 'GNUmakefile' has a special trick to +# do that whenever a 'dist' target is used.) +dist-with-updated-version: + @echo "Running './bootstrap' for new version string..." + $(top_srcdir)/bootstrap + $(MAKE) $(AM_MAKEFLAGS) $(top_srcdir)/.version dist + +.PHONY: dist-with-updated-version + # # Release management. @@ -760,7 +828,7 @@ system_flags = $(foreach system,$(1),-s $(system)) # # XXX: Depend on 'dist' rather than 'distcheck' to work around the Gettext # issue described at . -release: dist +release: dist-with-updated-version cd po; git checkout . @if ! git diff-index --quiet HEAD; then \ echo "There are uncommitted changes; stopping." >&2 ; \ @@ -769,9 +837,10 @@ release: dist $(MKDIR_P) "$(releasedir)" rm -f "$(releasedir)"/* mv $(SOURCE_TARBALLS) "$(releasedir)" - $(top_builddir)/pre-inst-env "$(GUILE)" \ - $(top_srcdir)/build-aux/update-guix-package.scm \ - "`git rev-parse HEAD`" "$(PACKAGE_VERSION)" + GUIX_ALLOW_ME_TO_USE_PRIVATE_COMMIT=yes \ + $(top_builddir)/pre-inst-env "$(GUILE)" \ + $(top_srcdir)/build-aux/update-guix-package.scm \ + "`git rev-parse HEAD`" "$(PACKAGE_VERSION)" git add $(top_srcdir)/gnu/packages/package-management.scm git commit -m "gnu: guix: Update to $(PACKAGE_VERSION)." $(top_builddir)/pre-inst-env guix build $(GUIX_FOR_BINARY_TARBALL) \ @@ -783,9 +852,10 @@ release: dist mv "guix-binary.$$system.tar.xz" \ "$(releasedir)/guix-binary-$(PACKAGE_VERSION).$$system.tar.xz" ; \ done - $(top_builddir)/pre-inst-env "$(GUILE)" \ - $(top_srcdir)/build-aux/update-guix-package.scm \ - "`git rev-parse HEAD`" + GUIX_ALLOW_ME_TO_USE_PRIVATE_COMMIT=yes \ + $(top_builddir)/pre-inst-env "$(GUILE)" \ + $(top_srcdir)/build-aux/update-guix-package.scm \ + "`git rev-parse HEAD`" git add $(top_srcdir)/gnu/packages/package-management.scm git commit -m "gnu: guix: Update to `git rev-parse HEAD | cut -c1-7`." $(top_builddir)/pre-inst-env guix build guix \ @@ -793,8 +863,8 @@ release: dist -v1 --no-grafts --fallback for system in $(GUIX_SYSTEM_SUPPORTED_SYSTEMS) ; do \ image=`$(top_builddir)/pre-inst-env \ - guix system disk-image \ - --file-system-type=iso9660 \ + guix system disk-image -t iso9660 \ + --label="GUIX_$${system}_$(VERSION)" \ --system=$$system --fallback \ gnu/system/install.scm` ; \ if [ ! -f "$$image" ] ; then \ @@ -808,6 +878,7 @@ release: dist for system in $(GUIX_SYSTEM_VM_SYSTEMS) ; do \ image=`$(top_builddir)/pre-inst-env \ guix system vm-image $(GUIX_SYSTEM_VM_IMAGE_FLAGS) \ + --save-provenance \ --system=$$system --fallback \ gnu/system/examples/vm-image.tmpl` ; \ if [ ! -f "$$image" ] ; then \ @@ -864,6 +935,11 @@ assert-final-inputs-self-contained: $(GOBJECTS) $(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/check-final-inputs-self-contained.scm" +# Validate channel news. +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 "$@"`" @@ -883,7 +959,7 @@ cuirass-jobs.scm: $(GOBJECTS) .PHONY: gen-ChangeLog gen-AUTHORS gen-tarball-version .PHONY: assert-no-store-file-names assert-binaries-available -.PHONY: assert-final-inputs-self-contained +.PHONY: assert-final-inputs-self-contained check-channel-news .PHONY: clean-go make-go as-derivation authenticate .PHONY: update-guix-package update-NEWS release