diff --git a/flake.lock b/flake.lock index 5d5463d0..3e519e6b 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,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": { @@ -48,11 +48,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": { @@ -77,11 +77,11 @@ ] }, "locked": { - "lastModified": 1724232775, - "narHash": "sha256-6u2DycIEgrgNYlLxyGqdFVmBNiKIitnQKJ1pbRP5oko=", + "lastModified": 1728672398, + "narHash": "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs=", "owner": "cachix", "repo": "cachix", - "rev": "03b6cb3f953097bff378fb8b9ea094bd091a4ec7", + "rev": "aac51f698309fd0f381149214b7eee213c66ef0a", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "crane": { "locked": { - "lastModified": 1725125250, - "narHash": "sha256-CB20rDD5eHikF6mMTTJdwPP1qvyoiyyw1RDUzwIaIF8=", + "lastModified": 1729273024, + "narHash": "sha256-Mb5SemVsootkn4Q2IiY0rr9vrXdCCpQ9HnZeD/J3uXs=", "owner": "ipetkov", "repo": "crane", - "rev": "96fd12c7100e9e05fa1a0a5bd108525600ce282f", + "rev": "fa8b7445ddadc37850ed222718ca86622be01967", "type": "github" }, "original": { @@ -122,11 +122,11 @@ ] }, "locked": { - "lastModified": 1725121898, - "narHash": "sha256-UZVuDnDCS5EgFNLtO9u0Q8+ZRql7t5fMbxd54VMtLdY=", + "lastModified": 1729445229, + "narHash": "sha256-3vhSEs2ufSvv2Oct8G9CWEPFI57c4NAZ2wR2accHELM=", "owner": "cachix", "repo": "devenv", - "rev": "3ec083c9d58c9007d2be2a6145b578c67322d575", + "rev": "006016cf4191c34c17cfdb6669e0690e24302ac0", "type": "github" }, "original": { @@ -138,11 +138,11 @@ "devour-flake": { "flake": false, "locked": { - "lastModified": 1709858306, - "narHash": "sha256-Vey9n9hIlWiSAZ6CCTpkrL6jt4r2JvT2ik9wa2bjeC0=", + "lastModified": 1726283167, + "narHash": "sha256-Cvc84VzvvdmehafnaIPfdPylNWJcDmv79QQh/MH/4Qk=", "owner": "srid", "repo": "devour-flake", - "rev": "17b711b9deadbbc5629cb7d2b64cf86ae72af3fa", + "rev": "9b96d31a55be119df8496ec5b7369823deec8a1c", "type": "github" }, "original": { @@ -153,21 +153,17 @@ }, "devshell": { "inputs": { - "flake-utils": [ - "ethereum-nix", - "flake-utils" - ], "nixpkgs": [ "ethereum-nix", "nixpkgs" ] }, "locked": { - "lastModified": 1710156081, - "narHash": "sha256-4PMY6aumJi5dLFjBzF5O4flKXmadMNq3AGUHKYfchh0=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "bc68b058dc7e6d4d6befc4ec6c60082b6e844b7d", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -183,11 +179,11 @@ ] }, "locked": { - "lastModified": 1724895876, - "narHash": "sha256-GSqAwa00+vRuHbq9O/yRv7Ov7W/pcMLis3HmeHv8a+Q=", + "lastModified": 1729281548, + "narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=", "owner": "nix-community", "repo": "disko", - "rev": "511388d837178979de66d14ca4a2ebd5f7991cd3", + "rev": "a6a3179ddf396dfc28a078e2f169354d0c137125", "type": "github" }, "original": { @@ -204,7 +200,7 @@ "flake-parts": [ "flake-parts" ], - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1714055636, @@ -225,6 +221,9 @@ "inputs": { "devour-flake": "devour-flake", "devshell": "devshell", + "fenix": [ + "fenix" + ], "flake-compat": [ "flake-compat" ], @@ -237,8 +236,12 @@ "foundry-nix": "foundry-nix", "lib-extras": "lib-extras", "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-2311": [ "nixos-2311" ], + "nixpkgs-nethermind": "nixpkgs-nethermind", "nixpkgs-unstable": [ "nixpkgs-unstable" ], @@ -250,11 +253,11 @@ ] }, "locked": { - "lastModified": 1721292412, - "narHash": "sha256-U6XCMdnPJxPhA4nHfKUTe8KlV7/l1HC968P8jkKUoKU=", + "lastModified": 1729583295, + "narHash": "sha256-DE76P4GfCLeGLq+pjCE8nRWEW50FCOaxPUwdI4i8hGA=", "owner": "metacraft-labs", "repo": "ethereum.nix", - "rev": "53526f8b9c77ef9624ad325dfbcc82a5cdd51010", + "rev": "cd120903d79a88a6eeabf4a5ed4fa04aa12deca6", "type": "github" }, "original": { @@ -271,33 +274,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1725085655, - "narHash": "sha256-0BQ6BZPaDq8rtEIdTduF2OPlQUKEkImKI8oysym9EVM=", - "owner": "nix-community", - "repo": "fenix", - "rev": "0df8ceddac0e11b695fd622e18908724cc478552", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "fenix_2": { - "inputs": { - "nixpkgs": [ - "microvm", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1722580276, - "narHash": "sha256-VaNcSh7n8OaFW/DJsR6Fm23V+EGpSei0DyF71RKB+90=", + "lastModified": 1729578683, + "narHash": "sha256-h0Wmvrkadbyi3IJXFLPi+QyYjCAKDr2xQ6dLxlQ8cXY=", "owner": "nix-community", "repo": "fenix", - "rev": "286f371b3cfeaa5c856c8e6dfb893018e86cc947", + "rev": "d66cda53e8193a878742dcadb5bb75f4df7c3c0a", "type": "github" }, "original": { @@ -325,15 +306,17 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ + "devenv", + "nix", "nixpkgs" ] }, "locked": { - "lastModified": 1725024810, - "narHash": "sha256-ODYRm8zHfLTH3soTFWE452ydPYz2iTvr9T8ftDMUQ3E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "af510d4a62d071ea13925ce41c95e3dec816c01d", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -343,6 +326,43 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "validator-ejector", @@ -394,17 +414,12 @@ } }, "flake-utils": { - "inputs": { - "systems": [ - "systems" - ] - }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -433,6 +448,26 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": [ + "systems" + ] + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "foundry-nix": { "inputs": { "flake-utils": [ @@ -445,11 +480,11 @@ ] }, "locked": { - "lastModified": 1709457044, - "narHash": "sha256-1SktmSjTjC1rhJwQ+kvqUeExKogNzserFGuoGwOerHw=", + "lastModified": 1728119511, + "narHash": "sha256-kJHt+BoDTc9aYXnmy7X+kQto9cT77lDKHAYp5FyY4OY=", "owner": "shazow", "repo": "foundry.nix", - "rev": "592e8ca2e82a2c3a8d0d4dcc7f7c5b8c3842efcd", + "rev": "c45f6bc1f2110b1d209e116be203648a06a02f80", "type": "github" }, "original": { @@ -473,11 +508,11 @@ ] }, "locked": { - "lastModified": 1724857454, - "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -537,11 +572,11 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { @@ -586,9 +621,24 @@ "type": "github" } }, + "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" + } + }, "microvm": { "inputs": { - "fenix": "fenix_2", "flake-utils": [ "flake-utils" ], @@ -598,11 +648,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1723470968, - "narHash": "sha256-W76xLG4thxkENM3MOoXWYqKPrgk1WgUWzTixUyuw/co=", + "lastModified": 1728779945, + "narHash": "sha256-RFKyZygnUbJlWq1uBn4JvEEcQKZW3AFBL3bQoywECPI=", "owner": "astro", "repo": "microvm.nix", - "rev": "69e8ac63a7a4d40bb65e73af41ba60df2eba0419", + "rev": "4d81c4115ef832880561f243efec21f06d2a8b7c", "type": "github" }, "original": { @@ -617,23 +667,24 @@ "devenv", "flake-compat" ], - "nixpkgs": [ - "devenv", - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression" + "flake-parts": "flake-parts", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression", + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1712911606, - "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=", + "lastModified": 1727438425, + "narHash": "sha256-X8ES7I1cfNhR9oKp06F6ir4Np70WGZU5sfCOuNBEwMg=", "owner": "domenkozar", "repo": "nix", - "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12", + "rev": "f6c5ae4c1b2e411e6b1e6a8181cc84363d6a7546", "type": "github" }, "original": { "owner": "domenkozar", - "ref": "devenv-2.21", + "ref": "devenv-2.24", "repo": "nix", "type": "github" } @@ -645,11 +696,11 @@ ] }, "locked": { - "lastModified": 1724994893, - "narHash": "sha256-yutISDGg6HUaZqCaa54EcsfTwew3vhNtt/FNXBBo44g=", + "lastModified": 1729579044, + "narHash": "sha256-0kEUVl5s8LHbK4/xEePflsdYVwG+RRFSIofSvITYmIU=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "c8d3157d1f768e382de5526bb38e74d2245cad04", + "rev": "64d9d1ae25215c274c37e3e4016977a6779cf0d3", "type": "github" }, "original": { @@ -668,11 +719,11 @@ ] }, "locked": { - "lastModified": 1724996935, - "narHash": "sha256-njRK9vvZ1JJsP8oV2OgkBrpJhgQezI03S7gzskCcHos=", + "lastModified": 1729339656, + "narHash": "sha256-smV7HQ/OqZeRguQxNjsb3uQDwm0p6zKDbSDbPCav/oY=", "owner": "nlewo", "repo": "nix2container", - "rev": "fa6bb0a1159f55d071ba99331355955ae30b3401", + "rev": "cc96df7c3747c61c584d757cfc083922b4f4b33e", "type": "github" }, "original": { @@ -687,15 +738,15 @@ "flake-parts" ], "flake-root": "flake-root_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1724296831, - "narHash": "sha256-+X9cc5fNEUtp6e+EZ2d9tjfPiXVcqkddEz1T/C9H5sc=", + "lastModified": 1729400108, + "narHash": "sha256-aKCdN1LjqHMIyVX44ETMkWCH1olh1Rd+AaKLFUDHMuA=", "owner": "nix-community", "repo": "nixd", - "rev": "f6ca74330b49c45f50cead6d0ac0469f8f830f88", + "rev": "d3c7e560bb8034926628099a04deb26afd575e1f", "type": "github" }, "original": { @@ -722,11 +773,11 @@ }, "nixos-2405": { "locked": { - "lastModified": 1725001927, - "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", + "lastModified": 1729307008, + "narHash": "sha256-QUvb6epgKi9pCu9CttRQW4y5NqJ+snKr1FZpG/x3Wtc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", + "rev": "a9b86fc2290b69375c5542b622088eb6eca2a7c3", "type": "github" }, "original": { @@ -756,11 +807,11 @@ ] }, "locked": { - "lastModified": 1724687279, - "narHash": "sha256-3YKbbL6y5AWK46e6B1MNAl5PC5ik2ws1Lzoq03J4Cq8=", + "lastModified": 1729496181, + "narHash": "sha256-LrCxIU6laEf4JD1QtOBNr+PASY6CbNPpUrjLIUizt+Y=", "owner": "numtide", "repo": "nixos-anywhere", - "rev": "2991be5b522c88244b8833dd662cac406e3d5d28", + "rev": "51d347d35caec995d36d1450cb5bb183318c7fb7", "type": "github" }, "original": { @@ -779,11 +830,11 @@ ] }, "locked": { - "lastModified": 1724028934, - "narHash": "sha256-2M5dqS7UbAKfrO+1U+P/t5S2QIGbuGIsTNMYJzwB17g=", + "lastModified": 1729474182, + "narHash": "sha256-kZYRf6nSVgDwqLFRZEi06rypSVzh3pOwTVA3jegox7g=", "owner": "nix-community", "repo": "nixos-images", - "rev": "b733f0680a42cc01d6ad53896fb5ca40a66d5e79", + "rev": "a5fbf34b25d54d1afe2366407bd094ea966bea1c", "type": "github" }, "original": { @@ -794,11 +845,11 @@ }, "nixos-stable": { "locked": { - "lastModified": 1717696253, - "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", + "lastModified": 1727264057, + "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b", + "rev": "759537f06e6999e141588ff1c9be7f3a5c060106", "type": "github" }, "original": { @@ -810,17 +861,61 @@ }, "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-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + } + }, + "nixpkgs-nethermind": { + "locked": { + "lastModified": 1719317636, + "narHash": "sha256-bu0xbu2Z6DDzA9LGV81yJunIti6r7tjUImeR8orAL/I=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9c513fc6fb75142f6aec6b7545cb8af2236b80f5", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9c513fc6fb75142f6aec6b7545cb8af2236b80f5", "type": "github" } }, @@ -842,11 +937,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -857,6 +952,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1714562304, "narHash": "sha256-Mr3U37Rh6tH0FbaDFu0aZDwk9mPAe7ASaqDOGgLqqLU=", @@ -872,6 +983,42 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": [ + "devenv", + "nix" + ], + "flake-utils": "flake-utils", + "gitignore": [ + "devenv", + "nix" + ], + "nixpkgs": [ + "devenv", + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "devenv", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -883,8 +1030,8 @@ "ethereum-nix": "ethereum-nix", "fenix": "fenix", "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "flake-utils": "flake-utils", + "flake-parts": "flake-parts_2", + "flake-utils": "flake-utils_2", "flake-utils-plus": "flake-utils-plus", "git-hooks-nix": "git-hooks-nix", "hercules-ci-effects": "hercules-ci-effects", @@ -911,28 +1058,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1725039453, - "narHash": "sha256-h8Pn1th2bss7yXvxs1uR1kXYMTNej1L6Qy/GgsR4t3A=", + "lastModified": 1729533545, + "narHash": "sha256-A/AuEWcGwwjpfBCZqWDNNg5GwYrJduzLvlMe+A7xG5U=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "9fd70519507b673fae250f84b0990e7e8155ca98", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-analyzer-src_2": { - "flake": false, - "locked": { - "lastModified": 1722521768, - "narHash": "sha256-FvJ4FaMy1kJbZ3Iw1RyvuiUAsbHJXoU2HwylzaFzj1o=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "f149dc5029d8406fae8b2c541603bcac06e30deb", + "rev": "de2ff17bc513807412d7bbaba1d995a774938583", "type": "github" }, "original": { @@ -973,24 +1103,38 @@ "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": [ - "flake-utils" - ], + "flake-parts": "flake-parts_3", "nixpkgs": [ - "nixos-2311" + "nixpkgs-unstable" ], + "systems": "systems_2", "terranix-examples": "terranix-examples" }, "locked": { - "lastModified": 1695406838, - "narHash": "sha256-xiUfVD6rtsVWFotVtUW3Q1nQh4obKzgvpN1wqZuGXvM=", + "lastModified": 1728959489, + "narHash": "sha256-1Pu2j5xsBTuoyga08ZVf+rKp3FOMmJh/0fXen/idOrA=", "owner": "terranix", "repo": "terranix", - "rev": "fc9077ca02ab5681935dbf0ecd725c4d889b9275", + "rev": "7734e2ee6a1472807a33ce1e7da794bed2aaf91c", "type": "github" }, "original": { @@ -1001,11 +1145,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": { @@ -1042,11 +1186,11 @@ ] }, "locked": { - "lastModified": 1724833132, - "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", + "lastModified": 1729242555, + "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", + "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", "type": "github" }, "original": { @@ -1057,7 +1201,7 @@ }, "validator-ejector": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_4", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index d7c7043a..19cfeb8c 100644 --- a/flake.nix +++ b/flake.nix @@ -71,13 +71,15 @@ ethereum-nix = { url = "github:metacraft-labs/ethereum.nix"; inputs = { - nixpkgs.follows = "nixos-2311"; + nixpkgs.follows = "nixpkgs"; + nixpkgs-2311.follows = "nixos-2311"; nixpkgs-unstable.follows = "nixpkgs-unstable"; flake-parts.follows = "flake-parts"; flake-utils.follows = "flake-utils"; systems.follows = "systems"; flake-compat.follows = "flake-compat"; treefmt-nix.follows = "treefmt-nix"; + fenix.follows = "fenix"; }; }; @@ -165,8 +167,7 @@ terranix = { url = "github:terranix/terranix"; inputs = { - nixpkgs.follows = "nixos-2311"; - flake-utils.follows = "flake-utils"; + nixpkgs.follows = "nixpkgs-unstable"; }; }; @@ -193,7 +194,6 @@ crane = { url = "github:ipetkov/crane"; - inputs.nixpkgs.follows = "nixpkgs"; }; dlang-nix = { diff --git a/packages/default.nix b/packages/default.nix index f15281e9..ed52b2e7 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -68,6 +68,7 @@ inherit (legacyPackages) rustToolchain; inherit (legacyPackages.inputs.dlang-nix) dub; inherit (legacyPackages.inputs.nixpkgs) cachix nix nix-eval-jobs nix-fast-build; + inherit (legacyPackages.inputs.ethereum-nix) foundry; } // optionalAttrs (system == "x86_64-linux" || system == "aarch64-darwin") { inherit (legacyPackages.inputs.ethereum-nix) geth; @@ -80,9 +81,6 @@ inherit (legacyPackages.inputs.terranix) terranix; inherit (legacyPackages.inputs.dlang-nix) dcd dscanner serve-d dmd ldc; inherit (legacyPackages.inputs.ethereum-nix) mev-boost nethermind web3signer nimbus-eth2; - foundry = legacyPackages.inputs.ethereum-nix.foundry.override { - rustPlatform = pkgs.rustPlatform; - }; }; }; }