Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ Requires Nix with flakes enabled.

```sh
nix develop # default shell (Solidity + Rust + Node + subgraph tools)
nix develop .#sol-shell # slim Solidity-only shell — no rust, node, chromium, subgraph
nix develop .#rust-shell # slim Rust-only shell — no sol, node, chromium
nix develop .#sol-shell # slim Solidity-only shell — no rust, node, subgraph
nix develop .#rust-shell # slim Rust-only shell — no sol, node
```

The default shell auto-sources `.env` if present and runs
Expand Down Expand Up @@ -179,8 +179,8 @@ jobs:
uses: rainlanguage/rainix/.github/workflows/rainix-rs-static.yaml@main
```

Always runs through rainix's `rust-shell` (rust toolchain only — no
chromium/sol/node), regardless of the consumer's default devShell.
Always runs through rainix's `rust-shell` (rust toolchain only — no sol/node),
regardless of the consumer's default devShell.

#### rainix-rs-test

Expand Down
28 changes: 2 additions & 26 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -127,28 +127,6 @@
'';
};

# Cross-platform `chromium` binary for headless rendering inside the dev
# shell (e.g. dumping rendered DOM of a deployed SPA preview to debug
# JS-side errors). On Linux, defer to the nixpkgs chromium build. On
# Darwin, nixpkgs has no chromium, so wrap the system Chrome.app — fails
# at invocation time with a clear message when Chrome is not installed.
chromium = pkgs.writeShellScriptBin "chromium" (
if pkgs.stdenv.isDarwin then
''
chrome="/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
if [ ! -x "$chrome" ]; then
echo "rainix chromium wrapper: Google Chrome.app not found at $chrome" >&2
echo "Install Chrome (https://www.google.com/chrome/) or use a Linux dev shell." >&2
exit 127
fi
exec "$chrome" "$@"
''
else
''
exec ${pkgs.chromium}/bin/chromium "$@"
''
);

# rainix-curated prettier bundle: a single nix-built node_modules
# tree containing prettier + the standardized plugins, plus a
# .prettierrc.json picked up via PRETTIER_BUNDLE_DIR. Consumers
Expand Down Expand Up @@ -337,7 +315,6 @@
bats test/bats/devshell/default/solc.test.bats
bats test/bats/devshell/default/gh.test.bats
bats test/bats/devshell/default/age.test.bats
bats test/bats/devshell/default/chromium.test.bats
bats test/bats/devshell/default/prettier-bundle.test.bats
bats test/bats/task/skip-simulation.test.bats
bats test/bats/task/subgraph-build.test.bats
Expand Down Expand Up @@ -551,7 +528,7 @@
};

devShells = {
# Slim shell for Solidity-only repos: no chromium, rust, node,
# Slim shell for Solidity-only repos: no rust, node,
# subgraph, sqlite, age. Lets sol-only consumers (rain.solmem,
# rain.deploy, rain.datacontract, etc.) avoid the heavy default
# closure when their CI is just rainix-sol-{test,static,legal}.
Expand All @@ -564,7 +541,7 @@
};

# Slim shell for Rust-only repos: rust toolchain + cargo + the
# rs-tasks, no sol/node/chromium. Mirror of sol-shell for the
# rs-tasks, no sol/node. Mirror of sol-shell for the
# Rust side. Consumers like rain.cli that ship a pure rust
# binary can alias `default = rust-shell` and skip the heavy
# default closure.
Expand All @@ -587,7 +564,6 @@
++ [
the-graph
goldsky
chromium
pkgs.sqlite
pkgs.yq-go
pkgs.age
Expand Down
4 changes: 0 additions & 4 deletions test/bats/devshell/default/chromium.test.bats

This file was deleted.

Loading