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.
configuration = if cfg.configFile == null
then toml
else cfg.configFile;
Comment on lines 63 to 65

This comment has been minimized.

@worldofpeace

worldofpeace Jan 26, 2020
Member

please use 2 space indentation per documentation

This comment has been minimized.

@Atemu

Atemu Jan 27, 2020
Author Member

Does this look good? fb868cc

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

@Atemu Atemu commented Jan 28, 2020

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

@Atemu Atemu force-pushed the Atemu:dnscrypt-proxy2-service branch from fb868cc to 8c5d0c8 Jan 28, 2020
};
}
'';
type = types.attrs;

This comment has been minimized.

@Infinisil

Infinisil Jan 30, 2020
Member

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

@nixos-discourse nixos-discourse commented Jan 30, 2020

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 worldofpeace force-pushed the Atemu:dnscrypt-proxy2-service branch from 8c5d0c8 to 308d74b Feb 1, 2020
@worldofpeace worldofpeace force-pushed the Atemu:dnscrypt-proxy2-service branch from 308d74b to 868e897 Feb 2, 2020
@worldofpeace
Copy link
Member

@worldofpeace 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
Member

@worldofpeace worldofpeace commented Feb 2, 2020

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
Member

@worldofpeace worldofpeace commented Feb 2, 2020

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 force-pushed the Atemu:dnscrypt-proxy2-service branch from 868e897 to c85da94 Feb 2, 2020
@worldofpeace worldofpeace added this to the 20.03 milestone Feb 2, 2020
@ofborg ofborg bot added the 8.has: clean-up label Feb 2, 2020
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Feb 2, 2020

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 Atemu commented Feb 2, 2020

Thanks a bunch @worldofpeace!

@Infinisil
Copy link
Member

@Infinisil Infinisil commented Feb 2, 2020

@worldofpeace I pushed a fixup commit doing what I meant

@Infinisil Infinisil force-pushed the Atemu:dnscrypt-proxy2-service branch from bced1eb to 9929beb Feb 2, 2020
yegortimoshenko and others added 2 commits Oct 12, 2018
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 worldofpeace force-pushed the Atemu:dnscrypt-proxy2-service branch from 9929beb to 304785a Feb 2, 2020
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Feb 2, 2020

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

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

worldofpeace added 2 commits Feb 1, 2020
This removes the old dnscrypt-proxy test.
@worldofpeace worldofpeace force-pushed the Atemu:dnscrypt-proxy2-service branch from 304785a to 39e893c Feb 3, 2020
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Feb 3, 2020

This works for me with systemd resolved.

@worldofpeace worldofpeace merged commit 74e4cb7 into NixOS:master Feb 3, 2020
13 checks passed
13 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
dtzWill added 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 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
@emilazy emilazy mentioned this pull request Apr 23, 2020
7 of 9 tasks complete
@Atemu Atemu deleted the Atemu:dnscrypt-proxy2-service branch Jul 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
You can’t perform that action at this time.