From dae9cf6106da19f79a39714f183ed253c62b32c5 Mon Sep 17 00:00:00 2001
From: wayne <wayne.warren.s@gmail.com>
Date: Tue, 10 Jul 2018 12:31:08 -0500
Subject: [PATCH] dnscrypt-proxy2: init at 2.0.15

---
 maintainers/maintainer-list.nix               |  5 ++++
 .../dnscrypt-proxy/{ => 1.x}/default.nix      |  0
 .../networking/dnscrypt-proxy/2.x/default.nix | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++-
 4 files changed, 32 insertions(+), 1 deletion(-)
 rename pkgs/tools/networking/dnscrypt-proxy/{ => 1.x}/default.nix (100%)
 create mode 100644 pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f39605049eec16..791d00cdb561c2 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
similarity index 100%
rename from pkgs/tools/networking/dnscrypt-proxy/default.nix
rename to 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 00000000000000..dc4e4b93b1dd86
--- /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 afe4ac611784e4..644f5d821e6895 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 { };