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.

Sign up for GitHub

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

Bump rustc version #2253

Closed
wants to merge 3 commits into from
Closed

Bump rustc version #2253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1255e89
Bump rustc version
osa1 Jan 13, 2021
251ebb7
Bump LLVM toolchain version too for compatibility with rustc
osa1 Jan 13, 2021
ffba3e6
Bump nixpkgs, mozilla overlay
osa1 Jan 13, 2021
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
12 changes: 6 additions & 6 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ let haskellPackages = nixpkgs.haskellPackages.override {
}; in
let
rtsBuildInputs = with nixpkgs; [
clang_10 # for native/wasm building
lld_10 # for wasm building
clang_11 # for native/wasm building
lld_11 # for wasm building
rustc-nightly
cargo-nightly
xargo
Expand All @@ -31,9 +31,9 @@ let
# When compiling natively, we want to use `clang` (which is a nixpkgs
# provided wrapper that sets various include paths etc).
# But for some reason it does not handle building for Wasm well, so
# there we use plain clang-10. There is no stdlib there anyways.
export CLANG="${nixpkgs.clang_10}/bin/clang"
export WASM_CLANG="clang-10"
# there we use plain clang-11. There is no stdlib there anyways.
export CLANG="${nixpkgs.clang_11}/bin/clang"
export WASM_CLANG="clang-11"
export WASM_LD=wasm-ld
'';
in
Expand Down Expand Up @@ -131,7 +131,7 @@ rec {
name = "motoko-rts-deps";
src = subpath rts/motoko-rts;
sourceRoot = null;
sha256 = "11la5fl0fgx6i5g52p56sf48yz7f0mqrgm38m320xh3wyqa2nim6";
sha256 = "0kpqc6i8mbk5fw0rc1f74z3rdh3ay7h04ljjadzpcz0s49b0sznb";
copyLockfile = true;
};
in
Expand Down
2 changes: 1 addition & 1 deletion nix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ let
# Rust nightly
(self: super: let
moz_overlay = import self.sources.nixpkgs-mozilla self super;
rust-channel = moz_overlay.rustChannelOf { date = "2020-07-22"; channel = "nightly"; };
rust-channel = moz_overlay.rustChannelOf { date = "2021-01-11"; channel = "nightly"; };
in rec {
rustc-nightly = rust-channel.rust.override {
targets = [ "wasm32-unknown-unknown" "wasm32-unknown-emscripten" ];
Expand Down
6 changes: 3 additions & 3 deletions nix/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@
"homepage": null,
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "66cd39409e8ae1e2981edfb33bb06c164893d70d",
"sha256": "1c44akgqbqsm2b6k5b850lb0q7wq5l5p4hm6bqbaif1h05sc2bkx",
"rev": "e6a184aca0d0d3252a516c317afbfa30fcc7e5d7",
"sha256": "066nkgr7snnlk7q85xz38mxrfbd36b9pasdrwpbc1n6ifbx1q9mz",
Comment on lines +99 to +100
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You changed the commit to a rev on master, without chanigng the branch field. Git doesn't tell you that, but it’ll be confusing for the next person to look at this. So before merging, make sure that the branch field correctly says which branch the revision is from.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do.

We may not want to change the branch, I mainly wanted to see if using the latest version will fix build issues on Darwin.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, that’s what I gathered. Just leaving this comment so that this doesn't slip through in the end.

"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/66cd39409e8ae1e2981edfb33bb06c164893d70d.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/e6a184aca0d0d3252a516c317afbfa30fcc7e5d7.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs-mozilla": {
Expand Down
4 changes: 2 additions & 2 deletions rts/motoko-rts/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rts/motoko-rts/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version = "0.2.73"

# Added here so that it ends up in Cargo.lock, so that nix will pre-fetch it
[dependencies.compiler_builtins]
version = "0.1.32"
version = "0.1.39"
# Without this feature we get dozens of duplicate symbol errors when generating
# the final shared .wasm file:
#
Expand Down
4 changes: 2 additions & 2 deletions test/lsp-int/lsp-int.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ executable lsp-int
main-is: Main.hs
-- other-modules:
other-extensions: OverloadedStrings, DuplicateRecordFields
build-depends: base ^>=4.13
, text ^>=1.2
build-depends: base
, text
, hspec
, HUnit
, filepath
Expand Down
4 changes: 2 additions & 2 deletions test/random/qc-motoko.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ executable qc-motoko
other-modules: Embedder, Turtle.Pipe
other-extensions: ConstraintKinds, StandaloneDeriving, DataKinds, KindSignatures, GADTs, MultiParamTypeClasses
ghc-options: -O -threaded -with-rtsopts=-N2
build-depends: base ^>=4.13.0.0
, text ^>=1.2.3.1
build-depends: base
, text
, process
, exceptions
, managed
Expand Down