fixup! feat(nix): add nix packages for zkstack and foundry-zksync…

…, update dev environments, and improve reproducibility Signed-off-by: Harald Hoyer <[email protected]>
matter-labs · Jan 24, 2025 · d1768bd · d1768bd
1 parent fa40c39
commit d1768bd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/etc/nix/devShell.nix b/etc/nix/devShell.nix
@@ -2,8 +2,6 @@
 , tee_prover
 , coreCommonArgs
 , inputs
-, customInputsFrom ? [ tee_prover ]
-, customPackages ? [ ]
 , ...
 }:
 let
@@ -14,8 +12,8 @@ let
   });
 in
 pkgs.mkShell {
-  inputsFrom = customInputsFrom;
-  packages = customPackages;
+  inputsFrom = [ tee_prover ];
+  packages = [ ];
 
   inherit (coreCommonArgs) env hardeningEnable;
 

diff --git a/etc/nix/devShellAll.nix b/etc/nix/devShellAll.nix
@@ -4,20 +4,25 @@
 , devShell
 , foundry-zksync
 , ...
-}: devShell.override {
-  customInputsFrom = [ zksync zkstack ];
+}:
+let
+  newshell = (pkgs.mkShell {
+    inputsFrom = [ zksync zkstack ];
 
-  customPackages = with pkgs; [
-    docker-compose
-    nodejs
-    yarn
-    axel
-    postgresql
-    python3
-    solc
-    sqlx-cli
-    zkstack
-    foundry-zksync
-    nodePackages.prettier
-  ];
-}
+    packages = with pkgs; [
+      docker-compose
+      nodejs
+      yarn
+      axel
+      postgresql
+      python3
+      solc
+      sqlx-cli
+      zkstack
+      foundry-zksync
+      nodePackages.prettier
+    ];
+  });
+in
+devShell.overrideAttrs
+  (old: { inherit (newshell) buildInputs nativeBuildInputs; })