From 4781f92ce838100bdb6b8a6afa3e48423262a3b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Tue, 26 Nov 2024 11:05:25 +0100
Subject: [PATCH] bump rust to 1.82.0

---
 Cargo.lock          | 16 ++++++++--------
 rust-toolchain.nix  |  4 +++-
 rust-toolchain.toml |  2 +-
 shell.nix           | 13 ++++++-------
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d0ca84f6..62bd49cf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2331,9 +2331,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.164"
+version = "0.2.165"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f"
+checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e"
 
 [[package]]
 name = "libdbus-sys"
@@ -2475,7 +2475,7 @@ checksum = "7a575d25cf00ed68e5790b473b29242a47e991c6187785d47b45e31fc5816554"
 dependencies = [
  "base64 0.22.1",
  "gethostname",
- "rustls 0.23.17",
+ "rustls 0.23.18",
  "rustls-pki-types",
  "smtp-proto",
  "tokio",
@@ -3524,9 +3524,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.17"
+version = "0.23.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e"
+checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f"
 dependencies = [
  "log",
  "once_cell",
@@ -3585,7 +3585,7 @@ dependencies = [
  "jni",
  "log",
  "once_cell",
- "rustls 0.23.17",
+ "rustls 0.23.18",
  "rustls-native-certs",
  "rustls-platform-verifier-android",
  "rustls-webpki 0.102.8",
@@ -4270,7 +4270,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.23.17",
+ "rustls 0.23.18",
  "rustls-pki-types",
  "tokio",
 ]
@@ -4492,7 +4492,7 @@ dependencies = [
  "log",
  "once_cell",
  "percent-encoding",
- "rustls 0.23.17",
+ "rustls 0.23.18",
  "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "rustls-platform-verifier",
diff --git a/rust-toolchain.nix b/rust-toolchain.nix
index 9f0cd9a1..ef7ad15d 100644
--- a/rust-toolchain.nix
+++ b/rust-toolchain.nix
@@ -2,10 +2,12 @@
 
 let
   file = ./rust-toolchain.toml;
-  sha256 = "+syqAd2kX8KVa8/U2gz3blIQTTsYYt3U63xBWaGOSc8=";
+  sha256 = "yMuSb5eQPO/bHv+Bcf/US8LVMbf/G/0MSfiPwBhiPpk=";
 in
 
 {
+  fromFile = fenix.fromToolchainFile { inherit file sha256; };
+
   fromTarget = target:
     let
       name = (lib.importTOML file).toolchain.channel;
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index a7274977..965f730e 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.77.0"
+channel = "1.82.0"
 profile = "default"
 components = [ "rust-src", "rust-analyzer" ]
diff --git a/shell.nix b/shell.nix
index 63865949..583fa2b9 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,18 +1,17 @@
 { pkgs ? import <nixpkgs> { } }:
 
 let
-  package = import ./default.nix {
-    isStatic = false;
-  };
+  inherit (pkgs) lib;
+
+  fenix = import (fetchTarball "https://github.com/soywod/fenix/archive/main.tar.gz") { };
+  mkToolchain = import ./rust-toolchain.nix { inherit lib fenix; };
+  rust = mkToolchain.fromFile;
 in
 
 pkgs.mkShell {
-  inputsFrom = [
-    package
-  ];
-
   buildInputs = with pkgs; [
     nixd
     nixpkgs-fmt
+    rust
   ];
 }