From 9933c053d93ed9e92835956b0a3aba8b7be51a6c Mon Sep 17 00:00:00 2001 From: reo101 Date: Tue, 13 May 2025 08:05:46 +0000 Subject: style(nix): format using `nixfmt-rfc-format` --- flake.nix | 146 ++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 84 insertions(+), 62 deletions(-) diff --git a/flake.nix b/flake.nix index 692e401..de8ead5 100644 --- a/flake.nix +++ b/flake.nix @@ -3,88 +3,110 @@ nixConfig = { extra-substituters = "https://nix-blockchain-development.cachix.org"; - extra-trusted-public-keys = - "nix-blockchain-development.cachix.org-1:Ekei3RuW3Se+P/UIo6Q/oAgor/fVhFuuuX5jR8K/cdg="; + extra-trusted-public-keys = "nix-blockchain-development.cachix.org-1:Ekei3RuW3Se+P/UIo6Q/oAgor/fVhFuuuX5jR8K/cdg="; }; inputs = { mcl-blockchain.url = "github:metacraft-labs/nix-blockchain-development"; - mcl-blockchain-old.url = - "github:metacraft-labs/nix-blockchain-development?rev=f717747a4ce11d5764578d8ee1c505d00bf8a81e"; + mcl-blockchain-old.url = "github:metacraft-labs/nix-blockchain-development?rev=f717747a4ce11d5764578d8ee1c505d00bf8a81e"; nixpkgs.follows = "mcl-blockchain/nixpkgs"; crane.follows = "mcl-blockchain/crane"; fenix.follows = "mcl-blockchain/fenix"; flake-parts.follows = "mcl-blockchain/flake-parts"; }; - outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } { - systems = [ - "x86_64-linux" - "aarch64-linux" - ]; + outputs = + inputs: + inputs.flake-parts.lib.mkFlake { inherit inputs; } { + systems = [ + "x86_64-linux" + "aarch64-linux" + ]; - perSystem = { inputs', pkgs, lib, system, ... }: let - craneLib-default = inputs.crane.mkLib pkgs; - callPackage = lib.callPackageWith pkgs; + perSystem = + { + inputs', + pkgs, + lib, + system, + ... + }: + let + craneLib-default = inputs.crane.mkLib pkgs; + callPackage = lib.callPackageWith pkgs; - zkvms = builtins.attrNames - (lib.filterAttrs (_: type: type == "directory") - (builtins.readDir ./zkvms)); + zkvms = builtins.attrNames ( + lib.filterAttrs (_: type: type == "directory") (builtins.readDir ./zkvms) + ); - guests = builtins.attrNames - (lib.filterAttrs (_: type: type == "directory") - (builtins.readDir ./guests)); + guests = builtins.attrNames ( + lib.filterAttrs (_: type: type == "directory") (builtins.readDir ./guests) + ); - createPackages = guestName: - let - guest = if guestName == null then "graph_coloring" else guestName; - postfix = if guestName == null then "" else "/" + guest; + createPackages = + guestName: + let + guest = if guestName == null then "graph_coloring" else guestName; + postfix = if guestName == null then "" else "/" + guest; + + args-zkVM = { + inherit craneLib-default; + zkvmLib = (import ./zkvmLib.nix) pkgs guest; + }; + in + lib.foldr ( + host: accum: + accum + // { + "${host}${postfix}" = callPackage ./zkvms/${host}/default.nix args-zkVM; + } + ) { } zkvms; - args-zkVM = { - inherit craneLib-default; - zkvmLib = (import ./zkvmLib.nix) pkgs guest; + hostPackages = lib.foldr (guest: accum: accum // (createPackages guest)) { } guests; + + guestPackages = lib.foldr ( + guest: accum: + accum + // { + ${guest} = callPackage ./zkvms_guest_io/default.nix { + inherit guest; + inherit zkvms; + inherit hostPackages; + inherit craneLib-default; + rev = inputs.self.rev or inputs.self.dirtyRev; + }; + } + ) { } guests; + in + { + _module.args.pkgs = import inputs.nixpkgs { + inherit system; + overlays = [ + inputs.mcl-blockchain.overlays.default + inputs.fenix.overlays.default + (_: _: { + metacraft-labs-old = inputs'.mcl-blockchain-old.legacyPackages.metacraft-labs; + }) + ]; }; - in lib.foldr (host: accum: - accum // { - "${host}${postfix}" = - callPackage ./zkvms/${host}/default.nix args-zkVM; - }) { } zkvms; - hostPackages = - lib.foldr (guest: accum: accum // (createPackages guest)) { } guests; + packages = + hostPackages + // guestPackages + // { + rust-format-all = callPackage ./rust-format-all.nix { }; + update-nix-dependencies = callPackage ./update-nix-dependencies.nix { + zkvms = builtins.map (name: inputs.mcl-blockchain.packages.${system}.${name}) zkvms; + }; + }; - guestPackages = lib.foldr (guest: accum: - accum // { - ${guest} = callPackage ./zkvms_guest_io/default.nix { - inherit guest; - inherit zkvms; - inherit hostPackages; - inherit craneLib-default; - rev = inputs.self.rev or inputs.self.dirtyRev; + devShells.default = pkgs.mkShell { + buildInputs = with pkgs; [ + rustup + ]; }; - }) { } guests; - in { - _module.args.pkgs = import inputs.nixpkgs { - inherit system; - overlays = [ - inputs.mcl-blockchain.overlays.default - inputs.fenix.overlays.default - (_: _: { - metacraft-labs-old = - inputs'.mcl-blockchain-old.legacyPackages.metacraft-labs; - }) - ]; - }; - packages = hostPackages // guestPackages // { - rust-format-all = callPackage ./rust-format-all.nix { }; - update-nix-dependencies = callPackage ./update-nix-dependencies.nix { - zkvms = builtins.map (name: inputs.mcl-blockchain.packages.${system}.${name}) - zkvms; + formatter = pkgs.nixfmt-rfc-style; }; - }; - - formatter = pkgs.nixfmt; }; - }; } -- cgit v1.2.3