remove zkevm-framework-clang

NilFoundation · Sep 5, 2024 · 51a9955 · 51a9955
1 parent a00e707
commit 51a9955
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/crypto3/crypto3.nix b/crypto3/crypto3.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation {
 
   cmakeFlags =
     [
-      (if runTests then "-DBUILD_TESTS=TRUE" else "")
+      (if runTests then "-DBUILD_TESTS=TRUE" else "-DBUILD_TESTS=False")
       (if enableDebug then "-DCMAKE_BUILD_TYPE=Debug" else "-DCMAKE_BUILD_TYPE=Release")
       "-G Ninja"
     ];

diff --git a/flake.nix b/flake.nix
@@ -22,7 +22,10 @@
         };
       in {
         packages = rec {
-          crypto3 = (pkgs.callPackage ./crypto3/crypto3.nix { });
+          crypto3 = (pkgs.callPackage ./crypto3/crypto3.nix {
+            runTests = false;
+            enableDebug = false;
+          });
           crypto3-tests = (pkgs.callPackage ./crypto3/crypto3.nix {
             runTests = true;
             enableDebug = false;
@@ -33,8 +36,9 @@
           });
 
           evm-assigner = (pkgs.callPackage ./evm-assigner/evm-assigner.nix {
-            crypto3 = crypto3;
+            runTests = false;
             enableDebug = false;
+            crypto3 = crypto3;
           });
           evm-assigner-tests = (pkgs.callPackage ./evm-assigner/evm-assigner.nix {
             runTests = true;
@@ -48,6 +52,8 @@
           });
 
           zkevm-framework = (pkgs.callPackage ./zkevm-framework/zkevm-framework.nix {
+            runTests = false;
+            enableDebug = false;
             crypto3 = crypto3;
             evm-assigner = evm-assigner;
           });
@@ -104,17 +110,10 @@
             crypto3 = crypto3-gcc;
             evm-assigner = evm-assigner-gcc;
           });
-          zkevm-framework-clang = (pkgs.callPackage ./zkevm-framework/zkevm-framework.nix {
-            stdenv = pkgs.llvmPackages_18.stdenv;
-            runTests = true;
-            enableDebug = false;
-            crypto3 = crypto3-clang;
-            evm-assigner = evm-assigner-clang;
-          });
 
           all-clang = pkgs.symlinkJoin {
             name = "all";
-            paths = [ crypto3-clang evm-assigner-clang zkevm-framework-clang ];
+            paths = [ crypto3-clang evm-assigner-clang ];
           };
           all-gcc = pkgs.symlinkJoin {
             name = "all";