Skip to content

update to Rust 1.62 for CI env #33

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

update to Rust 1.62 for CI env #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ef43f1
update to Rust 1.62 for CI env
macalinao Jul 20, 2022
fbd033f
cleanup
macalinao Jul 20, 2022
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
18 changes: 9 additions & 9 deletions flake.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 lib/buildFlakeOutputs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ in
packages = {
inherit env-anchor-idls env-anchor-build env-release-crates
env-release-npm;
rust = pkgs.rust-stable;
rust = pkgs.rust-full;

anchor = tool-anchor;
solana = tool-solana;
Expand Down
3 changes: 2 additions & 1 deletion overlay.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ let
rustNightly = mkRust prev.rust-bin.nightly."2022-05-21".minimal;
rust-1_60 = mkRust prev.rust-bin.stable."1.60.0".minimal;
rustStable = mkRust prev.rust-bin.stable."1.61.0".minimal;
rust-full = mkRust prev.rust-bin.stable."1.62.0".default;
saberPackages = (import ./packages {
inherit rustNightly rustStable rust-1_60;
inherit rustNightly rustStable rust-1_60 rust-full;
pkgs = prev;
});
in
Expand Down
4 changes: 3 additions & 1 deletion packages/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, rustNightly, rustStable, rust-1_60 }:
{ pkgs, rustNightly, rustStable, rust-1_60, rust-full }:
let
darwinPackages = pkgs.lib.optionals pkgs.stdenv.isDarwin
(with pkgs.darwin.apple_sdk.frameworks;
Expand Down Expand Up @@ -30,6 +30,8 @@ let
};
in
anchorPackages // solanaFlattened // rec {
inherit rust-full;

spl-token-cli = pkgs.callPackage ./spl-token-cli.nix {
inherit (rustStable) rustPlatform;
inherit (pkgs) lib clang llvm pkgconfig openssl zlib udev stdenv fetchCrate;
Expand Down