nsd: 4.1.15 -> 4.1.16 #26002
Closed
nsd: 4.1.15 -> 4.1.16 #26002
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
fpletz
reviewed
May 22, 2017
pkgs/servers/dns/nsd/default.nix
Outdated
| ''; | ||
|
|
||
| buildInputs = [ libevent ]; | ||
| propagatedBuildInputs = [ openssl ]; |
There was a problem hiding this comment.
If you're already replacing the openssl path in the shell script calling it, putting it in propagatedBuildInputs is not necessary except there are more scripts/tools depending on openssl being present.
pkgs/servers/dns/nsd/default.nix
Outdated
| }; | ||
|
|
||
| buildInputs = [ libevent openssl ]; | ||
| patchPhase = '' |
There was a problem hiding this comment.
You should use prePatch or postPatch here so you can still pass patches to the mkDerivation call which is done in the default patchPhase that you're replacing here.
pkgs/servers/dns/nsd/default.nix
Outdated
| buildInputs = [ libevent openssl ]; | ||
| patchPhase = '' | ||
| substituteInPlace nsd-control-setup.sh.in --replace openssl ${openssl}/bin/openssl | ||
| ''; |
There was a problem hiding this comment.
Minor indention nitpick. 2 spaces to the left please. :)
|
Fixed comments by @fpletz (thanks by the way)! |
|
Built and tested locally. Thank you for your contribution! |
bkchr
pushed a commit
to bkchr/nixpkgs
that referenced
this pull request
May 26, 2017
adrianpk
added a commit
to adrianpk/nixpkgs
that referenced
this pull request
May 31, 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.
Motivation for this change
Minor version update. Plus (in a second commit) a fix to nsd-control-setup. This convenience script was dependent on openssl being already installed, now it is a propagatedBuildInput.
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)