diff options
| -rw-r--r-- | maintainers/maintainer-list.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix (renamed from pkgs/tools/networking/dnscrypt-proxy/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 32 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f39605049ee..791d00cdb56 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4204,6 +4204,11 @@ github = "vyp"; name = "vyp"; }; + waynr = { + name = "Wayne Warren"; + email = "wayne.warren.s@gmail.com"; + github = "waynr"; + }; wchresta = { email = "wchresta.nix@chrummibei.ch"; github = "wchresta"; diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix index 6120b821bf4..6120b821bf4 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix diff --git a/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix b/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix new file mode 100644 index 00000000000..dc4e4b93b1d --- /dev/null +++ b/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "dnscrypt-proxy2-${version}"; + version = "2.0.15"; + + goPackagePath = "github.com/jedisct1/dnscrypt-proxy"; + + src = fetchFromGitHub { + owner = "jedisct1"; + repo = "dnscrypt-proxy"; + rev = "${version}"; + sha256 = "0iwvndk1h550zmwhwablb0smv9n2l51hqbmzj354mcgi6frnx819"; + }; + + meta = with stdenv.lib; { + description = "A tool that provides secure DNS resolution."; + + license = licenses.isc; + homepage = https://dnscrypt.info/; + maintainers = with maintainers; [ waynr ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afe4ac61178..644f5d821e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2012,7 +2012,9 @@ with pkgs; djbdns = callPackage ../tools/networking/djbdns { }; - dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy { }; + dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy/1.x { }; + + dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy/2.x { }; dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { }; |