Skip to content

Commit c334b5e

Browse files
monyarmPetarKirov
authored andcommitted
fix(nimbus): Switch to commit 499b870a1a8e6688ff03b958709955075064b7e5,re-add fakeGit, add git_revision_override flag
1 parent 97a6257 commit c334b5e

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

packages/nimbus/default.nix

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,29 @@
2424
assert nim.version == "1.6.12";
2525
stdenv.mkDerivation rec {
2626
pname = "nimbus";
27-
version = "23.3.2";
27+
rev = "499b870a1a8e6688ff03b958709955075064b7e5";
28+
version = "23.3.2.dev";
2829

2930
src = fetchFromGitHub {
3031
owner = "status-im";
3132
repo = "nimbus-eth2";
32-
rev = "v${version}";
33-
hash = "sha256-TkQW1IcUHMqlr7cOQA5vRcFlwacF2zDb4sJb+K/ejnY=";
33+
inherit rev;
34+
hash = "sha256-0w9XGXxCAhBAuMkQ42Wh67Lmetn7Ihbdoq3iBOSx71k=";
3435
fetchSubmodules = true;
35-
leaveDotGit = true;
3636
};
3737

3838
# Fix for Nim compiler calling 'git rev-parse' and 'lsb_release'.
3939
nativeBuildInputs = let
40+
fakeGit = writeScriptBin "git" "echo $commit";
4041
fakeLsbRelease = writeScriptBin "lsb_release" "echo nix";
4142
in
42-
[git fakeLsbRelease nim which cmake]
43+
[fakeGit fakeLsbRelease nim which cmake]
4344
++ lib.optionals stdenv.isDarwin [darwin.cctools];
4445

4546
enableParallelBuilding = true;
4647

4748
# Disable CPU optmizations that make binary not portable.
48-
NIMFLAGS = "-d:disableMarchNative";
49+
NIMFLAGS = "-d:disableMarchNative -d:git_revision_override=${rev}";
4950

5051
makeFlags = makeTargets ++ ["USE_SYSTEM_NIM=1"];
5152

0 commit comments

Comments
 (0)