From feeaa873f9ef3c0d05c9abef1345625934a4a2d3 Mon Sep 17 00:00:00 2001 From: Ro6afF Date: Tue, 11 Mar 2025 16:41:46 +0200 Subject: [PATCH 1/5] feat(pkgs/foundry): Implement package for foundry v1.0.0 --- packages/all-packages.nix | 6 ++++++ packages/default.nix | 3 +++ packages/foundry/default.nix | 39 ++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 packages/foundry/default.nix diff --git a/packages/all-packages.nix b/packages/all-packages.nix index 4fff0e1d..97b67191 100644 --- a/packages/all-packages.nix +++ b/packages/all-packages.nix @@ -23,6 +23,7 @@ cardano-cli pkgs-with-rust-overlay rust-bin-2024-08-01 + unstable-pkgs ; python3Packages = pkgs.python3Packages; @@ -119,6 +120,8 @@ graphql = callPackage ./graphql/default.nix { inherit cardano-cli cardano-node; }; cardano = callPackage ./cardano/default.nix { inherit cardano-cli cardano-node graphql; }; + foundry = callPackage ./foundry/default.nix { inherit unstable-pkgs; }; + polkadot-generic = callPackage ./polkadot/default.nix { craneLib = craneLib-stable; inherit (darwin) libiconv; @@ -189,6 +192,9 @@ { legacyPackages.metacraft-labs = rec { + + inherit foundry; + gaiad = callPackage ./gaiad { }; cosmos-theta-testnet = callPackage ./cosmos-theta-testnet { inherit gaiad; }; blst = callPackage ./blst { }; diff --git a/packages/default.nix b/packages/default.nix index b31fb44d..9d75dc05 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -23,6 +23,8 @@ in pkgs.extend rust-overlay; + unstable-pkgs = inputs.nixpkgs-unstable.legacyPackages.${system}; + rust-stable = pkgs-with-rust-overlay.rust-bin.stable.latest.default.override { extensions = [ "rust-src" ]; targets = [ @@ -90,6 +92,7 @@ craneLib-stable craneLib-nightly pkgs-with-rust-overlay + unstable-pkgs ; rust-bin-2024-08-01 = inputs.rust-overlay-2024-08-01.lib.mkRustBin { } pkgs; diff --git a/packages/foundry/default.nix b/packages/foundry/default.nix new file mode 100644 index 00000000..71882fa4 --- /dev/null +++ b/packages/foundry/default.nix @@ -0,0 +1,39 @@ +{ + unstable-pkgs, + ... +}: +with unstable-pkgs; +rustPlatform.buildRustPackage rec { + pname = "foundry"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "foundry-rs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-YTsneUj5OPw7EyKZMFLJJeAtZoD0je1DdmfMjVju4L8="; + }; + + solc-bin-json = fetchurl { + url = "https://raw.githubusercontent.com/ethereum/solc-bin/f5f39aa9f399dbd24e2dcbccb9e277c573a49d1b/linux-amd64/list.json"; + hash = "sha256-uiVRa6ewZDd1W62Vp5GGruJDO+fH8G8abVkz3XZZ/u8="; + }; + + cargoLock = { + lockFile = "${src}/Cargo.lock"; + }; + + doCheck = false; + + SVM_RELEASES_LIST_JSON = "${solc-bin-json}"; + + meta = { + description = "Foundry is a blazing fast, portable and modular toolkit for Ethereum application development written in Rust."; + homepage = "https://github.com/foundry-rs/foundry"; + license = [ + lib.licenses.mit + lib.licenses.asl20 + ]; + maintainers = [ ]; + }; +} From 1ccba1d0635c656db62b52e608464425bf782765 Mon Sep 17 00:00:00 2001 From: Ro6afF Date: Thu, 13 Mar 2025 16:12:49 +0200 Subject: [PATCH 2/5] feat(pkgs/cargo-stylus): Implement package for cargo-stylus v0.5.8 --- flake.nix | 1 + packages/all-packages.nix | 2 ++ packages/cargo-stylus/default.nix | 38 +++++++++++++++++++++++++++++++ shells/stylus.nix | 8 +++++++ 4 files changed, 49 insertions(+) create mode 100644 packages/cargo-stylus/default.nix create mode 100644 shells/stylus.nix diff --git a/flake.nix b/flake.nix index 9a394145..b94495cf 100644 --- a/flake.nix +++ b/flake.nix @@ -75,6 +75,7 @@ devShells.zkwasm = import ./shells/zkwasm.nix { pkgs = final; }; devShells.sp1 = import ./shells/sp1.nix { pkgs = final; }; devShells.risc0 = import ./shells/risc0.nix { pkgs = final; }; + devShells.stylus = import ./shells/stylus.nix { pkgs = final; }; }; }; } diff --git a/packages/all-packages.nix b/packages/all-packages.nix index 97b67191..5b6e293d 100644 --- a/packages/all-packages.nix +++ b/packages/all-packages.nix @@ -121,6 +121,7 @@ cardano = callPackage ./cardano/default.nix { inherit cardano-cli cardano-node graphql; }; foundry = callPackage ./foundry/default.nix { inherit unstable-pkgs; }; + cargo-stylus = callPackage ./cargo-stylus/default.nix { inherit unstable-pkgs; }; polkadot-generic = callPackage ./polkadot/default.nix { craneLib = craneLib-stable; @@ -194,6 +195,7 @@ rec { inherit foundry; + inherit cargo-stylus; gaiad = callPackage ./gaiad { }; cosmos-theta-testnet = callPackage ./cosmos-theta-testnet { inherit gaiad; }; diff --git a/packages/cargo-stylus/default.nix b/packages/cargo-stylus/default.nix new file mode 100644 index 00000000..281b70ce --- /dev/null +++ b/packages/cargo-stylus/default.nix @@ -0,0 +1,38 @@ +{ + unstable-pkgs, + ... +}: +with unstable-pkgs; +rustPlatform.buildRustPackage rec { + pname = "cargo-stylus"; + version = "0.5.8"; + + src = fetchFromGitHub { + owner = "OffchainLabs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-+wHGGzd4GWWmHnxset90s9FAzOjF7VMr58HZHUB+OwQ="; + }; + + cargoLock = { + lockFile = "${src}/Cargo.lock"; + }; + + buildInputs = [ + cargo + openssl + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + meta = { + description = "Cargo subcommand for developing Arbitrum Stylus projects in Rust."; + homepage = "https://github.com/OffchainLabs/cargo-stylus"; + license = [ + lib.licenses.mit + lib.licenses.asl20 + ]; + }; +} diff --git a/shells/stylus.nix b/shells/stylus.nix new file mode 100644 index 00000000..4da7a431 --- /dev/null +++ b/shells/stylus.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +with pkgs; +mkShell { + packages = [ + metacraft-labs.foundry + metacraft-labs.cargo-stylus + ]; +} From 1514b274999ea071bf4a1c8079211a61683b0ff8 Mon Sep 17 00:00:00 2001 From: Ro6afF Date: Fri, 14 Mar 2025 11:03:24 +0200 Subject: [PATCH 3/5] feat(pkgs/nitro-devnode): Implement package for nitro-devnode commit dd51c52 --- packages/all-packages.nix | 2 ++ packages/nitro-devnode/default.nix | 36 ++++++++++++++++++++++++++++++ shells/stylus.nix | 1 + 3 files changed, 39 insertions(+) create mode 100644 packages/nitro-devnode/default.nix diff --git a/packages/all-packages.nix b/packages/all-packages.nix index 5b6e293d..e1b4aa37 100644 --- a/packages/all-packages.nix +++ b/packages/all-packages.nix @@ -122,6 +122,7 @@ foundry = callPackage ./foundry/default.nix { inherit unstable-pkgs; }; cargo-stylus = callPackage ./cargo-stylus/default.nix { inherit unstable-pkgs; }; + nitro-devnode = callPackage ./nitro-devnode/default.nix { inherit foundry; }; polkadot-generic = callPackage ./polkadot/default.nix { craneLib = craneLib-stable; @@ -196,6 +197,7 @@ inherit foundry; inherit cargo-stylus; + inherit nitro-devnode; gaiad = callPackage ./gaiad { }; cosmos-theta-testnet = callPackage ./cosmos-theta-testnet { inherit gaiad; }; diff --git a/packages/nitro-devnode/default.nix b/packages/nitro-devnode/default.nix new file mode 100644 index 00000000..301eeba7 --- /dev/null +++ b/packages/nitro-devnode/default.nix @@ -0,0 +1,36 @@ +{ + foundry, + pkgs, + stdenv, +}: +with pkgs; +stdenv.mkDerivation rec { + pname = "nitro-devnode"; + version = "dd51c52"; + + src = fetchFromGitHub { + owner = "OffchainLabs"; + repo = "nitro-devnode"; + rev = "dd51c52129276f940632a4c4bf13844a93499a9f"; + hash = "sha256-0ppC05xfVOrcn2yATni3n3oh4A8MEMdgvhs8E2wNsr8="; + }; + + buildInputs = [ + bash + docker + foundry + ]; + + buildPhase = '' + mkdir -p $out/bin + cp ${src}/run-dev-node.sh $out/bin/run-nitro-devnode + ''; + + meta = { + description = "A script for running an Arbitrum Nitro dev node and deploying contracts for testing."; + homepage = "https://github.com/OffchainLabs/nitro-devnode"; + license = [ + lib.licenses.asl20 + ]; + }; +} diff --git a/shells/stylus.nix b/shells/stylus.nix index 4da7a431..416ed09f 100644 --- a/shells/stylus.nix +++ b/shells/stylus.nix @@ -4,5 +4,6 @@ mkShell { packages = [ metacraft-labs.foundry metacraft-labs.cargo-stylus + metacraft-labs.nitro-devnode ]; } From 93130c697c51a13673145469815cb9cfff0f4c5e Mon Sep 17 00:00:00 2001 From: Dimo Chanev Date: Mon, 19 May 2025 17:35:38 +0300 Subject: [PATCH 4/5] feat: Add rustup to stylus devshell --- shells/stylus.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/shells/stylus.nix b/shells/stylus.nix index 416ed09f..c8faa75d 100644 --- a/shells/stylus.nix +++ b/shells/stylus.nix @@ -2,6 +2,7 @@ with pkgs; mkShell { packages = [ + pkgs.rustup metacraft-labs.foundry metacraft-labs.cargo-stylus metacraft-labs.nitro-devnode From 81e8abd12975c24be23174aab138ac5c76a0572b Mon Sep 17 00:00:00 2001 From: Ro6afF Date: Tue, 3 Jun 2025 16:49:48 +0300 Subject: [PATCH 5/5] chore(stylus-tools): bump package versions --- flake.lock | 370 +++++++++++++---------------- packages/cargo-stylus/default.nix | 4 +- packages/foundry/default.nix | 4 +- packages/nitro-devnode/default.nix | 6 +- 4 files changed, 176 insertions(+), 208 deletions(-) diff --git a/flake.lock b/flake.lock index 60812caa..01e7f938 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1747575206, + "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "4835b1dc898959d8547a871ef484930675cb47f1", "type": "github" }, "original": { @@ -33,38 +33,6 @@ "type": "github" } }, - "bats-assert": { - "flake": false, - "locked": { - "lastModified": 1692829535, - "narHash": "sha256-oDqhUQ6Xg7a3xx537SWLGRzqP3oKKeyY4UYGCdz9z/Y=", - "owner": "bats-core", - "repo": "bats-assert", - "rev": "e2d855bc78619ee15b0c702b5c30fb074101159f", - "type": "github" - }, - "original": { - "owner": "bats-core", - "repo": "bats-assert", - "type": "github" - } - }, - "bats-support": { - "flake": false, - "locked": { - "lastModified": 1693050811, - "narHash": "sha256-PxJaH16+QrsfZqtkWVt5K6TwJB5gjIXnbGo+MB84WIU=", - "owner": "bats-core", - "repo": "bats-support", - "rev": "9bf10e876dd6b624fe44423f0b35e064225f7556", - "type": "github" - }, - "original": { - "owner": "bats-core", - "repo": "bats-support", - "type": "github" - } - }, "cachix": { "inputs": { "devenv": [ @@ -85,11 +53,11 @@ ] }, "locked": { - "lastModified": 1737621947, - "narHash": "sha256-8HFvG7fvIFbgtaYAY2628Tb89fA55nPm2jSiNs0/Cws=", + "lastModified": 1748418317, + "narHash": "sha256-PbqdJPZfLl3NCBjUQELKyTokSpoFCF5hBhCbdbpDxqU=", "owner": "cachix", "repo": "cachix", - "rev": "f65a3cd5e339c223471e64c051434616e18cc4f5", + "rev": "b0b77d1c63d8e0fdf472a4669d8d3b69a2a53864", "type": "github" }, "original": { @@ -100,11 +68,11 @@ }, "crane": { "locked": { - "lastModified": 1739936662, - "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=", + "lastModified": 1748047550, + "narHash": "sha256-t0qLLqb4C1rdtiY8IFRH5KIapTY/n3Lqt57AmxEv9mk=", "owner": "ipetkov", "repo": "crane", - "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7", + "rev": "b718a78696060df6280196a6f992d04c87a16aef", "type": "github" }, "original": { @@ -134,11 +102,11 @@ ] }, "locked": { - "lastModified": 1740851740, - "narHash": "sha256-urr8VnD7dXWd6io9DmwVlboa0Or9ygsahx1UAft7ZxY=", + "lastModified": 1748688634, + "narHash": "sha256-S9J86Dn05c1Skk1dpOEUM2AgO+tkiAyaGXT2PZLMcRM=", "owner": "cachix", "repo": "devenv", - "rev": "56e488989b3d72cd8e30ddd419e879658609bf88", + "rev": "df38744269cc4ea8cee9e36fe882e9ef786df11b", "type": "github" }, "original": { @@ -172,11 +140,11 @@ ] }, "locked": { - "lastModified": 1735644329, - "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", + "lastModified": 1741473158, + "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", "owner": "numtide", "repo": "devshell", - "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", + "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", "type": "github" }, "original": { @@ -193,11 +161,11 @@ ] }, "locked": { - "lastModified": 1740485968, - "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", + "lastModified": 1748225455, + "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", "owner": "nix-community", "repo": "disko", - "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", + "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", "type": "github" }, "original": { @@ -219,17 +187,17 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1714055636, - "narHash": "sha256-8LCyIPAK4/4ge03ohCIWpoJrMGgoCaOriALzt7gPxHE=", + "lastModified": 1744296746, + "narHash": "sha256-x9rQjZceKcCte+gZcy0EmrNw5WEXVpP130w2YIVLEnw=", "owner": "PetarKirov", "repo": "dlang.nix", - "rev": "dab4c199ad644dc23b0b9481e2e5a063e9492b84", + "rev": "e7c6c25978f5ec0a7b8ebae703dad3460d7fcceb", "type": "github" }, "original": { "owner": "PetarKirov", + "ref": "feat/build-dub-package", "repo": "dlang.nix", - "rev": "dab4c199ad644dc23b0b9481e2e5a063e9492b84", "type": "github" } }, @@ -255,6 +223,7 @@ ], "foundry-nix": "foundry-nix", "lib-extras": "lib-extras", + "nimbus-eth2": "nimbus-eth2", "nixpkgs": [ "nixos-modules", "nixos-2405" @@ -277,11 +246,11 @@ ] }, "locked": { - "lastModified": 1740477392, - "narHash": "sha256-Xs+cYer4cWYHdqTizUGEAKYzQSrHTkfDuVyfwzhB78E=", + "lastModified": 1744119391, + "narHash": "sha256-MEIZA2KiU6UVg2QJkBCPfKqGkG46mBT0SQATOiem2uo=", "owner": "metacraft-labs", "repo": "ethereum.nix", - "rev": "8bd2db47e19cb9219f6d039a82e4d55df8e0887b", + "rev": "207e072a3b1e61aee725ec9ff29b16e85006ade1", "type": "github" }, "original": { @@ -299,11 +268,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1740810935, - "narHash": "sha256-6RzWfxENGlO73jQb3uQNgOvubUFwvveeIg+PZxhAu6s=", + "lastModified": 1748673500, + "narHash": "sha256-gILKNw2g7eGXt1aVJM0pUdeJQX0z6kXZNoiAJPjXHTo=", "owner": "nix-community", "repo": "fenix", - "rev": "f44d7c3596ff028ad9f7fcc31d1941ed585f11b3", + "rev": "4064670e8aeab5353001612efd17b19c7af7fde4", "type": "github" }, "original": { @@ -315,11 +284,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -359,11 +328,11 @@ ] }, "locked": { - "lastModified": 1740872218, - "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3876f6b87db82f33775b1ef5ea343986105db764", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -394,28 +363,6 @@ "type": "github" } }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": [ - "nixos-modules", - "validator-ejector", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-root": { "locked": { "lastModified": 1692742795, @@ -502,11 +449,11 @@ ] }, "locked": { - "lastModified": 1738660302, - "narHash": "sha256-aLWyhJx2cO/M3/QLoDBpsObFfjC9e/VEN6HtaI0U6IA=", + "lastModified": 1743671500, + "narHash": "sha256-IJ2vPxTzDQNIEKScJ3JDOXBOJoXglErDeUI/I6rBOfU=", "owner": "shazow", "repo": "foundry.nix", - "rev": "33a209625b9e31227a5f11417e95a3ac7264d811", + "rev": "815a4d4a35ebf5c4ef855d8d4c5655fcbe63ee41", "type": "github" }, "original": { @@ -529,11 +476,11 @@ ] }, "locked": { - "lastModified": 1740870877, - "narHash": "sha256-LWDIJvKWMW0tiih1jTcAK0ncTi3S9IF3gOhpCT1ydik=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "25d4946dfc2021584f5bde1fbd2aa97353384a95", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -576,11 +523,11 @@ ] }, "locked": { - "lastModified": 1739595404, - "narHash": "sha256-0CjCfbq0yHWexOrpO06e2WU1r5JAqR6ffy1zgM3NksI=", + "lastModified": 1748000383, + "narHash": "sha256-EaAJhwfJGBncgIV/0NlJviid2DP93cTMc9h0q6P6xXk=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "06519cec8fb32d219006da6eacd255504a9996af", + "rev": "231726642197817d20310b9d39dd4afb9e899489", "type": "github" }, "original": { @@ -597,16 +544,37 @@ ] }, "locked": { - "lastModified": 1739757849, - "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", + "lastModified": 1748665073, + "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "282e1e029cb6ab4811114fc85110613d72771dea", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-25.05", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager-unstable": { + "inputs": { + "nixpkgs": [ + "nixos-modules", + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1748737919, + "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", + "rev": "5675a9686851d9626560052a032c4e14e533c1fa", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -679,11 +647,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1739104176, - "narHash": "sha256-bNvtud2PUcbYM0i5Uq1v01Dcgq7RuhVKfjaSKkW2KRI=", + "lastModified": 1748464257, + "narHash": "sha256-PdnQSE2vPfql9WEjunj2qQnDpuuvk7HH+4djgXJSwFs=", "owner": "astro", "repo": "microvm.nix", - "rev": "d3a9b7504d420a1ffd7c83c1bb8fe57deaf939d2", + "rev": "e238645b6f0447a2eb1d538d300d5049d4006f9f", "type": "github" }, "original": { @@ -692,6 +660,31 @@ "type": "github" } }, + "nimbus-eth2": { + "inputs": { + "nixpkgs": [ + "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": [ @@ -715,11 +708,11 @@ ] }, "locked": { - "lastModified": 1734114420, - "narHash": "sha256-n52PUzub5jZWc8nI/sR7UICOheU8rNA+YZ73YaHeCBg=", + "lastModified": 1745930071, + "narHash": "sha256-bYyjarS3qSNqxfgc89IoVz8cAFDkF9yPE63EJr+h50s=", "owner": "domenkozar", "repo": "nix", - "rev": "bde6a1a0d1f2af86caa4d20d23eca019f3d57eee", + "rev": "b455edf3505f1bf0172b39a735caef94687d0d9c", "type": "github" }, "original": { @@ -737,11 +730,11 @@ ] }, "locked": { - "lastModified": 1740755725, - "narHash": "sha256-amZbqP84H/ApugaT+TADXTB3NbjkVHI9Vac1saIk0kE=", + "lastModified": 1748352827, + "narHash": "sha256-sNUUP6qxGkK9hXgJ+p362dtWLgnIWwOCmiq72LAWtYo=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "5d6e0851b60508cffd66b4a6982440a40720338d", + "rev": "44a7d0e687a87b73facfe94fba78d323a6686a90", "type": "github" }, "original": { @@ -762,11 +755,11 @@ ] }, "locked": { - "lastModified": 1739638901, - "narHash": "sha256-w+mIxNbEaOh2JqDwV2BLt71GZTBMzTyHhm3JYG0rkj0=", + "lastModified": 1744699837, + "narHash": "sha256-mJ1OgxMM2VTTjSVrMZItM8DxttzROYbWkmEPvYF/Kpg=", "owner": "nlewo", "repo": "nix2container", - "rev": "50818838feff20902ff9004dcdef1aeb7098e488", + "rev": "78aadfc4ee1f9c2ee256e304b180ca356eb6a045", "type": "github" }, "original": { @@ -786,11 +779,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739259093, - "narHash": "sha256-pltdsmg4oh1AVNrMbKUgx1VPbndVdCGID5mrBmRIdVI=", + "lastModified": 1746955667, + "narHash": "sha256-VgVbPqZl8S09EGWFmgX++aFsz0Z7VmskSJGBXFE4eEs=", "owner": "nix-community", "repo": "nixd", - "rev": "065dcb4cb2f8269d6d15d2b2491a79cff47f9550", + "rev": "7d19dfe5b65035aa255b83147375fdd8257459b9", "type": "github" }, "original": { @@ -833,11 +826,11 @@ }, "nixos-2411": { "locked": { - "lastModified": 1740743217, - "narHash": "sha256-brsCRzLqimpyhORma84c3W2xPbIidZlIc3JGIuQVSNI=", + "lastModified": 1748421225, + "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b27ba4eb322d9d2bf2dc9ada9fd59442f50c8d7c", + "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b", "type": "github" }, "original": { @@ -847,6 +840,22 @@ "type": "github" } }, + "nixos-2505": { + "locked": { + "lastModified": 1748437600, + "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixos-anywhere": { "inputs": { "disko": [ @@ -872,11 +881,11 @@ ] }, "locked": { - "lastModified": 1740657886, - "narHash": "sha256-7kHxBQuzb7gcHzVmLGljJ4kF6BDDSYVCIxYFDmYPnAo=", + "lastModified": 1748730521, + "narHash": "sha256-2kDq3hkaxj9aQLc54I8DzAGmmCP3vbdzCDs2/9le3Uw=", "owner": "numtide", "repo": "nixos-anywhere", - "rev": "77e6a4e14baa93a29952ea9f0e4a59a29cca09e9", + "rev": "d2cebeb849a2331b68c986bfefb258cc4319e2ed", "type": "github" }, "original": { @@ -889,7 +898,7 @@ "inputs": { "nixos-stable": [ "nixos-modules", - "nixos-2405" + "nixos-2505" ], "nixos-unstable": [ "nixos-modules", @@ -897,11 +906,11 @@ ] }, "locked": { - "lastModified": 1740452541, - "narHash": "sha256-aa5gPveHysMTVkxj+0iH0BdcSn8+v8lZPud+IItOSaQ=", + "lastModified": 1748481078, + "narHash": "sha256-jwKRF2EDzlv0VBF8pImPFT7DAJma7stDun25utHtwBw=", "owner": "nix-community", "repo": "nixos-images", - "rev": "283bbacb81bd2c1a7b89f33e011ecabe398a564e", + "rev": "191a461dc38313ff41bd3df4b82e49f74a56560d", "type": "github" }, "original": { @@ -927,6 +936,7 @@ "git-hooks-nix": "git-hooks-nix", "hercules-ci-effects": "hercules-ci-effects", "home-manager": "home-manager", + "home-manager-unstable": "home-manager-unstable", "microvm": "microvm", "nix-darwin": "nix-darwin", "nix2container": "nix2container", @@ -934,25 +944,25 @@ "nixos-2311": "nixos-2311", "nixos-2405": "nixos-2405", "nixos-2411": "nixos-2411", + "nixos-2505": "nixos-2505", "nixos-anywhere": "nixos-anywhere", "nixos-images": "nixos-images", "nixpkgs": [ "nixos-modules", - "nixos-2411" + "nixos-2505" ], "nixpkgs-unstable": "nixpkgs-unstable", "systems": "systems", "terranix": "terranix", "treefmt-nix": "treefmt-nix_2", - "validator-ejector": "validator-ejector", "vscode-server": "vscode-server" }, "locked": { - "lastModified": 1741350666, - "narHash": "sha256-HD8Q9sPUxOvAt8GS0nSK2DDgT0OjckD7HTYWkGq+2v4=", + "lastModified": 1748801109, + "narHash": "sha256-RghSJ/CG4j04jElmEildWJGloBNd8frQ95yEkhEbYpE=", "owner": "metacraft-labs", "repo": "nixos-modules", - "rev": "f42b48c0b803469fda40c25fb730f937c63eb7b7", + "rev": "cd20928e83df87a1080f17c875ce8a439ebffb5a", "type": "github" }, "original": { @@ -963,16 +973,16 @@ }, "nixos-stable": { "locked": { - "lastModified": 1733808091, - "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", + "lastModified": 1748437600, + "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", + "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -995,11 +1005,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1740695751, - "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -1027,16 +1037,15 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1734435836, - "narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=", + "lastModified": 1744174375, + "narHash": "sha256-oxI9TLgnQbQ/WL0tIwVSIooLbXq4PW1QUhf5aQmXFgk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4989a246d7a390a859852baddb1013f825435cee", + "rev": "ef3a956f697525883b77192cbe208233ea0f8f79", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -1095,11 +1104,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1740737930, - "narHash": "sha256-2AW/FJQI/i6bbRB/8HR9l9SjxjuiukJpHdMPgwApPKA=", + "lastModified": 1748636115, + "narHash": "sha256-SUkOBIqQmdZK2/CHxkVf/v36JDBlFQl2uckz9gbCLVo=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "fe8444616679f8e50ff9696f4750df1f10e7433d", + "rev": "987cd076e211a02542d5d82264474bb3325e8e7e", "type": "github" }, "original": { @@ -1116,11 +1125,11 @@ ] }, "locked": { - "lastModified": 1741400194, - "narHash": "sha256-tEpgT+q5KlGjHSm8MnINgTPErEl8YDzX3Eps8PVc09g=", + "lastModified": 1748918260, + "narHash": "sha256-KhXNXQ5IDLvwwYfJ0pXDjwIuisZ2qM6F7fcXjIGZy/4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "16b6045a232fea0e9e4c69e55a6e269607dd8e3f", + "rev": "c9736155bc1eb7c7cf3a925920850e61c07ab22a", "type": "github" }, "original": { @@ -1153,11 +1162,11 @@ "spectrum": { "flake": false, "locked": { - "lastModified": 1733308308, - "narHash": "sha256-+RcbMAjSxV1wW5UpS9abIG1lFZC8bITPiFIKNnE7RLs=", + "lastModified": 1746869549, + "narHash": "sha256-BKZ/yZO/qeLKh9YqVkKB6wJiDQJAZNN5rk5NsMImsWs=", "ref": "refs/heads/main", - "rev": "80c9e9830d460c944c8f730065f18bb733bc7ee2", - "revCount": 792, + "rev": "d927e78530892ec8ed389e8fae5f38abee00ad87", + "revCount": 862, "type": "git", "url": "https://spectrum-os.org/git/spectrum" }, @@ -1198,22 +1207,19 @@ }, "terranix": { "inputs": { - "bats-assert": "bats-assert", - "bats-support": "bats-support", "flake-parts": "flake-parts_3", "nixpkgs": [ "nixos-modules", - "nixpkgs-unstable" + "nixpkgs" ], - "systems": "systems_2", - "terranix-examples": "terranix-examples" + "systems": "systems_2" }, "locked": { - "lastModified": 1739437924, - "narHash": "sha256-lRp8/Udbu8c7aR0DGCmteCXJtXsHcQAiVi6GckjEh5c=", + "lastModified": 1748688664, + "narHash": "sha256-hLZof2klWG0x8AuIZPQQKxuOcL9z8S88dOtYQxhaIGs=", "owner": "terranix", "repo": "terranix", - "rev": "bb56d576da73a2226961eff14f5530b72ca9e2e3", + "rev": "50bc78ef82c59fcc32d867e224ddcf6f66a3e655", "type": "github" }, "original": { @@ -1222,21 +1228,6 @@ "type": "github" } }, - "terranix-examples": { - "locked": { - "lastModified": 1637156952, - "narHash": "sha256-KqvXIe1yiKOEP9BRYqNQN+LOWPCsWojh0WjEgv5jfEI=", - "owner": "terranix", - "repo": "terranix-examples", - "rev": "921680efb8af0f332d8ad73718d53907f9483e24", - "type": "github" - }, - "original": { - "owner": "terranix", - "repo": "terranix-examples", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1267,11 +1258,11 @@ ] }, "locked": { - "lastModified": 1739829690, - "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", + "lastModified": 1748243702, + "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3d0579f5cc93436052d94b73925b48973a104204", + "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", "type": "github" }, "original": { @@ -1280,29 +1271,6 @@ "type": "github" } }, - "validator-ejector": { - "inputs": { - "flake-parts": "flake-parts_4", - "nixpkgs": [ - "nixos-modules", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1723454707, - "narHash": "sha256-6PmtWz2xRWcqKKCh50NFWQ9d1V0uaDHJK4F61YAYo2E=", - "owner": "metacraft-labs", - "repo": "validator-ejector", - "rev": "cd09d9167589f664267ef489d0a853151c19e480", - "type": "github" - }, - "original": { - "owner": "metacraft-labs", - "ref": "add/nix-package", - "repo": "validator-ejector", - "type": "github" - } - }, "vscode-server": { "inputs": { "flake-utils": [ diff --git a/packages/cargo-stylus/default.nix b/packages/cargo-stylus/default.nix index 281b70ce..0bf5a300 100644 --- a/packages/cargo-stylus/default.nix +++ b/packages/cargo-stylus/default.nix @@ -5,13 +5,13 @@ with unstable-pkgs; rustPlatform.buildRustPackage rec { pname = "cargo-stylus"; - version = "0.5.8"; + version = "0.6.0"; src = fetchFromGitHub { owner = "OffchainLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-+wHGGzd4GWWmHnxset90s9FAzOjF7VMr58HZHUB+OwQ="; + hash = "sha256-HmjMuAfamyp78I08VR5U22c2e+VKIL24hPotIXxtgko="; }; cargoLock = { diff --git a/packages/foundry/default.nix b/packages/foundry/default.nix index 71882fa4..275c52dc 100644 --- a/packages/foundry/default.nix +++ b/packages/foundry/default.nix @@ -5,13 +5,13 @@ with unstable-pkgs; rustPlatform.buildRustPackage rec { pname = "foundry"; - version = "1.0.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "foundry-rs"; repo = pname; rev = "v${version}"; - hash = "sha256-YTsneUj5OPw7EyKZMFLJJeAtZoD0je1DdmfMjVju4L8="; + hash = "sha256-XZHlBTFmdt4RL/JNGbHDI9XLwDRHoEr3KNCTq5oKexQ="; }; solc-bin-json = fetchurl { diff --git a/packages/nitro-devnode/default.nix b/packages/nitro-devnode/default.nix index 301eeba7..21b105b7 100644 --- a/packages/nitro-devnode/default.nix +++ b/packages/nitro-devnode/default.nix @@ -6,13 +6,13 @@ with pkgs; stdenv.mkDerivation rec { pname = "nitro-devnode"; - version = "dd51c52"; + version = "4c7e5f2"; src = fetchFromGitHub { owner = "OffchainLabs"; repo = "nitro-devnode"; - rev = "dd51c52129276f940632a4c4bf13844a93499a9f"; - hash = "sha256-0ppC05xfVOrcn2yATni3n3oh4A8MEMdgvhs8E2wNsr8="; + rev = "4c7e5f2ed12f29bb5f09a0ac0acf0ec167904434"; + hash = "sha256-AA9+fV7GslyhokDR69I3KDNvyfRoGyPZ4GEY9BqzBuU="; }; buildInputs = [