diff --git a/.github/workflows/linux-nix-check.yml b/.github/workflows/linux-nix-check.yml index 41347123e8..5d77ab115b 100644 --- a/.github/workflows/linux-nix-check.yml +++ b/.github/workflows/linux-nix-check.yml @@ -18,7 +18,7 @@ jobs: fetch-depth: 0 - name: Run checks - run: nix build -L .?submodules=1#checks.x86_64-linux.all-gcc + run: nix build -L .?checks.x86_64-linux.all-gcc env: NIX_CONFIG: | cores = 4 diff --git a/.github/workflows/mac-nix-check.yml b/.github/workflows/mac-nix-check.yml index b350dfdabd..ff90d4bc42 100644 --- a/.github/workflows/mac-nix-check.yml +++ b/.github/workflows/mac-nix-check.yml @@ -19,7 +19,7 @@ jobs: - uses: DeterminateSystems/flake-checker-action@main - name: Run checks - run: nix build -L .?submodules=1#checks.aarch64-darwin.all-gcc + run: nix build -L .?checks.aarch64-darwin.all-gcc env: NIX_CONFIG: | cores = 0 diff --git a/crypto3/crypto3.nix b/crypto3/crypto3.nix index 8d5a167360..df608a3d32 100644 --- a/crypto3/crypto3.nix +++ b/crypto3/crypto3.nix @@ -3,9 +3,7 @@ ninja, pkg-config, cmake, - boost183, - # We'll use boost183 by default, but you can override it - boost_lib ? boost183, + boost, gdb, cmake_modules, enableDebugging, @@ -22,7 +20,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake ninja pkg-config ] ++ (lib.optional (!stdenv.isDarwin) gdb); # enableDebugging will keep debug symbols in boost - propagatedBuildInputs = [ (if enableDebug then (enableDebugging boost_lib) else boost_lib) ]; + propagatedBuildInputs = [ (if enableDebug then (enableDebugging boost) else boost) ]; buildInputs = [cmake_modules]; diff --git a/crypto3/libs/blueprint/test/CMakeLists.txt b/crypto3/libs/blueprint/test/CMakeLists.txt index 73636831c1..e7290a0ff2 100644 --- a/crypto3/libs/blueprint/test/CMakeLists.txt +++ b/crypto3/libs/blueprint/test/CMakeLists.txt @@ -198,7 +198,7 @@ set(ZKEVM_TESTS_FILES "zkevm/state_transition" # "zkevm/opcodes/iszero" TODO re-activate "zkevm/opcodes/add_sub" - "zkevm/opcodes/mul" + #"zkevm/opcodes/mul" "zkevm/opcodes/div" ) diff --git a/flake.lock b/flake.lock index 135cede629..9b7fd0396f 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725283960, - "narHash": "sha256-oPBXLsHf6017Nvx5+VDh0Wc1gF5tE0SRQDw7+FPLrbM=", + "lastModified": 1725384028, + "narHash": "sha256-PZWvS483pAZAVKBrS/caLZYQAlHwOKrP72w2UejfMdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "afefcacba65525aac7f9d1009c9666f76aac227f", + "rev": "0bf3a8e9889cd7b430d2416d606beda9d333b5d7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2b48fc4721..5a53c68379 100644 --- a/flake.nix +++ b/flake.nix @@ -23,8 +23,8 @@ in { packages = rec { crypto3 = (pkgs.callPackage ./crypto3/crypto3.nix { }); - crypto3-debug = (pkgs.callPackage ./crypto3/crypto3.nix { - enableDebug = true; + crypto3-tests = (pkgs.callPackage ./crypto3/crypto3.nix { + runTests = true; }); crypto3-debug-tests = (pkgs.callPackage ./crypto3/crypto3.nix { enableDebug = true; @@ -34,8 +34,8 @@ evm-assigner = (pkgs.callPackage ./evm-assigner/evm-assigner.nix { crypto3 = crypto3; }); - evm-assigner-debug = (pkgs.callPackage ./evm-assigner/evm-assigner.nix { - enableDebug = true; + evm-assigner-tests = (pkgs.callPackage ./evm-assigner/evm-assigner.nix { + runTests = true; crypto3 = crypto3; }); evm-assigner-debug-tests = (pkgs.callPackage ./evm-assigner/evm-assigner.nix { @@ -56,31 +56,31 @@ }; checks = rec { - crypto3-gcc = (pkgs.callPackage ./crypto3/crypto3.nix { + crypto3-tests-gcc = (pkgs.callPackage ./crypto3/crypto3.nix { runTests = true; }); - crypto3-clang = (pkgs.callPackage ./crypto3/crypto3.nix { + crypto3-tests-clang = (pkgs.callPackage ./crypto3/crypto3.nix { stdenv = pkgs.llvmPackages_18.stdenv; runTests = true; }); - evm-assigner-gcc = (pkgs.callPackage ./evm-assigner/evm-assigner.nix { + evm-assigner-tests-gcc = (pkgs.callPackage ./evm-assigner/evm-assigner.nix { runTests = true; - crypto3 = crypto3-gcc; + crypto3 = crypto3-tests-gcc; }); - evm-assigner-clang = (pkgs.callPackage ./evm-assigner/evm-assigner.nix { + evm-assigner-tests-clang = (pkgs.callPackage ./evm-assigner/evm-assigner.nix { stdenv = pkgs.llvmPackages_18.stdenv; runTests = true; - crypto3 = crypto3-clang; + crypto3 = crypto3-tests-clang; }); all-clang = pkgs.symlinkJoin { name = "all"; - paths = [ crypto3-clang evm-assigner-clang ]; + paths = [ crypto3-tests-clang evm-assigner-tests-clang ]; }; all-gcc = pkgs.symlinkJoin { name = "all"; - paths = [ crypto3-gcc evm-assigner-gcc ]; + paths = [ crypto3-tests-gcc evm-assigner-tests-gcc ]; }; default = all-gcc; };