From 3ef43f1e254c798a8a99d33854c5965cd66871a1 Mon Sep 17 00:00:00 2001
From: Ian Macalinao <ian@saber.so>
Date: Wed, 20 Jul 2022 15:50:32 -0500
Subject: [PATCH 1/2] update to Rust 1.62 for CI env

---
 flake.lock                | 18 +++++++++---------
 lib/buildFlakeOutputs.nix |  2 +-
 overlay.nix               |  3 ++-
 packages/default.nix      |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4ae97e5..61285d2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1656065134,
-        "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
+        "lastModified": 1656928814,
+        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
+        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
         "type": "github"
       },
       "original": {
@@ -49,11 +49,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1656490020,
-        "narHash": "sha256-xonV1ITvAtwtoM58Iaz77mrkkj3NQKvP2QOPYZNiNvs=",
+        "lastModified": 1658311025,
+        "narHash": "sha256-GqagY5YmaZB3YaO41kKcQhe5RcpS83wnsW8iCu5Znqo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "23488b5815ef60b3084a874f71fdae2dff52e1f7",
+        "rev": "cd8d1784506a7c7eb0796772b73437e0b82fad57",
         "type": "github"
       },
       "original": {
@@ -79,11 +79,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1656644123,
-        "narHash": "sha256-xg7D9aYBdmzH08MH6DlEOJW1UR5DYaQkvvvhnuXEatc=",
+        "lastModified": 1658285378,
+        "narHash": "sha256-AL3tLo8sF9w14RGTqGnyKiUkvnLH41xH4l5qAK4/JWs=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "8b4c5bef319198920fd03a916dd5f6600147358b",
+        "rev": "8b4b3c2b4257a0dcbd9c7d61191782fe17155cf4",
         "type": "github"
       },
       "original": {
diff --git a/lib/buildFlakeOutputs.nix b/lib/buildFlakeOutputs.nix
index ca0db16..c234afb 100644
--- a/lib/buildFlakeOutputs.nix
+++ b/lib/buildFlakeOutputs.nix
@@ -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;
diff --git a/overlay.nix b/overlay.nix
index 17087ea..aacc623 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -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
diff --git a/packages/default.nix b/packages/default.nix
index 3149384..9c5b846 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -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;

From fbd033f34c0190c5f8fb247f2edbfff3ea19757b Mon Sep 17 00:00:00 2001
From: Ian Macalinao <ian@saber.so>
Date: Wed, 20 Jul 2022 16:00:10 -0500
Subject: [PATCH 2/2] cleanup

---
 packages/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/default.nix b/packages/default.nix
index 9c5b846..c41070d 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -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;