summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2014-11-03 08:32:59 +0100
committerJoachim Fasting <joachifm@fastmail.fm>2014-11-11 22:46:49 +0100
commit216ed76821fdb92443498920da6e8d88af451f9d (patch)
treed62fc115a0c604416c33cf92ca5a91274ca9be0f
parentdb4053fb590d72f68da681b3460e1cecb103c294 (diff)
downloadnixlib-216ed76821fdb92443498920da6e8d88af451f9d.tar
nixlib-216ed76821fdb92443498920da6e8d88af451f9d.tar.gz
nixlib-216ed76821fdb92443498920da6e8d88af451f9d.tar.bz2
nixlib-216ed76821fdb92443498920da6e8d88af451f9d.tar.lz
nixlib-216ed76821fdb92443498920da6e8d88af451f9d.tar.xz
nixlib-216ed76821fdb92443498920da6e8d88af451f9d.tar.zst
nixlib-216ed76821fdb92443498920da6e8d88af451f9d.zip
dnscrypt-proxy: new expression
-rw-r--r--lib/maintainers.nix1
-rw-r--r--pkgs/tools/networking/dnscrypt-proxy/default.nix19
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 22 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d0e156ea1771..99d4c3e1832b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -80,6 +80,7 @@
   jcumming = "Jack Cummings <jack@mudshark.org>";
   jgeerds = "Jascha Geerds <jg@ekby.de>";
   jirkamarsik = "Jirka Marsik <jiri.marsik89@gmail.com>";
+  joachifm = "Joachim Fasting <joachifm@fastmail.fm>";
   joamaki = "Jussi Maki <joamaki@gmail.com>";
   joelteon = "Joel Taylor <me@joelt.io>";
   jwiegley = "John Wiegley <johnw@newartisans.com>";
diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
new file mode 100644
index 000000000000..d0205be35b92
--- /dev/null
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, libsodium }:
+
+stdenv.mkDerivation rec {
+  name = "dnscrypt-proxy-1.4.1";
+
+  src = fetchurl {
+    url = "http://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2";
+    sha256 = "00cf5c520c8a5a71ad4916b33aa0c8f9f55434039304f4ba10d7fffc620563f8";
+  };
+
+  buildInputs = [ libsodium ];
+
+  meta = {
+    description = "A DNS proxy which encrypts and authenticates requests using the DNSCrypt protocol.";
+    homepage = http://dnscrypt.org/;
+    license = with stdenv.lib.licenses; [ isc ];
+    maintainers = with stdenv.lib.maintainers; [ joachifm ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97b96e9b26cc..29d9fcae8210 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -977,6 +977,8 @@ let
 
   dev86 = callPackage ../development/compilers/dev86 { };
 
+  dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy { };
+
   dnsmasq = callPackage ../tools/networking/dnsmasq { };
 
   dnstop = callPackage ../tools/networking/dnstop { };