From 39e893c468fe3ec2eaa6223dfc9be87ad4172389 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 1 Feb 2020 19:04:01 -0500
Subject: dnscrypt-proxy: remove

---
 .../networking/dnscrypt-proxy/1.x/default.nix      | 37 ----------------------
 .../networking/dnscrypt-proxy/2.x/default.nix      | 24 --------------
 pkgs/tools/networking/dnscrypt-proxy2/default.nix  | 24 ++++++++++++++
 pkgs/top-level/aliases.nix                         |  2 ++
 pkgs/top-level/all-packages.nix                    |  4 +--
 5 files changed, 27 insertions(+), 64 deletions(-)
 delete mode 100644 pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
 delete mode 100644 pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix
 create mode 100644 pkgs/tools/networking/dnscrypt-proxy2/default.nix

diff --git a/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix b/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
deleted file mode 100644
index fc4e40929c939..0000000000000
--- a/pkgs/tools/networking/dnscrypt-proxy/1.x/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libsodium, ldns, openssl, systemd }:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
-  pname = "dnscrypt-proxy";
-  version = "1.9.5";
-
-  src = fetchurl {
-    url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}-${version}.orig.tar.gz";
-    sha256 = "1dhvklr4dg2vlw108n11xbamacaryyg3dbrg629b76lp7685p7z8";
-  };
-
-  enableParallelBuilding = true;
-
-  configureFlags = optional stdenv.isLinux "--with-systemd";
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  # <ldns/ldns.h> depends on <openssl/ssl.h>
-  buildInputs = [ libsodium openssl.dev ldns ] ++ optional stdenv.isLinux systemd;
-
-  postInstall = ''
-    # Previous versions required libtool files to load plugins; they are
-    # now strictly optional.
-    rm $out/lib/dnscrypt-proxy/*.la
-  '';
-
-  meta = {
-    description = "A tool for securing communications between a client and a DNS resolver";
-    homepage = https://dnscrypt.info/;
-    license = licenses.isc;
-    maintainers = with maintainers; [ joachifm ];
-    # upstream claims OSX support, but Hydra fails
-    platforms = platforms.linux; # Maybe other non-darwin Unix
-  };
-}
diff --git a/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix b/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix
deleted file mode 100644
index 5c5cb7333ddcb..0000000000000
--- a/pkgs/tools/networking/dnscrypt-proxy/2.x/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  pname = "dnscrypt-proxy2";
-  version = "2.0.36";
-
-  goPackagePath = "github.com/jedisct1/dnscrypt-proxy";
-
-  src = fetchFromGitHub {
-    owner = "jedisct1";
-    repo = "dnscrypt-proxy";
-    rev = version;
-    sha256 = "05pk0fl4cyh69lfssvx9prd2gg0akw1l14b4q76zfhh9vc47z6x1";
-  };
-
-  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/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix
new file mode 100644
index 0000000000000..5c5cb7333ddcb
--- /dev/null
+++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "dnscrypt-proxy2";
+  version = "2.0.36";
+
+  goPackagePath = "github.com/jedisct1/dnscrypt-proxy";
+
+  src = fetchFromGitHub {
+    owner = "jedisct1";
+    repo = "dnscrypt-proxy";
+    rev = version;
+    sha256 = "05pk0fl4cyh69lfssvx9prd2gg0akw1l14b4q76zfhh9vc47z6x1";
+  };
+
+  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/aliases.nix b/pkgs/top-level/aliases.nix
index c75efae1abbae..d73e27bba0879 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -564,4 +564,6 @@ mapAliases ({
   '';
   oraclejre8psu = oraclejdk8psu;
   oraclejdk8psu_distro = oraclejdk8psu;
+
+  dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2."; # added 2020-02-02
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e760d73a893d..54b95df29cb48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2770,9 +2770,7 @@ in
 
   djbdns = callPackage ../tools/networking/djbdns { };
 
-  dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy/1.x { };
-
-  dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy/2.x { };
+  dnscrypt-proxy2 = callPackage ../tools/networking/dnscrypt-proxy2 { };
 
   dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { };
 
-- 
cgit 1.4.1