Skip to content

Commit e7c4a57

Browse files
github-actions[bot]bottie-mc-bot-faceselfuryon
authored
chore: update flake.lock (#406)
* chore: update flake.lock Flake lock file updates: • Updated input 'devour-flake': 'github:srid/devour-flake/30a34036b29b0d12989ef6c8be77aa949d85aef5' (2023-09-07) → 'github:srid/devour-flake/c89ad7a611caef31899292bc8f9aae9e7aa251cb' (2023-11-11) • Updated input 'devshell': 'github:numtide/devshell/1aed986e3c81a4f6698e85a7452cbfcc4b31a36e' (2023-10-27) → 'github:numtide/devshell/44ddedcbcfc2d52a76b64fb6122f209881bd3e1e' (2023-12-05) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4' (2023-10-03) → 'github:hercules-ci/flake-parts/34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5' (2023-12-01) • Updated input 'foundry-nix': 'github:shazow/foundry.nix/a56126a754d73f85d904768fed569a9e250388d9' (2023-10-04) → 'github:shazow/foundry.nix/ad6182c16c85a3303cb97ecd37086b034510a302' (2023-12-04) • Updated input 'mynixpkgs': 'github:aldoborrero/mynixpkgs/0d415cfc494dfc105a0fd5ebf83411be82a4d9b3' (2023-11-29) → 'github:aldoborrero/mynixpkgs/67a7db27330f85af19f3ce52ae06671e573968ea' (2023-12-10) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/808c0d8c53c7ae50f82aca8e7df263225cf235bf' (2023-10-26) → 'github:nixos/nixpkgs/aa9d4729cbc99dabacb50e3994dcefb3ea0f7447' (2023-12-14) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/5deb8dc125a9f83b65ca86cf0c8167c46593e0b1' (2023-10-27) → 'github:numtide/treefmt-nix/d06b70e5163a903f19009c3f97770014787a080f' (2023-12-13) * chore: add poetry2nix from a separate repo * chore: restrict foundry to only x86_64-linux and aarch64-linux platforms * chore: update eigenlayer to v0.5.0 * chore: update nimbus to 23.11.0 * chore: switch to nim v1.6.16 (minimal supported release for nimbus) --------- Co-authored-by: Bottie McBotFace <[email protected]> Co-authored-by: Sergey Yakovlev <[email protected]>
1 parent 1f8b13c commit e7c4a57

File tree

6 files changed

+227
-108
lines changed

6 files changed

+227
-108
lines changed

flake.lock

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

flake.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
url = "github:shazow/foundry.nix/monthly";
2626
inputs.nixpkgs.follows = "nixpkgs";
2727
};
28+
poetry2nix = {
29+
url = "github:nix-community/poetry2nix";
30+
inputs.nixpkgs.follows = "nixpkgs";
31+
};
2832

2933
# flake-parts
3034
flake-parts = {
@@ -104,6 +108,7 @@
104108
pkgsUnstable = lib.extras.nix.mkNixpkgs {
105109
inherit system;
106110
nixpkgs = inputs.nixpkgs-unstable;
111+
overlays = [inputs.poetry2nix.overlays.default];
107112
};
108113
};
109114

packages/clients/consensus/nimbus/default.nix

Lines changed: 53 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,54 +2,62 @@
22
fetchFromGitHub,
33
lib,
44
stdenv,
5-
nim,
65
lsb-release,
76
which,
87
cmake,
8+
pkgs,
99
writeShellScriptBin,
1010
buildFlags ? ["nimbus_beacon_node"],
11-
}:
12-
stdenv.mkDerivation rec {
13-
pname = "nimbus-eth2";
14-
version = "23.10.1";
15-
16-
src = fetchFromGitHub {
17-
owner = "status-im";
18-
repo = pname;
19-
rev = "v${version}";
20-
hash = "sha256-+/AmkgXblg5Gf7VNbVz2uqAs+o2Bol9IIZS3i3t7r94=";
21-
fetchSubmodules = true;
11+
}: let
12+
nim1 = pkgs.nim-unwrapped-1.overrideAttrs rec {
13+
version = "1.6.16";
14+
src = pkgs.fetchurl {
15+
url = "https://nim-lang.org/download/nim-${version}.tar.xz";
16+
hash = "sha256-ZnST+QKfdf3G5jsMdQ59JP9afBKkGWVykE1F1y1OViA=";
17+
};
2218
};
23-
24-
fakeGit = writeShellScriptBin "git" "echo ${version}";
25-
26-
# Dunno why we need `lsb-release`, looks like for nim itself
27-
# without `which` it can't find gcc
28-
nativeBuildInputs = [fakeGit lsb-release nim which cmake];
29-
enableParallelBuilding = true;
30-
31-
NIMFLAGS = "-d:disableMarchNative -d:release";
32-
33-
makeFlags = ["USE_SYSTEM_NIM=1"];
34-
inherit buildFlags;
35-
dontConfigure = true;
36-
37-
preBuild = ''
38-
patchShebangs scripts vendor/nimbus-build-system/scripts
39-
make nimbus-build-system-paths
40-
'';
41-
42-
installPhase = ''
43-
mkdir -p $out/bin
44-
rm -f build/generate_makefile
45-
cp build/* $out/bin
46-
'';
47-
48-
meta = {
49-
description = "Nim implementation of the Ethereum Beacon Chain";
50-
homepage = "https://github.com/status-im/nimbus-eth2";
51-
license = lib.licenses.asl20;
52-
mainProgram = "nimbus_beacon_node";
53-
platforms = ["x86_64-linux"];
54-
};
55-
}
19+
in
20+
stdenv.mkDerivation rec {
21+
pname = "nimbus-eth2";
22+
version = "23.11.0";
23+
24+
src = fetchFromGitHub {
25+
owner = "status-im";
26+
repo = pname;
27+
rev = "v${version}";
28+
hash = "sha256-SMiWLhsuERR2GOTSbOnmH2LBzTbgyKEXRnIuFKAuXDE=";
29+
fetchSubmodules = true;
30+
};
31+
32+
fakeGit = writeShellScriptBin "git" "echo ${version}";
33+
34+
# Dunno why we need `lsb-release`, looks like for nim itself
35+
# without `which` it can't find gcc
36+
nativeBuildInputs = [fakeGit lsb-release nim1 which cmake];
37+
enableParallelBuilding = true;
38+
39+
NIMFLAGS = "-d:disableMarchNative -d:release";
40+
41+
makeFlags = ["USE_SYSTEM_NIM=1"];
42+
inherit buildFlags;
43+
dontConfigure = true;
44+
45+
preBuild = ''
46+
patchShebangs scripts vendor/nimbus-build-system/scripts
47+
make nimbus-build-system-paths
48+
'';
49+
50+
installPhase = ''
51+
mkdir -p $out/bin
52+
rm -f build/generate_makefile
53+
cp build/* $out/bin
54+
'';
55+
56+
meta = {
57+
description = "Nim implementation of the Ethereum Beacon Chain";
58+
homepage = "https://github.com/status-im/nimbus-eth2";
59+
license = lib.licenses.asl20;
60+
mainProgram = "nimbus_beacon_node";
61+
platforms = ["x86_64-linux"];
62+
};
63+
}

0 commit comments

Comments
 (0)