Skip to content

inputs: 24.11, unstable -> 25.05 #616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

inputs: 24.11, unstable -> 25.05 #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
53adf1b
inputs: 24.11, unstable -> 25.05
bbjubjub2494 May 27, 2025
b85f2be
rocketpoold: fix build
bbjubjub2494 May 27, 2025
8dc8878
rocketpool{,d}: 1.15.3 -> 1.15.6
bbjubjub2494 May 27, 2025
9d0139c
fmt
bbjubjub2494 Jun 3, 2025
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
26 changes: 13 additions & 13 deletions docs/nixos/running-geth.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,21 @@ Additional arguments can be provided in a list directly to the Geth process via
For each instance that is configured a corresponding [Systemd](https://systemd.io/) service is created. The service name
follows a convention of `geth-${name}.service`.

| Config | Name | Service name |
| Config | Name | Service name |
| :------------------------------- | :------ | :--------------------- |
| `services.ethereum.geth.sepolia` | sepolia | `geth-sepolia.service` |
| `services.ethereum.geth.goerli` | goerli | `geth-goerli.service` |
| `services.ethereum.geth.goerli` | goerli | `geth-goerli.service` |
| `services.ethereum.geth.mainnet` | mainnet | `geth-mainnet.service` |

The service that is created can then be introspected and managed via the standard Systemd toolset.

| Action | Command |
| Action | Command |
| :------ | :--------------------------------------- |
| Status | `systemctl status geth-sepolia.service` |
| Stop | `systemctl stop geth-sepolia.service` |
| Start | `systemctl start geth-sepolia.service` |
| Status | `systemctl status geth-sepolia.service` |
| Stop | `systemctl stop geth-sepolia.service` |
| Start | `systemctl start geth-sepolia.service` |
| Restart | `systemctl restart geth-sepolia.service` |
| Logs | `journalctl -xefu geth-sepolia.service` |
| Logs | `journalctl -xefu geth-sepolia.service` |

## Using a Geth fork

Expand All @@ -83,13 +83,13 @@ To configure [Geth Sealer](https://github.com/manifoldfinance/geth-sealer) for e
By default, [openFirewall](./modules/geth.md#servicesethereumgethnameopenfirewall) is set to `false`.
If set to `true`, firewall rules are added which will expose the following ports:

| Protocol | Config | Default value |
| Protocol | Config | Default value |
| :------- | :------------------------------------------------------------------------ | :------------ |
| TCP, UDP | [port](./modules/geth.md#servicesethereumgethnameargsport) | 30303 |
| TCP | [authrpc.port](./modules/geth.md#servicesethereumgethnameargsauthrpcport) | 8551 |
| TCP | [http.port](./modules/geth.md#servicesethereumgethnameargshttpport) | 8545 |
| TCP | [ws.port](./modules/geth.md#servicesethereumgethnameargswsport) | 8546 |
| TCP | [metrics.port](./modules/geth.md#servicesethereumgethnameargsmetricsport) | 6060 |
| TCP, UDP | [port](./modules/geth.md#servicesethereumgethnameargsport) | 30303 |
| TCP | [authrpc.port](./modules/geth.md#servicesethereumgethnameargsauthrpcport) | 8551 |
| TCP | [http.port](./modules/geth.md#servicesethereumgethnameargshttpport) | 8545 |
| TCP | [ws.port](./modules/geth.md#servicesethereumgethnameargswsport) | 8546 |
| TCP | [metrics.port](./modules/geth.md#servicesethereumgethnameargsmetricsport) | 6060 |

**Note:** it is important when running multiple instances of Geth on the same machine that you ensure they are configured
with different ports.
22 changes: 11 additions & 11 deletions docs/nixos/running-lighthouse-beacon.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@ Additional arguments can be provided in a list directly to the Lighthouse Beacon
For each instance that is configured a corresponding [Systemd](https://systemd.io/) service is created. The service name
follows a convention of `lighthouse-beacon-${name}.service`.

| Config | Name | Service name |
| Config | Name | Service name |
| :-------------------------------------------- | :------ | :---------------------------------- |
| `services.ethereum.lighthouse-beacon.sepolia` | sepolia | `lighthouse-beacon-sepolia.service` |
| `services.ethereum.lighthouse-beacon.goerli` | goerli | `lighthouse-beacon-goerli.service` |
| `services.ethereum.lighthouse-beacon.goerli` | goerli | `lighthouse-beacon-goerli.service` |
| `services.ethereum.lighthouse-beacon.mainnet` | mainnet | `lighthouse-beacon-mainnet.service` |

The service that is created can then be introspected and managed via the standard Systemd toolset.

| Action | Command |
| Action | Command |
| :------ | :---------------------------------------------------- |
| Status | `systemctl status lighthouse-beacon-sepolia.service` |
| Stop | `systemctl stop lighthouse-beacon-sepolia.service` |
| Start | `systemctl start lighthouse-beacon-sepolia.service` |
| Status | `systemctl status lighthouse-beacon-sepolia.service` |
| Stop | `systemctl stop lighthouse-beacon-sepolia.service` |
| Start | `systemctl start lighthouse-beacon-sepolia.service` |
| Restart | `systemctl restart lighthouse-beacon-sepolia.service` |
| Logs | `journalctl -xefu lighthouse-beacon-sepolia.service` |
| Logs | `journalctl -xefu lighthouse-beacon-sepolia.service` |

## Using a Lighthouse Beacon fork

Expand All @@ -74,11 +74,11 @@ To configure a custom fork for example:
By default, [openFirewall](./modules/lighthouse-beacon.md#servicesethereumlighthouse-beaconnameopenfirewall) is set to `false`.
If set to `true` firewall rules are added which will expose the following ports:

| Protocol | Config | Default value |
| Protocol | Config | Default value |
| :------- | :------------------------------------------------------------------------------------------------------- | :------------ |
| UDP | [discovery-port](./modules/lighthouse-beacon.md#servicesethereumlighthouse-beaconnameargsdiscovery-port) | 9000 |
| UDP/TCP | [quic-port](./modules/lighthouse-beacon.md#servicesethereumlighthouse-beaconnameargsquic-port) | 9001 |
| TCP | [http-port](./modules/lighthouse-beacon.md#servicesethereumlighthouse-beaconnameargshttp-port) | 5052 |
| UDP | [discovery-port](./modules/lighthouse-beacon.md#servicesethereumlighthouse-beaconnameargsdiscovery-port) | 9000 |
| UDP/TCP | [quic-port](./modules/lighthouse-beacon.md#servicesethereumlighthouse-beaconnameargsquic-port) | 9001 |
| TCP | [http-port](./modules/lighthouse-beacon.md#servicesethereumlighthouse-beaconnameargshttp-port) | 5052 |

**Note:** it is important when running multiple instances of Lighthouse Beacon on the same machine that you ensure they are configured
with different ports.
22 changes: 11 additions & 11 deletions docs/nixos/running-nimbus-beacon.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,21 @@ Additional arguments can be provided in a list directly to the Nimbus Beacon pro
For each instance that is configured a corresponding [Systemd](https://systemd.io/) service is created. The service name
follows a convention of `nimbus-beacon-${name}.service`.

| Config | Name | Service name |
| Config | Name | Service name |
| :-------------------------------------------- | :------ | :---------------------------------- |
| `services.ethereum.nimbus-beacon.sepolia` | sepolia | `nimbus-beacon-sepolia.service` |
| `services.ethereum.nimbus-beacon.holesky` | holesky | `nimbus-beacon-holesky.service` |
| `services.ethereum.nimbus-beacon.holesky` | holesky | `nimbus-beacon-holesky.service` |
| `services.ethereum.nimbus-beacon.mainnet` | mainnet | `nimbus-beacon-mainnet.service` |

The service that is created can then be introspected and managed via the standard Systemd toolset.

| Action | Command |
| Action | Command |
| :------ | :---------------------------------------------------- |
| Status | `systemctl status nimbus-beacon-sepolia.service` |
| Stop | `systemctl stop nimbus-beacon-sepolia.service` |
| Start | `systemctl start nimbus-beacon-sepolia.service` |
| Status | `systemctl status nimbus-beacon-sepolia.service` |
| Stop | `systemctl stop nimbus-beacon-sepolia.service` |
| Start | `systemctl start nimbus-beacon-sepolia.service` |
| Restart | `systemctl restart nimbus-beacon-sepolia.service` |
| Logs | `journalctl -xefu nimbus-beacon-sepolia.service` |
| Logs | `journalctl -xefu nimbus-beacon-sepolia.service` |

## Checkpoint Sync

Expand Down Expand Up @@ -77,10 +77,10 @@ To configure a custom fork for example:
By default, [openFirewall](./modules/nimbus-beacon.md#servicesethereumnimbus-beaconnameopenfirewall) is set to `false`.
If set to `true` firewall rules are added which will expose the following ports:

| Protocol | Config | Default value |
| Protocol | Config | Default value |
| :------- | :------------------------------------------------------------------------------------------------------- | :------------ |
| TCP | [tcp-port](./modules/nimbus-beacon.md#servicesethereumnimbus-beaconnameargstcp-port) | 9000 |
| UDP | [udp-port](./modules/nimbus-beacon.md#servicesethereumnimbus-beaconnameargsudp-port) | 9000 |
| TCP | [rest-port](./modules/nimbus-beacon.md#servicesethereumnimbus-beaconnameargsrest-port) | 5052 |
| TCP | [tcp-port](./modules/nimbus-beacon.md#servicesethereumnimbus-beaconnameargstcp-port) | 9000 |
| UDP | [udp-port](./modules/nimbus-beacon.md#servicesethereumnimbus-beaconnameargsudp-port) | 9000 |
| TCP | [rest-port](./modules/nimbus-beacon.md#servicesethereumnimbus-beaconnameargsrest-port) | 5052 |

**Note:** it is important when running multiple instances of Nimbus Beacon on the same machine that you ensure they are configured with different ports.
26 changes: 13 additions & 13 deletions docs/nixos/running-prysm-beacon.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,21 @@ Additional arguments can be provided in a list directly to the Prysm Beacon proc
For each instance that is configured a corresponding [Systemd](https://systemd.io/) service is created. The service name
follows a convention of `prysm-beacon-${name}.service`.

| Config | Name | Service name |
| Config | Name | Service name |
| :--------------------------------------- | :------ | :----------------------------- |
| `services.ethereum.prysm-beacon.sepolia` | sepolia | `prysm-beacon-sepolia.service` |
| `services.ethereum.prysm-beacon.goerli` | goerli | `prysm-beacon-goerli.service` |
| `services.ethereum.prysm-beacon.goerli` | goerli | `prysm-beacon-goerli.service` |
| `services.ethereum.prysm-beacon.mainnet` | mainnet | `prysm-beacon-mainnet.service` |

The service that is created can then be introspected and managed via the standard Systemd toolset.

| Action | Command |
| Action | Command |
| :------ | :----------------------------------------------- |
| Status | `systemctl status prysm-beacon-sepolia.service` |
| Stop | `systemctl stop prysm-beacon-sepolia.service` |
| Start | `systemctl start prysm-beacon-sepolia.service` |
| Status | `systemctl status prysm-beacon-sepolia.service` |
| Stop | `systemctl stop prysm-beacon-sepolia.service` |
| Start | `systemctl start prysm-beacon-sepolia.service` |
| Restart | `systemctl restart prysm-beacon-sepolia.service` |
| Logs | `journalctl -xefu prysm-beacon-sepolia.service` |
| Logs | `journalctl -xefu prysm-beacon-sepolia.service` |

## Using a Prysm Beacon fork

Expand All @@ -77,13 +77,13 @@ To configure a custom fork for example:
By default, [openFirewall](./modules/prysm-beacon.md#servicesethereumprysm-beaconnameopenfirewall) is set to `false`.
If set to `true` firewall rules are added which will expose the following ports:

| Protocol | Config | Default value |
| Protocol | Config | Default value |
| :------- | :--------------------------------------------------------------------------------------------------- | :------------ |
| UDP | [p2p-udp-port](./modules/prysm-beacon.md#servicesethereumprysm-beaconnameargsp2p-udp-port) | 12000 |
| TCP | [p2p-tcp-port](./modules/prysm-beacon.md#servicesethereumprysm-beaconnameargsp2p-tcp-port) | 13000 |
| TCP | [grpc-gateway-port](./modules/prysm-beacon.md#servicesethereumprysm-beaconnameargsgrpc-gateway-port) | 3500 |
| TCP | [monitoring-port](./modules/prysm-beacon.md#servicesethereumprysm-beaconnameargsmonitoring-port) | 8080 |
| TCP | [pprofport](./modules/prysm-beacon.md#servicesethereumprysm-beaconnameargspprofport) | 8080 |
| UDP | [p2p-udp-port](./modules/prysm-beacon.md#servicesethereumprysm-beaconnameargsp2p-udp-port) | 12000 |
| TCP | [p2p-tcp-port](./modules/prysm-beacon.md#servicesethereumprysm-beaconnameargsp2p-tcp-port) | 13000 |
| TCP | [grpc-gateway-port](./modules/prysm-beacon.md#servicesethereumprysm-beaconnameargsgrpc-gateway-port) | 3500 |
| TCP | [monitoring-port](./modules/prysm-beacon.md#servicesethereumprysm-beaconnameargsmonitoring-port) | 8080 |
| TCP | [pprofport](./modules/prysm-beacon.md#servicesethereumprysm-beaconnameargspprofport) | 8080 |

**Note:** it is important when running multiple instances of Prysm Beacon on the same machine that you ensure they are configured
with different ports.
20 changes: 10 additions & 10 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

inputs = {
# packages
nixpkgs.url = "github:nixos/nixpkgs/24.11";
nixpkgs.url = "github:nixos/nixpkgs/25.05";
nixpkgs-2411.url = "github:nixos/nixpkgs/24.11";
nixpkgs-2311.url = "github:nixos/nixpkgs/23.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";

foundry-nix = {
url = "github:shazow/foundry.nix/monthly";
Expand Down Expand Up @@ -65,7 +65,7 @@
perSystem = {
config,
pkgs,
pkgsUnstable,
pkgs2411,
system,
self',
...
Expand All @@ -76,9 +76,9 @@
inherit system;
inherit (inputs) nixpkgs;
};
pkgsUnstable = lib.mkNixpkgs {
pkgs2411 = lib.mkNixpkgs {
inherit system;
nixpkgs = inputs.nixpkgs-unstable;
nixpkgs = inputs.nixpkgs-2411;
};
pkgs2311 = lib.mkNixpkgs {
inherit system;
Expand All @@ -89,7 +89,7 @@
# devshell
devshells.default = {
name = "ethereum.nix";
packages = with pkgsUnstable; [
packages = with pkgs; [
nix-update
];
commands = [
Expand Down Expand Up @@ -125,7 +125,7 @@
"*.md"
"*.html"
];
mdformat.package = lib.mkDefault (pkgs.mdformat.withPlugins (p: [
mdformat.package = lib.mkDefault (pkgs2411.mdformat.withPlugins (p: [
p.mdformat-admon
p.mdformat-beautysh
p.mdformat-footnote
Expand Down
20 changes: 10 additions & 10 deletions mkdocs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
{
perSystem = {
lib,
pkgsUnstable,
pkgs,
...
}: let
inherit (pkgsUnstable) stdenv runCommand;
inherit (pkgs) stdenv runCommand;
in {
packages.docs = let
mkdocs-custom =
pkgsUnstable.runCommand "mkdocs-custom" {
pkgs.runCommand "mkdocs-custom" {
buildInputs = [
pkgsUnstable.python312
pkgsUnstable.python312Packages.mkdocs
pkgsUnstable.python312Packages.mkdocs-material
pkgsUnstable.python312Packages.neoteroi-mkdocs
pkgs.python312
pkgs.python312Packages.mkdocs
pkgs.python312Packages.mkdocs-material
pkgs.python312Packages.neoteroi-mkdocs
];
meta.mainProgram = "mkdocs";
} ''
mkdir -p $out/bin

cat <<MKDOCS > $out/bin/mkdocs
#!${pkgsUnstable.runtimeShell}
#!${pkgs.runtimeShell}
set -euo pipefail
export PYTHONPATH=$PYTHONPATH
exec ${pkgsUnstable.python312Packages.mkdocs}/bin/mkdocs "\$@"
exec ${pkgs.python312Packages.mkdocs}/bin/mkdocs "\$@"
MKDOCS

chmod +x $out/bin/mkdocs
Expand Down Expand Up @@ -64,7 +64,7 @@
mv site $out
'';

passthru.serve = pkgsUnstable.writeShellScriptBin "serve" ''
passthru.serve = pkgs.writeShellScriptBin "serve" ''
set -euo pipefail

# create link to nixos markdown options reference
Expand Down
4 changes: 2 additions & 2 deletions modules/geth/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

The node keys for the various test processes are as follows:

| Filename | Key |
| Filename | Key |
| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- |
| `./testing/keys/alpha.key` | `078ebf4ec2530b49773acb15c2261d149427ee6464fbbce099af762bcdc16a403501e31c4ca15198c8a1e88bd5d0a35dcd929b22387249829c04aa9214a94f44` |
| `./testing/keys/beta.key` | `bbee5561cb95086c1dbcb2146d029286aeec6cdaec081cc88cb0a676de390cd121512d1c018c0bfe3716bd92dd1f0ff91721f61ff460e9370a0df2cb77fd8e1a` |
| `./testing/keys/beta.key` | `bbee5561cb95086c1dbcb2146d029286aeec6cdaec081cc88cb0a676de390cd121512d1c018c0bfe3716bd92dd1f0ff91721f61ff460e9370a0df2cb77fd8e1a` |
| `./testing/keys/gamma.key` | `2916650bd333498b83abd94ccdae54392d3cc81db3cadfd09f93ffe9eb7d072bd0a567e08341741050b54c11a98a9cde1132e490e199f14099160828ecfe70ab` |

An enode address can be constructed as follows by combining the node key with the instance ip address and port:
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/ro/rocketpool/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
}:
buildGoModule rec {
pname = "rocketpool";
version = "1.15.3";
version = "1.15.6";

src = fetchFromGitHub {
owner = "rocket-pool";
repo = "smartnode";
rev = "v${version}";
hash = "sha256-DX1e44m22em1wO1rSsUYOHfbBiTgq8bBTjPpdNsxrDg=";
hash = "sha256-vXk7WgN77SWDVzOs5QBJsPO8O4AJiS+VbUl1xNmZOP0=";
};

vendorHash = "sha256-tsrhti14Lj/yc8IZbiWi5wqDxJh4/m3FR2cpu1bh/hg=";
Expand Down
11 changes: 7 additions & 4 deletions pkgs/by-name/ro/rocketpoold/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
{
bls,
blst,
buildGoModule,
buildGo123Module,
fetchFromGitHub,
nix-update-script,
}:
buildGoModule rec {
# 1.23 is force due to this issue:
# https://github.com/NordSecurity/uniffi-bindgen-go/issues/66
# this can likely be removed in the next upstream version
buildGo123Module rec {
pname = "rocketpool";
version = "1.15.3";
version = "1.15.6";

src = fetchFromGitHub {
owner = "rocket-pool";
repo = "smartnode";
rev = "v${version}";
hash = "sha256-DX1e44m22em1wO1rSsUYOHfbBiTgq8bBTjPpdNsxrDg=";
hash = "sha256-vXk7WgN77SWDVzOs5QBJsPO8O4AJiS+VbUl1xNmZOP0=";
};

vendorHash = "sha256-tsrhti14Lj/yc8IZbiWi5wqDxJh4/m3FR2cpu1bh/hg=";
Expand Down
Loading