dnscrypt-proxy2: init at 2.0.15

NixOS · Jul 10, 2018 · dae9cf6 · dae9cf6
1 parent ff47879
commit dae9cf6
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 1 deletion.
diff --git 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/...ols/networking/dnscrypt-proxy/default.nix → ...networking/dnscrypt-proxy/1.x/default.nix b/...ols/networking/dnscrypt-proxy/default.nix → ...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
@@ -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
@@ -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 { };