Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow Rust to be provided for app development #52

Merged
merged 6 commits into from
Sep 26, 2024

Conversation

ThetaSinner
Copy link
Member

No description provided.

@@ -21,8 +21,6 @@
formatter = pkgs.nixpkgs-fmt;

devShells.default = pkgs.mkShell {
inputsFrom = [ inputs'.holonix.devShells ];
Copy link
Member Author

@ThetaSinner ThetaSinner Sep 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was wrong and should have been

- inputsFrom = [ inputs'.holonix.devShells ];
+ inputsFrom = [ inputs'.holonix.devShells.default ];

When you correct this, you end up pulling in everything from the base shell twice because we're also specifying packages. So we need to choose between these two options.

The idea was to keep this Holonix flexible, so I prefer removing the inputsFrom so that people can choose what to include in their dev shell

Copy link
Contributor

@c12i c12i Sep 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, will remove this from the scaffolded nix flake, had actually modified it to the snippet below. In ref to holochain/scaffolding#365

inputsFrom = [ inputs'.holonix.devShells.default ];

in
pkgs.mkShell {
packages = [
rust
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Provides a locally-defined Rust instead of the one from Holonix

templates/rust-stable/flake.nix Outdated Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Name this folder custom-rust and the custom one custom-holochain?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That'd be a nice pattern, done!

@ThetaSinner ThetaSinner force-pushed the allow-rust-to-be-provided-for-app-development branch from 77e9754 to bca5e49 Compare September 26, 2024 08:44
@ThetaSinner ThetaSinner merged commit 4b32f98 into main Sep 26, 2024
18 checks passed
@ThetaSinner ThetaSinner deleted the allow-rust-to-be-provided-for-app-development branch September 26, 2024 12:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants