From 73013f41f00f1d666f8e0c5ccb599fcf4331b23e Mon Sep 17 00:00:00 2001
From: Brendan Golden <git@brendan.ie>
Date: Tue, 11 Mar 2025 11:06:18 +0000
Subject: [PATCH] feat: better locking tot he rust version

---
 flake.lock | 17 +++++++++++++++++
 flake.nix  | 27 +++++++++++++++++++++++----
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7a5f7a4..d789a92 100644
--- a/flake.lock
+++ b/flake.lock
@@ -32,6 +32,22 @@
         "type": "indirect"
       }
     },
+    "nixpkgs-mozilla": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1740762144,
+        "narHash": "sha256-I7a6e3IYJAp9u3PwUSW1+oilO1tAfnbeN3/YJQ+ObCo=",
+        "owner": "mozilla",
+        "repo": "nixpkgs-mozilla",
+        "rev": "e35b0e071cae97469d80222be988fdd972b22c3b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mozilla",
+        "repo": "nixpkgs-mozilla",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1741513245,
@@ -51,6 +67,7 @@
       "inputs": {
         "naersk": "naersk",
         "nixpkgs": "nixpkgs_2",
+        "nixpkgs-mozilla": "nixpkgs-mozilla",
         "utils": "utils"
       }
     },
diff --git a/flake.nix b/flake.nix
index cc5fc48..7587f20 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,6 +5,10 @@
     nixpkgs.url = "nixpkgs/nixos-unstable";
     naersk.url  = "github:nix-community/naersk";
     utils.url   = "github:numtide/flake-utils";
+    nixpkgs-mozilla = {
+      url = "github:mozilla/nixpkgs-mozilla";
+      flake = false;
+    };
   };
   
   nixConfig = {
@@ -12,18 +16,33 @@
     extra-trusted-public-keys = "skynet-cache:zMFLzcRZPhUpjXUy8SF8Cf7KGAZwo98SKrzeXvdWABo=";
   };
 
-  outputs = { self, nixpkgs, utils, naersk }: utils.lib.eachDefaultSystem (system: 
+  outputs = { self, nixpkgs, utils, nixpkgs-mozilla, naersk }: utils.lib.eachDefaultSystem (system:
   let
     overrides = (builtins.fromTOML (builtins.readFile ./rust-toolchain.toml));
-    pkgs            = nixpkgs.legacyPackages."${system}";
-    naersk-lib      = naersk.lib."${system}";
+    pkgs = (import nixpkgs) {
+      inherit system;
+
+      overlays = [
+        (import nixpkgs-mozilla)
+      ];
+    };
+    toolchain = (pkgs.rustChannelOf {
+      rustToolchain = ./rust-toolchain.toml;
+      sha256 = "sha256-PjvuouwTsYfNKW5Vi5Ye7y+lL7SsWGBxCtBOOm2z14c=";
+    }).rust;
+
+    naersk' = pkgs.callPackage naersk {
+      cargo = toolchain;
+      rustc = toolchain;
+    };
+
     package_name    = "skynet_ldap_backend";
     package_update  = "update_groups";
     desc            = "Skynet LDAP backend";
   in rec {
 
     # `nix build`
-    packages."${package_name}" = naersk-lib.buildPackage {
+    packages."${package_name}" = naersk'.buildPackage {
       pname = "${package_name}";
       root = ./.;