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
nixos/dnscrypt-proxy2: init #78543
nixos/dnscrypt-proxy2: init #78543
Conversation
configuration = if cfg.configFile == null | ||
then toml | ||
else cfg.configFile; |
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.
please use 2 space indentation per documentation
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.
Does this look good? fb868cc
I just realized I made a mistake in implementing NixOS/rfcs#42 in line 6 |
fb868cc
to
8c5d0c8
Compare
}; | ||
} | ||
''; | ||
type = types.attrs; |
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.
Hm It's a bit unfortunate that #75584 isn't merged yet, because then you could use the json type there, which will allow mkDefault
and such to work correctly. I'll get to that soon.
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/nixos-20-03-feature-freeze/5655/8 |
8c5d0c8
to
308d74b
Compare
308d74b
to
868e897
Compare
Ok @Atemu, I really want to get this merged for you.
and while I updated the test I realized I couldn't use |
There's another module dnscrypt-wrapper, and we're missing documentation for the new (not so new anymore at least) dnscrypt-proxy. But these are todo's for a follow up. |
Also noticed that we had the rename for |
868e897
to
c85da94
Compare
Talked with @infinisil and I took #72815 (comment) out of context of #72815 (comment). I guess we should do this, but I don't understand it exactly. |
Thanks a bunch @worldofpeace! |
@worldofpeace I pushed a fixup commit doing what I meant |
bced1eb
to
9929beb
Compare
This removes the original dnscrypt-proxy module as well. Co-authored-by: Atemu <atemu.main@gmail.com> Co-authored-by: Silvan Mosberger <contact@infinisil.com> Co-authored-by: ryneeverett <ryneeverett@gmail.com> Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
9929beb
to
304785a
Compare
@infinisil thank you 😄 (commit for ref 9929beb @Atemu) Squashed/resolved conflicts, and added co-authors to commit message. |
This removes the old dnscrypt-proxy test.
304785a
to
39e893c
Compare
This works for me with systemd resolved. |
nixos/dnscrypt-proxy2: init (cherry picked from commit 74e4cb7)
Woo finally! Thanks a lot for your help getting this into 20.03! |
Motivation for this change
Implements changes requested in #72815
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)