From bffeacf1d2dd176dea8c7e544198ff7f75c032bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jasmine=20Lowen=20=F0=9F=A6=81?=
 <26892280+JasmineLowen@users.noreply.github.com>
Date: Sun, 15 Feb 2026 11:01:58 +0100
Subject: [PATCH] chore(nix): update flake lock & fix devshell+package (#1805)

---
 .gitignore |  5 ++++-
 flake.lock |  2 +-
 flake.nix  | 37 ++++++++++++++++++++++++++++++++++---
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1977bd934..e71600a75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,4 +39,7 @@ artifacts/
 PR_DESCRIPTION.md
 IMPLEMENTATION_PLAN.md
 scripts/s3-tests/selected_tests.txt
-docs
\ No newline at end of file
+docs
+
+# nix stuff
+result*
diff --git a/flake.lock b/flake.lock
index 8380f8921..549c566b0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -45,4 +45,4 @@
   },
   "root": "root",
   "version": 7
-}
+}
\ No newline at end of file
diff --git a/flake.nix b/flake.nix
index 52899929c..1948ffa55 100644
--- a/flake.nix
+++ b/flake.nix
@@ -76,9 +76,9 @@
 
             buildInputs = with pkgs; [
               openssl
-            ] ++ lib.optionals stdenv.isDarwin [
-              darwin.apple_sdk.frameworks.Security
-              darwin.apple_sdk.frameworks.SystemConfiguration
+            ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
+              pkgs.darwin.apple_sdk.frameworks.Security
+              pkgs.darwin.apple_sdk.frameworks.SystemConfiguration
             ];
 
             cargoBuildFlags = [
@@ -100,5 +100,36 @@
           };
         }
       );
+
+      devShells = forAllSystems (
+        system:
+        let
+          overlays = [ (import rust-overlay) ];
+          pkgs = import nixpkgs { inherit system overlays; };
+          rustToolchain = pkgs.rust-bin.stable.latest.default.override {
+            extensions = [
+              "rust-src"
+              "rust-analyzer"
+              "clippy"
+              "rustfmt"
+            ];
+          };
+        in
+        {
+          default = pkgs.mkShell {
+            packages = [
+              rustToolchain
+              pkgs.pkg-config
+              pkgs.protobuf
+              pkgs.openssl
+            ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
+              pkgs.darwin.apple_sdk.frameworks.Security
+              pkgs.darwin.apple_sdk.frameworks.SystemConfiguration
+            ];
+
+            PROTOC = "${pkgs.protobuf}/bin/protoc";
+          };
+        }
+      );
     };
 }