From 9becdfe6ff40a6b0dfdd5c40dbd4060153f93f5d Mon Sep 17 00:00:00 2001 From: Simeon Armenchev Date: Fri, 11 Apr 2025 15:15:27 +0300 Subject: [PATCH] feat(flake.nix): Switch from nix-blockchain-development to nixos-modules --- balance-verifier/default.nix | 248 ++++---- flake.lock | 1012 +++++++++++++++----------------- flake.nix | 12 +- libs/nix/common-shell-pkgs.nix | 2 +- shell.nix | 100 ++-- 5 files changed, 665 insertions(+), 709 deletions(-) diff --git a/balance-verifier/default.nix b/balance-verifier/default.nix index 4e1b1f1aa..c1a1d074f 100644 --- a/balance-verifier/default.nix +++ b/balance-verifier/default.nix @@ -1,143 +1,177 @@ -{inputs, ...}: { - perSystem = { - lib, - inputs', - system, - ... - }: let - inherit (inputs.mcl-blockchain.inputs) crane; - inherit (inputs'.mcl-blockchain.legacyPackages) nix2container pkgs-with-rust-overlay; - pkgs = pkgs-with-rust-overlay; - inherit (pkgs) callPackage rust-bin runCommandLocal writeScriptBin; - inherit (lib) getExe; +{ inputs, ... }: +{ + perSystem = + { + lib, + inputs', + system, + ... + }: + let + inherit (inputs.mcl-nixos-modules.inputs) crane; + inherit (inputs'.mcl-nixos-modules.legacyPackages) nix2container pkgs-with-rust-overlay; + pkgs = pkgs-with-rust-overlay; + inherit (pkgs) + callPackage + rust-bin + runCommandLocal + writeScriptBin + ; + inherit (lib) getExe; - nodejs = pkgs.nodejs_21; + nodejs = pkgs.nodejs_21; - rust-nightly = rust-bin.nightly."2023-06-12".default; + rust-nightly = rust-bin.nightly."2023-06-12".default; - craneLib = (crane.mkLib pkgs).overrideToolchain rust-nightly; + craneLib = (crane.mkLib pkgs).overrideToolchain rust-nightly; - circuits-executable = exeName: let - all = callPackage ../libs/nix/circuits_executables { - inherit craneLib; - }; - in - runCommandLocal exeName { - meta.programName = exeName; - } '' - install -Dm755 ${all}/bin/${exeName} -t $out/bin - ''; + circuits-executable = + exeName: + let + all = callPackage ../libs/nix/circuits_executables { + inherit craneLib; + }; + in + runCommandLocal exeName + { + meta.programName = exeName; + } + '' + install -Dm755 ${all}/bin/${exeName} -t $out/bin + ''; - balance-verifier-circuit-builder = circuits-executable "balance_verification_circuit_data_generation"; - balance-verifier = circuits-executable "balance_verification"; - commitment-mapper = circuits-executable "commitment_mapper"; - commitment-mapper-builder = circuits-executable "commitment_mapper_circuit_data_generation"; - final-layer = circuits-executable "final_layer"; + balance-verifier-circuit-builder = circuits-executable "balance_verification_circuit_data_generation"; + balance-verifier = circuits-executable "balance_verification"; + commitment-mapper = circuits-executable "commitment_mapper"; + commitment-mapper-builder = circuits-executable "commitment_mapper_circuit_data_generation"; + final-layer = circuits-executable "final_layer"; - balance-verification-circuit = level: - runCommandLocal "balance-verification-circuit-per-level-${level}" {} '' - ${getExe balance-verifier-circuit-builder} ${lib.optionalString (level != "all") "--level ${level}"} + balance-verification-circuit = + level: + runCommandLocal "balance-verification-circuit-per-level-${level}" { } '' + ${getExe balance-verifier-circuit-builder} ${lib.optionalString (level != "all") "--level ${level}"} + mkdir -p $out/bin + mv *.plonky2_targets *.plonky2_circuit $out/bin + ''; + + commitment-mapper-data = runCommandLocal "commitment-mapper-data" { } '' + ${getExe commitment-mapper-builder} mkdir -p $out/bin mv *.plonky2_targets *.plonky2_circuit $out/bin ''; - commitment-mapper-data = runCommandLocal "commitment-mapper-data" {} '' - ${getExe commitment-mapper-builder} - mkdir -p $out/bin - mv *.plonky2_targets *.plonky2_circuit $out/bin - ''; + allLevels = builtins.map builtins.toString (lib.lists.range 0 37); + balance-verifier-circuit-per-level = lib.genAttrs ( + allLevels ++ [ "all" ] + ) balance-verification-circuit; + + buildImage = + level: + let + levelBefore = toString (lib.toInt level - 1); + in + nix2container.buildImage { + name = "balance-verifier-for-level-${level}"; + tag = "latest"; + copyToRoot = pkgs.buildEnv { + name = "root"; + paths = [ + balance-verifier + balance-verifier-circuit-per-level."${level}" + pkgs.bash + pkgs.coreutils + (lib.optionalString (level != "0") balance-verifier-circuit-per-level."${levelBefore}") + ]; + pathsToLink = [ "/bin" ]; + }; + config = { + entrypoint = [ "/bin/${balance-verifier.meta.programName}" ]; + workingdir = "/bin"; + }; + }; - allLevels = builtins.map builtins.toString (lib.lists.range 0 37); - balance-verifier-circuit-per-level = lib.genAttrs (allLevels ++ ["all"]) balance-verification-circuit; + buildToolImage = + tool: + nix2container.buildImage { + name = "${builtins.replaceStrings [ "-" ] [ "_" ] tool.name}"; + tag = "latest"; + copyToRoot = pkgs.buildEnv { + name = "root"; + paths = [ tool ]; + pathsToLink = [ "/bin" ]; + }; + config = { + workingdir = "/bin"; + }; + }; - buildImage = level: let - levelBefore = toString (lib.toInt level - 1); - in - nix2container.buildImage { - name = "balance-verifier-for-level-${level}"; + commitment-mapper-image = nix2container.buildImage { + name = "commitment_mapper"; tag = "latest"; copyToRoot = pkgs.buildEnv { name = "root"; - paths = [balance-verifier balance-verifier-circuit-per-level."${level}" pkgs.bash pkgs.coreutils (lib.optionalString (level != "0") balance-verifier-circuit-per-level."${levelBefore}")]; - pathsToLink = ["/bin"]; + paths = [ + commitment-mapper + commitment-mapper-data + ]; + pathsToLink = [ "/bin" ]; }; config = { - entrypoint = ["/bin/${balance-verifier.meta.programName}"]; workingdir = "/bin"; }; }; - buildToolImage = tool: - nix2container.buildImage { - name = "${builtins.replaceStrings ["-"] ["_"] tool.name}"; + final-layer-image = nix2container.buildImage { + name = "final-layer"; tag = "latest"; copyToRoot = pkgs.buildEnv { name = "root"; - paths = [tool]; - pathsToLink = ["/bin"]; + paths = [ final-layer ]; + pathsToLink = [ "/bin" ]; }; config = { + entrypoint = [ "/bin/${final-layer.meta.programName}" ]; workingdir = "/bin"; }; }; - commitment-mapper-image = nix2container.buildImage { - name = "commitment_mapper"; - tag = "latest"; - copyToRoot = pkgs.buildEnv { - name = "root"; - paths = [commitment-mapper commitment-mapper-data]; - pathsToLink = ["/bin"]; - }; - config = { - workingdir = "/bin"; - }; - }; - - final-layer-image = nix2container.buildImage { - name = "final-layer"; - tag = "latest"; - copyToRoot = pkgs.buildEnv { - name = "root"; - paths = [final-layer]; - pathsToLink = ["/bin"]; - }; - config = { - entrypoint = ["/bin/${final-layer.meta.programName}"]; - workingdir = "/bin"; - }; - }; - - balance-verifier-circuit-per-level-docker = lib.genAttrs allLevels buildImage; + balance-verifier-circuit-per-level-docker = lib.genAttrs allLevels buildImage; - balance-verifier-all-images = - writeScriptBin "balance-verifier-all-images" - ( - lib.concatMapStringsSep - "\n" - (level: getExe (buildImage level).copyToDockerDaemon) - allLevels + balance-verifier-all-images = writeScriptBin "balance-verifier-all-images" ( + lib.concatMapStringsSep "\n" (level: getExe (buildImage level).copyToDockerDaemon) allLevels ); - get-balances-input = callPackage ../libs/nix/get_balances_input {inherit nodejs;}; - get-changed-validators = callPackage ../libs/nix/get_changed_validators {inherit nodejs;}; - misc-images = - writeScriptBin "misc-images" - ( - lib.concatMapStringsSep - "\n" - (image: getExe image.copyToDockerDaemon) - ((map buildToolImage [get-balances-input get-changed-validators]) - ++ [commitment-mapper-image]) + get-balances-input = callPackage ../libs/nix/get_balances_input { inherit nodejs; }; + get-changed-validators = callPackage ../libs/nix/get_changed_validators { inherit nodejs; }; + misc-images = writeScriptBin "misc-images" ( + lib.concatMapStringsSep "\n" (image: getExe image.copyToDockerDaemon) ( + (map buildToolImage [ + get-balances-input + get-changed-validators + ]) + ++ [ commitment-mapper-image ] + ) ); - in { - legacyPackages = { - inherit balance-verifier-circuit-per-level balance-verifier-circuit-per-level-docker commitment-mapper-data; - inherit balance-verifier commitment-mapper balance-verifier-all-images final-layer final-layer-image commitment-mapper-image; - inherit misc-images; - }; - packages = { - inherit balance-verifier-circuit-builder get-balances-input get-changed-validators; + in + { + legacyPackages = { + inherit + balance-verifier-circuit-per-level + balance-verifier-circuit-per-level-docker + commitment-mapper-data + ; + inherit + balance-verifier + commitment-mapper + balance-verifier-all-images + final-layer + final-layer-image + commitment-mapper-image + ; + inherit misc-images; + }; + packages = { + inherit balance-verifier-circuit-builder get-balances-input get-changed-validators; + }; }; - }; } diff --git a/flake.lock b/flake.lock index 2078b46cb..3515a74ed 100644 --- a/flake.lock +++ b/flake.lock @@ -3,32 +3,28 @@ "agenix": { "inputs": { "darwin": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "nix-darwin" ], "home-manager": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "home-manager" ], "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "nixpkgs" ], "systems": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "systems" ] }, "locked": { - "lastModified": 1712079060, - "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "owner": "ryantm", "repo": "agenix", - "rev": "1381a759b205dff7a6818733118d02253340fd5e", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { @@ -40,11 +36,11 @@ "bats-assert": { "flake": false, "locked": { - "lastModified": 1636059754, - "narHash": "sha256-ewME0l27ZqfmAwJO4h5biTALc9bDLv7Bl3ftBzBuZwk=", + "lastModified": 1692829535, + "narHash": "sha256-oDqhUQ6Xg7a3xx537SWLGRzqP3oKKeyY4UYGCdz9z/Y=", "owner": "bats-core", "repo": "bats-assert", - "rev": "34551b1d7f8c7b677c1a66fc0ac140d6223409e5", + "rev": "e2d855bc78619ee15b0c702b5c30fb074101159f", "type": "github" }, "original": { @@ -56,11 +52,11 @@ "bats-support": { "flake": false, "locked": { - "lastModified": 1548869839, - "narHash": "sha256-Gr4ntadr42F2Ks8Pte2D4wNDbijhujuoJi4OPZnTAZU=", + "lastModified": 1693050811, + "narHash": "sha256-PxJaH16+QrsfZqtkWVt5K6TwJB5gjIXnbGo+MB84WIU=", "owner": "bats-core", "repo": "bats-support", - "rev": "d140a65044b2d6810381935ae7f0c94c7023c8c3", + "rev": "9bf10e876dd6b624fe44423f0b35e064225f7556", "type": "github" }, "original": { @@ -72,32 +68,28 @@ "cachix": { "inputs": { "devenv": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "devenv" ], "flake-compat": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "flake-compat" ], + "git-hooks": [ + "mcl-nixos-modules", + "git-hooks-nix" + ], "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "nixpkgs-unstable" - ], - "pre-commit-hooks": [ - "mcl-blockchain", - "nixos-modules", - "pre-commit-hooks" ] }, "locked": { - "lastModified": 1712055811, - "narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=", + "lastModified": 1742042642, + "narHash": "sha256-D0gP8srrX0qj+wNYNPdtVJsQuFzIng3q43thnHXQ/es=", "owner": "cachix", "repo": "cachix", - "rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30", + "rev": "a624d3eaf4b1d225f918de8543ed739f2f574203", "type": "github" }, "original": { @@ -107,19 +99,12 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1713738183, - "narHash": "sha256-qd/MuLm7OfKQKyd4FAMqV4H6zYyOfef5lLzRrmXwKJM=", + "lastModified": 1743908961, + "narHash": "sha256-e1idZdpnnHWuosI3KsBgAgrhMR05T2oqskXCmNzGPq0=", "owner": "ipetkov", "repo": "crane", - "rev": "f6c6a2fb1b8bd9b65d65ca9342dd0eb180a63f11", + "rev": "80ceeec0dc94ef967c371dcdc56adb280328f591", "type": "github" }, "original": { @@ -147,33 +132,29 @@ "devenv": { "inputs": { "cachix": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "cachix" ], "flake-compat": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "flake-compat" ], + "git-hooks": [ + "mcl-nixos-modules", + "git-hooks-nix" + ], "nix": "nix", "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "nixpkgs" - ], - "pre-commit-hooks": [ - "mcl-blockchain", - "nixos-modules", - "pre-commit-hooks" ] }, "locked": { - "lastModified": 1713773675, - "narHash": "sha256-ZPN5aY4eQWFL5SdCFrm6Z+UYpU1zcn4kzo39fV9Jrtk=", + "lastModified": 1743783972, + "narHash": "sha256-5wPsNCnWmeLpLxavsftA9L7tnYgtlexV7FwLegxtpy4=", "owner": "cachix", "repo": "devenv", - "rev": "c4b6e9c374db67bc35acbae68a05826aa7977e84", + "rev": "2f53e2f867e0c2ba18b880e66169366e5f8ca554", "type": "github" }, "original": { @@ -185,11 +166,11 @@ "devour-flake": { "flake": false, "locked": { - "lastModified": 1709858306, - "narHash": "sha256-Vey9n9hIlWiSAZ6CCTpkrL6jt4r2JvT2ik9wa2bjeC0=", + "lastModified": 1738639461, + "narHash": "sha256-R7MHvTh5fskzxNLBe9bher+GQBZ8ZHjz75CPQG3fSRI=", "owner": "srid", "repo": "devour-flake", - "rev": "17b711b9deadbbc5629cb7d2b64cf86ae72af3fa", + "rev": "9fe4db872c107ea217c13b24527b68d9e4a4c01b", "type": "github" }, "original": { @@ -200,25 +181,18 @@ }, "devshell": { "inputs": { - "flake-utils": [ - "mcl-blockchain", - "nixos-modules", - "ethereum-nix", - "flake-utils" - ], "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "ethereum-nix", "nixpkgs" ] }, "locked": { - "lastModified": 1708939976, - "narHash": "sha256-O5+nFozxz2Vubpdl1YZtPrilcIXPcRAjqNdNE8oCRoA=", + "lastModified": 1741473158, + "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", "owner": "numtide", "repo": "devshell", - "rev": "5ddecd67edbd568ebe0a55905273e56cc82aabe3", + "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", "type": "github" }, "original": { @@ -230,17 +204,16 @@ "disko": { "inputs": { "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "nixpkgs" ] }, "locked": { - "lastModified": 1713749408, - "narHash": "sha256-9hFaSpgx+rZgGVLsjWdT+QUGyZplUyGdK45IoWEx1GM=", + "lastModified": 1743598667, + "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=", "owner": "nix-community", "repo": "disko", - "rev": "b8785a1c37f6176b6bc3d2939df329ab3a8f226c", + "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6", "type": "github" }, "original": { @@ -252,27 +225,26 @@ "dlang-nix": { "inputs": { "flake-compat": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "flake-compat" ], "flake-parts": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "flake-parts" ], - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1712645561, - "narHash": "sha256-LYLdh09asySJmjOjCaU8pUDop8OPDMpeB3bSDsSZf+M=", + "lastModified": 1744030092, + "narHash": "sha256-EwKNnBBTpjgNH20nfhJocGh6rZQJji0/8i1qsaviiGQ=", "owner": "PetarKirov", "repo": "dlang.nix", - "rev": "7241c2c06efa973a3e4bc91d064cf567071cd281", + "rev": "ab6b8f72d7b56bfd0b12e189fc4dfaed9d46de76", "type": "github" }, "original": { "owner": "PetarKirov", + "ref": "feat/build-dub-package", "repo": "dlang.nix", "type": "github" } @@ -281,51 +253,52 @@ "inputs": { "devour-flake": "devour-flake", "devshell": "devshell", + "fenix": [ + "mcl-nixos-modules", + "fenix" + ], "flake-compat": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "flake-compat" ], "flake-parts": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "flake-parts" ], "flake-utils": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "flake-utils" ], "foundry-nix": "foundry-nix", "lib-extras": "lib-extras", + "nimbus-eth2": "nimbus-eth2", "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", - "nixpkgs" + "mcl-nixos-modules", + "nixos-2405" + ], + "nixpkgs-2311": [ + "mcl-nixos-modules", + "nixos-2311" ], "nixpkgs-unstable": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "nixpkgs-unstable" ], - "poetry2nix": "poetry2nix", "systems": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "systems" ], "treefmt-nix": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "treefmt-nix" ] }, "locked": { - "lastModified": 1712595448, - "narHash": "sha256-LWGTxv4WkWuZ2IU+7GD2L/awMBeBSqyfGQnTV8eH8kw=", + "lastModified": 1744119391, + "narHash": "sha256-MEIZA2KiU6UVg2QJkBCPfKqGkG46mBT0SQATOiem2uo=", "owner": "metacraft-labs", "repo": "ethereum.nix", - "rev": "95947315cb4897f389688d3e162ef98eab2aaeb0", + "rev": "207e072a3b1e61aee725ec9ff29b16e85006ade1", "type": "github" }, "original": { @@ -337,18 +310,17 @@ "fenix": { "inputs": { "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "nixpkgs" ], "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1713767058, - "narHash": "sha256-ZxK6mi0iKun+Ykol5ceHh/yj9AMNcv1wDnhznu0daOc=", + "lastModified": 1742452566, + "narHash": "sha256-sVuLDQ2UIWfXUBbctzrZrXM2X05YjX08K7XHMztt36E=", "owner": "nix-community", "repo": "fenix", - "rev": "f90ff54f3637d455352780f4f27715725a0d6841", + "rev": "7d9ba794daf5e8cc7ee728859bc688d8e26d5f06", "type": "github" }, "original": { @@ -360,11 +332,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -376,8 +348,9 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", + "devenv", + "nix", "nixpkgs" ] }, @@ -398,8 +371,50 @@ "flake-parts_2": { "inputs": { "nixpkgs-lib": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "mcl-nixos-modules", + "terranix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": [ + "mcl-nixos-modules", "validator-ejector", "nixpkgs" ] @@ -433,20 +448,34 @@ "type": "github" } }, + "flake-root_2": { + "locked": { + "lastModified": 1723604017, + "narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=", + "owner": "srid", + "repo": "flake-root", + "rev": "b759a56851e10cb13f6b8e5698af7b59c44be26e", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "flake-root", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "systems" ] }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -458,17 +487,16 @@ "flake-utils-plus": { "inputs": { "flake-utils": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "flake-utils" ] }, "locked": { - "lastModified": 1696331477, - "narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=", + "lastModified": 1738591040, + "narHash": "sha256-4WNeriUToshQ/L5J+dTSWC5OJIwT39SEP7V7oylndi8=", "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", - "rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3", + "rev": "afcb15b845e74ac5e998358709b2b5fe42a948d1", "type": "github" }, "original": { @@ -480,24 +508,22 @@ "foundry-nix": { "inputs": { "flake-utils": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "ethereum-nix", "flake-utils" ], "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "ethereum-nix", "nixpkgs" ] }, "locked": { - "lastModified": 1709457044, - "narHash": "sha256-1SktmSjTjC1rhJwQ+kvqUeExKogNzserFGuoGwOerHw=", + "lastModified": 1743671500, + "narHash": "sha256-IJ2vPxTzDQNIEKScJ3JDOXBOJoXglErDeUI/I6rBOfU=", "owner": "shazow", "repo": "foundry.nix", - "rev": "592e8ca2e82a2c3a8d0d4dcc7f7c5b8c3842efcd", + "rev": "815a4d4a35ebf5c4ef855d8d4c5655fcbe63ee41", "type": "github" }, "original": { @@ -507,12 +533,37 @@ "type": "github" } }, + "git-hooks-nix": { + "inputs": { + "flake-compat": [ + "mcl-nixos-modules", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "mcl-nixos-modules", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", - "pre-commit-hooks", + "mcl-nixos-modules", + "git-hooks-nix", "nixpkgs" ] }, @@ -533,22 +584,20 @@ "hercules-ci-effects": { "inputs": { "flake-parts": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "flake-parts" ], "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "nixpkgs" ] }, "locked": { - "lastModified": 1713722610, - "narHash": "sha256-kcZsbH1PQTG+sS22u/igLq2SaBEHJgmU5hoKzrT2ukI=", + "lastModified": 1742014779, + "narHash": "sha256-I6fG1zrfdLFcp/imGZElig0BJO3YU0QEXLgvwWoOpJ8=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "4615d28841e93f6f549fde9188caf493b3822668", + "rev": "524637ef84c177661690b924bf64a1ce18072a2c", "type": "github" }, "original": { @@ -560,22 +609,21 @@ "home-manager": { "inputs": { "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "nixpkgs" ] }, "locked": { - "lastModified": 1712386041, - "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", + "lastModified": 1744117652, + "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", "owner": "nix-community", "repo": "home-manager", - "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", + "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -583,27 +631,23 @@ "lib-extras": { "inputs": { "devshell": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "ethereum-nix", "devshell" ], "flake-parts": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "ethereum-nix", "flake-parts" ], "flake-root": "flake-root", "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "ethereum-nix", "nixpkgs" ], "treefmt-nix": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "ethereum-nix", "treefmt-nix" ] @@ -623,100 +667,92 @@ "type": "github" } }, - "mcl-blockchain": { + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", + "type": "github" + } + }, + "mcl-nixos-modules": { "inputs": { - "crane": [ - "mcl-blockchain", - "nixos-modules", - "crane" - ], - "devenv": [ - "mcl-blockchain", - "nixos-modules", - "devenv" - ], - "ethereum_nix": [ - "mcl-blockchain", - "nixos-modules", - "ethereum-nix" - ], - "fenix": [ - "mcl-blockchain", - "nixos-modules", - "fenix" - ], - "flake-compat": [ - "mcl-blockchain", - "nixos-modules", - "flake-compat" - ], - "flake-parts": [ - "mcl-blockchain", - "nixos-modules", - "flake-parts" - ], - "flake-utils": [ - "mcl-blockchain", - "nixos-modules", - "flake-utils" - ], - "nix2container": [ - "mcl-blockchain", - "nixos-modules", - "nix2container" - ], - "nixos-modules": "nixos-modules", + "agenix": "agenix", + "cachix": "cachix", + "crane": "crane", + "devenv": "devenv", + "disko": "disko", + "dlang-nix": "dlang-nix", + "ethereum-nix": "ethereum-nix", + "fenix": "fenix", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts_2", + "flake-utils": "flake-utils", + "flake-utils-plus": "flake-utils-plus", + "git-hooks-nix": "git-hooks-nix", + "hercules-ci-effects": "hercules-ci-effects", + "home-manager": "home-manager", + "microvm": "microvm", + "nix-darwin": "nix-darwin", + "nix2container": "nix2container", + "nixd": "nixd", + "nixos-2311": "nixos-2311", + "nixos-2405": "nixos-2405", + "nixos-2411": "nixos-2411", + "nixos-anywhere": "nixos-anywhere", + "nixos-images": "nixos-images", "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", - "nixpkgs" + "mcl-nixos-modules", + "nixos-2411" ], - "nixpkgs-unstable": [ - "mcl-blockchain", - "nixos-modules", - "nixpkgs-unstable" - ], - "rust-overlay": "rust-overlay", - "treefmt-nix": [ - "mcl-blockchain", - "nixos-modules", - "treefmt-nix" - ] + "nixpkgs-unstable": "nixpkgs-unstable", + "systems": "systems", + "terranix": "terranix", + "treefmt-nix": "treefmt-nix_2", + "validator-ejector": "validator-ejector", + "vscode-server": "vscode-server" }, "locked": { - "lastModified": 1713800759, - "narHash": "sha256-o4zAIHFlzllR/eQw29JGJPAKfaMmoQ4QRlILTzOni/8=", + "lastModified": 1744368934, + "narHash": "sha256-G5RRHYWV01I9WAEMIodjZvdLfk9UUnIk/tgyLkUOhU8=", "owner": "metacraft-labs", - "repo": "nix-blockchain-development", - "rev": "cc628745755efab5a0ccb3f4170f64e247cc6fe8", + "repo": "nixos-modules", + "rev": "1809b33be3ecfe69bf8e1e06f8b324b9527b2417", "type": "github" }, "original": { "owner": "metacraft-labs", - "repo": "nix-blockchain-development", + "ref": "feat/nix-blockchain-development-migration", + "repo": "nixos-modules", "type": "github" } }, "microvm": { "inputs": { "flake-utils": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "flake-utils" ], "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "nixpkgs" ], "spectrum": "spectrum" }, "locked": { - "lastModified": 1713463636, - "narHash": "sha256-IPdnR0Rs7XoffnCn6rExYDlft/GHD/UFgQ11lTVEK48=", + "lastModified": 1743083165, + "narHash": "sha256-Fz7AiCJWtoWZ2guJwO3B1h3RuJxYWaCzFIqY0Kmkyrs=", "owner": "astro", "repo": "microvm.nix", - "rev": "6a4f822a817180be03fcdceb654088d002c9ec5e", + "rev": "773d5a04e2e10ca7b412270dea11276a496e1b61", "type": "github" }, "original": { @@ -725,33 +761,64 @@ "type": "github" } }, + "nimbus-eth2": { + "inputs": { + "nixpkgs": [ + "mcl-nixos-modules", + "ethereum-nix", + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1742560866, + "narHash": "sha256-3/FXHzq6YrJUNa9/nHaV8xXn3IOqCT5ymf6VU6wlXIk=", + "ref": "v25.3.1", + "rev": "283ee0b3e86028c8dbd190cfe6d25f4063b451f7", + "revCount": 7262, + "submodules": true, + "type": "git", + "url": "https://github.com/status-im/nimbus-eth2" + }, + "original": { + "ref": "v25.3.1", + "submodules": true, + "type": "git", + "url": "https://github.com/status-im/nimbus-eth2" + } + }, "nix": { "inputs": { "flake-compat": [ - "mcl-blockchain", - "nixos-modules", - "devenv", - "flake-compat" + "mcl-nixos-modules", + "devenv" ], - "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", - "devenv", - "nixpkgs" + "flake-parts": "flake-parts", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs", + "nixpkgs-23-11": [ + "mcl-nixos-modules", + "devenv" ], - "nixpkgs-regression": "nixpkgs-regression" + "nixpkgs-regression": [ + "mcl-nixos-modules", + "devenv" + ], + "pre-commit-hooks": [ + "mcl-nixos-modules", + "devenv" + ] }, "locked": { - "lastModified": 1712911606, - "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "lastModified": 1741798497, + "narHash": "sha256-E3j+3MoY8Y96mG1dUIiLFm2tZmNbRvSiyN7CrSKuAVg=", "owner": "domenkozar", "repo": "nix", - "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", + "rev": "f3f44b2baaf6c4c6e179de8cbb1cc6db031083cd", "type": "github" }, "original": { "owner": "domenkozar", - "ref": "devenv-2.21", + "ref": "devenv-2.24", "repo": "nix", "type": "github" } @@ -759,17 +826,16 @@ "nix-darwin": { "inputs": { "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "nixpkgs" ] }, "locked": { - "lastModified": 1713543876, - "narHash": "sha256-olEWxacm1xZhAtpq+ZkEyQgR4zgfE7ddpNtZNvubi3g=", + "lastModified": 1743496612, + "narHash": "sha256-emPWa5lmKbnyuj8c1mSJUkzJNT+iJoU9GMcXwjp2oVM=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "9e7c20ffd056e406ddd0276ee9d89f09c5e5f4ed", + "rev": "73d59580d01e9b9f957ba749f336a272869c42dd", "type": "github" }, "original": { @@ -778,81 +844,23 @@ "type": "github" } }, - "nix-fast-build": { - "inputs": { - "flake-parts": [ - "mcl-blockchain", - "nixos-modules", - "flake-parts" - ], - "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", - "nixpkgs" - ], - "treefmt-nix": [ - "mcl-blockchain", - "nixos-modules", - "treefmt-nix" - ] - }, - "locked": { - "lastModified": 1709911523, - "narHash": "sha256-XNutwbRI6h57ybeKy0yYupfngWYcfcIqE0b0LgXnyxs=", - "owner": "Mic92", - "repo": "nix-fast-build", - "rev": "692fe3e98f36b60c678d637235271b57910a7f80", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "nix-fast-build", - "type": "github" - } - }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", - "ethereum-nix", - "poetry2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703863825, - "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, "nix2container": { "inputs": { "flake-utils": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "flake-utils" ], "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "nixpkgs" ] }, "locked": { - "lastModified": 1712990762, - "narHash": "sha256-hO9W3w7NcnYeX8u8cleHiSpK2YJo7ecarFTUlbybl7k=", + "lastModified": 1742501024, + "narHash": "sha256-4G0RaAkRQY8Oty0WjoDfIkEAkX7PckUqUGjAQrxhDiA=", "owner": "nlewo", "repo": "nix2container", - "rev": "20aad300c925639d5d6cbe30013c8357ce9f2a2e", + "rev": "e6315c8307edf2938ae24df0e28b47ca865121de", "type": "github" }, "original": { @@ -864,22 +872,19 @@ "nixd": { "inputs": { "flake-parts": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "flake-parts" ], - "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", - "nixpkgs" - ] + "flake-root": "flake-root_2", + "nixpkgs": "nixpkgs_3", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1713710522, - "narHash": "sha256-tBFiQBdH92zyaNUVOBh4PsG8ZQ3t6orBgINTeJ7DKCM=", + "lastModified": 1744084647, + "narHash": "sha256-DgFfDQf713caAN4LtxABGBhP7QxXow+kQSafSddzzr4=", "owner": "nix-community", "repo": "nixd", - "rev": "dc0164e0df37e5d06bda61b6fb2ca16089d5f838", + "rev": "e32db14503340dbcae7a156de306ba680cb1b516", "type": "github" }, "original": { @@ -890,11 +895,11 @@ }, "nixos-2311": { "locked": { - "lastModified": 1713725259, - "narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=", + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", "type": "github" }, "original": { @@ -904,41 +909,68 @@ "type": "github" } }, + "nixos-2405": { + "locked": { + "lastModified": 1735563628, + "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixos-2411": { + "locked": { + "lastModified": 1743975612, + "narHash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a880f49904d68b5e53338d1e8c7bf80f59903928", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixos-anywhere": { "inputs": { "disko": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "disko" ], "flake-parts": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "flake-parts" ], "nixos-images": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "nixos-images" ], "nixos-stable": "nixos-stable", "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "nixpkgs" ], "treefmt-nix": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "treefmt-nix" ] }, "locked": { - "lastModified": 1713609162, - "narHash": "sha256-p0cL/Ww9Vjn8fALaMMVywx5YpckhhkIPwrrJtWF74b4=", + "lastModified": 1743910931, + "narHash": "sha256-Z/oPNf6DWLxWfoJVKGOvvV1mDcMCVfytjSaze4pC/QY=", "owner": "numtide", "repo": "nixos-anywhere", - "rev": "3f97a42aad0731f8a1533aaf1a20a29f7136a47b", + "rev": "6490e56fa7dacf0e22db8dbfef25847c55958b07", "type": "github" }, "original": { @@ -949,23 +981,21 @@ }, "nixos-images": { "inputs": { - "nixos-2311": [ - "mcl-blockchain", - "nixos-modules", - "nixos-2311" + "nixos-stable": [ + "mcl-nixos-modules", + "nixos-2405" ], "nixos-unstable": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1713523007, - "narHash": "sha256-kEnwogkcBn0omgIsGo3zbfAP9nJTDUhp+Q9QWXxsUd0=", + "lastModified": 1743988375, + "narHash": "sha256-aSgNesq082wmJU/CAfy+jTYffI0Vq+O6OwOflZSOOtc=", "owner": "nix-community", "repo": "nixos-images", - "rev": "f064936faf1d12452212030c38e8c325f5b4dfe5", + "rev": "2dd67fe0898826b2f64fc6777f133a2594b9c0d3", "type": "github" }, "original": { @@ -974,112 +1004,61 @@ "type": "github" } }, - "nixos-modules": { - "inputs": { - "agenix": "agenix", - "cachix": "cachix", - "crane": "crane", - "devenv": "devenv", - "disko": "disko", - "dlang-nix": "dlang-nix", - "ethereum-nix": "ethereum-nix", - "fenix": "fenix", - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "flake-utils": "flake-utils", - "flake-utils-plus": "flake-utils-plus", - "hercules-ci-effects": "hercules-ci-effects", - "home-manager": "home-manager", - "microvm": "microvm", - "nix-darwin": "nix-darwin", - "nix-fast-build": "nix-fast-build", - "nix2container": "nix2container", - "nixd": "nixd", - "nixos-2311": "nixos-2311", - "nixos-anywhere": "nixos-anywhere", - "nixos-images": "nixos-images", - "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", - "nixos-2311" - ], - "nixpkgs-unstable": "nixpkgs-unstable", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", - "terranix": "terranix", - "treefmt-nix": "treefmt-nix", - "validator-ejector": "validator-ejector", - "vscode-server": "vscode-server" - }, - "locked": { - "lastModified": 1713786877, - "narHash": "sha256-qbkcs2ta0JX4TLirJ3K3ZTOXgzRTPFEMs5/4kDrCIXw=", - "owner": "metacraft-labs", - "repo": "nixos-modules", - "rev": "3d06b5c8c91c7ba0abc84e0ea4a331209dfb855e", - "type": "github" - }, - "original": { - "owner": "metacraft-labs", - "repo": "nixos-modules", - "type": "github" - } - }, "nixos-stable": { "locked": { - "lastModified": 1702233072, - "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=", + "lastModified": 1743703532, + "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348", + "rev": "bdb91860de2f719b57eef819b5617762f7120c70", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "lastModified": 1717432640, + "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-regression": { + "nixpkgs-unstable": { "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "lastModified": 1743964447, + "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs_2": { "locked": { - "lastModified": 1713714899, - "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -1089,83 +1068,19 @@ "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": [ - "mcl-blockchain", - "nixos-modules", - "ethereum-nix", - "flake-utils" - ], - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", - "ethereum-nix", - "nixpkgs" - ], - "systems": [ - "mcl-blockchain", - "nixos-modules", - "ethereum-nix", - "systems" - ], - "treefmt-nix": [ - "mcl-blockchain", - "nixos-modules", - "ethereum-nix", - "treefmt-nix" - ] - }, + "nixpkgs_3": { "locked": { - "lastModified": 1708589824, - "narHash": "sha256-2GOiFTkvs5MtVF65sC78KNVxQSmsxtk0WmV1wJ9V2ck=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "3c92540611f42d3fb2d0d084a6c694cd6544b609", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": [ - "mcl-blockchain", - "nixos-modules", - "flake-compat" - ], - "flake-utils": [ - "mcl-blockchain", - "nixos-modules", - "flake-utils" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", - "nixpkgs" - ], - "nixpkgs-stable": [ - "mcl-blockchain", - "nixos-modules", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713775815, - "narHash": "sha256-Wu9cdYTnGQQwtT20QQMg7jzkANKQjwBD9iccfGKkfls=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "2ac4dcbf55ed43f3be0bae15e181f08a57af24a4", + "lastModified": 1734435836, + "narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4989a246d7a390a859852baddb1013f825435cee", "type": "github" }, "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", "type": "github" } }, @@ -1173,12 +1088,12 @@ "inputs": { "dendreth-build-artifacts": "dendreth-build-artifacts", "flake-parts": [ - "mcl-blockchain", + "mcl-nixos-modules", "flake-parts" ], - "mcl-blockchain": "mcl-blockchain", + "mcl-nixos-modules": "mcl-nixos-modules", "nixpkgs": [ - "mcl-blockchain", + "mcl-nixos-modules", "nixpkgs-unstable" ] } @@ -1186,11 +1101,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1713717558, - "narHash": "sha256-afXDSvbyKRvCiP0VDb7J0BtV/W3OuUbb8Dt9d17EGPM=", + "lastModified": 1742296961, + "narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "47a901b9bf1f99b1ec5222d478684fc412d526a5", + "rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4", "type": "github" }, "original": { @@ -1200,39 +1115,14 @@ "type": "github" } }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "mcl-blockchain", - "flake-utils" - ], - "nixpkgs": [ - "mcl-blockchain", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1713752081, - "narHash": "sha256-x0QDETp7paa8qq+LX6191JwSq8abUFXCnKNulQ8L7ps=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "606c0ecb23c676c444a0b026eecf800d5bd5fec2", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "spectrum": { "flake": false, "locked": { - "lastModified": 1708358594, - "narHash": "sha256-e71YOotu2FYA67HoC/voJDTFsiPpZNRwmiQb4f94OxQ=", + "lastModified": 1733308308, + "narHash": "sha256-+RcbMAjSxV1wW5UpS9abIG1lFZC8bITPiFIKNnE7RLs=", "ref": "refs/heads/main", - "rev": "6d0e73864d28794cdbd26ab7b37259ab0e1e044c", - "revCount": 614, + "rev": "80c9e9830d460c944c8f730065f18bb733bc7ee2", + "revCount": 792, "type": "git", "url": "https://spectrum-os.org/git/spectrum" }, @@ -1256,28 +1146,39 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "terranix": { "inputs": { "bats-assert": "bats-assert", "bats-support": "bats-support", - "flake-utils": [ - "mcl-blockchain", - "nixos-modules", - "flake-utils" - ], + "flake-parts": "flake-parts_3", "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "nixpkgs" ], + "systems": "systems_2", "terranix-examples": "terranix-examples" }, "locked": { - "lastModified": 1695406838, - "narHash": "sha256-xiUfVD6rtsVWFotVtUW3Q1nQh4obKzgvpN1wqZuGXvM=", + "lastModified": 1739437924, + "narHash": "sha256-lRp8/Udbu8c7aR0DGCmteCXJtXsHcQAiVi6GckjEh5c=", "owner": "terranix", "repo": "terranix", - "rev": "fc9077ca02ab5681935dbf0ecd725c4d889b9275", + "rev": "bb56d576da73a2226961eff14f5530b72ca9e2e3", "type": "github" }, "original": { @@ -1288,11 +1189,11 @@ }, "terranix-examples": { "locked": { - "lastModified": 1636300201, - "narHash": "sha256-0n1je1WpiR6XfCsvi8ZK7GrpEnMl+DpwhWaO1949Vbc=", + "lastModified": 1637156952, + "narHash": "sha256-KqvXIe1yiKOEP9BRYqNQN+LOWPCsWojh0WjEgv5jfEI=", "owner": "terranix", "repo": "terranix-examples", - "rev": "a934aa1cf88f6bd6c6ddb4c77b77ec6e1660bd5e", + "rev": "921680efb8af0f332d8ad73718d53907f9483e24", "type": "github" }, "original": { @@ -1304,17 +1205,38 @@ "treefmt-nix": { "inputs": { "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", + "nixd", "nixpkgs" ] }, "locked": { - "lastModified": 1711963903, - "narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=", + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "mcl-nixos-modules", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743748085, + "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d", "type": "github" }, "original": { @@ -1325,19 +1247,18 @@ }, "validator-ejector": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_4", "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "nixpkgs" ] }, "locked": { - "lastModified": 1710236967, - "narHash": "sha256-2HJmglBoFg9h9GEAg/PT9wINa8ENtF58B13Gtz0pr/I=", + "lastModified": 1723454707, + "narHash": "sha256-6PmtWz2xRWcqKKCh50NFWQ9d1V0uaDHJK4F61YAYo2E=", "owner": "metacraft-labs", "repo": "validator-ejector", - "rev": "bfeb33e99e18a6bc9f6321e5329e7da0a55a1c2e", + "rev": "cd09d9167589f664267ef489d0a853151c19e480", "type": "github" }, "original": { @@ -1350,28 +1271,25 @@ "vscode-server": { "inputs": { "flake-utils": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "flake-utils" ], "nixpkgs": [ - "mcl-blockchain", - "nixos-modules", + "mcl-nixos-modules", "nixpkgs" ] }, "locked": { - "lastModified": 1694401971, - "narHash": "sha256-7ZaJGCK/Hwz7YtPFX9xX6HtzNozUtY0qqwe2syyA5Oo=", + "lastModified": 1729422940, + "narHash": "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=", "owner": "nix-community", "repo": "nixos-vscode-server", - "rev": "7e581626a07486b1779ef02320e7e310feb11611", + "rev": "8b6db451de46ecf9b4ab3d01ef76e59957ff549f", "type": "github" }, "original": { "owner": "nix-community", "repo": "nixos-vscode-server", - "rev": "7e581626a07486b1779ef02320e7e310feb11611", "type": "github" } } diff --git a/flake.nix b/flake.nix index 90a5086ef..c66bdcdb9 100644 --- a/flake.nix +++ b/flake.nix @@ -23,9 +23,9 @@ # * end up with multiple copies of the same package from nixpkgs # * be unable to use the binary cache, since the packages there where # using different versions of their dependencies from nixpkgs - mcl-blockchain.url = "github:metacraft-labs/nix-blockchain-development"; - nixpkgs.follows = "mcl-blockchain/nixpkgs-unstable"; - flake-parts.follows = "mcl-blockchain/flake-parts"; + mcl-nixos-modules.url = "github:metacraft-labs/nixos-modules/feat/nix-blockchain-development-migration"; + nixpkgs.follows = "mcl-nixos-modules/nixpkgs-unstable"; + flake-parts.follows = "mcl-nixos-modules/flake-parts"; dendreth-build-artifacts = { flake = false; @@ -37,7 +37,7 @@ self, flake-parts, nixpkgs, - mcl-blockchain, + mcl-nixos-modules, dendreth-build-artifacts, ... }: @@ -57,7 +57,7 @@ inputs', ... }: let - inherit (inputs'.mcl-blockchain.legacyPackages) nix2container rust-stable rust-nightly; + inherit (inputs'.mcl-nixos-modules.legacyPackages) nix2container rust-stable rust-nightly; docker-images = import ./libs/nix/docker-images.nix {inherit pkgs nix2container;}; light-client = pkgs.callPackage ./libs/nix/light-client/default.nix { @@ -67,7 +67,7 @@ _module.args.pkgs = import nixpkgs { inherit system; overlays = [ - mcl-blockchain.overlays.default + mcl-nixos-modules.overlays.default ]; config.permittedInsecurePackages = [ # wasm3 is insecure if used to execute untrusted third-party code diff --git a/libs/nix/common-shell-pkgs.nix b/libs/nix/common-shell-pkgs.nix index 986125034..75f090d9a 100644 --- a/libs/nix/common-shell-pkgs.nix +++ b/libs/nix/common-shell-pkgs.nix @@ -97,7 +97,7 @@ in nim-wasm # EOS - metacraft-labs.leap + # metacraft-labs.leap metacraft-labs.eos-vm metacraft-labs.cdt # A basic Cosmos SDK app to host WebAssembly smart contracts diff --git a/shell.nix b/shell.nix index c23a4920e..740d2bd63 100644 --- a/shell.nix +++ b/shell.nix @@ -1,50 +1,54 @@ -{inputs, ...}: { - perSystem = { - lib, - inputs', - pkgs, - system, - ... - }: let - inherit (inputs'.mcl-blockchain.legacyPackages) pkgs-with-rust-overlay rust-stable; - inherit (pkgs-with-rust-overlay) rust-bin; - - rust-nightly = rust-bin.nightly."2024-03-28".default.override { - extensions = ["rust-src" "rust-analyzer"]; - }; - in { - devShells.default = with pkgs; let - shell-pkgs = import ./libs/nix/common-shell-pkgs.nix {inherit pkgs rust-stable;}; +{ inputs, ... }: +{ + perSystem = + { + lib, + inputs', + pkgs, + system, + ... + }: + let + inherit (inputs'.mcl-nixos-modules.legacyPackages) rust-stable rust-latest; in - mkShell { - packages = [rust-nightly] ++ shell-pkgs; - - nativeBuildInputs = [pkg-config openssl]; - - shellHook = '' - set -e - - export NODE_OPTIONS="--experimental-vm-modules" - export CC=clang - export LOCAL_NIM_LIB="$PWD/vendor/nim/lib" - export CIRCOM_LIB="$(find $PWD/.yarn/unplugged -maxdepth 1 -type d -name 'circomlib-*')/node_modules/circomlib/circuits" - export LOCAL_HARDHAT_PRIVATE_KEY="0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" - - export GIT_ROOT="$(git rev-parse --show-toplevel)" - - if [ -f .env ]; then - set -a - source .env - set +a - fi - - # scripts/check-user-env-file-contents.sh - - # Set up the environment for the Solidity compiler - # ./scripts/config_solidity_import_mapping.sh - - figlet "DendrETH" - ''; - }; - }; + { + devShells.default = + with pkgs; + let + shell-pkgs = import ./libs/nix/common-shell-pkgs.nix { inherit pkgs rust-stable; }; + in + mkShell { + packages = [ rust-latest ] ++ shell-pkgs; + + nativeBuildInputs = [ + pkg-config + openssl + ]; + + shellHook = '' + set -e + + export NODE_OPTIONS="--experimental-vm-modules" + export CC=clang + export LOCAL_NIM_LIB="$PWD/vendor/nim/lib" + export CIRCOM_LIB="$(find $PWD/.yarn/unplugged -maxdepth 1 -type d -name 'circomlib-*')/node_modules/circomlib/circuits" + export LOCAL_HARDHAT_PRIVATE_KEY="0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" + + export GIT_ROOT="$(git rev-parse --show-toplevel)" + + if [ -f .env ]; then + set -a + source .env + set +a + fi + + # scripts/check-user-env-file-contents.sh + + # Set up the environment for the Solidity compiler + # ./scripts/config_solidity_import_mapping.sh + + figlet "DendrETH" + ''; + }; + }; }