From f7bc632dc6c275e7f3f9ba967e6b42c1244f6df8 Mon Sep 17 00:00:00 2001
From: Jaremy Creechley <creechley@gmail.com>
Date: Fri, 22 Dec 2023 15:52:06 -0700
Subject: [PATCH] use deps setup rather than sub-workspace

---
 atlas.lock      | 303 ++++++++++++++++++++++++++++--------------------
 atlas.workspace |   2 +-
 2 files changed, 181 insertions(+), 124 deletions(-)

diff --git a/atlas.lock b/atlas.lock
index 05ff852..3a979ec 100644
--- a/atlas.lock
+++ b/atlas.lock
@@ -1,140 +1,197 @@
 {
   "items": {
-    "nim-zlib": {
-      "dir": "vendor/nim-zlib",
-      "url": "https://github.com/status-im/nim-zlib",
-      "commit": "f34ca261efd90f118dc1647beefd2f7a69b05d93"
+    "stint": {
+      "dir": "$deps/nim-stint",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-stint",
+      "commit": "86621eced1dcfb5e25903019ebcfc76ed9128ec5",
+      "version": "0.0.1"
     },
-    "nim-stew": {
-      "dir": "vendor/nim-stew",
-      "url": "https://github.com/status-im/nim-stew",
-      "commit": "7afe7e3c070758cac1f628e4330109f3ef6fc853"
-    },
-    "nim-http-utils": {
-      "dir": "vendor/nim-http-utils",
-      "url": "https://github.com/status-im/nim-http-utils",
-      "commit": "3b491a40c60aad9e8d3407443f46f62511e63b18"
-    },
-    "nim-chronos": {
-      "dir": "vendor/nim-chronos",
-      "url": "https://github.com/status-im/nim-chronos",
-      "commit": "0277b65be2c7a365ac13df002fba6e172be55537"
-    },
-    "upraises": {
-      "dir": "vendor/upraises",
-      "url": "https://github.com/markspanbroek/upraises",
-      "commit": "ff4f8108e44fba9b35cac535ab63d3927e8fd3c2"
-    },
-    "nim-sqlite3-abi": {
-      "dir": "vendor/nim-sqlite3-abi",
-      "url": "https://github.com/arnetheduck/nim-sqlite3-abi",
-      "commit": "362e1bd9f689ad9f5380d9d27f0705b3d4dfc7d3"
-    },
-    "questionable": {
-      "dir": "vendor/questionable",
-      "url": "https://github.com/codex-storage/questionable",
-      "commit": "b3cf35ac450fd42c9ea83dc084f5cba2efc55da3"
-    },
-    "nim-results": {
-      "dir": "vendor/nim-results",
-      "url": "https://github.com/arnetheduck/nim-results",
-      "commit": "f3c666a272c69d70cb41e7245e7f6844797303ad"
-    },
-    "nim-unittest2": {
-      "dir": "vendor/nim-unittest2",
-      "url": "https://github.com/status-im/nim-unittest2",
-      "commit": "b178f47527074964f76c395ad0dfc81cf118f379"
-    },
-    "nim-websock": {
-      "dir": "vendor/nim-websock",
-      "url": "https://github.com/status-im/nim-websock",
-      "commit": "2c3ae3137f3c9cb48134285bd4a47186fa51f0e8"
-    },
-    "nim-secp256k1": {
-      "dir": "vendor/nim-secp256k1",
-      "url": "https://github.com/status-im/nim-secp256k1",
-      "commit": "2acbbdcc0e63002a013fff49f015708522875832"
-    },
-    "nim-bearssl": {
-      "dir": "vendor/nim-bearssl",
-      "url": "https://github.com/status-im/nim-bearssl",
-      "commit": "99fcb3405c55b27cfffbf60f5368c55da7346f23"
-    },
-    "dnsclient.nim": {
-      "dir": "vendor/dnsclient.nim",
-      "url": "https://github.com/ba0f3/dnsclient.nim",
-      "commit": "23214235d4784d24aceed99bbfe153379ea557c8"
-    },
-    "nimcrypto": {
-      "dir": "vendor/nimcrypto",
-      "url": "https://github.com/status-im/nimcrypto",
-      "commit": "24e006df85927f64916e60511620583b11403178"
-    },
-    "nim-json-serialization": {
-      "dir": "vendor/nim-json-serialization",
-      "url": "https://github.com/status-im/nim-json-serialization",
-      "commit": "bb53d49caf2a6c6cf1df365ba84af93cdcfa7aa3"
-    },
-    "nim-testutils": {
-      "dir": "vendor/nim-testutils",
-      "url": "https://github.com/status-im/nim-testutils",
-      "commit": "b56a5953e37fc5117bd6ea6dfa18418c5e112815"
-    },
-    "npeg": {
-      "dir": "vendor/npeg",
-      "url": "https://github.com/zevv/npeg",
-      "commit": "b15a10e388b91b898c581dbbcb6a718d46b27d2f"
-    },
-    "nim-serialization": {
-      "dir": "vendor/nim-serialization",
-      "url": "https://github.com/status-im/nim-serialization",
-      "commit": "384eb2561ee755446cff512a8e057325848b86a7"
-    },
-    "nim-faststreams": {
-      "dir": "vendor/nim-faststreams",
-      "url": "https://github.com/status-im/nim-faststreams",
-      "commit": "720fc5e5c8e428d9d0af618e1e27c44b42350309"
-    },
-    "nim-datastore": {
-      "dir": "vendor/nim-datastore",
-      "url": "https://github.com/codex-storage/nim-datastore",
-      "commit": "0cde8aeb67c59fd0ac95496dc6b5e1168d6632aa"
+    "protobuf_serialization": {
+      "dir": "$deps/nim-protobuf-serialization",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-protobuf-serialization",
+      "commit": "28214b3e40c755a9886d2ec8f261ec48fbb6bec6",
+      "version": "0.3.0"
     },
     "asynctest": {
-      "dir": "vendor/asynctest",
-      "url": "https://github.com/codex-storage/asynctest",
-      "commit": "fe1a34caf572b05f8bdba3b650f1871af9fce31e"
+      "dir": "$deps/asynctest",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/asynctest",
+      "commit": "fe1a34caf572b05f8bdba3b650f1871af9fce31e",
+      "version": "0.4.1"
     },
-    "nim-stint": {
-      "dir": "vendor/nim-stint",
-      "url": "https://github.com/status-im/nim-stint",
-      "commit": "86621eced1dcfb5e25903019ebcfc76ed9128ec5"
+    "results": {
+      "dir": "$deps/nim-results",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-results",
+      "commit": "f3c666a272c69d70cb41e7245e7f6844797303ad",
+      "version": "0.4.0"
     },
-    "nim-metrics": {
-      "dir": "vendor/nim-metrics",
-      "url": "https://github.com/status-im/nim-metrics",
-      "commit": "6142e433fc8ea9b73379770a788017ac528d46ff"
+    "faststreams": {
+      "dir": "$deps/nim-faststreams",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-faststreams",
+      "commit": "720fc5e5c8e428d9d0af618e1e27c44b42350309",
+      "version": "0.3.0"
     },
-    "nim-libp2p": {
-      "dir": "vendor/nim-libp2p",
-      "url": "https://github.com/status-im/nim-libp2p",
-      "commit": "440461b24b9e66542b34d26a0b908c17f6549d05"
+    "json_serialization": {
+      "dir": "$deps/nim-json-serialization",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-json-serialization",
+      "commit": "bb53d49caf2a6c6cf1df365ba84af93cdcfa7aa3",
+      "version": "0.1.5"
     },
-    "nim-chronicles": {
-      "dir": "vendor/nim-chronicles",
-      "url": "https://github.com/status-im/nim-chronicles",
-      "commit": "c9c8e58ec3f89b655a046c485f622f9021c68b61"
+    "questionable": {
+      "dir": "$deps/questionable",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/questionable",
+      "commit": "b3cf35ac450fd42c9ea83dc084f5cba2efc55da3",
+      "version": "0.10.10"
     },
-    "nim-protobuf-serialization": {
-      "dir": "vendor/nim-protobuf-serialization",
-      "url": "https://github.com/status-im/nim-protobuf-serialization",
-      "commit": "28214b3e40c755a9886d2ec8f261ec48fbb6bec6"
+    "dnsclient": {
+      "dir": "$deps/dnsclient.nim",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/dnsclient.nim",
+      "commit": "23214235d4784d24aceed99bbfe153379ea557c8",
+      "version": "0.3.4"
+    },
+    "sqlite3_abi": {
+      "dir": "$deps/nim-sqlite3-abi",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-sqlite3-abi",
+      "commit": "362e1bd9f689ad9f5380d9d27f0705b3d4dfc7d3",
+      "version": "3.40.1.1"
+    },
+    "bearssl": {
+      "dir": "$deps/nim-bearssl",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-bearssl",
+      "commit": "99fcb3405c55b27cfffbf60f5368c55da7346f23",
+      "version": "0.2.0"
+    },
+    "secp256k1": {
+      "dir": "$deps/nim-secp256k1",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-secp256k1",
+      "commit": "2acbbdcc0e63002a013fff49f015708522875832",
+      "version": "0.6.0.3.1"
+    },
+    "datastore": {
+      "dir": "$deps/nim-datastore",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-datastore",
+      "commit": "0cde8aeb67c59fd0ac95496dc6b5e1168d6632aa",
+      "version": "0.0.1"
+    },
+    "nimcrypto": {
+      "dir": "$deps/nimcrypto",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nimcrypto",
+      "commit": "24e006df85927f64916e60511620583b11403178",
+      "version": "0.5.4"
+    },
+    "serialization": {
+      "dir": "$deps/nim-serialization",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-serialization",
+      "commit": "384eb2561ee755446cff512a8e057325848b86a7",
+      "version": "0.2.0"
+    },
+    "websock": {
+      "dir": "$deps/nim-websock",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-websock",
+      "commit": "2c3ae3137f3c9cb48134285bd4a47186fa51f0e8",
+      "version": "0.1.0"
+    },
+    "libp2p": {
+      "dir": "$deps/nim-libp2p",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-libp2p",
+      "commit": "440461b24b9e66542b34d26a0b908c17f6549d05",
+      "version": "1.1.0"
+    },
+    "chronos": {
+      "dir": "$deps/nim-chronos",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-chronos",
+      "commit": "0277b65be2c7a365ac13df002fba6e172be55537",
+      "version": "3.2.0"
+    },
+    "npeg": {
+      "dir": "$deps/npeg",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/npeg",
+      "commit": "b15a10e388b91b898c581dbbcb6a718d46b27d2f",
+      "version": "1.2.1"
+    },
+    "unittest2": {
+      "dir": "$deps/nim-unittest2",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-unittest2",
+      "commit": "b178f47527074964f76c395ad0dfc81cf118f379",
+      "version": "0.0.7"
+    },
+    "metrics": {
+      "dir": "$deps/nim-metrics",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-metrics",
+      "commit": "6142e433fc8ea9b73379770a788017ac528d46ff",
+      "version": "0.0.1"
+    },
+    "testutils": {
+      "dir": "$deps/nim-testutils",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-testutils",
+      "commit": "b56a5953e37fc5117bd6ea6dfa18418c5e112815",
+      "version": "0.5.0"
+    },
+    "chronicles": {
+      "dir": "$deps/nim-chronicles",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-chronicles",
+      "commit": "c9c8e58ec3f89b655a046c485f622f9021c68b61",
+      "version": "0.10.3"
+    },
+    "stew": {
+      "dir": "$deps/nim-stew",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-stew",
+      "commit": "7afe7e3c070758cac1f628e4330109f3ef6fc853",
+      "version": "0.1.0"
+    },
+    "httputils": {
+      "dir": "$deps/nim-http-utils",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-http-utils",
+      "commit": "3b491a40c60aad9e8d3407443f46f62511e63b18",
+      "version": "0.3.0"
+    },
+    "upraises": {
+      "dir": "$deps/upraises",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/upraises",
+      "commit": "ff4f8108e44fba9b35cac535ab63d3927e8fd3c2",
+      "version": "0.1.0"
+    },
+    "zlib": {
+      "dir": "$deps/nim-zlib",
+      "url": "file:///Users/jaremycreechley/projs/status/nim-codex-dht/vendor/nim-zlib",
+      "commit": "f34ca261efd90f118dc1647beefd2f7a69b05d93",
+      "version": "0.1.0"
     }
   },
-  "nimcfg": "############# begin Atlas config section ##########\n--noNimblePath\n--path:\"vendor/nim-secp256k1\"\n--path:\"vendor/nim-protobuf-serialization\"\n--path:\"vendor/nimcrypto\"\n--path:\"vendor/nim-bearssl\"\n--path:\"vendor/nim-chronicles\"\n--path:\"vendor/nim-chronos\"\n--path:\"vendor/nim-libp2p\"\n--path:\"vendor/nim-metrics\"\n--path:\"vendor/nim-stew\"\n--path:\"vendor/nim-stint\"\n--path:\"vendor/asynctest\"\n--path:\"vendor/nim-datastore\"\n--path:\"vendor/questionable\"\n--path:\"vendor/nim-faststreams\"\n--path:\"vendor/nim-serialization\"\n--path:\"vendor/npeg/src\"\n--path:\"vendor/nim-unittest2\"\n--path:\"vendor/nim-testutils\"\n--path:\"vendor/nim-json-serialization\"\n--path:\"vendor/nim-http-utils\"\n--path:\"vendor/dnsclient.nim/src\"\n--path:\"vendor/nim-websock\"\n--path:\"vendor/nim-results\"\n--path:\"vendor/nim-sqlite3-abi\"\n--path:\"vendor/upraises\"\n--path:\"vendor/nim-zlib\"\n############# end Atlas config section   ##########\n",
+  "nimcfg": [
+    "############# begin Atlas config section ##########",
+    "--noNimblePath",
+    "--path:\"vendor/nim-secp256k1\"",
+    "--path:\"vendor/nim-protobuf-serialization\"",
+    "--path:\"vendor/nimcrypto\"",
+    "--path:\"vendor/nim-bearssl\"",
+    "--path:\"vendor/nim-chronicles\"",
+    "--path:\"vendor/nim-chronos\"",
+    "--path:\"vendor/nim-libp2p\"",
+    "--path:\"vendor/nim-metrics\"",
+    "--path:\"vendor/nim-stew\"",
+    "--path:\"vendor/nim-stint\"",
+    "--path:\"vendor/asynctest\"",
+    "--path:\"vendor/nim-datastore\"",
+    "--path:\"vendor/questionable\"",
+    "--path:\"vendor/nim-faststreams\"",
+    "--path:\"vendor/nim-serialization\"",
+    "--path:\"vendor/npeg/src\"",
+    "--path:\"vendor/nim-unittest2\"",
+    "--path:\"vendor/nim-testutils\"",
+    "--path:\"vendor/nim-json-serialization\"",
+    "--path:\"vendor/nim-http-utils\"",
+    "--path:\"vendor/dnsclient.nim/src\"",
+    "--path:\"vendor/nim-websock\"",
+    "--path:\"vendor/nim-results\"",
+    "--path:\"vendor/nim-sqlite3-abi\"",
+    "--path:\"vendor/upraises\"",
+    "--path:\"vendor/nim-zlib\"",
+    "############# end Atlas config section   ##########",
+    ""
+  ],
   "nimbleFile": {
     "filename": "",
-    "content": "# Package\n\nversion       = \"0.3.2\"\nauthor        = \"Status Research & Development GmbH\"\ndescription   = \"DHT based on the libp2p Kademlia spec\"\nlicense       = \"MIT\"\nskipDirs      = @[\"tests\"]\n\n\n# Dependencies\nrequires \"nim >= 1.2.0\"\nrequires \"secp256k1#2acbbdcc0e63002a013fff49f015708522875832\" # >= 0.5.2 & < 0.6.0\nrequires \"protobuf_serialization\" # >= 0.2.0 & < 0.3.0\nrequires \"nimcrypto == 0.5.4\"\nrequires \"bearssl#head\"\nrequires \"chronicles >= 0.10.2 & < 0.11.0\"\nrequires \"chronos == 3.2.0\" #  >= 3.0.11 & < 3.1.0\nrequires \"libp2p#unstable\"\nrequires \"metrics\"\nrequires \"stew#head\"\nrequires \"stint\"\nrequires \"asynctest >= 0.3.1 & < 0.4.0\"\nrequires \"https://github.com/codex-storage/nim-datastore#head\"\nrequires \"questionable\"\n\ninclude \"build.nims\"\n\n"
+    "content": []
   },
   "hostOS": "macosx",
   "hostCPU": "arm64",
diff --git a/atlas.workspace b/atlas.workspace
index 812bfb2..5837f8f 100644
--- a/atlas.workspace
+++ b/atlas.workspace
@@ -1,3 +1,3 @@
-deps=""
+deps="vendor"
 resolver="MaxVer"
 overrides="urls.rules"