X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/da56f10971e0b6f32969b10e38ed043b2c99bb82..cb9cb2e89afce6724d38588ec5b0a58f03ff46dc:/Makefile.am?ds=sidebyside diff --git a/Makefile.am b/Makefile.am index 36f3bc5c27..c6a2e6cf6c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ MODULES = \ guix/cpio.scm \ guix/deprecation.scm \ guix/docker.scm \ + guix/json.scm \ guix/records.scm \ guix/pki.scm \ guix/progress.scm \ @@ -78,6 +79,7 @@ MODULES = \ guix/modules.scm \ guix/download.scm \ guix/discovery.scm \ + guix/bzr-download.scm \ guix/git-download.scm \ guix/hg-download.scm \ guix/swh.scm \ @@ -89,6 +91,7 @@ MODULES = \ guix/nar.scm \ guix/derivations.scm \ guix/grafts.scm \ + guix/repl.scm \ guix/inferior.scm \ guix/describe.scm \ guix/channels.scm \ @@ -96,6 +99,7 @@ MODULES = \ guix/self.scm \ guix/upstream.scm \ guix/licenses.scm \ + guix/lint.scm \ guix/glob.scm \ guix/git.scm \ guix/graph.scm \ @@ -103,6 +107,7 @@ MODULES = \ 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 \ @@ -121,10 +126,13 @@ MODULES = \ guix/build-system/gnu.scm \ guix/build-system/guile.scm \ guix/build-system/haskell.scm \ + guix/build-system/julia.scm \ guix/build-system/linux-module.scm \ + guix/build-system/node.scm \ guix/build-system/perl.scm \ guix/build-system/python.scm \ guix/build-system/ocaml.scm \ + guix/build-system/qt.scm \ guix/build-system/waf.scm \ guix/build-system/r.scm \ guix/build-system/rakudo.scm \ @@ -142,6 +150,7 @@ MODULES = \ guix/svn-download.scm \ guix/colors.scm \ guix/i18n.scm \ + guix/diagnostics.scm \ guix/ui.scm \ guix/status.scm \ guix/build/android-ndk-build-system.scm \ @@ -159,15 +168,18 @@ MODULES = \ guix/build/font-build-system.scm \ guix/build/go-build-system.scm \ guix/build/asdf-build-system.scm \ + guix/build/bzr.scm \ guix/build/git.scm \ guix/build/hg.scm \ guix/build/glib-or-gtk-build-system.scm \ guix/build/gnu-build-system.scm \ guix/build/gnu-dist.scm \ guix/build/guile-build-system.scm \ + guix/build/node-build-system.scm \ guix/build/perl-build-system.scm \ guix/build/python-build-system.scm \ guix/build/ocaml-build-system.scm \ + guix/build/qt-build-system.scm \ guix/build/r-build-system.scm \ guix/build/rakudo-build-system.scm \ guix/build/ruby-build-system.scm \ @@ -175,8 +187,10 @@ MODULES = \ guix/build/texlive-build-system.scm \ guix/build/waf-build-system.scm \ guix/build/haskell-build-system.scm \ + guix/build/julia-build-system.scm \ guix/build/linux-module-build-system.scm \ guix/build/store-copy.scm \ + guix/build/json.scm \ guix/build/utils.scm \ guix/build/union.scm \ guix/build/profiles.scm \ @@ -209,6 +223,7 @@ MODULES = \ guix/import/gnu.scm \ guix/import/hackage.scm \ guix/import/json.scm \ + guix/import/kde.scm \ guix/import/launchpad.scm \ guix/import/opam.scm \ guix/import/print.scm \ @@ -228,6 +243,7 @@ MODULES = \ guix/scripts/remove.scm \ guix/scripts/upgrade.scm \ guix/scripts/search.scm \ + guix/scripts/show.scm \ guix/scripts/gc.scm \ guix/scripts/hash.scm \ guix/scripts/pack.scm \ @@ -240,6 +256,7 @@ MODULES = \ guix/scripts/describe.scm \ guix/scripts/system.scm \ guix/scripts/system/search.scm \ + guix/scripts/system/reconfigure.scm \ guix/scripts/lint.scm \ guix/scripts/challenge.scm \ guix/scripts/import/crate.scm \ @@ -262,6 +279,8 @@ MODULES = \ guix/scripts/weather.scm \ guix/scripts/container.scm \ guix/scripts/container/exec.scm \ + guix/scripts/deploy.scm \ + guix/scripts/time-machine.scm \ guix.scm \ $(GNU_SYSTEM_MODULES) @@ -269,6 +288,7 @@ if HAVE_GUILE_SSH MODULES += \ guix/ssh.scm \ + guix/remote.scm \ guix/scripts/copy.scm \ guix/store/ssh.scm @@ -290,18 +310,21 @@ STORE_MODULES = \ MODULES += $(STORE_MODULES) # Internal modules with test suite support. -dist_noinst_DATA = guix/tests.scm guix/tests/http.scm +dist_noinst_DATA = \ + guix/tests.scm \ + guix/tests/http.scm \ + guix/tests/git.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.0-arm.conf \ - gnu/packages/aux-files/linux-libre/5.0-arm64.conf \ - gnu/packages/aux-files/linux-libre/5.0-i686.conf \ - gnu/packages/aux-files/linux-libre/5.0-x86_64.conf \ + gnu/packages/aux-files/linux-libre/5.4-arm.conf \ + gnu/packages/aux-files/linux-libre/5.4-arm-veyron.conf \ + gnu/packages/aux-files/linux-libre/5.4-arm64.conf \ + gnu/packages/aux-files/linux-libre/5.4-i686.conf \ + gnu/packages/aux-files/linux-libre/5.4-x86_64.conf \ gnu/packages/aux-files/linux-libre/4.19-arm.conf \ - gnu/packages/aux-files/linux-libre/5.0-arm-veyron.conf \ gnu/packages/aux-files/linux-libre/4.19-arm64.conf \ gnu/packages/aux-files/linux-libre/4.19-i686.conf \ gnu/packages/aux-files/linux-libre/4.19-x86_64.conf \ @@ -321,6 +344,7 @@ EXAMPLES = \ gnu/system/examples/beaglebone-black.tmpl \ gnu/system/examples/desktop.tmpl \ gnu/system/examples/lightweight-desktop.tmpl \ + gnu/system/examples/docker-image.tmpl \ gnu/system/examples/vm-image.tmpl GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go) @@ -349,75 +373,80 @@ TEST_EXTENSIONS = .scm .sh if CAN_RUN_TESTS SCM_TESTS = \ + tests/accounts.scm \ tests/base16.scm \ tests/base32.scm \ tests/base64.scm \ + tests/bournish.scm \ + tests/builders.scm \ + tests/build-utils.scm \ + tests/cache.scm \ + tests/challenge.scm \ tests/channels.scm \ + tests/combinators.scm \ + tests/containers.scm \ tests/cpan.scm \ tests/cpio.scm \ + tests/cran.scm \ tests/crate.scm \ - tests/gem.scm \ - tests/pki.scm \ - tests/print.scm \ - tests/sets.scm \ - tests/modules.scm \ - tests/gnu-maintenance.scm \ - tests/substitute.scm \ - tests/builders.scm \ - tests/derivations.scm \ - tests/glob.scm \ - tests/grafts.scm \ - tests/ui.scm \ - tests/status.scm \ - tests/records.scm \ - tests/processes.scm \ - tests/upstream.scm \ - tests/combinators.scm \ + tests/cve.scm \ + tests/debug-link.scm \ + tests/derivations.scm \ tests/discovery.scm \ - tests/utils.scm \ - tests/build-utils.scm \ - tests/packages.scm \ - tests/snix.scm \ - tests/hackage.scm \ - tests/cran.scm \ tests/elpa.scm \ - tests/texlive.scm \ - tests/store.scm \ - tests/monads.scm \ + tests/file-systems.scm \ + tests/gem.scm \ tests/gexp.scm \ - tests/nar.scm \ - tests/union.scm \ - tests/profiles.scm \ - tests/search-paths.scm \ - tests/syscalls.scm \ - tests/inferior.scm \ + tests/git.scm \ + tests/glob.scm \ + tests/gnu-maintenance.scm \ + tests/grafts.scm \ + tests/graph.scm \ tests/gremlin.scm \ - tests/debug-link.scm \ - tests/bournish.scm \ + tests/hackage.scm \ + tests/import-utils.scm \ + tests/inferior.scm \ tests/lint.scm \ - tests/publish.scm \ - tests/scripts.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/uuid.scm \ - tests/system.scm \ - tests/accounts.scm \ - tests/services.scm \ - tests/scripts-build.scm \ - tests/containers.scm \ + tests/lzlib.scm \ + tests/modules.scm \ + tests/monads.scm \ + tests/nar.scm \ + tests/networking.scm \ tests/opam.scm \ + tests/packages.scm \ tests/pack.scm \ + tests/pki.scm \ + tests/print.scm \ + tests/processes.scm \ + tests/profiles.scm \ + tests/publish.scm \ tests/pypi.scm \ - tests/import-utils.scm \ + tests/records.scm \ + tests/scripts.scm \ + tests/scripts-build.scm \ + tests/search-paths.scm \ + tests/services.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 \ - tests/store-roots.scm + tests/store-deduplication.scm \ + tests/store-roots.scm \ + tests/store.scm \ + tests/substitute.scm \ + tests/swh.scm \ + tests/syscalls.scm \ + tests/system.scm \ + tests/texlive.scm \ + tests/ui.scm \ + tests/union.scm \ + tests/upstream.scm \ + tests/utils.scm \ + tests/uuid.scm \ + tests/workers.scm \ + tests/zlib.scm SH_TESTS = \ tests/guix-build.sh \ @@ -483,10 +512,10 @@ check-system: $(GOBJECTS) -e '(@@ (run-system-tests) run-system-tests)' \ $(top_srcdir)/build-aux/run-system-tests.scm -# Public key used to sign substitutes from hydra.gnu.org & co. +# Public keys used to sign substitutes. dist_pkgdata_DATA = \ - etc/substitutes/hydra.gnu.org.pub \ etc/substitutes/berlin.guixsd.org.pub \ + etc/substitutes/ci.guix.gnu.org.pub \ etc/substitutes/ci.guix.info.pub # Bash completion file. @@ -508,8 +537,10 @@ EXTRA_DIST += \ TODO \ CODE-OF-CONDUCT \ .dir-locals.el \ + .guix-channel \ scripts/guix.in \ etc/guix-install.sh \ + etc/news.scm \ build-aux/build-self.scm \ build-aux/compile-all.scm \ build-aux/hydra/evaluate.scm \ @@ -523,6 +554,7 @@ EXTRA_DIST += \ build-aux/check-final-inputs-self-contained.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 \ @@ -532,10 +564,10 @@ EXTRA_DIST += \ tests/test.drv \ tests/signing-key.pub \ tests/signing-key.sec \ - tests/cve-sample.xml \ + tests/cve-sample.json \ build-aux/config.rpath \ bootstrap \ - release.nix \ + doc/build.scm \ $(TESTS) if !BUILD_DAEMON_OFFLOAD @@ -582,9 +614,21 @@ $(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_guileobject_DATA). Thus, give it # special treatment. -install-data-hook: set-bootstrap-executable-permissions +install-data-hook: touch "$(DESTDIR)$(guileobjectdir)/guix/config.go" +# Commit corresponding to the 'v1.0.1' tag. +commit_v1_0_1 = d68de958b60426798ed62797ff7c96c327a672ac + +# Authenticate the current Git checkout by checking signatures on every commit +# starting from $(commit_v1_0_1). +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)" + # Assuming Guix is already installed and the daemon is up and running, this # rule builds from $(srcdir), creating and building derivations. as-derivation: @@ -627,7 +671,7 @@ guix-binary.%.tar.xz: cp "$$tarball" "$@.tmp" ; mv "$@.tmp" "$@" -dist-hook: $(distdir)/ChangeLog gen-AUTHORS gen-tarball-version +dist-hook: gen-ChangeLog gen-AUTHORS gen-tarball-version dist-hook: assert-no-store-file-names dist-hook: doc-po-update @@ -641,12 +685,12 @@ $(top_srcdir)/.version: gen-tarball-version: echo $(VERSION) > "$(distdir)/.tarball-version" -gen-ChangeLog $(distdir)/ChangeLog: +gen-ChangeLog: $(AM_V_GEN)if test -d .git; then \ $(top_srcdir)/build-aux/gitlog-to-changelog \ - > $(distdir)/cl-t; \ + > $(distdir)/ChangeLog.tmp; \ rm -f $(distdir)/ChangeLog; \ - mv $(distdir)/cl-t $(distdir)/ChangeLog; \ + mv $(distdir)/ChangeLog.tmp $(distdir)/ChangeLog; \ fi gen-AUTHORS: @@ -714,7 +758,6 @@ system_flags = $(foreach system,$(1),-s $(system)) # issue described at . release: dist cd po; git checkout . - cd doc; git checkout . @if ! git diff-index --quiet HEAD; then \ echo "There are uncommitted changes; stopping." >&2 ; \ exit 1 ; \ @@ -791,13 +834,15 @@ update-NEWS: $(GOBJECTS) $(top_srcdir)/NEWS "$(GUIX_MAINTENANCE_DIRECTORY)/data" # Make sure we're not shipping a file that embeds a local /gnu/store file name. -assert-no-store-file-names: $(distdir)/ChangeLog +assert-no-store-file-names: $(AM_V_at)if grep -r --exclude=*.texi --exclude=*.info \ --exclude=*.info-[0-9] --exclude=*.dot \ --exclude=*.eps --exclude-dir=bootstrap \ - --exclude=guix-manual.pot --exclude=guix-manual.*.po \ + --exclude=guix-manual.pot --exclude=guix-manual.*.po \ + --exclude=guix-cookbook.pot --exclude=guix-cookbook.*.po \ --exclude=guix-prettify.el \ - --exclude=ChangeLog \ + --exclude=ChangeLog* \ + --exclude=binutils-boot-2.20*.patch \ -E "$(storedir)/[a-z0-9]{32}-" $(distdir) ; \ then \ echo "error: store file names embedded in the distribution" >&2 ; \ @@ -834,9 +879,42 @@ 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: clean-go make-go as-derivation +.PHONY: clean-go make-go as-derivation authenticate .PHONY: update-guix-package update-NEWS release +# Downloading up-to-date PO files. + +# make-download-po-rule DOMAIN DIRECTORY [FILE-NAME-PREFIX] +define make-download-po-rule + +download-po.$(1): + if [ -f "$(top_srcdir)/$(2)/LINGUAS" ]; then \ + LINGUAS="`grep -v '^[[:blank:]]*#' < $(top_srcdir)/$(2)/LINGUAS`" ; \ + else \ + LINGUAS="`(cd $(top_srcdir)/$(2); \ + for i in *.po; do echo $$$$i; done) | cut -d . -f 2`" ; \ + fi ; \ + for lang in $$$$LINGUAS; do \ + if wget -nv -O "$(top_srcdir)/$(2)/$(3)$$$$lang.po.tmp" \ + "https://translationproject.org/latest/$(1)/$$$$lang.po" ; \ + then \ + mv "$(top_srcdir)/$(2)/$(3)$$$$lang.po"{.tmp,} ; \ + else \ + rm "$(top_srcdir)/$(2)/$(3)$$$$lang.po.tmp" ; \ + fi ; \ + done + +.PHONY: download-po.$(1) + +endef + +$(eval $(call make-download-po-rule,guix,po/guix)) +$(eval $(call make-download-po-rule,guix-packages,po/packages)) +$(eval $(call make-download-po-rule,guix-manual,po/doc,guix-manual.)) + +download-po: $(foreach domain,guix guix-packages guix-manual,download-po.$(domain)) +.PHONY: download-po + ## -------------- ## ## Silent rules. ## ## -------------- ##