diff --git a/.gitignore b/.gitignore index cb29712..92b2793 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ .direnv -##### TUP GITIGNORE ##### -##### Lines below automatically generated by Tup. -##### Do not edit. -.tup -/.gitignore diff --git a/.gitmodules b/.gitmodules index b15dc9b..ab329ea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -166,3 +166,24 @@ [submodule "nimble/websock"] path = nimble/websock url = https://github.com/status-im/nim-websock.git +[submodule "nimble/ws"] + path = nimble/ws + url = https://github.com/treeform/ws.git +[submodule "syndicate_actor_tox"] + path = syndicate_actor_tox + url = git@git.syndicate-lang.org:ehmry/syndicate_actor_tox.git +[submodule "eer"] + path = eer + url = https://codeberg.org/eris/eer.git +[submodule "nimble/npeg"] + path = nimble/npeg + url = https://github.com/zevv/npeg.git +[submodule "nimble/cps"] + path = nimble/cps + url = https://github.com/nim-works/cps.git +[submodule "nimble/cpstest"] + path = nimble/cpstest + url = https://github.com/zevv/cpstest.git +[submodule "nimble/eventqueue"] + path = nimble/eventqueue + url = https://github.com/disruptek/eventqueue.git diff --git a/Tuprules.tup b/Tuprules.tup index 91dbe9b..d6f21c8 100644 --- a/Tuprules.tup +++ b/Tuprules.tup @@ -1,4 +1,3 @@ -.gitignore export NIX_PATH export XDG_CACHE_HOME diff --git a/dhall-nim b/dhall-nim index 42bc574..4fc6484 160000 --- a/dhall-nim +++ b/dhall-nim @@ -1 +1 @@ -Subproject commit 42bc57446d3d336e9910ce22b7ba06784876a8fd +Subproject commit 4fc64844885d574e47236262e32b8b0554c01fa9 diff --git a/eer b/eer new file mode 160000 index 0000000..1c5f7ca --- /dev/null +++ b/eer @@ -0,0 +1 @@ +Subproject commit 1c5f7ca08b201e023a8cb96e2ef99b4d6ab3366a diff --git a/eris-go b/eris-go index b6c1586..d090cc2 160000 --- a/eris-go +++ b/eris-go @@ -1 +1 @@ -Subproject commit b6c1586deb205c4caa24d70d2b2bb1857d170b1d +Subproject commit d090cc2a1f50ead751538cab4eb850b686f3f87f diff --git a/eris-nim b/eris-nim index 9f5c62a..35aa075 160000 --- a/eris-nim +++ b/eris-nim @@ -1 +1 @@ -Subproject commit 9f5c62a5827aa3f9e3a9c8c2c5a2bd4dc8c90167 +Subproject commit 35aa0756c4e75ea4ec60812e8f345d5d8273ddff diff --git a/fontconfig_actor b/fontconfig_actor index f83e57e..60515ad 160000 --- a/fontconfig_actor +++ b/fontconfig_actor @@ -1 +1 @@ -Subproject commit f83e57ee22364d69af6a44974fc498de014afe89 +Subproject commit 60515ad4088dce0bf58c6e0eb4238b4f1a8d2844 diff --git a/genode-nim b/genode-nim deleted file mode 160000 index 2bc5075..0000000 --- a/genode-nim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2bc5075232aeb2f6df44f6960796729fcf4ebbd8 diff --git a/getdns b/getdns index fedc9a8..e4ae099 160000 --- a/getdns +++ b/getdns @@ -1 +1 @@ -Subproject commit fedc9a8fab419ae529095f847ad7bf90cc8d1c28 +Subproject commit e4ae0992ed7c5540e6d498f3074d06c8f454a0b6 diff --git a/libnotify_actor b/libnotify_actor index e2d7d98..5b7d241 160000 --- a/libnotify_actor +++ b/libnotify_actor @@ -1 +1 @@ -Subproject commit e2d7d98ec3fc4b73a1efbce9e8ad4c0e748f5c26 +Subproject commit 5b7d241c62069501f9a8c72ba27e4fe446ca9c40 diff --git a/nim b/nim index 527d780..9af1fba 160000 --- a/nim +++ b/nim @@ -1 +1 @@ -Subproject commit 527d780c663d680e65a1245ac9906611860b4a9c +Subproject commit 9af1fba47127d2b55529b89681fa9c265a015246 diff --git a/nimble/Tupfile b/nimble/Tupfile index 61c7555..2034843 100644 --- a/nimble/Tupfile +++ b/nimble/Tupfile @@ -1,7 +1,6 @@ !nix_build = |> ^o^ nix build -f ../nixexprs/nixpkgs --out-link %o |> -: |> !nix_build nimPackages.illwill |> illwill ./ -: |> !nix_build nimPackages.base32 |> base32 ./ -: |> !nix_build nimPackages.nimSHA2 |> nimsha2 ./ -: |> !nix_build nimPackages.npeg |> npeg ./ -: |> !nix_build nimPackages.flatty |> flatty ./ -: |> !nix_build nimPackages.sdl2 |> sdl2 ./ +: |> !nix_build nim2Packages.illwill |> illwill ./ +: |> !nix_build nim2Packages.base32 |> base32 ./ +: |> !nix_build nim2Packages.nimSHA2 |> nimsha2 ./ +: |> !nix_build nim2Packages.flatty |> flatty ./ +: |> !nix_build nim2Packages.sdl2 |> sdl2 ./ diff --git a/nimble/cps b/nimble/cps new file mode 160000 index 0000000..7f83a3d --- /dev/null +++ b/nimble/cps @@ -0,0 +1 @@ +Subproject commit 7f83a3d843d84e2597d83c07e0c06f128e667c80 diff --git a/nimble/cpstest b/nimble/cpstest new file mode 160000 index 0000000..668f341 --- /dev/null +++ b/nimble/cpstest @@ -0,0 +1 @@ +Subproject commit 668f3415ee56795ad7af5c1063c22b40f286cde4 diff --git a/nimble/eventqueue b/nimble/eventqueue new file mode 160000 index 0000000..597d5e0 --- /dev/null +++ b/nimble/eventqueue @@ -0,0 +1 @@ +Subproject commit 597d5e08e87521652c0469c273d4d21743d13404 diff --git a/nimble/npeg b/nimble/npeg new file mode 160000 index 0000000..b15a10e --- /dev/null +++ b/nimble/npeg @@ -0,0 +1 @@ +Subproject commit b15a10e388b91b898c581dbbcb6a718d46b27d2f diff --git a/nimble/ws b/nimble/ws new file mode 160000 index 0000000..5ac521b --- /dev/null +++ b/nimble/ws @@ -0,0 +1 @@ +Subproject commit 5ac521b72d7d4860fb394e5e1f9f08cf480e9822 diff --git a/nix_actor b/nix_actor index d51d9b3..8e06628 160000 --- a/nix_actor +++ b/nix_actor @@ -1 +1 @@ -Subproject commit d51d9b3c34a887587d17985add18a109001f5d16 +Subproject commit 8e06628d2113116e86635e97ebceae08edc2ed6c diff --git a/preserves-nim b/preserves-nim index 6008b0b..4bfd7e9 160000 --- a/preserves-nim +++ b/preserves-nim @@ -1 +1 @@ -Subproject commit 6008b0ba2509dc2e92f914d78b3f54f24040f641 +Subproject commit 4bfd7e9efa45fa309b1e60b5346d86c95c88c67c diff --git a/sigil b/sigil index f170f48..272a141 160000 --- a/sigil +++ b/sigil @@ -1 +1 @@ -Subproject commit f170f48b6084274f6bc80619778878d1d0cd6a1f +Subproject commit 272a141fc16dcad3478fe6dd253344b80e76dfb2 diff --git a/syndicate-flake b/syndicate-flake index 4d26917..a581bce 160000 --- a/syndicate-flake +++ b/syndicate-flake @@ -1 +1 @@ -Subproject commit 4d2691722c7cf0b9c053bb73c1b6165784968030 +Subproject commit a581bce64c81fe02b4bb38ad63599b6f218d3e69 diff --git a/syndicate-nim b/syndicate-nim index 38b6935..dc36161 160000 --- a/syndicate-nim +++ b/syndicate-nim @@ -1 +1 @@ -Subproject commit 38b6935ea02e8ce94532b0e12d75cd871439d475 +Subproject commit dc361618644690c48e2eb09d5c8216544465766c diff --git a/syndicate-protocols b/syndicate-protocols index d8a139b..4a30cb4 160000 --- a/syndicate-protocols +++ b/syndicate-protocols @@ -1 +1 @@ -Subproject commit d8a139b23a40bad6698f9f4240f9e8426b4a123f +Subproject commit 4a30cb442f3e2290d88bfc78ed1a3add7384cd2a diff --git a/syndicate_actor_tox b/syndicate_actor_tox new file mode 160000 index 0000000..72d959d --- /dev/null +++ b/syndicate_actor_tox @@ -0,0 +1 @@ +Subproject commit 72d959dd6e66bb09e051013ca373415633cce28a diff --git a/syndicate_genode b/syndicate_genode deleted file mode 160000 index 711a703..0000000 --- a/syndicate_genode +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 711a7032c0902a457b5203e07e67b4f33395e947 diff --git a/syndicate_utils b/syndicate_utils index 818c23f..ef38792 160000 --- a/syndicate_utils +++ b/syndicate_utils @@ -1 +1 @@ -Subproject commit 818c23f0259c82e2649735c200f0741218722674 +Subproject commit ef3879297018ce32e4cda7de56869f31377bc675 diff --git a/taps b/taps index 285f183..9517b72 160000 --- a/taps +++ b/taps @@ -1 +1 @@ -Subproject commit 285f1833c934add0fb3aea44c46c7cb29e51c189 +Subproject commit 9517b7271a20eb2c0bfd5030e036cdc3835672a6