Skip to content

Commit 05d1d4e

Browse files
committed
flake: use this repo's hevm
Had to remove aarch64-darwin, as GHC 8.10.4 isn't supported on this platform.
1 parent f38f583 commit 05d1d4e

File tree

2 files changed

+9
-109
lines changed

2 files changed

+9
-109
lines changed

flake.lock

Lines changed: 1 addition & 104 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,29 @@
44
inputs = {
55
# same as in default.nix
66
nixpkgs.url = "github:NixOS/nixpkgs/aa576357673d609e618d87db43210e49d4bb1789";
7-
ethereum-hevm.url = "github:ethereum/hevm";
87
};
98

109
nixConfig = {
10+
# required to build hevm
11+
allow-import-from-derivation = true;
1112
extra-substituters = [ "https://dapp.cachix.org" ];
1213
extra-substituters-public-keys = [ "dapp.cachix.org-1:9GJt9Ja8IQwR7YW/aF0QvCa6OmjGmsKoZIist0dG+Rs=" ];
1314
};
1415

15-
outputs = { self, nixpkgs, ethereum-hevm }:
16+
outputs = { self, nixpkgs }:
1617
let
1718
supportedSystems = [
18-
"aarch64-darwin"
1919
"aarch64-linux"
2020

2121
"x86_64-darwin"
2222
"x86_64-linux"
2323
];
2424

2525
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
26-
nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
26+
nixpkgsFor = forAllSystems (system: import nixpkgs {
27+
inherit system;
28+
overlays = [ (import ./overlay.nix) ];
29+
});
2730
in
2831
{
2932
packages =
@@ -36,7 +39,7 @@
3639
rec {
3740
dapp = pkgs.callPackage (import ./src/dapp) { inherit dapptoolsSrc hevm seth; };
3841
ethsign = pkgs.callPackage (import ./src/ethsign) { };
39-
hevm = ethereum-hevm.packages.${system}.hevm;
42+
hevm = pkgs.hevm;
4043
seth = pkgs.callPackage (import ./src/seth) { inherit dapptoolsSrc hevm ethsign; };
4144
});
4245

0 commit comments

Comments
 (0)