Add dnscrypt-proxy2 package. #43227

waynr · 2018-07-08T16:46:30Z

I am adding a new package instead of simply bumping the version of the old one for two reasons:

The 1.x series of dnscrypt-proxy is written in C whereas the 2.x series is written in golang
2.x has different configuration conventions than 1.x; replacing the existing dnscrypt-proxy package with a backwards incompatible version would eventually break someone's preferred encrypted DNS setup.

I was reading some blog posts about encrypted DNS which recommended the 2.x series of dnscrypt rather than the 1.x. I also wanted an excuse to make my first contribution to this repository.

Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
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 nox --run "nox-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)
Fits CONTRIBUTING.md.

waynr · 2018-07-08T16:48:20Z

@joachifm @jgeerds since you two are maintainers on dnscrypt-proxy 1.x, I thought you might want to review this.

pSub

Looks good to me.

Mic92 · 2018-07-08T21:09:47Z

Should we keep the old version at all? It does not seem that it is maintained.

Mic92 · 2018-07-08T21:10:27Z

@GrahamcOfBorg build dnscrypt-proxy2

GrahamcOfBorg · 2018-07-08T21:11:12Z

Success on x86_64-linux (full log)

Attempted: dnscrypt-proxy2

Partial log (click to expand)

stripping (with command strip and flags -S) in /nix/store/1acx0cf3flyam6rzyw3wbxns66bsrl2m-dnscrypt-proxy2-2.0.15-bin/bin
patching script interpreter paths in /nix/store/1acx0cf3flyam6rzyw3wbxns66bsrl2m-dnscrypt-proxy2-2.0.15-bin
checking for references to /build in /nix/store/1acx0cf3flyam6rzyw3wbxns66bsrl2m-dnscrypt-proxy2-2.0.15-bin...
shrinking RPATHs of ELF executables and libraries in /nix/store/c8d0ydamyzy92x6hc04wkxvs09bb7a9v-dnscrypt-proxy2-2.0.15
strip is /nix/store/4qvrxzxa535y8304mk195x50b6p9607d-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/c8d0ydamyzy92x6hc04wkxvs09bb7a9v-dnscrypt-proxy2-2.0.15
/nix/store/c8d0ydamyzy92x6hc04wkxvs09bb7a9v-dnscrypt-proxy2-2.0.15/share/go/src/github.com/jedisct1/dnscrypt-proxy/vendor/github.com/coreos/go-systemd/test: interpreter directive changed from "/bin/bash -e" to "/nix/store/8zkg9ac4s4alzyf4a8kfrig1j73z66dw-bash-4.4-p23/bin/bash -e"
/nix/store/c8d0ydamyzy92x6hc04wkxvs09bb7a9v-dnscrypt-proxy2-2.0.15/share/go/src/github.com/jedisct1/dnscrypt-proxy/vendor/github.com/kardianos/service/linux-test-su.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/8zkg9ac4s4alzyf4a8kfrig1j73z66dw-bash-4.4-p23/bin/bash"
checking for references to /build in /nix/store/c8d0ydamyzy92x6hc04wkxvs09bb7a9v-dnscrypt-proxy2-2.0.15...
/nix/store/1acx0cf3flyam6rzyw3wbxns66bsrl2m-dnscrypt-proxy2-2.0.15-bin

GrahamcOfBorg · 2018-07-08T21:11:21Z

Success on x86_64-darwin (full log)

Attempted: dnscrypt-proxy2

Partial log (click to expand)

