HCoop / jackhill / guix / guix.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
gnu: libid3tag: Install pkg-config file.
[jackhill/guix/guix.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 8e91e1e..aec2bb1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,6 +39,7 @@ do_subst = $(SED)                                     \
   -e 's,[@]GUILE[@],$(GUILE),g'                                \
   -e 's,[@]guilemoduledir[@],$(guilemoduledir),g'      \
   -e 's,[@]guileobjectdir[@],$(guileobjectdir),g'      \
+  -e 's,[@]abs_top_builddir[@],$(abs_top_builddir),g'  \
   -e 's,[@]localedir[@],$(localedir),g'
 
 scripts/guix: scripts/guix.in Makefile
@@ -47,6 +48,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
@@ -93,6 +106,7 @@ MODULES =                                    \
   guix/derivations.scm                         \
   guix/grafts.scm                              \
   guix/repl.scm                                        \
+  guix/transformations.scm                     \
   guix/inferior.scm                            \
   guix/describe.scm                            \
   guix/quirks.scm                              \
@@ -113,6 +127,7 @@ MODULES =                                   \
   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                    \
@@ -162,6 +177,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             \
@@ -306,6 +322,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 +=                                     \
@@ -332,10 +356,15 @@ 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.8-arm.conf       \
-  gnu/packages/aux-files/linux-libre/5.8-arm64.conf     \
-  gnu/packages/aux-files/linux-libre/5.8-i686.conf      \
-  gnu/packages/aux-files/linux-libre/5.8-x86_64.conf    \
+  gnu/packages/aux-files/guix.vim                      \
+  gnu/packages/aux-files/linux-libre/5.10-arm.conf     \
+  gnu/packages/aux-files/linux-libre/5.10-arm64.conf   \
+  gnu/packages/aux-files/linux-libre/5.10-i686.conf    \
+  gnu/packages/aux-files/linux-libre/5.10-x86_64.conf  \
+  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     \
@@ -395,6 +424,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                        \
@@ -443,7 +473,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                     \
@@ -460,6 +489,7 @@ SCM_TESTS =                                 \
   tests/syscalls.scm                           \
   tests/system.scm                             \
   tests/texlive.scm                            \
+  tests/transformations.scm                    \
   tests/ui.scm                                 \
   tests/union.scm                              \
   tests/upstream.scm                           \
@@ -548,7 +578,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                                              \
@@ -556,6 +586,7 @@ EXTRA_DIST +=                                               \
   TODO                                                 \
   CODE-OF-CONDUCT                                      \
   .dir-locals.el                                       \
+  .guix-authorizations                                 \
   .guix-channel                                                \
   scripts/guix.in                                      \
   etc/guix-install.sh                                  \
@@ -571,6 +602,7 @@ 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                     \
@@ -652,9 +684,11 @@ 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..." ;       \
        guix git authenticate                                   \
+           --keyring=$(GUIX_GIT_KEYRING)                       \
            --cache-key=channels/guix --stats                   \
            "$(channel_intro_commit)" "$(channel_intro_signer)"
 
@@ -688,12 +722,11 @@ AM_DISTCHECK_CONFIGURE_FLAGS =                    \
   --localstatedir="$$dc_install_base/var"      \
   --with-libgcrypt-prefix="$(LIBGCRYPT_PREFIX)"        \
   --with-libgcrypt-libdir="$(LIBGCRYPT_LIBDIR)"        \
-  --with-nix-prefix="$(NIX_PREFIX)"            \
   --enable-daemon                              \
   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:
@@ -713,8 +746,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"
@@ -809,9 +842,10 @@ release: dist-with-updated-version
        $(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)      \
@@ -823,9 +857,10 @@ release: dist-with-updated-version
          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                    \
@@ -833,9 +868,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                                                  \
-           --label="GUIX_$${system}_$(VERSION)"                                                \
+           guix system disk-image -t iso9660                                           \
+           --label="GUIX_$${system}_$(VERSION)"                                        \
             --system=$$system --fallback                                               \
            gnu/system/install.scm` ;                                                   \
          if [ ! -f "$$image" ] ; then                                                  \
jackhill's copy of GNU Guix: https://guix.gnu.org/