diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am index 77c05ff63b..01c6cace81 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012-2023 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012-2024 Ludovic Courtès <ludo@gnu.org> # Copyright © 2013 Andreas Enge <andreas@enge.fr> # Copyright © 2015, 2017 Alex Kost <alezost@gmail.com> # Copyright © 2016, 2018 Mathieu Lirzin <mthl@gnu.org> @@ -19,6 +19,7 @@ # Copyright © 2021 Andrew Tropin <andrew@trop.in> # Copyright © 2023 Clément Lassieur <clement@lassieur.org> # Copyright © 2023, 2024 Wilko Meyer <w@wmeyer.eu> +# Copyright © 2024 gemmaro <gemmaro.dev@gmail.com> # # This file is part of GNU Guix. # @@ -306,6 +307,7 @@ MODULES = \ guix/import/kde.scm \ guix/import/launchpad.scm \ guix/import/minetest.scm \ + guix/import/npm-binary.scm \ guix/import/opam.scm \ guix/import/print.scm \ guix/import/pypi.scm \ @@ -360,6 +362,7 @@ MODULES = \ guix/scripts/import/hexpm.scm \ guix/scripts/import/json.scm \ guix/scripts/import/minetest.scm \ + guix/scripts/import/npm-binary.scm \ guix/scripts/import/opam.scm \ guix/scripts/import/pypi.scm \ guix/scripts/import/stackage.scm \ @@ -427,10 +430,16 @@ AUX_FILES = \ gnu/packages/aux-files/emacs/guix-emacs.el \ gnu/packages/aux-files/findclass.php \ gnu/packages/aux-files/guix.vim \ + gnu/packages/aux-files/linux-libre/6.9-arm.conf \ + gnu/packages/aux-files/linux-libre/6.9-arm64.conf \ + gnu/packages/aux-files/linux-libre/6.9-i686.conf \ + gnu/packages/aux-files/linux-libre/6.9-x86_64.conf \ + gnu/packages/aux-files/linux-libre/6.9-riscv.conf \ gnu/packages/aux-files/linux-libre/6.8-arm.conf \ gnu/packages/aux-files/linux-libre/6.8-arm64.conf \ gnu/packages/aux-files/linux-libre/6.8-i686.conf \ gnu/packages/aux-files/linux-libre/6.8-x86_64.conf \ + gnu/packages/aux-files/linux-libre/6.8-riscv.conf \ gnu/packages/aux-files/linux-libre/6.6-arm.conf \ gnu/packages/aux-files/linux-libre/6.6-arm64.conf \ gnu/packages/aux-files/linux-libre/6.6-i686.conf \ @@ -554,6 +563,7 @@ SCM_TESTS = \ tests/modules.scm \ tests/monads.scm \ tests/nar.scm \ + tests/npm-binary.scm \ tests/networking.scm \ tests/opam.scm \ tests/openpgp.scm \ @@ -895,22 +905,6 @@ $(guix_install_go_files): install-nobase_dist_guilemoduleDATA install-data-hook: touch "$(DESTDIR)$(guileobjectdir)/guix/config.go" -# 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. -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)" - # Assuming Guix is already installed and the daemon is up and running, this # rule builds from $(srcdir), creating and building derivations. as-derivation: @@ -1227,13 +1221,13 @@ cuirass-jobs: $(GOBJECTS) .PHONY: gen-ChangeLog gen-AUTHORS gen-tarball-version .PHONY: assert-no-store-file-names assert-binaries-available .PHONY: assert-final-inputs-self-contained check-channel-news -.PHONY: clean-go make-go as-derivation authenticate +.PHONY: clean-go make-go as-derivation .PHONY: update-guix-package update-NEWS cuirass-jobs release # Git auto-configuration. -.git/hooks/pre-push: etc/git/pre-push +.git/hooks/%: etc/git/% $(AM_V_at)if test -d .git; then \ - cp etc/git/pre-push .git/hooks/pre-push; \ + cp "$<" "$@"; \ fi .git/config: etc/git/gitconfig @@ -1256,7 +1250,11 @@ COMMIT_MSG_MAGIC = VGhpcyBpcyB0aGUgY29tbWl0LW1zZyBob29rIG9mIEd1aXg= # from a tarball. Do not add dependencies on these to *_DATA when building # from a tarball, as that breaks the build. if in_git_p -nodist_noinst_DATA = .git/hooks/pre-push .git/config .git/hooks/commit-msg +nodist_noinst_DATA = \ + .git/hooks/pre-push \ + .git/hooks/post-merge \ + .git/config \ + .git/hooks/commit-msg endif # Downloading up-to-date PO files. @@ -1319,8 +1317,8 @@ AM_V_HELP2MAN_0 = @echo " HELP2MAN" $@; AM_V_PO4A = $(AM_V_PO4A_$(V)) AM_V_PO4A_ = $(AM_V_PO4A_$(AM_DEFAULT_VERBOSITY)) -AM_V_PO4A_0 = @echo " PO4A" $@; +AM_V_PO4A_0 = @echo " PO4A " $@; AM_V_POXREF = $(AM_V_POXREF_$(V)) AM_V_POXREF_ = $(AM_V_POXREF_$(AM_DEFAULT_VERBOSITY)) -AM_V_POXREF_0 = @echo " POXREF" $@; +AM_V_POXREF_0 = @echo " POXREF " $@; |