Skip to content

Commit

Permalink
Merge pull request #111 from roc-lang/rust-nix-upgrade
Browse files Browse the repository at this point in the history
Rust+nix upgrade
  • Loading branch information
Anton-4 authored Oct 6, 2023
2 parents d82be6a + c997436 commit 6d9b49f
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 61 deletions.
53 changes: 29 additions & 24 deletions flake.lock

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

1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
# to easily make configs for multiple architectures
flake-utils.url = "github:numtide/flake-utils";
Expand Down
95 changes: 60 additions & 35 deletions src/Cargo.lock

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

4 changes: 2 additions & 2 deletions src/rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
# - Find the latest nightly release that matches RUST_VERSION here: https://github.com/oxalica/rust-overlay/tree/master/manifests/nightly/2022
# - update `channel = "nightly-OLD_DATE"` below

channel = "1.64.0" # check ^^^ when changing this
channel = "1.71.1" # check ^^^ when changing this
#
# channel = "nightly-2022-08-06" # 1.64 nightly to be able to use unstable features
# channel = "nightly-2023-05-28" # 1.71.0 nightly to be able to use unstable features

0 comments on commit 6d9b49f

Please sign in to comment.