/private/tmp/nix-build-dnscrypt-proxy2-2.0.15.drv-0
post-installation fixup
strip is /nix/store/7ddbq63v97nk8gkbf7gcsfmby37h6gbl-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/26zc6gnzhmisz7bp0qj0zmkrpg06pg9n-dnscrypt-proxy2-2.0.15-bin/bin
patching script interpreter paths in /nix/store/26zc6gnzhmisz7bp0qj0zmkrpg06pg9n-dnscrypt-proxy2-2.0.15-bin
strip is /nix/store/7ddbq63v97nk8gkbf7gcsfmby37h6gbl-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/905gbckr6kwyzg7wkb02s3bx3x72vdks-dnscrypt-proxy2-2.0.15
/nix/store/905gbckr6kwyzg7wkb02s3bx3x72vdks-dnscrypt-proxy2-2.0.15/share/go/src/github.com/jedisct1/dnscrypt-proxy/vendor/github.com/coreos/go-systemd/test: interpreter directive changed from "/bin/bash -e" to "/nix/store/q2wqq1k20v8kc3vckapqf5nws30brnni-bash-4.4-p23/bin/bash -e"
/nix/store/905gbckr6kwyzg7wkb02s3bx3x72vdks-dnscrypt-proxy2-2.0.15/share/go/src/github.com/jedisct1/dnscrypt-proxy/vendor/github.com/kardianos/service/linux-test-su.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/q2wqq1k20v8kc3vckapqf5nws30brnni-bash-4.4-p23/bin/bash"
/nix/store/26zc6gnzhmisz7bp0qj0zmkrpg06pg9n-dnscrypt-proxy2-2.0.15-bin

GrahamcOfBorg · 2018-07-08T21:11:25Z

Success on aarch64-linux (full log)

Attempted: dnscrypt-proxy2

Partial log (click to expand)

stripping (with command strip and flags -S) in /nix/store/sfy52y5bid53gwrpmv085sb8raxkdbns-dnscrypt-proxy2-2.0.15-bin/bin
patching script interpreter paths in /nix/store/sfy52y5bid53gwrpmv085sb8raxkdbns-dnscrypt-proxy2-2.0.15-bin
checking for references to /build in /nix/store/sfy52y5bid53gwrpmv085sb8raxkdbns-dnscrypt-proxy2-2.0.15-bin...
shrinking RPATHs of ELF executables and libraries in /nix/store/4fvaj3r3f6vqlbwayjbjifqipzhlzi7f-dnscrypt-proxy2-2.0.15
strip is /nix/store/0pjsgkxz0rp5baycq5sp2s72lrr5q9sg-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/4fvaj3r3f6vqlbwayjbjifqipzhlzi7f-dnscrypt-proxy2-2.0.15
/nix/store/4fvaj3r3f6vqlbwayjbjifqipzhlzi7f-dnscrypt-proxy2-2.0.15/share/go/src/github.com/jedisct1/dnscrypt-proxy/vendor/github.com/coreos/go-systemd/test: interpreter directive changed from "/bin/bash -e" to "/nix/store/p0vy17dp9jk2mvqsxsqnb14s3797lay7-bash-4.4-p23/bin/bash -e"
/nix/store/4fvaj3r3f6vqlbwayjbjifqipzhlzi7f-dnscrypt-proxy2-2.0.15/share/go/src/github.com/jedisct1/dnscrypt-proxy/vendor/github.com/kardianos/service/linux-test-su.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/p0vy17dp9jk2mvqsxsqnb14s3797lay7-bash-4.4-p23/bin/bash"
checking for references to /build in /nix/store/4fvaj3r3f6vqlbwayjbjifqipzhlzi7f-dnscrypt-proxy2-2.0.15...
/nix/store/sfy52y5bid53gwrpmv085sb8raxkdbns-dnscrypt-proxy2-2.0.15-bin

waynr · 2018-07-08T22:03:58Z

@Mic92 I have no opinion on that; I didn't remove it because I didn't want to disrupt anyone who might be using it currently and it doesn't seem like much effort to just add a second package. @joachifm or @jgeerds might have an opinion on the matter.

worldofpeace · 2018-07-09T00:04:31Z

pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix

@@ -0,0 +1,26 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, go }:


I don't think you need go here

