Skip to content

Commit

Permalink
Reorganized repository
Browse files Browse the repository at this point in the history
  • Loading branch information
guillemcordoba committed May 21, 2024
1 parent 0064469 commit ef44aa9
Show file tree
Hide file tree
Showing 81 changed files with 169 additions and 567 deletions.
121 changes: 84 additions & 37 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
[workspace]
members = ["tauri-plugin-holochain", "crates/*"]
members = ["crates/*"]
resolver = "2"

[patch.crates-io]
# TODO: remove these patches once https://github.com/holochain/tx5/issues/87 is resolved
tx5-go-pion-sys = { git = "https://github.com/guillemcordoba/tx5", branch = "custom-go" }
tx5-go-pion-turn = { git = "https://github.com/guillemcordoba/tx5", branch = "custom-go" }
14 changes: 9 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
# Tauri Plugin holochain
# p2p-shipyard

Tauri Plugin Holochain is [Source-Available](https://en.wikipedia.org/wiki/Source-available_software), you can see its source code [here](https://github.com/darksoil-studio/tauri-plugin-holochain). We are raising funds to make it Open Source.
Build cross-platform holochain apps and runtimes.

If you'd like to contribute to `tauri-plugin-holochain` being open-source and free to use by everyone, please go to our open-collective page to contribute!
---

https://opencollective.com/darksoil/projects/tauri-plugin-holochain
`p2p-shipyard` is [Source-Available](https://en.wikipedia.org/wiki/Source-available_software), you can see its source code [here](https://github.com/darksoil-studio/p2p-shipyard). We are raising funds to make it Open Source.

If you'd like to contribute to `p2p-shipyard` being open-source and free to use by everyone, please go to our open-collective page to contribute!

https://opencollective.com/darksoil/projects/p2p-shipyard

Learn more in the main documentation page:

https://darksoil.studio/tauri-plugin-holochain
https://darksoil.studio/p2p-shipyard
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@
nixpkgs.follows = "holochain/nixpkgs";
flake-parts.follows = "holochain/flake-parts";

tauri-plugin-holochain.url = "github:darksoil-studio/tauri-plugin-holochain";
p2p-shipyard.url = "github:darksoil-studio/p2p-shipyard";
};

outputs = inputs:
inputs.flake-parts.lib.mkFlake { inherit inputs; } {
systems = builtins.attrNames inputs.holochain.devShells;
perSystem = { inputs', config, pkgs, system, ... }: {
devShells.default = pkgs.mkShell {
inputsFrom = [ inputs'.tauri-plugin-holochain.devShells.holochainTauriDev ];
inputsFrom = [ inputs'.p2p-shipyard.devShells.holochainTauriDev ];
};
devShells.androidDev = pkgs.mkShell {
inputsFrom = [ inputs'.tauri-plugin-holochain.devShells.holochainTauriAndroidDev];
inputsFrom = [ inputs'.p2p-shipyard.devShells.holochainTauriAndroidDev];
};
};
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ tauri-build = { version = "2.0.0-beta", default-features = false , features = []

[dependencies]
tauri = { version = "2.0.0-beta", features = [] }
tauri-plugin-holochain = { git = "https://github.com/darksoil-studio/tauri-plugin-holochain", branch = "main" }
tauri-plugin-holochain = { git = "https://github.com/darksoil-studio/p2p-shipyard", branch = "main" }
holochain_types = { version = "0.3.1-rc" }
lair_keystore = { version = "0.4.0" }
holochain_client = { version = "0.5.0-dev" }
Expand Down
2 changes: 1 addition & 1 deletion crates/scaffold-tauri-app/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ nix run .#scaffold-tauri-app -- --path /tmp/forum-scaffold-tauri-app --ui-packag

cd /tmp/forum-scaffold-tauri-app

nix develop --override-input tauri-plugin-holochain $DIR --command bash -c "
nix develop --override-input p2p-shipyard $DIR --command bash -c "
set -e
npm i
Expand Down
Loading

0 comments on commit ef44aa9

Please sign in to comment.