From a2341c9d9d775355b36db7880a9ee31c82abc26e Mon Sep 17 00:00:00 2001
From: Brendan Golden <git@brendan.ie>
Date: Mon, 10 Mar 2025 19:50:28 +0000
Subject: [PATCH] feat: got a better locked down version of rust

---
 flake.lock          | 26 +++++++++++++-------------
 flake.nix           | 13 +++++++++++--
 rust-toolchain.toml |  2 +-
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index 64fe76f..7a5f7a4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1686572087,
-        "narHash": "sha256-jXTut7ZSYqLEgm/nTk7TuVL2ExahTip605bLINklAnQ=",
+        "lastModified": 1739824009,
+        "narHash": "sha256-fcNrCMUWVLMG3gKC5M9CBqVOAnJtyRvGPxptQFl5mVg=",
         "owner": "nix-community",
         "repo": "naersk",
-        "rev": "8507af04eb40c5520bd35d9ce6f9d2342cea5ad1",
+        "rev": "e5130d37369bfa600144c2424270c96f0ef0e11d",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1687011986,
-        "narHash": "sha256-ZNSi/wBw12d7LO8YcZ4aehIlPp4lgSkKbrHaoF80IKI=",
+        "lastModified": 1741462378,
+        "narHash": "sha256-ZF3YOjq+vTcH51S+qWa1oGA9FgmdJ67nTNPG2OIlXDc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2c09e8eb8717e240ef9c5727c1cc9186db9fb309",
+        "rev": "2d9e4457f8e83120c9fdf6f1707ed0bc603e5ac9",
         "type": "github"
       },
       "original": {
@@ -34,16 +34,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1686921029,
-        "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=",
+        "lastModified": 1741513245,
+        "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04",
+        "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-23.05",
+        "ref": "nixos-unstable",
         "type": "indirect"
       }
     },
@@ -74,11 +74,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 52850d8..46c67ec 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "Skynet LDAP backend";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-23.05";
+    nixpkgs.url = "nixpkgs/nixos-unstable";
     naersk.url  = "github:nix-community/naersk";
     utils.url   = "github:numtide/flake-utils";
   };
@@ -14,6 +14,7 @@
 
   outputs = { self, nixpkgs, utils, naersk }: utils.lib.eachDefaultSystem (system: 
   let
+    overrides = (builtins.fromTOML (builtins.readFile ./rust-toolchain.toml));
     pkgs            = nixpkgs.legacyPackages."${system}";
     naersk-lib      = naersk.lib."${system}";
     package_name    = "skynet_ldap_backend";
@@ -43,7 +44,15 @@
 
     # `nix develop`
     devShell = pkgs.mkShell {
-      nativeBuildInputs = with pkgs; [ rustc cargo pkg-config openssl];
+      nativeBuildInputs = with pkgs; [rustup rustPlatform.bindgenHook pkg-config openssl];
+      # libraries here
+      buildInputs = [ ];
+      RUSTC_VERSION = overrides.toolchain.channel;
+      # https://github.com/rust-lang/rust-bindgen#environment-variables
+      shellHook = ''
+        export PATH="''${CARGO_HOME:-~/.cargo}/bin":"$PATH"
+        export PATH="''${RUSTUP_HOME:-~/.rustup}/toolchains/$RUSTC_VERSION-${pkgs.stdenv.hostPlatform.rust.rustcTarget}/bin":"$PATH"
+      '';
     };
     
     nixosModule = { lib, pkgs, config, ... }: 
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 8763feb..3f1697f 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "stable-2023-12-07"
\ No newline at end of file
+channel = "1.74"
\ No newline at end of file