Merge branch 'master' into core-updates

Conflicts:
	distro/packages/multiprecision.scm

1 files changed, 3 insertions, 4 deletions

diff --git a/bootstrap b/bootstrap
index e445af2f2c..f34c43dc52 100755
--- a/bootstrap
+++ b/bootstrap
@@ -7,10 +7,9 @@ set -e -x
 top_srcdir="$PWD"
 export top_srcdir
 
-if [ ! -d nix-upstream ]
-then
-    git submodule init
-fi
+git submodule init
 git submodule update
 
+./nix/sync-with-upstream
+
 exec autoreconf -vfi