nixos/gnunet: create switch for package. #39681
Merged
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
dotlambda
requested changes
Apr 29, 2018
| @@ -102,6 +102,12 @@ in | |||
| }; | |||
| }; | |||
|
|
|||
| package = mkOption { | |||
| default = pkgs.gnunet; | |||
| description = "Overridable attribute of the gnunet package to use."; | |||
There was a problem hiding this comment.
You should add defaultText = "pkgs.gnunet";.
| @@ -130,16 +136,16 @@ in | |||
|
|
|||
| # The user tools that talk to `gnunetd' should come from the same source, | |||
| # so install them globally. | |||
| environment.systemPackages = [ pkgs.gnunet ]; | |||
| environment.systemPackages = [ config.services.gnunet.package ]; | |||
There was a problem hiding this comment.
Please use cfg instead of config.services.gnunet.
|
|
||
| systemd.services.gnunet = { | ||
| description = "GNUnet"; | ||
| after = [ "network.target" ]; | ||
| wantedBy = [ "multi-user.target" ]; | ||
| path = [ pkgs.gnunet pkgs.miniupnpc ]; | ||
| path = [ config.services.gnunet.package pkgs.miniupnpc ]; |
There was a problem hiding this comment.
Is the gnunet package really needed in here?
dotlambda
reviewed
May 2, 2018
| default = pkgs.gnunet; | ||
| defaultText = "pkgs.gnunet"; | ||
| description = "Overridable attribute of the gnunet package to use."; | ||
| example = "pkgs.gnunet_git"; |
There was a problem hiding this comment.
Please use example = literalExample "pkgs.gnunet_git" here.
| @@ -102,6 +102,13 @@ in | |||
| }; | |||
| }; | |||
|
|
|||
| package = mkOption { | |||
| default = pkgs.gnunet; | |||
There was a problem hiding this comment.
You should add type = types.package
| package = mkOption { | ||
| default = pkgs.gnunet; | ||
| defaultText = "pkgs.gnunet"; | ||
| description = "Overridable attribute of the gnunet package to use."; |
There was a problem hiding this comment.
I think this is usually just "Gnunet package to use."
There was a problem hiding this comment.
Stole that one from services.matrix-synapse.package
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.
Motivation for this change
Add switch to the gnunet service to make gnunet_git usable with the service.
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)Here's the promised switch, @viric