Skip to content
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

Jump to bottom

acme.sh: add bind.dnsutils to PATH #84412

Merged
merged 2 commits into from Apr 10, 2020
Merged

acme.sh: add bind.dnsutils to PATH #84412

merged 2 commits into from Apr 10, 2020

Conversation

coderobe
Copy link
Contributor

@coderobe coderobe commented Apr 6, 2020

Motivation for this change

This is required for nsupdate functionality.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@coderobe
acme.sh: add bind.dnsutils to PATH
1d34740 
This is required for nsupdate
@cole-h
Copy link
Member

cole-h commented Apr 6, 2020

Hi! The reason CI is failing is because you need to add bind to the arguments at the top of the file so Nix can find what bind.dnsutils refers to, like so:

{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools, bind }:

However, there's a slightly simpler way: instead, add dnsutils to the arguments list, and then drop the bind. prefix. E.g.:

{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools, dnsutils }: and lib.makeBinPath [ .... dnsutils ].

@ofborg ofborg bot requested a review from yorickvP April 6, 2020 01:57
cole-h
cole-h approved these changes Apr 6, 2020
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have a way to test functionality, but diff LGTM and binary still displays --help info.

[1 built, 0.0 MiB DL]
https://github.com/NixOS/nixpkgs/pull/84412
1 package built:
acme-sh

@yorickvP
Copy link
Contributor

yorickvP commented Apr 9, 2020

lgtm.

@edef1c edef1c merged commit 7d4d98c into NixOS:master Apr 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cole-h cole-h cole-h approved these changes

@yorickvP yorickvP Awaiting requested review from yorickvP

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@coderobe @cole-h @yorickvP @edef1c @Janik-Haag