From ac135e728b8288024cb8ba17811d4e67da9ac5ac Mon Sep 17 00:00:00 2001
From: Nathan Perry <np@nathanperry.dev>
Date: Mon, 28 Nov 2022 08:13:35 -0500
Subject: nix: switch from mozilla-overlay to rust-overlay

---
 flake.lock | 40 ++++++++++++++++++++++++----------------
 flake.nix  | 34 ++++++++++++++++++----------------
 2 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/flake.lock b/flake.lock
index 72c2dd0..8d41f9d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -53,29 +53,37 @@
         "type": "github"
       }
     },
-    "nixpkgs-mozilla": {
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "naersk": "naersk",
+        "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1664789696,
-        "narHash": "sha256-UGWJHQShiwLCr4/DysMVFrYdYYHcOqAOVsWNUu+l6YU=",
-        "owner": "mozilla",
-        "repo": "nixpkgs-mozilla",
-        "rev": "80627b282705101e7b38e19ca6e8df105031b072",
+        "lastModified": 1669602829,
+        "narHash": "sha256-I3LBvBiVui4Rf0iQvTqUIgBovaLDzpOzsoNEzCsDowg=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "b9da8e68a08707115be750c0cf7ade33f49d8ec4",
         "type": "github"
       },
       "original": {
-        "owner": "mozilla",
+        "owner": "oxalica",
         "ref": "master",
-        "repo": "nixpkgs-mozilla",
+        "repo": "rust-overlay",
         "type": "github"
       }
-    },
-    "root": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "naersk": "naersk",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-mozilla": "nixpkgs-mozilla"
-      }
     }
   },
   "root": "root",
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;
-- 
cgit v1.3.1