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

Jump to bottom

rls: tie version to rustc's #66728

Merged
merged 1 commit into from Aug 21, 2019
Merged

rls: tie version to rustc's #66728

merged 1 commit into from Aug 21, 2019

Conversation

symphorien
Copy link
Member

@symphorien symphorien commented Aug 16, 2019 •
edited by basvandijk

Motivation for this change

Save a PR to update rls after each rustc update.

Idea from #66713

Things done

(tested on nixos-unstable, and then rebased on master)

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@Mic92
Copy link
Member

Mic92 commented Aug 17, 2019

@GrahamcOfBorg build rls

@Mic92
Copy link
Member

Mic92 commented Aug 17, 2019

Is there a way to convince cargo to build the modified source anyhow?

This is from aarch64:

patching sources
updateAutotoolsGnuConfigScriptsPhase
Updating Autotools / GNU config script to a newer upstream version: ./vendor/backtrace-sys/src/libbacktrace/config.sub
Updating Autotools / GNU config script to a newer upstream version: ./vendor/jemalloc-sys/jemalloc/build-aux/config.sub
Updating Autotools / GNU config script to a newer upstream version: ./vendor/lzma-sys/xz-5.2.3/build-aux/config.sub
Updating Autotools / GNU config script to a newer upstream version: ./src/llvm-project/llvm/cmake/config.guess
Updating Autotools / GNU config script to a newer upstream version: ./src/llvm-emscripten/cmake/config.guess
Updating Autotools / GNU config script to a newer upstream version: ./vendor/backtrace-sys/src/libbacktrace/config.guess
Updating Autotools / GNU config script to a newer upstream version: ./vendor/jemalloc-sys/jemalloc/build-aux/config.guess
Updating Autotools / GNU config script to a newer upstream version: ./vendor/lzma-sys/xz-5.2.3/build-aux/config.guess
configuring
[target."aarch64-unknown-linux-gnu"]
"linker" = "/nix/store/klyy5lnql0b551qv31x760yyk2cv929x-gcc-wrapper-7.4.0/bin/cc"
building
/build/rustc-1.36.0-src/src/tools/rls /build/rustc-1.36.0-src
++ env CC_aarch64-unknown-linux-gnu=/nix/store/klyy5lnql0b551qv31x760yyk2cv929x-gcc-wrapper-7.4.0/bin/cc CXX_aarch64-unknown-linux-gnu=/nix/store/klyy5lnql0b551qv31x760yyk2cv929x-gcc-wrapper-7.4.0/bin/c++ CC_aarch64-unknown-linux-gnu=/nix/store/klyy5lnql0b551qv31x760yyk2cv929x-gcc-wrapper-7.4.0/bin/cc CXX_aarch64-unknown-linux-gnu=/nix/store/klyy5lnql0b551qv31x760yyk2cv929x-gcc-wrapper-7.4.0/bin/c++ cargo build --release --target aarch64-unknown-linux-gnu --frozen
error: the listed checksum of `/build/rustc-1.36.0-src/vendor/backtrace-sys/src/libbacktrace/config.sub` has changed:
expected: c8e70ab53f04d2f2b0280aa0e8a5432e90a902bfa2af7b0854168eb1fb3a84c0
actual:   64db5b1ae1f0f32ba554e57c2f88d1c05d4272d195c2b05f4db34f87bb4ac944
directory sources are not intended to be edited, if modifications are required then it is recommended that [replace] is used with a forked copy of the source
builder for '/nix/store/lz8rxa8jad080c13qr75lgmg7j2pxiky-rls-1.36.0.drv' failed with exit code 101
error: build of '/nix/store/lz8rxa8jad080c13qr75lgmg7j2pxiky-rls-1.36.0.drv' failed

@symphorien
Copy link
Member Author

#66681 uses dontUpdateAutotoolsGnuConfigScripts = true; instead, let's try this.

@Mic92
Copy link
Member

Mic92 commented Aug 18, 2019

@GrahamcOfBorg build rls

@basvandijk
Copy link
Member

I can confirm nix-build -A rustPackages.rls works on MacOS.

@basvandijk
Copy link
Member

I can confirm nix-build -A rustPackages.rls works on x86_64-linux.

@basvandijk
Copy link
Member

Let's try one more time if ofborg agrees:

@GrahamcOfBorg build rls

@basvandijk
Copy link
Member

I fixed the conflict.

@GrahamcOfBorg build rls

@symphorien
Copy link
Member Author

Thanks, I had not realized there were conflicts.

@GrahamcOfBorg merge

@symphorien
Copy link
Member Author

oh I mixed rfc 50 and 39

@basvandijk basvandijk merged commit cbf76c7 into NixOS:master Aug 21, 2019
@symphorien symphorien deleted the rust-rls branch March 21, 2020 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@basvandijk basvandijk basvandijk approved these changes

@LnL7 LnL7 Awaiting requested review from LnL7

@Mic92 Mic92 Awaiting requested review from Mic92 Mic92 is a code owner

Assignees
No one assigned
Labels
6.topic: rust 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@symphorien @Mic92 @basvandijk