-
Notifications
You must be signed in to change notification settings - Fork 33
barebones flake.nix #532
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
CupOfTeaJay
wants to merge
10
commits into
TheBevyFlock:main
Choose a base branch
from
CupOfTeaJay:main
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
barebones flake.nix #532
Changes from all commits
Commits
Show all changes
10 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 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
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,61 @@ | ||
| { | ||
| 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; | ||
| cargoBuildFlags = [ "--all" ]; | ||
| doCheck = false; | ||
|
|
||
| nativeBuildInputs = nativeBuildInputs ++ (with pkgs; [ makeBinaryWrapper ]); | ||
| inherit buildInputs; | ||
|
|
||
| postInstall = '' | ||
| for bin in $out/bin/bevy{,_lint}; do | ||
| wrapProgram $bin --set BEVY_LINT_SYSROOT ${toolchain} | ||
| done | ||
| ''; | ||
| }; | ||
| }; | ||
|
|
||
| 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.
Uh oh!
There was an error while loading. Please reload this page.
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.
Hey, I've tested out your PR and you just need to make a few changes to make
bevy lintwork:A few important points:
bevy_lintrequires the nightly compiler, so we need to pull in a community-maintained overlay sincenixpkgsdoesn't provide one. Therust-toolchain.tomlfrom the repo is used here, so we'll never go out-of-sync. See the official manual for details.We can't expect
rustupto be available on NixOS systems, so we need to pointBEVY_LINT_SYSROOTto the same nightly toolchain used to build the linter.cargoBuildFlags = [ "--all" ];This just builds all the packages in the workspace so that we get both
bevyandbevy_lint. Is it worth it to be more specific?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.
Does setting BEVY_LINT_SYSROOT for the bevy cli (not the bevy_lint cli) do anything, or should it be set for only bevy_cli?
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.
The Bevy CLI doesn't read
BEVY_LINT_SYSROOT, but if you run the linter through the CLI (such as withbevy lint web, for example), you'll still wantBEVY_LINT_SYSROOTto be set. Check out the docs on environmental variables for more details. :)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.
These changes should be applied now