Skip to content

Commit c9d46cf

Browse files
committed
fix: rename heimdall to heimdall-rs to avoid conflicts with nixpkgs
1 parent f29ca51 commit c9d46cf

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

pkgs/default.nix

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@
3737
ethereal = callPackage ./ethereal {};
3838
evmc = callPackage ./evmc {};
3939
foundry = callPackageUnstable ./foundry {};
40-
foundry-bin = inputs.foundry-nix.defaultPackage.${system}.overrideAttrs (_oldAttrs: {
41-
# TODO: Uncomment when https://github.com/shazow/foundry.nix/issues/23
42-
# meta.platforms = [system];
43-
meta.platforms = ["x86_64-linux" "aarch64-linux"];
44-
});
40+
# foundry-bin = inputs.foundry-nix.defaultPackage.${system}.overrideAttrs (_oldAttrs: {
41+
# # TODO: Uncomment when https://github.com/shazow/foundry.nix/issues/23
42+
# # meta.platforms = [system];
43+
# meta.platforms = ["x86_64-linux" "aarch64-linux"];
44+
# });
4545
geth = callPackage ./geth {};
4646
geth-sealer = callPackage ./geth-sealer {};
47-
heimdall = callPackage ./heimdall {};
47+
heimdall-rs = callPackage ./heimdall-rs {};
4848
lighthouse = callPackage ./lighthouse {inherit foundry;};
4949
mcl = callPackage ./mcl {};
5050
mev-boost = callPackage ./mev-boost {inherit blst;};

pkgs/heimdall/default.nix renamed to pkgs/heimdall-rs/default.nix

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
pkg-config,
77
rustPlatform,
88
stdenv,
9+
nix-update-script,
910
}:
1011
rustPlatform.buildRustPackage rec {
11-
pname = "heimdall";
12+
pname = "heimdall-rs";
1213
version = "0.7.3";
1314

1415
src = fetchFromGitHub {
1516
owner = "jon-becker";
16-
repo = "${pname}-rs";
17+
repo = pname;
1718
rev = version;
1819
hash = "sha256-E3WFJ+1ps5UiA+qzJAjouBR4wJbzxrJfvcW6Kany/jU=";
1920
};
@@ -39,11 +40,14 @@ rustPlatform.buildRustPackage rec {
3940
# tested in upstream CI.
4041
doCheck = false;
4142

43+
passthru.updateScript = nix-update-script {};
44+
4245
meta = with lib; {
4346
description = "A toolkit for EVM bytecode analysis";
4447
homepage = "https://heimdall.rs";
4548
license = [licenses.mit];
4649
mainProgram = "heimdall";
4750
platforms = platforms.unix;
51+
ethereum-nix = true;
4852
};
4953
}

0 commit comments

Comments
 (0)