Skip to content

Commit 12ced6f

Browse files
committed
config(pkgs): Get nimbus package from status-im repo
1 parent a82b4b6 commit 12ced6f

File tree

3 files changed

+102
-70
lines changed

3 files changed

+102
-70
lines changed

flake.lock

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@
5656
url = "github:nix-community/fenix";
5757
inputs.nixpkgs.follows = "nixpkgs-unstable";
5858
};
59+
nimbus-eth2 = {
60+
url = "git+https://github.com/status-im/nimbus-eth2?ref=v25.3.1&submodules=1";
61+
inputs.nixpkgs.follows = "nixpkgs-unstable";
62+
};
5963
};
6064

6165
outputs = inputs @ {

pkgs/default.nix

Lines changed: 74 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
}: {
77
# add all our packages based on host platform
88
flake.overlays.default = _final: prev: let
9-
inherit (prev.stdenv.hostPlatform) system;
9+
inherit (prev.stdenv.hostPlatform) system isLinux;
1010
in
1111
if builtins.hasAttr system self.packages
1212
then self.packages.${system}
@@ -21,7 +21,8 @@
2121
system,
2222
...
2323
}: let
24-
inherit (pkgs) callPackage;
24+
inherit (pkgs) callPackage hostPlatform;
25+
inherit (hostPlatform) isLinux;
2526
inherit (lib.extras.flakes) platformPkgs platformApps;
2627
callPackageUnstable = pkgsUnstable.callPackage;
2728
callPackage2311 = pkgs2311.callPackage;
@@ -33,71 +34,74 @@
3334
rustc = rustToolchain;
3435
};
3536
in {
36-
packages = platformPkgs system rec {
37-
besu = callPackageUnstable ./besu {};
38-
bls = callPackage ./bls {};
39-
blst = callPackage ./blst {};
40-
blutgang = callPackage ./blutgang {inherit (pkgsUnstable) rustPlatform;};
41-
charon = callPackage ./charon {inherit bls mcl;};
42-
dirk = callPackage ./dirk {inherit bls mcl;};
43-
dreamboat = callPackage ./dreamboat {inherit blst;};
44-
eigenlayer = callPackage ./eigenlayer {};
45-
erigon = callPackage ./erigon {};
46-
erigon-blst-portable = erigon.overrideAttrs (_finalAttrs: _previousAttrs: {
47-
CGO_CFLAGS = "-O -D__BLST_PORTABLE__";
48-
});
49-
eth2-testnet-genesis = callPackage ./eth2-testnet-genesis {inherit bls;};
50-
eth2-val-tools = callPackage ./eth2-val-tools {inherit bls mcl;};
51-
eth-validator-watcher = callPackage2311 ./eth-validator-watcher {};
52-
ethdo = callPackage ./ethdo {inherit bls mcl;};
53-
ethereal = callPackage ./ethereal {inherit bls mcl;};
54-
evmc = callPackage ./evmc {};
55-
foundry = callPackageUnstable ./foundry {inherit rustPlatform;};
56-
foundry-bin = inputs.foundry-nix.defaultPackage.${system}.overrideAttrs (_oldAttrs: {
57-
# TODO: Uncomment when https://github.com/shazow/foundry.nix/issues/23
58-
# meta.platforms = [system];
59-
meta.platforms = ["x86_64-linux" "aarch64-linux"];
60-
});
61-
geth = callPackageUnstable ./geth {};
62-
geth-sealer = callPackage ./geth-sealer {};
63-
heimdall = callPackage ./heimdall {};
64-
lighthouse = callPackageUnstable ./lighthouse {inherit foundry;};
65-
mcl = callPackage ./mcl {};
66-
mev-boost = callPackageUnstable ./mev-boost {inherit blst;};
67-
mev-boost-builder = callPackage ./mev-boost-builder {inherit blst;};
68-
mev-boost-relay = callPackage ./mev-boost-relay {inherit blst;};
69-
mev-rs = callPackage ./mev-rs {};
70-
nethermind = callPackageUnstable ./nethermind {};
71-
nimbus = callPackageUnstable ./nimbus {};
72-
prysm = callPackage ./prysm {inherit bls blst;};
73-
reth = callPackageUnstable ./reth {};
74-
rocketpool = callPackage ./rocketpool {};
75-
rocketpoold = callPackage ./rocketpoold {inherit bls blst;};
76-
rotki-bin = callPackageUnstable ./rotki-bin {};
77-
sedge = callPackage2311 ./sedge {
78-
bls = callPackage2311 ./bls {};
79-
mcl = callPackage2311 ./mcl {};
37+
packages =
38+
platformPkgs system rec {
39+
besu = callPackageUnstable ./besu {};
40+
bls = callPackage ./bls {};
41+
blst = callPackage ./blst {};
42+
blutgang = callPackage ./blutgang {inherit (pkgsUnstable) rustPlatform;};
43+
charon = callPackage ./charon {inherit bls mcl;};
44+
dirk = callPackage ./dirk {inherit bls mcl;};
45+
dreamboat = callPackage ./dreamboat {inherit blst;};
46+
eigenlayer = callPackage ./eigenlayer {};
47+
erigon = callPackage ./erigon {};
48+
erigon-blst-portable = erigon.overrideAttrs (_finalAttrs: _previousAttrs: {
49+
CGO_CFLAGS = "-O -D__BLST_PORTABLE__";
50+
});
51+
eth2-testnet-genesis = callPackage ./eth2-testnet-genesis {inherit bls;};
52+
eth2-val-tools = callPackage ./eth2-val-tools {inherit bls mcl;};
53+
eth-validator-watcher = callPackage2311 ./eth-validator-watcher {};
54+
ethdo = callPackage ./ethdo {inherit bls mcl;};
55+
ethereal = callPackage ./ethereal {inherit bls mcl;};
56+
evmc = callPackage ./evmc {};
57+
foundry = callPackageUnstable ./foundry {inherit rustPlatform;};
58+
foundry-bin = inputs.foundry-nix.defaultPackage.${system}.overrideAttrs (_oldAttrs: {
59+
# TODO: Uncomment when https://github.com/shazow/foundry.nix/issues/23
60+
# meta.platforms = [system];
61+
meta.platforms = ["x86_64-linux" "aarch64-linux"];
62+
});
63+
geth = callPackageUnstable ./geth {};
64+
geth-sealer = callPackage ./geth-sealer {};
65+
heimdall = callPackage ./heimdall {};
66+
lighthouse = callPackageUnstable ./lighthouse {inherit foundry;};
67+
mcl = callPackage ./mcl {};
68+
mev-boost = callPackageUnstable ./mev-boost {inherit blst;};
69+
mev-boost-builder = callPackage ./mev-boost-builder {inherit blst;};
70+
mev-boost-relay = callPackage ./mev-boost-relay {inherit blst;};
71+
mev-rs = callPackage ./mev-rs {};
72+
nethermind = callPackageUnstable ./nethermind {};
73+
prysm = callPackage ./prysm {inherit bls blst;};
74+
reth = callPackageUnstable ./reth {};
75+
rocketpool = callPackage ./rocketpool {};
76+
rocketpoold = callPackage ./rocketpoold {inherit bls blst;};
77+
rotki-bin = callPackageUnstable ./rotki-bin {};
78+
sedge = callPackage2311 ./sedge {
79+
bls = callPackage2311 ./bls {};
80+
mcl = callPackage2311 ./mcl {};
81+
};
82+
slither = callPackage ./slither {};
83+
snarkjs = callPackage ./snarkjs {};
84+
ssv-dkg = callPackage2311 ./ssv-dkg {
85+
bls = callPackage2311 ./bls {};
86+
mcl = callPackage2311 ./mcl {};
87+
};
88+
ssvnode = callPackage ./ssvnode {
89+
bls = callPackage2311 ./bls {};
90+
mcl = callPackage2311 ./mcl {};
91+
};
92+
staking-deposit-cli = callPackage ./staking-deposit-cli {};
93+
teku = callPackage ./teku {};
94+
tx-fuzz = callPackage ./tx-fuzz {};
95+
vouch = callPackage ./vouch {inherit bls mcl;};
96+
vouch-unstable = callPackage ./vouch/unstable.nix {inherit bls mcl;};
97+
vscode-plugin-ackee-blockchain-solidity-tools = callPackage ./ackee-blockchain.solidity-tools {};
98+
vscode-plugin-consensys-vscode-solidity-visual-editor = callPackage ./consensys.vscode-solidity-auditor {};
99+
web3signer = callPackage ./web3signer {};
100+
zcli = callPackage ./zcli {};
101+
}
102+
// lib.optionalAttrs isLinux {
103+
nimbus = inputs'.nimbus-eth2.packages.beacon_node;
80104
};
81-
slither = callPackage ./slither {};
82-
snarkjs = callPackage ./snarkjs {};
83-
ssv-dkg = callPackage2311 ./ssv-dkg {
84-
bls = callPackage2311 ./bls {};
85-
mcl = callPackage2311 ./mcl {};
86-
};
87-
ssvnode = callPackage ./ssvnode {
88-
bls = callPackage2311 ./bls {};
89-
mcl = callPackage2311 ./mcl {};
90-
};
91-
staking-deposit-cli = callPackage ./staking-deposit-cli {};
92-
teku = callPackage ./teku {};
93-
tx-fuzz = callPackage ./tx-fuzz {};
94-
vouch = callPackage ./vouch {inherit bls mcl;};
95-
vouch-unstable = callPackage ./vouch/unstable.nix {inherit bls mcl;};
96-
vscode-plugin-ackee-blockchain-solidity-tools = callPackage ./ackee-blockchain.solidity-tools {};
97-
vscode-plugin-consensys-vscode-solidity-visual-editor = callPackage ./consensys.vscode-solidity-auditor {};
98-
web3signer = callPackage ./web3signer {};
99-
zcli = callPackage ./zcli {};
100-
};
101105

102106
apps = platformApps self'.packages {
103107
besu.bin = "besu";
@@ -138,10 +142,10 @@
138142
nethermind.bin = "nethermind-cli";
139143
nethermind-runner.bin = "nethermind";
140144
};
141-
nimbus = {
142-
nimbus-beacon-node.bin = "nimbus_beacon_node";
143-
nimbus-validator-client.bin = "nimbus_validator_client";
144-
};
145+
# nimbus = {
146+
# nimbus-beacon-node.bin = "nimbus_beacon_node";
147+
# nimbus-validator-client.bin = "nimbus_validator_client";
148+
# };
145149
prysm = {
146150
prysm-beacon-chain.bin = "beacon-chain";
147151
prysm-validator.bin = "validator";

0 commit comments

Comments
 (0)