From 20ef1f4a82e46a46a8e27d3702d27a5f6c5e93ae Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 21 Jul 2023 10:23:13 +0100 Subject: [PATCH] Update repos --- .envrc | 1 - .gitignore | 1 - .gitmodules | 14 +++++++++++++- acpi_actor | 2 +- cbor | 2 +- dhall-nim | 2 +- eris-go | 2 +- eris-nim | 2 +- eristekt | 1 + nim | 2 +- nimble/Tupfile | 14 +++++++------- nimble/bigints | 1 + nimble/nimAES | 1 + nimble/websock | 1 + nix_actor | 2 +- preserves-nim | 2 +- shell.nix | 5 ----- sigil | 2 +- syn-open | 1 + syndicate-flake | 2 +- syndicate-nim | 2 +- syndicate_utils | 2 +- xapian_actor | 2 +- xdg_open_ng | 1 - 24 files changed, 38 insertions(+), 29 deletions(-) create mode 160000 eristekt create mode 160000 nimble/bigints create mode 160000 nimble/nimAES create mode 160000 nimble/websock delete mode 100644 shell.nix create mode 160000 syn-open delete mode 160000 xdg_open_ng diff --git a/.envrc b/.envrc index f52e90d..c393412 100644 --- a/.envrc +++ b/.envrc @@ -1,3 +1,2 @@ export NIX_PATH=$PWD/nixexprs -# use nix PATH_add bin diff --git a/.gitignore b/.gitignore index 5575d85..cb29712 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,3 @@ ##### Do not edit. .tup /.gitignore -/bin diff --git a/.gitmodules b/.gitmodules index d250e99..b15dc9b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -56,7 +56,7 @@ path = syndicate-protocols url = https://git.syndicate-lang.org/syndicate-lang/syndicate-protocols.git [submodule "xdg_open_ng"] - path = xdg_open_ng + path = syn-open url = https://git.syndicate-lang.org/ehmry/xdg_open_ng.git [submodule "syndicate_utils"] path = syndicate_utils @@ -154,3 +154,15 @@ [submodule "syndicate-flake"] path = syndicate-flake url = https://git.syndicate-lang.org/ehmry/syndicate-flake.git +[submodule "nimble/bigints"] + path = nimble/bigints + url = https://github.com/nim-lang/bigints.git +[submodule "nimble/nimAES"] + path = nimble/nimAES + url = https://github.com/jangko/nimAES.git +[submodule "eristekt"] + path = eristekt + url = https://codeberg.org/eris/eristekt +[submodule "nimble/websock"] + path = nimble/websock + url = https://github.com/status-im/nim-websock.git diff --git a/acpi_actor b/acpi_actor index e8ebc72..104c822 160000 --- a/acpi_actor +++ b/acpi_actor @@ -1 +1 @@ -Subproject commit e8ebc723702e64958f1bae1f80c434db5f5a69cf +Subproject commit 104c822cd0c848eed5b99bb1518d5c2379341eee diff --git a/cbor b/cbor index ad81088..a4a1aff 160000 --- a/cbor +++ b/cbor @@ -1 +1 @@ -Subproject commit ad810889aa3e7c7dbd93d9a1abe68701f7ea4f45 +Subproject commit a4a1affd45ba90bea24e08733ae2bd02fe058166 diff --git a/dhall-nim b/dhall-nim index 74592b0..42bc574 160000 --- a/dhall-nim +++ b/dhall-nim @@ -1 +1 @@ -Subproject commit 74592b05f176c6208231e38dc5fdf49ec15480bc +Subproject commit 42bc57446d3d336e9910ce22b7ba06784876a8fd diff --git a/eris-go b/eris-go index 0e27160..b6c1586 160000 --- a/eris-go +++ b/eris-go @@ -1 +1 @@ -Subproject commit 0e271609fde50433bb57a707a89ef69e8b90f802 +Subproject commit b6c1586deb205c4caa24d70d2b2bb1857d170b1d diff --git a/eris-nim b/eris-nim index 1633a5b..9f5c62a 160000 --- a/eris-nim +++ b/eris-nim @@ -1 +1 @@ -Subproject commit 1633a5b24759b2bd03db1863d475ea0e04a99fa9 +Subproject commit 9f5c62a5827aa3f9e3a9c8c2c5a2bd4dc8c90167 diff --git a/eristekt b/eristekt new file mode 160000 index 0000000..52c654f --- /dev/null +++ b/eristekt @@ -0,0 +1 @@ +Subproject commit 52c654f5b7a09e4fcec9f0813cde081f5ab425d5 diff --git a/nim b/nim index d61dc77..527d780 160000 --- a/nim +++ b/nim @@ -1 +1 @@ -Subproject commit d61dc77f2e6718a2d0a62e0a37f4ffd8acef3d76 +Subproject commit 527d780c663d680e65a1245ac9906611860b4a9c diff --git a/nimble/Tupfile b/nimble/Tupfile index cf05625..61c7555 100644 --- a/nimble/Tupfile +++ b/nimble/Tupfile @@ -1,7 +1,7 @@ -!nix_build = |> ^o nix build %o^ nix build --out-link %o |> -: |> !nix_build nixpkgs#nimPackages.illwill |> illwill ./ -: |> !nix_build nixpkgs#nimPackages.base32 |> base32 ./ -: |> !nix_build nixpkgs#nimPackages.nimSHA2 |> nimsha2 ./ -: |> !nix_build nixpkgs#nimPackages.npeg |> npeg ./ -: |> !nix_build nixpkgs#nimPackages.flatty |> flatty ./ -: |> !nix_build nixpkgs#nimPackages.sdl2 |> sdl2 ./ +!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 ./ diff --git a/nimble/bigints b/nimble/bigints new file mode 160000 index 0000000..6d77ea7 --- /dev/null +++ b/nimble/bigints @@ -0,0 +1 @@ +Subproject commit 6d77ea78e8da1d870017303bc0cbd798f85bb506 diff --git a/nimble/nimAES b/nimble/nimAES new file mode 160000 index 0000000..b9d6d29 --- /dev/null +++ b/nimble/nimAES @@ -0,0 +1 @@ +Subproject commit b9d6d29cb44d4b6965ad4db04770bef2a35dd4b7 diff --git a/nimble/websock b/nimble/websock new file mode 160000 index 0000000..2c3ae31 --- /dev/null +++ b/nimble/websock @@ -0,0 +1 @@ +Subproject commit 2c3ae3137f3c9cb48134285bd4a47186fa51f0e8 diff --git a/nix_actor b/nix_actor index 9a0d2a2..d51d9b3 160000 --- a/nix_actor +++ b/nix_actor @@ -1 +1 @@ -Subproject commit 9a0d2a22ec9fc5bd8b7119efa447ac8dd253e72d +Subproject commit d51d9b3c34a887587d17985add18a109001f5d16 diff --git a/preserves-nim b/preserves-nim index 117aa19..6008b0b 160000 --- a/preserves-nim +++ b/preserves-nim @@ -1 +1 @@ -Subproject commit 117aa19ef3dd2b862a70060b981ae543a6fec715 +Subproject commit 6008b0ba2509dc2e92f914d78b3f54f24040f641 diff --git a/shell.nix b/shell.nix deleted file mode 100644 index c1710e0..0000000 --- a/shell.nix +++ /dev/null @@ -1,5 +0,0 @@ -let - pkgs = import { }; - tup' = pkgs.tup.overrideAttrs - ({ patches ? [ ], ... }: { patches = patches ++ [ ./tup.patch ]; }); -in pkgs.mkShell { packages = [ pkgs.ccacheWrapper pkgs.tup ]; } diff --git a/sigil b/sigil index eedfff3..f170f48 160000 --- a/sigil +++ b/sigil @@ -1 +1 @@ -Subproject commit eedfff3c27e21976296fc5c6177a3a5f6f0d018f +Subproject commit f170f48b6084274f6bc80619778878d1d0cd6a1f diff --git a/syn-open b/syn-open new file mode 160000 index 0000000..509970a --- /dev/null +++ b/syn-open @@ -0,0 +1 @@ +Subproject commit 509970a2d2517de4f11468aa977a47a9c3cda623 diff --git a/syndicate-flake b/syndicate-flake index 4fd103a..4d26917 160000 --- a/syndicate-flake +++ b/syndicate-flake @@ -1 +1 @@ -Subproject commit 4fd103a34a35ba84f40ae2a569c159d1284aa9ae +Subproject commit 4d2691722c7cf0b9c053bb73c1b6165784968030 diff --git a/syndicate-nim b/syndicate-nim index 7a36a6e..38b6935 160000 --- a/syndicate-nim +++ b/syndicate-nim @@ -1 +1 @@ -Subproject commit 7a36a6e8a4773ac9992c906a6f9729c4ddbffe44 +Subproject commit 38b6935ea02e8ce94532b0e12d75cd871439d475 diff --git a/syndicate_utils b/syndicate_utils index e244524..818c23f 160000 --- a/syndicate_utils +++ b/syndicate_utils @@ -1 +1 @@ -Subproject commit e244524bc91f228cab0228c7bc425690af115028 +Subproject commit 818c23f0259c82e2649735c200f0741218722674 diff --git a/xapian_actor b/xapian_actor index ecd5ee5..bf722fa 160000 --- a/xapian_actor +++ b/xapian_actor @@ -1 +1 @@ -Subproject commit ecd5ee5eb09c794cac8400ff976e74173e03f0d8 +Subproject commit bf722fa5b8bcbd50be5214647969b7314da5bed8 diff --git a/xdg_open_ng b/xdg_open_ng deleted file mode 160000 index 4db9037..0000000 --- a/xdg_open_ng +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4db9037153d123bb1f12feafba7a4d2210c53578