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

nixos/dnscrypt-proxy2: init #78543

Merged
merged 4 commits into from Feb 3, 2020
Merged

Conversation

Atemu
Copy link
Member

@Atemu Atemu commented Jan 26, 2020

Motivation for this change

Implements changes requested in #72815

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.

Comment on lines 63 to 65
configuration = if cfg.configFile == null
then toml
else cfg.configFile;
Copy link
Contributor

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

Copy link
Member Author

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

@ryneeverett ryneeverett mentioned this pull request Jan 28, 2020
10 tasks
@Atemu
Copy link
Member Author

Atemu commented Jan 28, 2020

I just realized I made a mistake in implementing NixOS/rfcs#42 in line 6

};
}
'';
type = types.attrs;
Copy link
Member

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.

@nixos-discourse
Copy link

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

@worldofpeace
Copy link
Contributor

worldofpeace commented Feb 2, 2020

Ok @Atemu, I really want to get this merged for you.
I've:

  • added a release note
  • updated the test
  • removed dnscrypt-proxy v1

and while I updated the test I realized I couldn't use settings because the assertion on configFile would fail. I had to allow null unlike #72815 (comment).

@worldofpeace
Copy link
Contributor

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.

@worldofpeace
Copy link
Contributor

Also noticed that we had the rename for services.networking.dnscrypt-proxy but the module is services.dnscrypt-proxy. Fixed that.

@worldofpeace worldofpeace changed the title dnscrypt-proxy2 service: init nixos/dnscrypt-proxy2: init Feb 2, 2020
@worldofpeace worldofpeace added this to the 20.03 milestone Feb 2, 2020
@worldofpeace
Copy link
Contributor

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.

@Atemu
Copy link
Member Author

Atemu commented Feb 2, 2020

Thanks a bunch @worldofpeace!

@infinisil
Copy link
Member

@worldofpeace I pushed a fixup commit doing what I meant

lukateras and others added 2 commits February 2, 2020 11:11
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>
@worldofpeace
Copy link
Contributor

worldofpeace commented Feb 2, 2020

@infinisil thank you 😄 (commit for ref 9929beb @Atemu)

Squashed/resolved conflicts, and added co-authors to commit message.

@worldofpeace
Copy link
Contributor

This works for me with systemd resolved.

@worldofpeace worldofpeace merged commit 74e4cb7 into NixOS:master Feb 3, 2020
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Feb 3, 2020
nixos/dnscrypt-proxy2: init

(cherry picked from commit 74e4cb7)
@Atemu
Copy link
Member Author

Atemu commented Feb 3, 2020

Woo finally!

Thanks a lot for your help getting this into 20.03!

@rnhmjoj rnhmjoj mentioned this pull request Feb 11, 2020
@Atemu Atemu deleted the dnscrypt-proxy2-service branch July 30, 2020 12:52
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

6 participants