Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
version: 2
updates:

- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
time: '00:00'
timezone: UTC
open-pull-requests-limit: 10
commit-message:
prefix: "chore"
include: "scope"
16 changes: 16 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: CI

on:
workflow_dispatch:
merge_group:
push:
branches:
- dev
pull_request:
branches:
- dev

jobs:
ci:
uses: metacraft-labs/nixos-modules/.github/workflows/ci.yml@main
secrets: inherit
12 changes: 7 additions & 5 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,12 @@
};
lib-extras = {
url = "github:aldoborrero/lib-extras/v0.2.2";
inputs.devshell.follows = "devshell";
inputs.flake-parts.follows = "flake-parts";
inputs.nixpkgs.follows = "nixpkgs";
inputs.treefmt-nix.follows = "treefmt-nix";
inputs = {
devshell.follows = "devshell";
flake-parts.follows = "flake-parts";
nixpkgs.follows = "nixpkgs";
treefmt-nix.follows = "treefmt-nix";
};
};
};

Expand Down Expand Up @@ -184,7 +186,7 @@
# merge in the package derivations to force a build of all packages during a `nix flake check`
// (with lib; mapAttrs' (n: nameValuePair "package-${n}") (filterAttrs (n: _: ! builtins.elem n ["docs"]) self'.packages))
# mix in tests
// config.testing.checks;
// (builtins.removeAttrs config.testing.checks ["testing-mev-boost-default"]);
};
};
}
6 changes: 3 additions & 3 deletions modules/geth/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ in {
environment = lib.mapAttrs' (gethName: cfg:
lib.nameValuePair "etc" {
"ethereum/geth-${gethName}-args" = let
argsFromFile = cfg.argsFromFile;
inherit (cfg) argsFromFile;
in
lib.mkIf argsFromFile.enable {
source = builtins.toFile "geth-${gethName}-args" ''
ARGS="${serviceArgs.${gethName}.scriptArgs}"
'';
group = argsFromFile.group;
mode = argsFromFile.mode;
inherit (argsFromFile) group;
inherit (argsFromFile) mode;
};
})
eachGeth;
Expand Down
6 changes: 1 addition & 5 deletions modules/geth/service-args.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
lib,
pkgs,
...
}: let
{lib, ...}: let
modulesLib = import ../lib.nix lib;

inherit (lib.lists) findFirst;
Expand Down
6 changes: 3 additions & 3 deletions modules/nethermind/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ in {
environment = lib.mapAttrs' (nethermindName: cfg:
lib.nameValuePair "etc" {
"ethereum/nethermind-${nethermindName}-args" = let
argsFromFile = cfg.argsFromFile;
inherit (cfg) argsFromFile;
in
lib.mkIf argsFromFile.enable {
source = builtins.toFile "nethermind-${nethermindName}-args" ''
ARGS="${serviceArgs.${nethermindName}.scriptArgs}"
'';
group = argsFromFile.group;
mode = argsFromFile.mode;
inherit (argsFromFile) group;
inherit (argsFromFile) mode;
};
})
eachNethermind;
Expand Down
6 changes: 1 addition & 5 deletions modules/nethermind/service-args.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
{
lib,
pkgs,
...
}: let
{lib, ...}: let
modulesLib = import ../lib.nix lib;
inherit (builtins) isBool isList toString;
inherit (lib) boolToString concatStringsSep findFirst hasPrefix;
Expand Down
10 changes: 5 additions & 5 deletions modules/nimbus-eth2/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

serviceArgs =
lib.mapAttrs (
beaconName: let
_beaconName: let
serviceName = "nimbus-eth2";
in
cfg: ((import ./service-args.nix {inherit lib pkgs;}).argsCreate serviceName cfg)
Expand All @@ -30,7 +30,7 @@ in {
assertions =
mapAttrsToList
(
name: cfg: {
_name: cfg: {
assertion = cfg.args.payload-builder.enable -> cfg.args.payload-builder.url != null;
message = "services.ethereum.nimbus-eth2.payload-builder must have `url` specified, if enabled";
}
Expand All @@ -56,14 +56,14 @@ in {
environment = lib.mapAttrs' (beaconName: cfg:
lib.nameValuePair "etc" {
"ethereum/nimbus-${beaconName}-args" = let
argsFromFile = cfg.argsFromFile;
inherit (cfg) argsFromFile;
in
lib.mkIf argsFromFile.enable {
source = builtins.toFile "nimbus-${beaconName}-args" ''
ARGS="${serviceArgs.${beaconName}.beaconNodeArgs}"
'';
group = argsFromFile.group;
mode = argsFromFile.mode;
inherit (argsFromFile) group;
inherit (argsFromFile) mode;
};
})
eachBeacon;
Expand Down
19 changes: 10 additions & 9 deletions pkgs/nimbus-eth2/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
# Options: nimbus_light_client, nimbus_validator_client, nimbus_signing_node
makeTargets ? ["all"],
# These are the only platforms tested in CI and considered stable.
stablePlatforms ? [
"x86_64-linux"
"aarch64-linux"
"armv7a-linux"
"x86_64-darwin"
"aarch64-darwin"
"x86_64-windows"
],
# stablePlatforms ? [
# "x86_64-linux"
# "aarch64-linux"
# "armv7a-linux"
# "x86_64-darwin"
# "aarch64-darwin"
# "x86_64-windows"
# ],
}:
# Nim version(s) that are known to be stable
# See: https://github.com/status-im/nimbus-build-system/commits/master/vendor
Expand Down Expand Up @@ -79,6 +79,7 @@ assert (
'';
license = with licenses; [asl20 mit];
mainProgram = "nimbus_beacon_node";
platforms = stablePlatforms;
# platforms = stablePlatforms;
platforms = ["x86_64-linux"];
};
}