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.

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

Introduce networking.hostFiles option #81945

Merged
merged 3 commits into from Mar 12, 2020
Merged

Conversation

infinisil
Copy link
Member

Motivation for this change

When blocklists are built with a derivation, using extraHosts would
require IFD (import-from-derivation), since the result of the derivation needs to be converted to
a string again.

By introducing this option no IFD is needed for such use-cases, since
the fetched files can be assigned directly.

A second commit changes the cjdns module to use this new option so no IFD is needed. A third commit just fixes a doc rendering issue in the cjdns module.

This change will be useful for #80113 as well, so ping @pasqui23

Ping @oxij @regellosigkeitsaxiom for the networking module

Ping @ehmry @joachifm for related issues #20422 and #21592

Things done
  • Built nix-build nixos --arg configuration ./config.nix -A config.environment.etc.hosts.source before and after this change, making sure nothing changes, even with extraHosts and services.cjdns enabled (and configured).
  • Built the docs with nix-build nixos/release.nix -A manualHTML.x86_64-linux successfully

When blocklists are built with a derivation, using extraHosts would
require IFD, since the result of the derivation needs to be converted to
a string again.

By introducing this option no IFD is needed for such use-cases, since
the fetched files can be assigned directly.
@infinisil infinisil merged commit 8f2109c into NixOS:master Mar 12, 2020
@infinisil infinisil deleted the hostFiles branch March 12, 2020 14:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants