From f901cd453dc7588e859b62b9b0f4a1c58979cb48 Mon Sep 17 00:00:00 2001
From: chesedo <pieter@chesedo.me>
Date: Fri, 2 Dec 2022 16:08:38 +0200
Subject: [PATCH 1/3] ci: update toolchain for binaries

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 45b537eee..4b3cc0111 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -292,7 +292,7 @@ jobs:
       - run: sudo apt update && sudo DEBIAN_FRONTEND=noninteractive apt install -y libssl-dev musl-tools clang
       - run:
           name: Install Rust
-          command: curl --proto '=https' --tlsv1.3 https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain 1.63.0 --target << parameters.target >>
+          command: curl --proto '=https' --tlsv1.3 https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain 1.65.0 --target << parameters.target >>
       - run:
           name: Build
           command: |
@@ -315,7 +315,7 @@ jobs:
           name: Install Rust
           command: |
             wget -OutFile "C:\rustup-init.exe" https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe
-            C:\rustup-init.exe -y --default-toolchain 1.63.0 --target x86_64-pc-windows-msvc
+            C:\rustup-init.exe -y --default-toolchain 1.65.0 --target x86_64-pc-windows-msvc
       - run:
           name: Build
           command: |
@@ -335,7 +335,7 @@ jobs:
       - checkout
       - run:
           name: Install Rust
-          command: curl --proto '=https' https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain 1.63.0 --target x86_64-apple-darwin
+          command: curl --proto '=https' https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain 1.65.0 --target x86_64-apple-darwin
       - run:
           name: Build
           command: |

From 41af298b438046147eeab7a899908dd8eba57f3c Mon Sep 17 00:00:00 2001
From: chesedo <pieter@chesedo.me>
Date: Fri, 2 Dec 2022 16:08:56 +0200
Subject: [PATCH 2/3] misc: update dev environment

---
 shell.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/shell.nix b/shell.nix
index 8f7cfdab6..13fa0a32a 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,7 +1,7 @@
 let
   moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz);
   # Pin to stable from https://status.nixos.org/
-  nixpkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/3d47bbaa26e7a771059d828eecf3bd8bf28a8b0f.tar.gz") { overlays = [ moz_overlay ]; };
+  nixpkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/596a8e828c5dfa504f91918d0fa4152db3ab5502.tar.gz") { overlays = [ moz_overlay ]; };
 in
   with nixpkgs;
   stdenv.mkDerivation {
@@ -11,8 +11,9 @@ in
       pkg-config
     ];
     buildInputs = with nixpkgs; [
-      (rustChannelOf{ channel = "1.63.0"; }).rust
-      rust-analyzer
+      ((rustChannelOf{ channel = "1.65.0"; }).rust.override {
+        extensions = ["rust-src"];
+      })
       cargo-watch
       terraform
       awscli2

From 3ec668653e3219de6b524a76873431cd386d0c92 Mon Sep 17 00:00:00 2001
From: chesedo <pieter@chesedo.me>
Date: Fri, 2 Dec 2022 16:09:28 +0200
Subject: [PATCH 3/3] misc: remove patches from Cargo.lock

---
 Cargo.lock | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ee2517e37..7b0b02596 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7882,15 +7882,3 @@ dependencies = [
  "cc",
  "libc",
 ]
-
-[[patch.unused]]
-name = "shuttle-aws-rds"
-version = "0.7.2"
-
-[[patch.unused]]
-name = "shuttle-persist"
-version = "0.7.2"
-
-[[patch.unused]]
-name = "shuttle-shared-db"
-version = "0.7.2"