From 1a12418e5607adc5db03693a9924f6fa50e59b02 Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Thu, 14 Dec 2023 11:04:31 +0800
Subject: [PATCH] fix(fenix): use stable toolchain and add wasm32 target

---
 flake.lock           | 30 +++++++++++++++---------------
 modules/packages.nix | 14 ++++++++++++--
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 0a9e645..436242d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -86,11 +86,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1702275809,
-        "narHash": "sha256-cd+IhiNJ9VYSheVxPzw6aLy91Q3+BUR35CtBqPCXfRE=",
+        "lastModified": 1702448575,
+        "narHash": "sha256-Gm8lI5vumDEryeUI+bT8w0AIvbolZIGh0F/E0mQSLcw=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "ab4ec60bcf513278aa1e26d71ca822161075bffc",
+        "rev": "dcf3ca909bd069e6a5737461b64c8d894c6dee85",
         "type": "github"
       },
       "original": {
@@ -168,11 +168,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702203126,
-        "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=",
+        "lastModified": 1702423270,
+        "narHash": "sha256-3ZA5E+b2XBP+c9qGhWpRApzPq/PZtIPgkeEDpTBV4g8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883",
+        "rev": "d9297efd3a1c3ebb9027dc68f9da0ac002ae94db",
         "type": "github"
       },
       "original": {
@@ -243,11 +243,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1702206697,
-        "narHash": "sha256-vE9oEx3Y8TO5MnWwFlmopjHd1JoEBno+EhsfUCq5iR8=",
+        "lastModified": 1702272962,
+        "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "29d6c96900b9b576c2fb89491452f283aa979819",
+        "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d",
         "type": "github"
       },
       "original": {
@@ -264,11 +264,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701668522,
-        "narHash": "sha256-5pOkZfSR+bz3IpOvhdGL38qhlxXr1aXcQ6Nvxqqcfso=",
+        "lastModified": 1702296501,
+        "narHash": "sha256-5G7R/Pl7W47h13LOYN9dsvEAyaBnnW1TTARvbZ9qSR0=",
         "owner": "ryanccn",
         "repo": "nrr",
-        "rev": "c4a32f589b656f6cbf56bd9c4b3ee44cad33c5ed",
+        "rev": "2e59f5cd741319bea29920e70f638cc305c87dc6",
         "type": "github"
       },
       "original": {
@@ -336,11 +336,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1702247072,
-        "narHash": "sha256-JX+pWFPjckWD0Qa2oji1ZUbzL4kCIgeGsVcEb0Bnn+E=",
+        "lastModified": 1702418101,
+        "narHash": "sha256-XyrXFAiMS5r9Kl4lPpmkTTclPKGwJBxln6enERe5nvk=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "457b966b171b09a7e57acb710fbca29a4b3526f0",
+        "rev": "b3af1916ccfb85233571ce9ecb45a3a7c74ba0fb",
         "type": "github"
       },
       "original": {
diff --git a/modules/packages.nix b/modules/packages.nix
index d0bb3d2..d81a033 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -18,7 +18,18 @@
     direnv
     fh
 
-    fenix.default.toolchain
+    (fenix.combine (
+      with fenix;
+      with stable; [
+        cargo
+        rustc
+        rustfmt
+        clippy
+        rust-src
+        rust-docs
+        targets.wasm32-unknown-unknown.stable.rust-std
+      ]
+    ))
 
     fnm
     deno
@@ -33,7 +44,6 @@
     libffi
     openssl
 
-    rust-analyzer
     nodePackages.typescript-language-server
     dprint