From 5f6a5cac8414e0c57fbcffc78aee9abbcf1329d7 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Wed, 5 Apr 2023 15:15:28 -0500 Subject: [PATCH] Repo shuffle --- .gitmodules | 41 ++++++++++++++++++++++++++++++++++++++++- Tuprules.tup | 11 ++++++----- bumpy | 1 + chroma | 1 + crunchy | 1 + fontconfig_actor | 2 +- libnotify_actor | 1 + nimble/Tupfile | 8 ++++++++ nimble/nimsvg.nix | 18 ++++++++++++++++++ nimsimd | 1 + npeg | 1 - pixie | 1 + preserves-nim | 2 +- vmath | 1 + zippy | 1 + 15 files changed, 82 insertions(+), 9 deletions(-) create mode 160000 bumpy create mode 160000 chroma create mode 160000 crunchy create mode 160000 libnotify_actor create mode 100644 nimble/Tupfile create mode 100644 nimble/nimsvg.nix create mode 160000 nimsimd delete mode 160000 npeg create mode 160000 pixie create mode 160000 vmath create mode 160000 zippy diff --git a/.gitmodules b/.gitmodules index 3398361..bf6551d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,7 @@ path = nim url = git@github.com:ehmry/nim.git [submodule "npeg"] - path = npeg + path = nimble/npeg url = https://github.com/zevv/npeg.git [submodule "getdns"] path = getdns @@ -70,3 +70,42 @@ [submodule "svui"] path = svui url = git@git.sr.ht:~ehmry/svui +[submodule "nimsvg"] + path = nimble/nimsvg + url = https://github.com/bluenote10/NimSvg.git +[submodule "bumpy"] + path = bumpy + url = https://github.com/treeform/bumpy.git +[submodule "nimsha2"] + path = nimble/nimsha2 + url = https://github.com/jangko/nimSHA2.git +[submodule "nimble/vmath"] + path = nimble/vmath + url = https://github.com/treeform/vmath.git +[submodule "nimble/base32"] + path = nimble/base32 + url = https://github.com/rgv151/base32.nim +[submodule "nimble/illwill"] + path = nimble/illwill + url = //github.com/johnnovak/illwill.git +[submodule "pixie"] + path = pixie + url = git@github.com:ehmry/pixie.git +[submodule "chroma"] + path = chroma + url = https://github.com/treeform/chroma.git +[submodule "nimsimd"] + path = nimsimd + url = https://github.com/guzba/nimsimd.git +[submodule "vmath"] + path = vmath + url = https://github.com/treeform/vmath.git +[submodule "zippy"] + path = zippy + url = https://github.com/treeform/zippy.git +[submodule "crunchy"] + path = crunchy + url = https://github.com/guzba/crunchy.git +[submodule "libnotify_actor"] + path = libnotify_actor + url = git@git.syndicate-lang.org:ehmry/libnotify_actor.git diff --git a/Tuprules.tup b/Tuprules.tup index d5f9be5..ecbf986 100644 --- a/Tuprules.tup +++ b/Tuprules.tup @@ -9,11 +9,12 @@ SYNDICATE_PROTOCOL = $(TUP_CWD)/syndicate-nim/ NIM = $(TUP_CWD)/nim/bin/nim -NIM_BACKEND = compile -!nim = |> ^o nim compile %f^ $(DIRENV) $(NIM) compile $(NIM_FLAGS) $(NIM_FLAGS_%B) -o:%o %f |> %B -!nim_run = |> ^o nim run %f^ $(DIRENV) $(NIM) compile $(NIM_FLAGS) $(NIM_FLAGS_%B) -o:%o -r %f |> %B.run -!nim_bin = |> ^o nim bin %f^ $(DIRENV) $(NIM) compile $(NIM_FLAGS) $(NIM_FLAGS_%B) -o:%o %f |> $(BIN_DIR)/%B | $(BIN_DIR)/<%B> -!nim_check = |> ^ nim doc %f^ $(DIRENV) $(NIM) doc $(NIM_FLAGS) $(NIM_FLAGS_%B) -o:%o %f |> %B.html +NIM_FLAGS = --noNimblePath + +!nim = | $(NIM_GROUPS) |> ^o nim compile %f^ $(DIRENV) $(NIM) compile $(NIM_FLAGS) $(NIM_FLAGS_%B) -o:%o %f |> %B +!nim_run = | $(NIM_GROUPS) |> ^o nim run %f^ $(DIRENV) $(NIM) compile $(NIM_FLAGS) $(NIM_FLAGS_%B) -o:%o -r %f |> %B.run +!nim_bin = | $(NIM_GROUPS) |> ^o nim bin %f^ $(DIRENV) $(NIM) compile $(NIM_FLAGS) $(NIM_FLAGS_%B) -o:%o %f |> $(BIN_DIR)/%B | $(BIN_DIR)/<%B> +!nim_check = | $(NIM_GROUPS) |> ^ nim doc %f^ $(DIRENV) $(NIM) doc $(NIM_FLAGS) $(NIM_FLAGS_%B) -o:%o %f |> %B.html !symlink = |> ln -s %f %o |> diff --git a/bumpy b/bumpy new file mode 160000 index 0000000..cf13b44 --- /dev/null +++ b/bumpy @@ -0,0 +1 @@ +Subproject commit cf13b445238c25981dddccca96187920cb6e0047 diff --git a/chroma b/chroma new file mode 160000 index 0000000..64eab23 --- /dev/null +++ b/chroma @@ -0,0 +1 @@ +Subproject commit 64eab23fde36e365479e02b860521b944c84a4a6 diff --git a/crunchy b/crunchy new file mode 160000 index 0000000..6dda0e3 --- /dev/null +++ b/crunchy @@ -0,0 +1 @@ +Subproject commit 6dda0e3347e310ed883f9c0abee900cfc6c4a65a diff --git a/fontconfig_actor b/fontconfig_actor index a6710d6..2a421a0 160000 --- a/fontconfig_actor +++ b/fontconfig_actor @@ -1 +1 @@ -Subproject commit a6710d6d88eeff8c395cf491bc56ac699288f41b +Subproject commit 2a421a0e53e38ed54dd1ecca9efe4f272ec27d86 diff --git a/libnotify_actor b/libnotify_actor new file mode 160000 index 0000000..80b7bf7 --- /dev/null +++ b/libnotify_actor @@ -0,0 +1 @@ +Subproject commit 80b7bf7277a3e30c51034f797ff316a12ff4f7f1 diff --git a/nimble/Tupfile b/nimble/Tupfile new file mode 100644 index 0000000..dfd7634 --- /dev/null +++ b/nimble/Tupfile @@ -0,0 +1,8 @@ +export NIX_PATH +: |> nix build --out-link %o nixpkgs#nimPackages.illwill |> illwill ./ +: |> nix build --out-link %o nixpkgs#nimPackages.base32 |> base32 ./ +: |> nix build --out-link %o nixpkgs#nimPackages.bumpy |> bumpy ./ +: |> nix build --out-link %o nixpkgs#nimPackages.vmath |> vmath ./ +: |> nix build --out-link %o nixpkgs#nimPackages.nimSHA2 |> nimsha2 ./ +: |> nix build --out-link %o nixpkgs#nimPackages.npeg |> npeg ./ +: nimsvg.nix |> nix build -f %f --out-link %o |> nimsvg ./ diff --git a/nimble/nimsvg.nix b/nimble/nimsvg.nix new file mode 100644 index 0000000..0ea4097 --- /dev/null +++ b/nimble/nimsvg.nix @@ -0,0 +1,18 @@ +{ pkgs ? import { } }: + +pkgs.nimPackages.callPackage ({ lib, buildNimPackage, fetchFromGitHub }: + + buildNimPackage rec { + pname = "NimSvg"; + version = "unstable-2021-06-10"; + + src = fetchFromGitHub { # https://github.com/bluenote10/NimSvg + owner = "bluenote10"; + repo = pname; + rev = "89e7b31a1937524451fdf57f3e851f293385e8ca"; + hash = "sha256-U+8UbQvos4ycJUDatGHHeCr/7vX6llVTkDJ7I/9cdAA="; + }; + + doCheck = true; + + }) { } diff --git a/nimsimd b/nimsimd new file mode 160000 index 0000000..1d75f15 --- /dev/null +++ b/nimsimd @@ -0,0 +1 @@ +Subproject commit 1d75f15c8bb8df9c1d4779072bbfc8a7e3e84c98 diff --git a/npeg b/npeg deleted file mode 160000 index d93ae31..0000000 --- a/npeg +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d93ae315a0d9e16fcada8af9e6bb3d90be5e9f64 diff --git a/pixie b/pixie new file mode 160000 index 0000000..f7a4bdc --- /dev/null +++ b/pixie @@ -0,0 +1 @@ +Subproject commit f7a4bdcba787a4f42f5659463e1fd5827f023f26 diff --git a/preserves-nim b/preserves-nim index 466a8d3..b7e1f2c 160000 --- a/preserves-nim +++ b/preserves-nim @@ -1 +1 @@ -Subproject commit 466a8d3af43ac4ee6897d1be23f10218891fb088 +Subproject commit b7e1f2c8c74de5c81a23fd0e788c6cbd9093c50b diff --git a/vmath b/vmath new file mode 160000 index 0000000..b078254 --- /dev/null +++ b/vmath @@ -0,0 +1 @@ +Subproject commit b0782541e1028a4619ddb0fd45939450e4efd742 diff --git a/zippy b/zippy new file mode 160000 index 0000000..3eb234c --- /dev/null +++ b/zippy @@ -0,0 +1 @@ +Subproject commit 3eb234cfc2bf7b552da3115e0788128d7cfa2647