X-Git-Url: http://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/9b043df7403a10b35b93d133aac796fd277a7339..b5f2a035f93519b27f46673e6d76665767a1fbd9:/Makefile.am diff --git a/Makefile.am b/Makefile.am index 9cf9318e8a..e7053ee4f4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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,7 +80,6 @@ MODULES = \ guix/cpio.scm \ guix/deprecation.scm \ guix/docker.scm \ - guix/json.scm \ guix/records.scm \ guix/openpgp.scm \ guix/pki.scm \ @@ -80,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 \ @@ -93,6 +105,7 @@ MODULES = \ guix/derivations.scm \ guix/grafts.scm \ guix/repl.scm \ + guix/transformations.scm \ guix/inferior.scm \ guix/describe.scm \ guix/quirks.scm \ @@ -109,8 +122,6 @@ MODULES = \ 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 \ @@ -132,6 +143,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 \ @@ -171,6 +183,7 @@ 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 \ @@ -181,6 +194,7 @@ MODULES = \ 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 \ @@ -212,6 +226,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 \ @@ -281,6 +298,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 \ @@ -326,6 +345,10 @@ dist_noinst_DATA = \ 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 \ @@ -385,6 +408,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 \ @@ -416,11 +440,11 @@ 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 \ @@ -433,7 +457,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 \ @@ -450,19 +473,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 \ @@ -477,6 +501,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) @@ -522,7 +547,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 @@ -537,7 +562,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.in EXTRA_DIST += \ HACKING \ @@ -551,6 +576,7 @@ EXTRA_DIST += \ 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 \ @@ -559,12 +585,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 \ @@ -636,14 +662,18 @@ install-data-hook: # Commit corresponding to the 'v1.0.0' tag. commit_v1_0_0 = 6298c3ffd9654d3231a6f25390b056483e8f407c -# Authenticate the current Git checkout by checking signatures on every commit -# starting from $(commit_v1_0_0). -authenticate: guix/openpgp.go guix/git-authenticate.go guix/git.go +# 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. +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_0)" + 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. @@ -820,8 +850,8 @@ release: dist-with-updated-version -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 \