rust-analyzer: 2020-06-01 -> 2020-06-15 and fix version display #90976
Conversation
This file contains 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
|
With #90211 merged, can this be rebased onto it? Also, cc @lovesegfault on the version display. Isn't there a better way to pass this in? |
|
@flokli I think this approach is fine, although perhaps it could benefit from being upstreamed with an explanation of why this helps us in Nix land. |
|
Humm… I thought about using the git-version crate (but didn't check if it allows overriding the version via an env variable), instead of implementing (and extending the logic on our own) |
bors bot
added a commit
to rust-lang/rust-analyzer
that referenced
this pull request
Jun 19, 2020
4937: Allow overriding rust-analyzer display version r=matklad a=oxalica The build script invokes `git` for version information which is displayed when rust-analyzer is called with `--version`. But in build environment without `git` or when the source code is not a git repo, there's no way to manually specify the version information. This patch respects environment variable ~`REV`~ `RUST_ANALYZER_REV` in compile time for overriding. Related: NixOS/nixpkgs#90976 Co-authored-by: oxalica <oxalicc@pm.me>
|
Maybe we could wait for the next release to fix it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation for this change
Bump version.
Fix output when it is called with
--version. (Used to be??????)Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)