From dabeb06e025e8d8497cbb4d42eff990a831cf1c9 Mon Sep 17 00:00:00 2001 From: Andrei Malashkin Date: Tue, 24 Sep 2024 09:11:24 +0200 Subject: [PATCH] add clang packages --- flake.lock | 6 +++--- flake.nix | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 2c58f500b1..6ee86fa1a1 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726814018, - "narHash": "sha256-b4q/lxezVoM/LmA2GUuqQRQgr44dKlzZW+o4WuV7NAg=", + "lastModified": 1727161591, + "narHash": "sha256-pRL955PV6PiuTpaIeBMAbNkHnT3mtiOAlij+rB/ii54=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e433609e5822ecb1a88386eca7c0964bb847a08b", + "rev": "32f0bfd993cac795a9b98f853a71c4af469f0636", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 18d12df041..290f13bcc3 100644 --- a/flake.nix +++ b/flake.nix @@ -39,6 +39,11 @@ runTests = true; sanitize = true; }); + crypto3-clang-debug = (pkgs.callPackage ./crypto3/crypto3.nix { + stdenv = pkgs.llvmPackages_19.stdenv; + runTests = false; + enableDebug = true; + }); parallel-crypto3 = (pkgs.callPackage ./parallel-crypto3/parallel-crypto3.nix { runTests = false; @@ -55,8 +60,14 @@ runTests = true; crypto3 = crypto3; }); + parallel-crypto3-clang-debug = (pkgs.callPackage ./parallel-crypto3/parallel-crypto3.nix { + stdenv = pkgs.llvmPackages_19.stdenv; + enableDebug = true; + runTests = false; + crypto3 = crypto3-clang-debug; + }); - evm-assigner = (pkgs.callPackage ./evm-assigner/evm-assigner.nix { + evm-assigner = (pkgs.callPackage ./evm-assigner/evm-assigner.nix { runTests = false; enableDebug = false; crypto3 = crypto3; @@ -71,6 +82,12 @@ runTests = true; crypto3 = crypto3; }); + evm-assigner-clang-debug = (pkgs.callPackage ./evm-assigner/evm-assigner.nix { + stdenv = pkgs.llvmPackages_19.stdenv; + enableDebug = true; + runTests = false; + crypto3 = crypto3-clang-debug; + }); zkevm-framework = (pkgs.callPackage ./zkevm-framework/zkevm-framework.nix { runTests = false; @@ -90,6 +107,13 @@ crypto3 = crypto3; evm-assigner = evm-assigner; }); + zkevm-framework-clang-debug = (pkgs.callPackage ./zkevm-framework/zkevm-framework.nix { + stdenv = pkgs.llvmPackages_19.stdenv; + enableDebug = true; + runTests = false; + crypto3 = crypto3-clang-debug; + evm-assigner = evm-assigner-clang-debug; + }); transpiler = (pkgs.callPackage ./transpiler/transpiler.nix { runTests = false; @@ -106,6 +130,12 @@ runTests = true; crypto3 = crypto3; }); + transpiler-clang-debug = (pkgs.callPackage ./transpiler/transpiler.nix { + stdenv = pkgs.llvmPackages_19.stdenv; + enableDebug = true; + runTests = false; + crypto3 = crypto3-clang-debug; + }); proof-producer = (pkgs.callPackage ./proof-producer/proof-producer.nix { runTests = false; @@ -128,6 +158,14 @@ transpiler = transpiler; parallel-crypto3 = parallel-crypto3; }); + proof-producer-clang-debug = (pkgs.callPackage ./proof-producer/proof-producer.nix { + stdenv = pkgs.llvmPackages_19.stdenv; + enableDebug = true; + runTests = false; + crypto3 = crypto3-clang-debug; + transpiler = transpiler-clang-debug; + parallel-crypto3 = parallel-crypto3-clang-debug; + }); # The "all" package will build all packages. Convenient for CI, # so that "nix build" will check that all packages are correct.