From d7e5d92b8269c608eb2a56d32bd97ba6c3df3979 Mon Sep 17 00:00:00 2001 From: Hanno Cornelius Date: Thu, 8 Jun 2023 18:25:46 +0200 Subject: [PATCH] fix: submodule clashes. update --- .gitmodules | 5 +++++ vendor/nim-chronicles | 2 +- vendor/nim-chronos | 2 +- vendor/nim-confutils | 2 +- vendor/nim-eth | 2 +- vendor/nim-faststreams | 2 +- vendor/nim-json-rpc | 2 +- vendor/nim-json-serialization | 2 +- vendor/nim-serialization | 2 +- vendor/nim-stew | 2 +- vendor/nim-stint | 2 +- vendor/nim-unittest2 | 2 +- vendor/nim-zlib | 1 + 13 files changed, 17 insertions(+), 11 deletions(-) create mode 160000 vendor/nim-zlib diff --git a/.gitmodules b/.gitmodules index 49099de..50ec804 100644 --- a/.gitmodules +++ b/.gitmodules @@ -103,3 +103,8 @@ url = https://github.com/status-im/nim-secp256k1.git ignore = untracked branch = master +[submodule "vendor/nim-zlib"] + path = vendor/nim-zlib + url = https://github.com/status-im/nim-zlib.git + ignore = untracked + branch = master diff --git a/vendor/nim-chronicles b/vendor/nim-chronicles index af31ca2..0644549 160000 --- a/vendor/nim-chronicles +++ b/vendor/nim-chronicles @@ -1 +1 @@ -Subproject commit af31ca2157ed5c65ed339a0bbe5bed6faa033502 +Subproject commit 06445495141d3bef82ddd9e68dfd7887bdc46fbf diff --git a/vendor/nim-chronos b/vendor/nim-chronos index 02fda01..0035f4f 160000 --- a/vendor/nim-chronos +++ b/vendor/nim-chronos @@ -1 +1 @@ -Subproject commit 02fda01bf260a16d70e5b827819b5314542d5ecd +Subproject commit 0035f4fa6692e85756aa192b4df84c21d3cacacb diff --git a/vendor/nim-confutils b/vendor/nim-confutils index 1f3acaf..6c35668 160000 --- a/vendor/nim-confutils +++ b/vendor/nim-confutils @@ -1 +1 @@ -Subproject commit 1f3acaf6e968ea8e4ec3eec177aebd50eef1040c +Subproject commit 6c3566850d5ec241d8cb687ae8461c972040311a diff --git a/vendor/nim-eth b/vendor/nim-eth index 55b9da0..99d980c 160000 --- a/vendor/nim-eth +++ b/vendor/nim-eth @@ -1 +1 @@ -Subproject commit 55b9da0bea5dde89a160d43cdc469210dd481720 +Subproject commit 99d980c3f6016c616edc938ed8d12542fae193b2 diff --git a/vendor/nim-faststreams b/vendor/nim-faststreams index 5839747..2a771bb 160000 --- a/vendor/nim-faststreams +++ b/vendor/nim-faststreams @@ -1 +1 @@ -Subproject commit 583974782f1d5487e16cc72289cd97e8897bc894 +Subproject commit 2a771bb91f8aae8520a5553955a2acce5fdd0c87 diff --git a/vendor/nim-json-rpc b/vendor/nim-json-rpc index f79be14..4c31a8b 160000 --- a/vendor/nim-json-rpc +++ b/vendor/nim-json-rpc @@ -1 +1 @@ -Subproject commit f79be14c997092e29ba1edf706bb15a238fb37a5 +Subproject commit 4c31a8bd464c1b824813089e4e176710787615c0 diff --git a/vendor/nim-json-serialization b/vendor/nim-json-serialization index ed4440d..aa44ee6 160000 --- a/vendor/nim-json-serialization +++ b/vendor/nim-json-serialization @@ -1 +1 @@ -Subproject commit ed4440d881f9e2cb7778c01a0f638d928f339aa7 +Subproject commit aa44ee61dd323022d4abe7cbf4e44668aad88454 diff --git a/vendor/nim-serialization b/vendor/nim-serialization index bc46b4c..f0860e1 160000 --- a/vendor/nim-serialization +++ b/vendor/nim-serialization @@ -1 +1 @@ -Subproject commit bc46b4c1c1730cc25bf5fb5f3d64bd708a6ad89e +Subproject commit f0860e1c25acf26ef5e6ea231c7c0537c793b555 diff --git a/vendor/nim-stew b/vendor/nim-stew index 7b4c940..6c97f11 160000 --- a/vendor/nim-stew +++ b/vendor/nim-stew @@ -1 +1 @@ -Subproject commit 7b4c9407f29075d3206123c1a2d87fa74af40fd0 +Subproject commit 6c97f11c7cb59eadf91b124b92d2ec035f7251fa diff --git a/vendor/nim-stint b/vendor/nim-stint index 94fc521..86621ec 160000 --- a/vendor/nim-stint +++ b/vendor/nim-stint @@ -1 +1 @@ -Subproject commit 94fc521ee0f1e113d09ceeaa3568d4d7a6c0b67d +Subproject commit 86621eced1dcfb5e25903019ebcfc76ed9128ec5 diff --git a/vendor/nim-unittest2 b/vendor/nim-unittest2 index 5ed05c9..b178f47 160000 --- a/vendor/nim-unittest2 +++ b/vendor/nim-unittest2 @@ -1 +1 @@ -Subproject commit 5ed05c90fb54f5e1c41004f91fa57260bdfb6133 +Subproject commit b178f47527074964f76c395ad0dfc81cf118f379 diff --git a/vendor/nim-zlib b/vendor/nim-zlib new file mode 160000 index 0000000..d65ee2a --- /dev/null +++ b/vendor/nim-zlib @@ -0,0 +1 @@ +Subproject commit d65ee2a7611eb9f0ef0e7350caed6e93ccfa9651