From 8b83064e9e527789eb8e4f125af999cff3f2bf77 Mon Sep 17 00:00:00 2001 From: Martin Nikov Date: Tue, 22 Oct 2024 16:06:44 +0300 Subject: [PATCH] build(flake/checks): Use ethereum.nix's original foundry derivation Now that our ethereum.nix has a proper CI: * https://github.com/metacraft-labs/ethereum.nix/pull/36 we're making sure that `foundry`'s derivation is up-to-date: * https://github.com/metacraft-labs/ethereum.nix/pull/37 With the latest fixes applied, we no longer need to override its `rustPlatform` parameter, as it's now set to fenix in ethereum.nix. --- packages/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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; - }; }; }; }