From b4f3b7fc4c95dc288f0867090bc095139ea96221 Mon Sep 17 00:00:00 2001 From: akokoshn Date: Wed, 28 Aug 2024 10:51:12 +0300 Subject: [PATCH] Restore github type for crypto3 dependency --- CMakeLists.txt | 1 - flake.lock | 18 +++++++++--------- flake.nix | 9 +++------ zkevm-framework.nix | 3 ++- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aede2ac..23bb0e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,6 @@ include(GNUInstallDirs) option(BUILD_DOCS "Build documentation" FALSE) option(ENABLE_TESTS "Enable tests" FALSE) - add_subdirectory(libs) add_subdirectory(bin) diff --git a/flake.lock b/flake.lock index 787de53..802ad65 100644 --- a/flake.lock +++ b/flake.lock @@ -31,17 +31,17 @@ ] }, "locked": { - "lastModified": 1724160518, - "narHash": "sha256-ZuNrBrf9YhPZLugcK6ubHl6WwLlU1iYwDMAlIYrygg8=", - "ref": "refs/heads/master", - "rev": "e0df9de54db6e1cfe8f016aed6975aeb202820fb", - "revCount": 10449, - "type": "git", - "url": "https://github.com/NilFoundation/crypto3" + "lastModified": 1724667448, + "narHash": "sha256-OkrktQ6SwdRX7iz2dNzMxj4IsvDH8be0O2lW/4zuhNs=", + "owner": "NilFoundation", + "repo": "crypto3", + "rev": "7a23eb3010ec1045ee9fd8c812b454afe5b8ecc5", + "type": "github" }, "original": { - "type": "git", - "url": "https://github.com/NilFoundation/crypto3" + "owner": "NilFoundation", + "repo": "crypto3", + "type": "github" } }, "nil-evm-assigner": { diff --git a/flake.nix b/flake.nix index a6a53cf..58a4692 100644 --- a/flake.nix +++ b/flake.nix @@ -23,8 +23,9 @@ }; }; nil-crypto3 = { - url = "https://github.com/NilFoundation/crypto3"; - type = "git"; + type = "github"; + owner = "NilFoundation"; + repo = "crypto3"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; @@ -94,10 +95,6 @@ type = "app"; program = "${packages.default}/bin/assigner"; }; - block_gen = { - type = "app"; - program = "${packages.default}/bin/block_gen"; - }; }; })); } diff --git a/zkevm-framework.nix b/zkevm-framework.nix index cb77aa7..79484b9 100644 --- a/zkevm-framework.nix +++ b/zkevm-framework.nix @@ -48,7 +48,8 @@ in stdenv.mkDerivation rec { doCheck = runTests; checkPhase = '' - ninja executables_tests && ctest + ctest + ninja executables_tests ''; shellHook = ''