nix: switch from mozilla-overlay to rust-overlay

1 files changed, 18 insertions, 16 deletions

diff --git a/flake.nix b/flake.nix
index fbe0fab..476498b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,8 +3,13 @@
     nixpkgs.url = "github:nixos/nixpkgs/release-22.05";
     flake-utils.url = "github:numtide/flake-utils/master";
 
-    nixpkgs-mozilla = {
-      url = "github:mozilla/nixpkgs-mozilla/master";
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay/master";
+
+      inputs = {
+        flake-utils.follows = "flake-utils";
+        nixpkgs.follows = "nixpkgs";
+      };
     };
 
     naersk = {
@@ -26,24 +31,21 @@
         inherit system;
 
         overlays = [
-          (import inputs.nixpkgs-mozilla)
+          (import inputs.rust-overlay)
         ];
       };
 
-      mkRust = extensions: (pkgs.rustChannelOf {
-        channel = "nightly";
-        date = "2021-10-26";
-        sha256 = "1hLbypXA+nuH7o3AHCokzSBZAvQxvef4x9+XxO3aBao=";
-      }).rust.override {
-        inherit extensions;
-      };
+      buildToolchain = pkgs.rust-bin.nightly."2022-11-20".minimal;
 
-      buildToolchain = mkRust [];
-      devToolchain = mkRust [
-        "rust-analyzer"
-        "rust-src"
-        "clippy"
-      ];
+      devToolchain = buildToolchain.override {
+        extensions = [
+          "rust-src"
+          "rust-analyzer"
+          "clippy"
+          "rust-docs"
+          "rustfmt"
+        ];
+      };
 
       naersk = pkgs.callPackage inputs.naersk {
         cargo = buildToolchain;