diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-03-21 21:38:19 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-03-21 21:38:19 -0400 |
commit | 49b350fafc2c3ea1db66461b73d4e304cd13ec92 (patch) | |
tree | 9b9b1a4a383b5175241ae6b91b83de0590f13983 /Makefile.am | |
parent | 03b5668a035ba96c9690476078c5ee1d5793f3e2 (diff) | |
parent | e584a093f943be216fdc93895281fde835836b8d (diff) | |
download | guix-49b350fafc2c3ea1db66461b73d4e304cd13ec92.tar.gz |
Merge branch 'master' into staging.
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 7463606d20..7402c89b62 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012-2022 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> @@ -486,6 +486,7 @@ SCM_TESTS = \ tests/gremlin.scm \ tests/hackage.scm \ tests/home-import.scm \ + tests/http-client.scm \ tests/import-git.scm \ tests/import-github.scm \ tests/import-utils.scm \ @@ -1026,10 +1027,12 @@ assert-no-store-file-names: exit 1 ; \ fi -# Make sure important substitutes are available. +# Make sure important substitutes are available. Check only the primary +# server so that '--display-missing' doesn't print two lists. assert-binaries-available: $(GOBJECTS) $(AM_V_at)$(top_builddir)/pre-inst-env \ guix weather -m "$(top_srcdir)/etc/release-manifest.scm" \ + --substitute-urls="https://ci.guix.gnu.org" \ --display-missing # Make sure the final inputs don't refer to bootstrap tools. |