-
Notifications
You must be signed in to change notification settings - Fork 36
Create flake.nix for CLI
#733
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
Open
BD103
wants to merge
18
commits into
main
Choose a base branch
from
cli-flake.nix
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
6ccf442
barebones flake.nix
CupOfTeaJay 54e738d
Merge branch 'TheBevyFlock:main' into main
CupOfTeaJay 04e8675
nix flake update
CupOfTeaJay 0feb7ed
apply review suggestions && nix flake update
CupOfTeaJay 1ae6f87
Merge branch 'TheBevyFlock:main' into main
CupOfTeaJay 4c24f51
configure nightly toolchain for linter
CupOfTeaJay 071c4f1
Merge branch 'main' into main
DaAlbrecht 3e0d88e
Merge branch 'TheBevyFlock:main' into main
CupOfTeaJay 0fd9ed8
document Nix support
CupOfTeaJay 3c32ece
qualify both CLI & Linter for Nix support
CupOfTeaJay eddc831
Merge branch 'main' into main
BD103 c509fbb
chore: update `flake.lock`
BD103 a7a6f24
chore: ignore result folder generated by nix-build
BD103 426378a
fix: change build flags to use `--workspace` instead of deprecated `-…
BD103 00c6862
feat: create action to check `flake.nix`
BD103 c6a0002
fix: remove linter support from flake for now
BD103 9dedf74
feat: format `flake.nix`
BD103 7d49ad8
fix: add nix flake instructions to docs
BD103 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| name: Test Nix flake | ||
|
|
||
| on: | ||
| push: | ||
| branches: [main] | ||
| # Only run for pull requests when the flake, toolchain, or action is modified. | ||
| pull_request: | ||
| paths: | ||
| - flake.nix | ||
| - flake.lock | ||
| - rust-toolchain.toml | ||
| - .github/workflows/nix-flake.yml | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| test-flake: | ||
| name: Test Nix flake | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v6 | ||
|
|
||
| - name: Install Nix | ||
| uses: DeterminateSystems/determinate-nix-action@v3.15.2 | ||
|
|
||
| - name: Check flake | ||
| run: nix flake check --all-systems | ||
|
|
||
| - name: Run Bevy CLI | ||
| run: nix run . -- --version | ||
|
|
||
| - name: Format `flake.nix` | ||
| run: nix-shell -p nixfmt --run "nixfmt --check --strict --verify flake.nix" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| { | ||
| description = "A Bevy CLI tool and linter"; | ||
|
|
||
| inputs = { | ||
| flake-utils.url = "github:numtide/flake-utils"; | ||
| nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; | ||
| rust-overlay = { | ||
| url = "github:oxalica/rust-overlay"; | ||
| inputs.nixpkgs.follows = "nixpkgs"; | ||
| }; | ||
| }; | ||
|
|
||
| outputs = | ||
| { | ||
| self, | ||
| flake-utils, | ||
| nixpkgs, | ||
| rust-overlay, | ||
| }: | ||
| flake-utils.lib.eachDefaultSystem ( | ||
| system: | ||
| let | ||
| pkgs = nixpkgs.legacyPackages.${system}.extend rust-overlay.overlays.default; | ||
|
|
||
| nativeBuildInputs = with pkgs; [ pkg-config ]; | ||
|
|
||
| buildInputs = with pkgs; [ openssl ]; | ||
|
|
||
| toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; | ||
|
|
||
| rustPlatform = pkgs.makeRustPlatform { | ||
| cargo = toolchain; | ||
| rustc = toolchain; | ||
| }; | ||
| in | ||
| { | ||
| packages = { | ||
| default = self.outputs.packages.${system}.bevy; | ||
| bevy = rustPlatform.buildRustPackage { | ||
| pname = "bevy"; | ||
| version = "0.1.0-dev"; | ||
| src = ./.; | ||
| cargoLock.lockFile = ./Cargo.lock; | ||
| doCheck = false; | ||
|
|
||
| nativeBuildInputs = nativeBuildInputs ++ (with pkgs; [ makeBinaryWrapper ]); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. postInstall = ''
for bin in $out/bin/bevy{,_lint}; do
wrapProgram $bin --set BEVY_LINT_SYSROOT ${toolchain}
done
'';
|
||
| inherit buildInputs; | ||
| }; | ||
| }; | ||
|
|
||
| devShells.default = pkgs.mkShell { inherit buildInputs nativeBuildInputs; }; | ||
| } | ||
| ); | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need
--allso thatbevy_lintalso gets built.