Okay, I'm trying to rebuild without it but removing it doesn't seem to invalidate the already-built binary.

worldofpeace · 2018-07-09T00:06:32Z

Isn't it standard to use a goDeps = ./deps.nix; in go packages? Especially one that is using dep.

worldofpeace · 2018-07-09T00:11:06Z

@Mic92 There's a nixos module and tests
for the original, so I don't think anyone wants that removed.

waynr · 2018-07-09T02:56:29Z

Isn't it standard to use a goDeps = ./deps.nix; in go packages?

Do you have a link to what the expected contents of ./deps.nix would be? Based on the name, it sounds like the expectation would be that we should specify the dependencies of dnscrypt-proxy in this file which sounds wrong from the perspective of someone who spends every day writing, debugging, or otherwise interacting with go source code. Coming recently from a non-go background I know it sounds stupid/absurd but the modern convention of golang dependency management (even with dep) is for projects to vendor their dependencies in-repo; case in point, here is where dnscrypt-proxy keeps its dependencies: https://github.com/jedisct1/dnscrypt-proxy/tree/master/vendor

Also, for what it's worth I didn't see anything like this in the package whose example I was largely mimicking for this PR: https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/version-management/git-and-tools/hub

worldofpeace · 2018-07-09T12:38:52Z

pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix

+    sha256 = "0iwvndk1h550zmwhwablb0smv9n2l51hqbmzj354mcgi6frnx819";
+  };
+
+  enableParallelBuilding = true;


no need to set this as it's default

nixpkgs/pkgs/development/go-modules/generic/default.nix

Line 7 in 92609ec

, enableParallelBuilding ? true

* The 'go' input parameter is apparently unnecessary. * The 'enableParallelBuilding' setting is apparently true by default.

joachifm · 2018-07-10T17:31:14Z

Thank you

joachifm · 2018-07-10T17:51:38Z

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add dnscrypt-proxy2 package. #43227

Add dnscrypt-proxy2 package. #43227

waynr commented Jul 8, 2018

waynr commented Jul 8, 2018

pSub left a comment

Mic92 commented Jul 8, 2018 •

edited

Mic92 commented Jul 8, 2018

GrahamcOfBorg commented Jul 8, 2018

GrahamcOfBorg commented Jul 8, 2018

GrahamcOfBorg commented Jul 8, 2018

waynr commented Jul 8, 2018

worldofpeace Jul 9, 2018

waynr Jul 9, 2018

worldofpeace commented Jul 9, 2018 •

edited

worldofpeace commented Jul 9, 2018

waynr commented Jul 9, 2018

worldofpeace Jul 9, 2018

joachifm commented Jul 10, 2018

joachifm commented Jul 10, 2018

		@@ -0,0 +1,26 @@
		{ stdenv, buildGoPackage, fetchFromGitHub, go }:

Add dnscrypt-proxy2 package. #43227

Add dnscrypt-proxy2 package. #43227

Conversation

waynr commented Jul 8, 2018

waynr commented Jul 8, 2018

pSub left a comment

Choose a reason for hiding this comment

Mic92 commented Jul 8, 2018 • edited

Mic92 commented Jul 8, 2018

GrahamcOfBorg commented Jul 8, 2018

GrahamcOfBorg commented Jul 8, 2018

GrahamcOfBorg commented Jul 8, 2018

waynr commented Jul 8, 2018

worldofpeace Jul 9, 2018

Choose a reason for hiding this comment

waynr Jul 9, 2018

Choose a reason for hiding this comment

worldofpeace commented Jul 9, 2018 • edited

worldofpeace commented Jul 9, 2018

waynr commented Jul 9, 2018

worldofpeace Jul 9, 2018

Choose a reason for hiding this comment

joachifm commented Jul 10, 2018

joachifm commented Jul 10, 2018

Mic92 commented Jul 8, 2018 •

edited

worldofpeace commented Jul 9, 2018 •

edited