-
-
Notifications
You must be signed in to change notification settings - Fork 456
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
Add networking.hosts and .hostFiles from nixos #939
base: master
Are you sure you want to change the base?
Conversation
Possible duplicate of #807? (my PR is older and doesn't have tests though, so maybe this should be preferred) |
Sorry @willemml I missed your PR. I didn’t intend to duplicate work. |
This PR seems fine but is blocked as a review is required. How can we help to get it merged? |
Oh this would be awesome :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you rebase this PR?
modules/networking/default.nix
Outdated
in mkBefore [ localhostHosts stringHosts extraHosts ]; | ||
|
||
environment.etc.hosts = { | ||
copy = true; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
copy = true; | |
knownSha256Hashes = [ "..." ]; |
The copy
option was removed, can you add the default /etc/hosts
to docs/known-files
and its sha256 hash here?
tests/networking-hosts.nix
Outdated
echo checking /etc/hosts file >&2 | ||
|
||
file=${config.out}/etc/hosts | ||
grep '127.0.0.1' $file |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably also worth testing that localhost
is mapped to 127.0.0.1
and ::1
as they're the defaults
This code was taking nearly verbatim from https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/modules/config/networking.nix The few changes were related to making default /etc/hosts match the Apple's stock one. This implied no 127.0.0.2 and forcing the IPV6 ::1 entry.
851b145
to
274963a
Compare
@Enzime rebasing is done. I tried to do the hash thing but I think I got it wrong. I did |
It looks right to me:
|
However the file in |
@emilazy good catch! Indeed: Without the newline: $ sha256sum doc/known-files/c7dd0e2ed261ce76d76f852596c5b54026b9a894fa481381ffd399b556c0e2da
1b6fb3e08d41ae31b6bfe1f66fecf3ef53e302047993f6235570bc9391f291bb doc/known-files/c7dd0e2ed261ce76d76f852596c5b54026b9a894fa481381ffd399b556c0e2da With: $ sha256sum doc/known-files/c7dd0e2ed261ce76d76f852596c5b54026b9a894fa481381ffd399b556c0e2da
c7dd0e2ed261ce76d76f852596c5b54026b9a894fa481381ffd399b556c0e2da doc/known-files/c7dd0e2ed261ce76d76f852596c5b54026b9a894fa481381ffd399b556c0e2da |
Looks like the tests are broken now |
@Enzime indeed 😞 I have two questions related to the two failures I see. How can I fix the I looked and looked at the test output and can’t see the error printed out. How can I run the tests locally if I use flakes? I tried a few command line incantations but I can’t seem to make it right. |
The ability to run the tests through a flake interface will be added in #1140, until that's merged you can run your test locally with I've accessed the GitHub runner through tmate (I suspect only maintainers have access but I'm not sure, it's the last step in the
I suspect that every GitHub Mac will have a different nix-darwin/.github/workflows/test.yml Lines 143 to 146 in 98e7dba
|
Also if you could rebase this PR that would be great, let us know if you're still interested in working on this PR |
Probably simplest to just move the config files out of the way rather than hashing them. |
In the case of |
This code was taken nearly verbatim from
https://github.com/NixOS/nixpkgs/blob/nixos-unstable/nixos/modules/config/networking.nix
The few changes were related to making the default
/etc/hosts
match the Apple's stock one. This implied no127.0.0.2
and forcing the IPV6::1
entry.