From 41c4d186b589a83dcf91ae954337634c3926db65 Mon Sep 17 00:00:00 2001 From: jangko Date: Mon, 21 Jun 2021 16:30:02 +0700 Subject: [PATCH] vendor: update nim-graphql, replace nim-miniz with nim-zlib, add nim-ws - we replace nim-miniz with nim-zlib because nim-ws requires features not available in miniz - nim-graphql also switch to nim-zlib - nim-ws depends on nim-zlib and we need it for upcoming websocket rpc --- .gitmodules | 81 ++++++++++++++++++++++++---------------------- vendor/nim-graphql | 2 +- vendor/nim-miniz | 1 - vendor/nim-ws | 1 + vendor/nim-zlib | 1 + 5 files changed, 46 insertions(+), 40 deletions(-) delete mode 160000 vendor/nim-miniz create mode 160000 vendor/nim-ws create mode 160000 vendor/nim-zlib diff --git a/.gitmodules b/.gitmodules index 60f0f0d68..7d2581cba 100644 --- a/.gitmodules +++ b/.gitmodules @@ -64,18 +64,18 @@ ignore = dirty branch = master [submodule "vendor/nim-confutils"] - path = vendor/nim-confutils - url = https://github.com/status-im/nim-confutils.git - ignore = dirty - branch = master + path = vendor/nim-confutils + url = https://github.com/status-im/nim-confutils.git + ignore = dirty + branch = master [submodule "vendor/nim-beacon-chain"] path = vendor/nim-beacon-chain url = https://github.com/status-im/nim-beacon-chain.git ignore = dirty branch = master [submodule "vendor/nim-blscurve"] - path = vendor/nim-blscurve - url = https://github.com/status-im/nim-blscurve + path = vendor/nim-blscurve + url = https://github.com/status-im/nim-blscurve ignore = dirty branch = master [submodule "vendor/nim-chronos"] @@ -149,47 +149,52 @@ ignore = dirty branch = master [submodule "vendor/nim-evmc"] - path = vendor/nim-evmc - url = https://github.com/status-im/nim-evmc + path = vendor/nim-evmc + url = https://github.com/status-im/nim-evmc ignore = dirty - branch = api-version-7.5 + branch = api-version-7.5 [submodule "vendor/nim-libbacktrace"] - path = vendor/nim-libbacktrace - url = https://github.com/status-im/nim-libbacktrace.git - ignore = dirty - branch = master + path = vendor/nim-libbacktrace + url = https://github.com/status-im/nim-libbacktrace.git + ignore = dirty + branch = master [submodule "vendor/nim-testutils"] - path = vendor/nim-testutils - url = https://github.com/status-im/nim-testutils.git - ignore = dirty - branch = master + path = vendor/nim-testutils + url = https://github.com/status-im/nim-testutils.git + ignore = dirty + branch = master [submodule "vendor/nim-sqlite3-abi"] - path = vendor/nim-sqlite3-abi - url = https://github.com/arnetheduck/nim-sqlite3-abi.git + path = vendor/nim-sqlite3-abi + url = https://github.com/arnetheduck/nim-sqlite3-abi.git ignore = dirty - branch = master + branch = master [submodule "vendor/nim-bearssl"] - path = vendor/nim-bearssl - url = https://github.com/status-im/nim-bearssl - ignore = dirty - branch = master + path = vendor/nim-bearssl + url = https://github.com/status-im/nim-bearssl + ignore = dirty + branch = master [submodule "tests/fixtures/eth_tests"] - path = tests/fixtures/eth_tests - url = https://github.com/ethereum/tests - ignore = dirty - branch = master + path = tests/fixtures/eth_tests + url = https://github.com/ethereum/tests + ignore = dirty + branch = master [submodule "vendor/nim-graphql"] - path = vendor/nim-graphql - url = https://github.com/status-im/nim-graphql + path = vendor/nim-graphql + url = https://github.com/status-im/nim-graphql ignore = dirty - branch = master + branch = master [submodule "vendor/nim-toml-serialization"] - path = vendor/nim-toml-serialization - url = https://github.com/status-im/nim-toml-serialization + path = vendor/nim-toml-serialization + url = https://github.com/status-im/nim-toml-serialization ignore = dirty - branch = master -[submodule "vendor/nim-miniz"] - path = vendor/nim-miniz - url = https://github.com/status-im/nim-miniz + branch = master +[submodule "vendor/nim-zlib"] + path = vendor/nim-zlib + url = https://github.com/status-im/nim-zlib ignore = dirty - branch = master + branch = master +[submodule "vendor/nim-ws"] + path = vendor/nim-ws + url = https://github.com/status-im/nim-ws + ignore = dirty + branch = master diff --git a/vendor/nim-graphql b/vendor/nim-graphql index 75d913ca4..c83b51ab4 160000 --- a/vendor/nim-graphql +++ b/vendor/nim-graphql @@ -1 +1 @@ -Subproject commit 75d913ca4de8baaa1bfa7d914df74fa8685b985e +Subproject commit c83b51ab479c85d087b50c8991b8a74bf7445a03 diff --git a/vendor/nim-miniz b/vendor/nim-miniz deleted file mode 160000 index cfc45c3ba..000000000 --- a/vendor/nim-miniz +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cfc45c3babc1b844108ff5a1d869cb37e1386eb3 diff --git a/vendor/nim-ws b/vendor/nim-ws new file mode 160000 index 000000000..e56447dda --- /dev/null +++ b/vendor/nim-ws @@ -0,0 +1 @@ +Subproject commit e56447dda33fd4de54de0f1f145b10b7123e96ab diff --git a/vendor/nim-zlib b/vendor/nim-zlib new file mode 160000 index 000000000..6bbc67d09 --- /dev/null +++ b/vendor/nim-zlib @@ -0,0 +1 @@ +Subproject commit 6bbc67d09e624d69052d62b2353878f491186942