Move some repos up for better artifact grouping

This commit is contained in:
Emery Hemingway 2022-12-05 16:12:38 -06:00
parent 37a164d405
commit cc273ed535
9 changed files with 26 additions and 10 deletions

6
.gitmodules vendored
View File

@ -1,8 +1,8 @@
[submodule "syndicate/preserves-nim"]
path = syndicate/preserves-nim
path = preserves-nim
url = git.syndicate-lang.org:ehmry/preserves-nim.git
[submodule "syndicate/preserves"]
path = syndicate/preserves
path = preserves
url = https://git.syndicate-lang.org/syndicate-lang/preserves.git
[submodule "coap"]
path = coap
@ -11,5 +11,5 @@
path = syndicate/protocols
url = https://git.syndicate-lang.org/syndicate-lang/syndicate-protocols.git
[submodule "syndicate/syndicate-protocols"]
path = syndicate/syndicate-protocols
path = syndicate-protocols
url = https://git.syndicate-lang.org/syndicate-lang/syndicate-protocols.git

View File

@ -1,4 +1,6 @@
include_rules
: syndicate/preserves-nim/src/preserves/preserves_schema_nim.nim |> !nim |> $(preserves_schema_nim)
: preserves-nim/src/preserves/preserves_schema_nim.nim |> !nim |> $(preserves_schema_nim)
: preserves-nim/src/preserves/schemac.nim |> !nim |> $(preserves-schemac)
: |> nix build ops#dhall --out-link %o |> $(DHALL_LINK)
: |> nix build --offline $(PKGS_FLAKE)#dhall --out-link %o |> $(DHALL_LINK)
: |> nix build --offline $(PKGS_FLAKE)#lowdown --out-link %o |> $(LOWDOWN_LINK)

View File

@ -2,15 +2,30 @@ export NIX_PATH
export XDG_CACHE_HOME
NIX_SHELL = nix-shell --run
PKGS_FLAKE = "github:nixos/nixpkgs/release-22.11"
DHALL_LINK = $(TUP_CWD)/dhall
!dhall = | $(DHALL_LINK) |> $(DHALL_LINK)/bin/dhall |>
LOWDOWN_LINK = $(TUP_CWD)/lowdown
!lowdown = | $(LOWDOWN_LINK) |> $(LOWDOWN_LINK)/bin/lowdown |>
NODEJS_LINK = $(TUP_CWD)/nodejs
!nodejs = | $(NODEJS_LINK) |> $(NODEJS_LINK)/bin/node |>
preserves_schema_nim = $(TUP_CWD)/preserves_schema_nim
NIM = $(TUP_CWD)/nim/bin/nim
!nim = |> $(NIM) c -o:%o %f |> %B
!nim_run = |> $(NIM) c -r -o:%o %f |> %B.run
!nim = |> $(NIM) c --hints:off $(NIM_PATH) -o:%o %f |> %B
!nim_run = |> $(NIM) c --hints:off -o:%o -r %f |> %B.run
PRESERVES_TOP = $(TUP_CWD)
!preserves_schema_nim = | $(preserves_schema_nim) |> $(preserves_schema_nim) %f |> $(PRESERVES_TOP)/<preserves>
preserves-schemac = $(TUP_CWD)/preserves-schemac
!preserves-schemac = | $(preserves-schemac) |> $(preserves-schemac) |> $(PRESERVES_TOP)/<schemas>
NIM_PATH += --path:$(TUP_CWD)/preserves-nim/src
NIM_PATH += --path:$(TUP_CWD)/syndicate-nim/src
NIM_PATH += --path:$(TUP_CWD)/taps/src

1
preserves Submodule

@ -0,0 +1 @@
Subproject commit b88cccb884ef55cefce0807cd3b5dd267af99f25

1
preserves-nim Submodule

@ -0,0 +1 @@
Subproject commit d3132391bd832f88aee497dd5317aa59c8e75ce6

@ -1 +0,0 @@
Subproject commit 269ed2391a7ee2efad578b078f21234842e3c5c7

@ -1 +0,0 @@
Subproject commit 114b564263e7bd4e2af4eb56b156e9e9ff5e6584

@ -1 +0,0 @@
Subproject commit ca92d99c524d99b6d3be04a0ba5383ec5a65b550