Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[submodule "vendor/Nim"]
path = vendor/Nim
url = https://github.com/status-im/Nim.git
url = https://github.com/nim-lang/Nim.git
ignore = dirty
branch = nimbus
branch = version-2-2
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ You also need to specify it when using this non-default Nim compiler version:
### NIM_COMMIT_REPO

`NIM_COMMIT` will try to fetch commits from the
[status-im fork](https://github.com/status-im/Nim), followed by the
[official Nim language repo](https://github.com/nim-lang/Nim). If you want to
use a fork from somewhere else, you can set this to the repo's URL.

Expand Down
2 changes: 1 addition & 1 deletion makefiles/targets.mk
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ update-test:
update-common: | sanity-checks update-test
git submodule foreach --quiet 'git ls-files --exclude-standard --recurse-submodules -z -- ":!:.*" | xargs -0 rm -rf'
git $(GIT_SUBMODULE_CONFIG) submodule update --init --recursive || true
# changing URLs in a submodule's submodule means we have to sync and update twice
# changing URLs in a submodule's submodule means we have to sync and update twice
git submodule sync --quiet --recursive
git $(GIT_SUBMODULE_CONFIG) submodule update --init --recursive
git submodule foreach --quiet --recursive 'git $(GIT_SUBMODULE_CONFIG) reset --quiet --hard'
Expand Down
5 changes: 3 additions & 2 deletions scripts/build_nim.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ nim_needs_rebuilding() {

if [[ ! -e "$NIM_DIR" ]]; then
# Shallow clone, optimised for the default NIM_COMMIT value.
git clone -q --depth=1 https://github.com/status-im/Nim.git "$NIM_DIR"
git clone -q --depth=1 https://github.com/nim-lang/Nim.git "$NIM_DIR"
fi

pushd "${NIM_DIR}" >/dev/null
Expand All @@ -58,7 +58,8 @@ nim_needs_rebuilding() {
git restore . 2>/dev/null || git reset --hard
if ! git checkout -q "${NIM_COMMIT}" 2>/dev/null; then
# Pay the price for a non-default NIM_COMMIT here, by fetching everything.
# (This includes upstream branches and tags that might be missing from our fork.)
# The "upstream" remote (pointing at the same location as the "origin")
# is kept for backward compatibility.
if ! git remote | grep -q "^upstream$"; then
git remote add upstream https://github.com/nim-lang/Nim
fi
Expand Down