Skip to content

Commit bdedde2

Browse files
galin-sPetarKirov
authored andcommitted
feat(nimbus): Upgrade 24.12.0 -> 25.1.0
Remove the `nimble.nix` patch as on version 25.1.0 there is no need to patch `nimble.nix` as it contains the correct hash. I verified it like this: ``` nurl -S https://github.com/nim-lang/nimble 123f97a5e4ee9ba35720c0869e19a047c43c797e $ nix flake prefetch --extra-experimental-features 'nix-command flakes' --json git+https://github.com/nim-lang/nimble?allRefs=1&rev=123f97a5e4ee9ba35720c0869e19a047c43c797e&submodules=1 fetchFromGitHub { owner = "nim-lang"; repo = "nimble"; rev = "123f97a5e4ee9ba35720c0869e19a047c43c797e"; hash = "sha256-Rz48sGUKZEAp+UySla+MlsOfsERekuGKw69Tm11fDz8="; fetchSubmodules = true; } ``` The hash `sha256-Rz48sGUKZEAp+UySla+MlsOfsERekuGKw69Tm11fDz8=` is exactly the same as the one in nimble.nix @ 25.1.0: https://github.com/status-im/nimbus-eth2/blob/v25.1.0/nix/nimble.nix#L12
1 parent 8d2fa1a commit bdedde2

File tree

4 files changed

+7
-114
lines changed

4 files changed

+7
-114
lines changed

pkgs/default.nix

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,6 @@
7171
mev-rs = callPackage ./mev-rs {};
7272
nethermind = callPackageNethermind ./nethermind {};
7373
nimbus = callPackageUnstable ./nimbus {};
74-
nimbus-eth2 = callPackageUnstable ./nimbus-eth2 {
75-
# For now the nimbus team prefers nim 1.6 over 2.0.
76-
# In newer versions of `pkgsUnstable` `nim` points to v2.0.0 in older it is 1.6.
77-
# In newer versions the `nim1` package exists but not in older.
78-
# See: https://github.com/status-im/nimbus-build-system/commits/master/vendor
79-
nim = pkgsUnstable.nim1 or pkgsUnstable.nim;
80-
};
8174
prysm = callPackage ./prysm {inherit bls blst;};
8275
reth = callPackageUnstable ./reth {};
8376
rocketpool = callPackage ./rocketpool {};

pkgs/nimbus-eth2/default.nix

Lines changed: 0 additions & 85 deletions
This file was deleted.

pkgs/nimbus/default.nix

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
{
2-
applyPatches,
32
fetchFromGitHub,
43
pkgs,
54
targets ? ["nimbus_beacon_node" "nimbus_validator_client" "gnosis-build" "gnosis-vc-build"],
65
stableSystems ? ["x86_64-linux" "aarch64-linux"],
76
}: let
8-
version = "24.12.0";
9-
src = applyPatches {
10-
src = fetchFromGitHub {
11-
owner = "status-im";
12-
repo = "nimbus-eth2";
13-
rev = "v${version}";
14-
hash = "sha256-DBvsnGr91a69eCj1hAeoVOpxas5rfaT36rIxWEmvIVg=";
15-
fetchSubmodules = true;
16-
};
17-
patches = [./fix-hash.patch];
7+
version = "25.1.0";
8+
src = fetchFromGitHub {
9+
owner = "status-im";
10+
repo = "nimbus-eth2";
11+
rev = "v${version}";
12+
hash = "sha256-I+rDkVUk5BLxV2wNnRMHSE9Uuz9KykbVeXB40zvRZz8=";
13+
fetchSubmodules = true;
1814
};
1915
in
2016
import "${src}/nix" {inherit pkgs targets stableSystems;}

pkgs/nimbus/fix-hash.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)