diff options
| author | Kamen Mladenov <kamen@syndamia.com> | 2025-05-02 10:25:20 +0300 |
|---|---|---|
| committer | Kamen Mladenov <kamen@syndamia.com> | 2025-05-02 15:32:54 +0300 |
| commit | c046089656f3021972cb44cac92dbda0a59f8a0b (patch) | |
| tree | 8f425fe08d1fc4c1bee8d15aaf00eb801ec04962 | |
| parent | 1a2ad5528f7a61390c40c0b6f56fa507923d09f5 (diff) | |
| download | zkVMs-benchmarks-c046089656f3021972cb44cac92dbda0a59f8a0b.tar zkVMs-benchmarks-c046089656f3021972cb44cac92dbda0a59f8a0b.tar.gz zkVMs-benchmarks-c046089656f3021972cb44cac92dbda0a59f8a0b.zip | |
chore: nix fmt
| -rw-r--r-- | flake.nix | 6 | ||||
| -rw-r--r-- | update-nix-dependencies.nix | 7 | ||||
| -rw-r--r-- | zkvms_guest_io/default.nix | 27 |
3 files changed, 17 insertions, 23 deletions
@@ -75,10 +75,10 @@ }) { } guests; in { packages.${system} = hostPackages // guestPackages // { - rust-format-all = callPackage ./rust-format-all.nix { - }; + rust-format-all = callPackage ./rust-format-all.nix { }; update-nix-dependencies = callPackage ./update-nix-dependencies.nix { - zkvms = builtins.map (name: mcl-blockchain.packages.${system}.${name}) zkvms; + zkvms = builtins.map (name: mcl-blockchain.packages.${system}.${name}) + zkvms; }; }; diff --git a/update-nix-dependencies.nix b/update-nix-dependencies.nix index 77b38af..5b83330 100644 --- a/update-nix-dependencies.nix +++ b/update-nix-dependencies.nix @@ -5,11 +5,8 @@ writeShellApplication { runtimeInputs = [ cargo ]; text = let - namesAndPaths = builtins.concatStringsSep - " " - (builtins.map - (zkvm: zkvm.pname + "," + zkvm.outPath) - zkvms); + namesAndPaths = builtins.concatStringsSep " " + (builtins.map (zkvm: zkvm.pname + "," + zkvm.outPath) zkvms); in '' updatePath() { sed -i "s|/nix/store/[^-]\+-$1-[^/]\+|$2|" Cargo.toml diff --git a/zkvms_guest_io/default.nix b/zkvms_guest_io/default.nix index b9ba3cc..e9e3d6f 100644 --- a/zkvms_guest_io/default.nix +++ b/zkvms_guest_io/default.nix @@ -1,11 +1,12 @@ -{ rev, craneLib-default, guest, zkvms, hostPackages, lib, metacraft-labs, benchexec, }: +{ rev, craneLib-default, guest, zkvms, hostPackages, lib, metacraft-labs +, benchexec, }: let commonArgs = { name = "${guest}"; - buildInputs = [ benchexec ] ++ - (lib.foldr (zkvm: accum: accum ++ [ hostPackages."${zkvm}/${guest}" ]) [ ] - zkvms); + buildInputs = [ benchexec ] + ++ (lib.foldr (zkvm: accum: accum ++ [ hostPackages."${zkvm}/${guest}" ]) + [ ] zkvms); src = lib.fileset.toSource { root = ./.; @@ -13,17 +14,13 @@ let }; PROGRAMS = lib.foldr (zkvm: accum: - (builtins.concatStringsSep - "|" - [ - zkvm - metacraft-labs.${zkvm}.src.rev - guest - rev - (hostPackages."${zkvm}/${guest}" + "/bin/${zkvm}_${guest}") - ] - ) + "," + accum) "" - zkvms; + (builtins.concatStringsSep "|" [ + zkvm + metacraft-labs.${zkvm}.src.rev + guest + rev + (hostPackages."${zkvm}/${guest}" + "/bin/${zkvm}_${guest}") + ]) + "," + accum) "" zkvms; postPatch = '' sed -i 's|"runexec"|"${benchexec}/bin/runexec"|' ./src/main.rs |