lighthouse: add package option to service
#285005
Merged
+37
−18
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rolfschr
force-pushed
the
lighthouse-service-add-package
branch
from
20f14a1
to
6b3b48c
Compare
|
@ritave Do you mind having a look into this? EDIT: @centromere @philipmw Since you are the lighthouse package maintainers, maybe you could look into this, too? |
|
@rolfschr LGTM. |
|
Can we merge this? |
gileri
approved these changes
Sep 7, 2024
K900
reviewed
Oct 30, 2024
| @@ -207,12 +207,19 @@ in { | |||
| default = ""; | |||
| example = ""; | |||
| }; | |||
|
|
|||
| package = mkOption { | |||
There was a problem hiding this comment.
mkPackageOption will be nicer here
Frontear
suggested changes
Oct 30, 2024
| @@ -229,7 +236,7 @@ in { | |||
| # make sure the chain data directory is created on first run | |||
| mkdir -p ${cfg.beacon.dataDir}/${cfg.network} | |||
| ${pkgs.lighthouse}/bin/lighthouse beacon_node \ | |||
| ${cfg.package}/bin/lighthouse beacon_node \ | |||
There was a problem hiding this comment.
Suggested change
| ${cfg.package}/bin/lighthouse beacon_node \ | |
| ${lib.getExe cfg.package} beacon_node \ |
| @@ -277,7 +284,7 @@ in { | |||
| # make sure the chain data directory is created on first run | |||
| mkdir -p ${cfg.validator.dataDir}/${cfg.network} | |||
| ${pkgs.lighthouse}/bin/lighthouse validator_client \ | |||
| ${cfg.package}/bin/lighthouse validator_client \ | |||
There was a problem hiding this comment.
Suggested change
| ${cfg.package}/bin/lighthouse validator_client \ | |
| ${lib.getExe cfg.package} validator_client \ |
|
Okay, thanks for the additinal input. I updated the branch accordingly and aslo applied |
|
Ah, I realize something is wrong (it doesn't build). I had not run anything locally. Will look into this 🤷 . |
rolfschr
force-pushed
the
lighthouse-service-add-package
branch
from
463874a
to
6b5d6b7
Compare
|
Fixed my syntax error diff --git a/nixos/modules/services/blockchain/ethereum/lighthouse.nix b/nixos/modules/services/blockchain/ethereum/lighthouse.nix
index 2c5e3d2bff7f..247174028adc 100644
--- a/nixos/modules/services/blockchain/ethereum/lighthouse.nix
+++ b/nixos/modules/services/blockchain/ethereum/lighthouse.nix
@@ -216,7 +216,7 @@ in
example = "";
};
- package = lib.mkPackageOption pkgs "lighthouse";
+ package = lib.mkPackageOption pkgs "lighthouse" { };
};
};
|
r-vdp
approved these changes
Nov 1, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.